gentoo resync : 15.12.2019

101 files changed, 852 insertions, 781 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 74d41faaef6d..01ac8b6b0e83 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index 87d007dc6a54..00ad89b7beab 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,5 +1,5 @@
 AUX bbrun-1.6-list.patch 2945 BLAKE2B f8cad837778fb0d197605227d751247b71e14176a6b40ed303d2a8797db84d6e89f9ad13f7c96d9afdffc3e0697ae0c4035792b4c27bf864a057eed98dd4f3a6 SHA512 9cece93b2f75891f12a39f23bafca2ae48c7ef5344b63f7fb0e36c52013ccb236c1c8398eff8a271fbee5661abba561d3152bfee5ee437e3cee42f44f125fde7
 AUX bbrun-1.6-makefile.patch 730 BLAKE2B b70a72c4337059c277e2d4cd221fceb9714e91dd435609a1962bafc9fb02864db67c8aa047fa33a8cfc5f0111521e8ce1649b03f532b36d225459ae32b33427b SHA512 c4f3d4b13fbfd8a13279a3a3cab293b251f5e89b9eedff58bd681729ed571ea4efcbaecedd972706006a263b1140c76addac0b8c6f62f7be9c344f1c12a6dc6a
 DIST bbrun-1.6.tar.gz 21132 BLAKE2B 77b7cc5d55e6021f2a4347b2600c34f5168ec5fe2edc16fd2cdbb826e4ebf6ec1cb8cca04f2404b7698e6938b20fe588bcb6d70a23bd331b28b9e591cee8aa08 SHA512 7dfa73f90775ff5826b67c977184e617521cc1308f64e1445061e6b16f1cdadc81e3b12d16e1f2cb6ff0b58e59af6608c07dc0cb483c1c60794da3213e0bfe21
-EBUILD bbrun-1.6-r1.ebuild 653 BLAKE2B 1fdd82e8d05bc90644814b6523d30e1e4a9db0093379fb0d9419047ca52dc784164dca17992482a08c3e41beffc8c970293404c2f18759d69682ff15965117a4 SHA512 11f64316687c90396e7849bbe7b1182672480c3882ca3eef3027862d1af5e1c7f5097098c3c60b413bf26c888cd56715fe8ab2b967b926234316d0441b197dea
+EBUILD bbrun-1.6-r1.ebuild 646 BLAKE2B 66bf76c657050e31b118820ace1f3e0e12c8ceb6709da68907ff9612ba9cd6e71874ba18ff7343a7f2db374eabb3c9d33bdefe14341b5c4f19883d78b691483b SHA512 5dcf48c35ab9443f1bbe02a54247f98e20e9c3fcd0fcf2c63204efa76062b2b2ddb350e30ae69565625c6795db710c8c7a74203b7b623a03d579307494a7b4ac
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
index c4340fdd041d..07fa033e05dc 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -25,7 +25,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake -C ${PN} CC="$(tc-getCC)" || die
+	emake -C ${PN} CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/x11-misc/gmrun/Manifest b/x11-misc/gmrun/Manifest
index 8d4d9810634c..b9c63b31caca 100644
--- a/x11-misc/gmrun/Manifest
+++ b/x11-misc/gmrun/Manifest
@@ -4,6 +4,6 @@ AUX gmrun-0.9.2-glibc210.patch 324 BLAKE2B 6080d23e033fe589c6df27622c955dc4c8110
 AUX gmrun-0.9.2-stlport.patch 697 BLAKE2B 6ebb5d3a8a0a0047ab5a537a5a6f7814add9b9a9ae05feb0ac9b9eab8b5643097b2b31ec0afadfbe345abba89d46432b64bdf34e1f1516ffa2c0c4fd8422bddd SHA512 84ea68891309b6c3a29188e188e4572b7228abf3d874f138750cf51f33f8fc42aee33f8f4538fc80e324c16e64c68b739cc321cb94e49dd4ace5ec1b3bc4605d
 AUX gmrun-0.9.2-sysconfdir.patch 863 BLAKE2B 11cd0ded75db0d90843799a1e06cc9118bf323d540d3870acf3c98e34486b902cb08e03a859c2a0debb1761a5d20923d560b41e276743640d9ab7a85026cb8ce SHA512 0c201cc73f35bf1d56ccc072e2adcc8c6acf5d42d325919fc2e4c4d4440db076812e5a4dc67cde3f857b78332b7f37adc1fb250bababee6ff4aecc16ecc0cbee
 DIST gmrun-0.9.2.tar.gz 66097 BLAKE2B 3b8f253e8d683d02c8b6cc8da3d54103b53c6b9ebd4d90b4675325809f592f407a32532e6f0d3d3a112f5c7b9304eaae75bc3ba7f1e1b372614d95206edf0da3 SHA512 3ce881463c23b6c2c39b4d41ff98f3d4a2b77f45a46d4ac43d8bbf726fcb3769b643436932714f9f5c22b855188928453810468d165af2c2433059a0149d6422
-EBUILD gmrun-0.9.2-r1.ebuild 837 BLAKE2B 597e3bf5f5bb78fa88d6cd30f40ff8b988ddadd4628951280b0822d00a4c41c4a99639328564ccaa5cce79fef0ef778b1676eb3be8f73e2e498eac5b891dabf7 SHA512 20d45866530f4c4b817a44eecb37a756f7381c1679bea84413d4bd2064c6f9df5993f465d33545fd3425327edb9266c5318c8f13b11a50e22318c73bdc032885
+EBUILD gmrun-0.9.2-r1.ebuild 807 BLAKE2B 0072c5676d41c1747ed9c5fa4d054fe7bb95945562ade42e5c594c66cd6fc1c1e31144a76bed3fe5c2e6d18a4bcc965c4f8c3933c9893ccbe272d562bbec68b2 SHA512 b56da789824b6fdb5cf9f72a53757a2b0e6e2c1f8260867c6b9d05b2b95fc2e49c071860e3af64087bea36326d6888517276ae9253e4f26256248327dc652791
 EBUILD gmrun-0.9.2-r2.ebuild 768 BLAKE2B 3e79d32b18a322c86b83da6eb171ff6314757a8b2c81f7a6282301b015d73e3c29743354921b6ab7e410f1d88a808607313029ff6f9b689bdb80a8acd6b7011a SHA512 e36415e424243fd967bf85fb7cc66b8790da7db137aa61de9a0eaf24fc9c0199c2820a2bf54257e7e9827f0e427c653fd963941d72d824c4353f48040bfde46c
 MISC metadata.xml 523 BLAKE2B 64ba9f284e12ddc2c01c23641870422810ea147ef875177c633082e9ab65f86b0cef0ae332eb61235cee9facdc2de08a9a3e07b27cf595696ab3e42d03a161e2 SHA512 8cd78652f2a6be93952b1edb9570261fba71afff13eeba915e47c4178adfbb26450ed1159812ad211c941a0ffbd96b3e5b864c2c7300b882d2245285a1d3f730
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
index 237b61d4f568..4a0f55c5db3e 100644
--- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
@@ -35,6 +35,6 @@ src_prepare() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS ChangeLog README NEWS
 }
diff --git a/x11-misc/habak/Manifest b/x11-misc/habak/Manifest
index f859ac713000..d003a2b0e9b1 100644
--- a/x11-misc/habak/Manifest
+++ b/x11-misc/habak/Manifest
@@ -1,4 +1,7 @@
 AUX README.en 6729 BLAKE2B e7c97c01b774d6813bb87373b8634000b71094ad6668e6402805d8fd5ee6ec1cea523bd4239f0ae1b7d4f53fecfc7545c4990a172b87a13a8a0615d53b81ecc8 SHA512 2857284f10734223fc03c57150f796bad07ecdcf9fd687893155f16b3633903df322d397be7f5e51f2c5ac87ae27d246549dd098b36e061ffa2d2dd3ae610e58
+AUX habak-0.2.5-gentoo.patch 796 BLAKE2B 901f4673a8509029fde736c4dea5f809c268682b8a1800f51b21da40eb052a537e199193546c46169cb2d2914e61dbd8861b6e792f7618d8deba1122a2cf9a34 SHA512 0e18a2186dc533fe6defbb089e31999d16b1da3ed18a1315c6c54ea20b52641114a94cdc62d952d9dfe33f2a03899028aef4d6552141e79fb9399e9e42b396ca
+DIST habak-0.2.5-sourceforge.tar.gz 28747 BLAKE2B 60c6f60e0a16dca2091f41c9e4f419e5fb4be88a3ce44de98d91740f94e468fb7bd64bbf0b399b64035c21547b50fccf2e40954e0ff59ab1f1c0ce8dc6e56670 SHA512 4b1ff1484c65f74441b297e558360a8f2ea8f12ac63c4b74f846e41328dd84a1d619bde55e81224c3bd527897625e17bc07a6bb0d4cc3bd0eec6f4e787201277
 DIST habak-0.2.5.tar.bz2 22657 BLAKE2B 10b3c4808251b255bcf26935974514a2df5946520bd4bc080b9bdc551c727925c8b9a7485124013303654769b9daacff42d54fc0e5d567b26d99c5a75a0a50c2 SHA512 256ac24a3b322397b6cdbd2ca8add5938c77d166092a783234baa6186c3b4e01aeffd0b890749c7ac14aa39961e5fc6326f614ceb04eadfc5e4af282d04b7188
 EBUILD habak-0.2.5-r2.ebuild 955 BLAKE2B ce9836d9b21573542341bc80036cd83b0e5305be8e2fb446cb8896820dcd1beb375b5d5d41769660729248483ff7202c957703015c3d94b46c0ad56a78fa4590 SHA512 32324ee7e7f9401b99e3186d6f684581ec9855e1f9ebaf18fda0d016abfb5d7a7347d91fe68e5aeadac3e76c35aa17416652f2fb00d2dc168284d2b0ab3a6bd6
+EBUILD habak-0.2.5-r3.ebuild 787 BLAKE2B e792615c561d5433f74719d61440daf69544d3a343254da0218d0c70c6730b49ae8c8237cd74d9d380aa8cb6f0d518f4a421fc8dcfb5d4bdef9f7e646835b69f SHA512 cf414a9b0b5acf812d518a08683115550f24df563e00d916fb06328bdc477ae0984f04c98e4247e01e7f1ed8bffecb495b4b82868eefafea076fc400697b7364
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/habak/files/habak-0.2.5-gentoo.patch b/x11-misc/habak/files/habak-0.2.5-gentoo.patch
new file mode 100644
index 000000000000..2dd77451f8ad
--- /dev/null
+++ b/x11-misc/habak/files/habak-0.2.5-gentoo.patch
@@ -0,0 +1,30 @@
+--- a/src/Makefile
+--- b/src/Makefile
+@@ -2,22 +2,22 @@
+ #LDFLAGS = -L/usr/X11R6/lib -lImlib2 -lm -g -ggdb
+ 
+ CFLAGS += -I/usr/X11R6/include -Wall
+-LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm
++LIBS = -lm $(shell $(PKG_CONFIG) --libs imlib2 x11)
+ 
+ all:	habak
+ 	ln -f habak ../habak
+ 
+ habak:	xcore.o random.o habak.o
+-	gcc $(LDFLAGS) -o habak xcore.o random.o habak.o
++	$(CC) $(CFLAGS) $(LDFLAGS) -o habak xcore.o random.o habak.o $(LIBS)
+ 
+ habak.o: habak.c types.h defaults.h proto.h
+-	gcc $(CFLAGS) -c habak.c -o habak.o
++	$(CC) $(CFLAGS) -c habak.c -o habak.o
+ 
+ random.o: random.c proto.h
+-	gcc $(CFLAGS) -c random.c -o random.o
++	$(CC) $(CFLAGS) -c random.c -o random.o
+ 
+ xcore.o: xcore.c
+-	gcc $(CFLAGS) -c xcore.c -o xcore.o
++	$(CC) $(CFLAGS) -c xcore.c -o xcore.o
+ 
+ clean:
+ 	rm habak *.o
diff --git a/x11-misc/habak/habak-0.2.5-r3.ebuild b/x11-misc/habak/habak-0.2.5-r3.ebuild
new file mode 100644
index 000000000000..1dcc37e3e714
--- /dev/null
+++ b/x11-misc/habak/habak-0.2.5-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="A simple but powerful tool to set desktop wallpaper"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	media-libs/imlib2[X]
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+DOCS=( ChangeLog README TODO "${FILESDIR}"/README.en )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C src ${PN}
+}
+
+src_install() {
+	dobin src/${PN}
+	einstalldocs
+}
diff --git a/x11-misc/icewmcp/Manifest b/x11-misc/icewmcp/Manifest
index 4027d51dfc21..2c80058b191d 100644
--- a/x11-misc/icewmcp/Manifest
+++ b/x11-misc/icewmcp/Manifest
@@ -1,3 +1,3 @@
 DIST IceWMControlPanel-3.2.tar.bz2 586044 BLAKE2B cedf4156548deaacd8c114cd372c1b55a375851b52de124622deac202777730f9fd5096c711b87c7bb6aeb5bec3448185690ca5f8f26209f400b7c5a3246a829 SHA512 017b257bb30c49eb0b13a9570df70f6f8ccb55087121440cd1331f8364ddc6c23fae26c98bae1bd831f2a9fc52bef531cab9313f3e2ea209ce26d776ee64c47e
-EBUILD icewmcp-3.2-r4.ebuild 1481 BLAKE2B b6ec7d226f6bdf648569e9e872d8ef98ed16fe763cfce507a1b2db323fee1fac39d49677a2ae68b0d8bb63113d6bd1fa57affdfd91ded6644f2a5b25998a045e SHA512 7dfc3f4fbf96a6e53e3641aaf6cd7f55eca5d7fc977b5431c61f9addd9b30f1b8d9940f277d10638d282b8318f07bbc43082b4de05d895140b78de4d934b9ad2
+EBUILD icewmcp-3.2-r4.ebuild 1474 BLAKE2B faf05a8f52225538b975ac6ac5a776154077d880e126e087bd81aab6c9b604004993cb87b9c28029f805c2137b3a39bda62fc265f61dd66f6211d638ff01a38b SHA512 171152837a999c2afed9f40cbde6fe6a165f4269d5134db466a7aaec12e5048dc17ff7a93c572f8a5afc173fb02cc7b121c88e6f89e4d751d311ef236be9bcfc
 MISC metadata.xml 361 BLAKE2B 175f971e5b3aab6d05312ef598d8330b7a1ea524d6aff192aefbc109b7f49392b08e87b75531c3cdc87b880df2bc0f51fd12ce1fd1d35373a9b9be0296683ffd SHA512 aecb95a7b415e6ca55502d8bc3e1204fcd50b1d44045ba51d753b074050f4b757c48647d8d5e21fe7c9f8be23019b836eb972af4772efab8a28c4f957f7d1302
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
index 65d5ea53bf13..7304b1186c53 100644
--- a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
+++ b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
@@ -54,7 +54,7 @@ src_install() {
 	for w in "${wraps[@]}" ; do
 		set -- ${w}
 		printf '#!/bin/sh\nexec %s %s/%s\n' "${EPYTHON}" "${dest}" "$1" > "${T}"/$2
-		dobin "${T}"/$2 || die
+		dobin "${T}"/$2
 	done
 
 	dodoc ../doc/*.txt
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 4300e92cdee7..9fb69656fde3 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,3 +1,3 @@
 DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
-EBUILD j4-dmenu-desktop-2.17.ebuild 806 BLAKE2B 33cfa76df58b02cac721b34532768a71a9c883912181eff6fded7cf25c01a67a1a7acde5a7718ab70574356a0d9ad25674c75dc58b55045e8bc3d41d4780299d SHA512 0719a768fc80a6f3bc542a417e10a5a73d83e46b36ebf68dc920fdc35a1ea976e701b814a88a06af8dec9274ac85469605a6e5a756d3c8edbd8fe767091b9247
-MISC metadata.xml 818 BLAKE2B b7c476e13a8de66b8f828895f478988d2f7381ff2ca823d7e0a74bb931f1b5288dd4d574cc8e4e5d2f5d4c7b1cb24c9d4fd9bb8cd1a9710d43ba2e6db90430cb SHA512 4444201bda84c9fc9eaffca6904df20fd06bcdf772a09a16d20d08015fea6672edb9e17435b35933b9ce71552831560b361732147c510ab1d79cea43073de8e1
+EBUILD j4-dmenu-desktop-2.17.ebuild 844 BLAKE2B c7a6cd3d14f91e26e27012b8d47828753d3c966d146a10feb177aab0153cc6870266f7bc2b14cd24032ecaed9516c14ae3adddcd49b100d2b686df227fc6d3e4 SHA512 74f3fb875e880382c82077aafbb2a9c2174befb17456cf8601f18ff21604805c44a6152fe07513137b3d08c86411257a79832d5e82b750165a0c54e66d769070
+MISC metadata.xml 816 BLAKE2B cb61f2be4ec787970ee3d4493c8ff12582909778f99b2825bd6fd8305c8af9027aaa81ad7dc63d41562eb4aa4d0a176c0e20c8b6d2943121a8adb05da69489ce SHA512 b497342b293354d1928ac44072b2e5cda1ebc7f7027b346e6c55326e69ad843da0828abbd5e1b40e091d628c4f00f9889936c0474433bdd515e856d551dd372a
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
index 132952a0bfef..d95530d4b3ed 100644
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
+++ b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.17.ebuild
@@ -8,13 +8,14 @@ inherit cmake-utils
 MY_PV="r${PV}"
 
 DESCRIPTION="A fast desktop replacement for i3-dmenu-desktop"
-HOMEPAGE="https://github.com/enkore/${PN}"
+HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
 SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( dev-cpp/catch:1 )"
 RDEPEND="x11-misc/dmenu"
diff --git a/x11-misc/j4-dmenu-desktop/metadata.xml b/x11-misc/j4-dmenu-desktop/metadata.xml
index 146361db405a..6e9c2be5fb2b 100644
--- a/x11-misc/j4-dmenu-desktop/metadata.xml
+++ b/x11-misc/j4-dmenu-desktop/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
-		<name>Conrad Kostecki</name>
+		<email>sir.suriv@gmail.com</email>
+		<name>Diogo Pereira</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 87a2fa36605b..8746ba802b57 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,4 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
+DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2067 BLAKE2B cc9bccbf51bf4442ce17517dbe2a8144428d4f5c66715dcd1730632a085c0c9e42acb4f659ec3b84b08063eb75884c5a3ddd8e4beed004d0c93a096329f76786 SHA512 daa125ad030a5eda55fc81ee3d411769e3fb4718613edfff9648f2df426d78c700a66094fa9971dad662f7b5e6d765241cc9dcbc6bea5753258007084522b497
+EBUILD lightdm-gtk-greeter-2.0.7-r1.ebuild 2069 BLAKE2B 85ac307153999ed026fa7a05b25e930e204d4782427f7bd7fb7a4d8b82e59424786c40367341522bfbaa9a24bbbd463ef75143306cbeebde5f287291ea7419d0 SHA512 8c25b3c1950da716ffbf3e7d9270f4ac8dcfc0b0d3dc14338b1eab929bb82c42d7938c2069a3b6e2d22b543d3142e6be2f49ab903a8545ebd2dff0518f8a084d
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
new file mode 100644
index 000000000000..9f5a4ca5be0c
--- /dev/null
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.7-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="LightDM GTK+ Greeter"
+HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
+SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
+	branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
+
+LICENSE="GPL-3 LGPL-3
+	branding? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana branding"
+
+COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
+	x11-libs/gtk+:3
+	>=x11-misc/lightdm-1.2.2"
+
+DEPEND="
+	${COMMON_DEPEND}
+	xfce-base/exo
+"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-themes-standard
+	>=x11-themes/adwaita-icon-theme-3.14.1"
+
+GENTOO_BG="gentoo-bg_65.jpg"
+
+src_prepare() {
+	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
+	# I will fix this once I decide to update the tarball with a new gentoo
+	# background
+	# Bug #404467
+	if use branding; then
+		sed \
+			-e "/xft-hintstyle/s:slight:hintslight:" \
+			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			-i "${WORKDIR}"/${PN}.conf || die
+		# Add back the reboot/shutdown buttons
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
+	fi
+	default
+
+	# Fix docdir
+	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-kill-on-sigterm
+		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
+		$(use_enable ayatana libindicator)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use branding; then
+		insinto /etc/lightdm/
+		doins "${WORKDIR}"/${PN}.conf
+		insinto /usr/share/lightdm/backgrounds/
+		doins "${WORKDIR}"/${GENTOO_BG}
+		newdoc "${WORKDIR}"/README.txt README-background.txt
+	fi
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/macopix/Manifest b/x11-misc/macopix/Manifest
index 18e07f5bfdc4..5265b7de90bf 100644
--- a/x11-misc/macopix/Manifest
+++ b/x11-misc/macopix/Manifest
@@ -10,6 +10,6 @@ DIST macopix-mascot-one-euc-ja-1.02.tar.gz 199796 BLAKE2B 64c303704daadcd47379ea
 DIST macopix-mascot-pia2-euc-ja-1.02.tar.gz 191520 BLAKE2B 7fa81c34df02751563fff92fba5bde1d60720f659f49d714cbc5d45c93c394b9bae399c65b3950ed3defe929b9058e13bf51d08241ddacc80626e0ac4fa22d0f SHA512 4e0177ca699d9e9caea7a9b6f6d81b41a25e1f05f44c9df1ea31578ddb908fcf12e6463bb84f0536ae25df24aca712b17a0d068d74c587671bb202c8441b7f42
 DIST macopix-mascot-triangle_heart-euc-ja-1.02.tar.gz 310099 BLAKE2B f52f2ad14cd9c76f32eb8c582bd07886f50eb6ae2615766306081ea1850b51b205b5177831ca30ab4049fd07081ff42d5dc7c9858efa49ab79a6acf2135ff9b1 SHA512 133a3446a3713192ffef84cd381065b2a99db2eb0dd18692d54e7974eb26aa63eef6d051466ddf89152f6baa8e4625ae6e7e975cf944dd12e0b6cc17c56e5673
 DIST macopix-mascot-tsukihime-euc-ja-1.02.tar.gz 616138 BLAKE2B 8616fb0f3b8e4b72c6576dfada3794dc3e387d250e3a6f64eb2b290ef793f62c43f20ef9c03d2b309f4fd3860ce828a562f28ec37ca55ce8e2831315ccbd8a63 SHA512 226a175846a1f81a5aeedab6d7b85e38903d3b85a88a4a2c9a91365ba8a149a9ee54d6174bf8c4595cbe6542d3afcebd440a4185402c2139310664059515a2c5
-EBUILD macopix-1.7.4-r1.ebuild 1820 BLAKE2B c9fa77abbfbbde5c4ec3b2b09ec078223bb3ed20dc44b4ca7ea05bdb5f83310d82320b2599510eb5c4157ae3be48503b117db1fb65a0fad9fd48e8769e5aef5b SHA512 1d11c0d2c98b16f5544d4a8895d539dfa9a191f64d4ca55f5f4d1bc2e49f42af13b92e7fd15c5ef29f1fd64d8e6bee93fe31ab64cdf52c0255efd53dba393cca
+EBUILD macopix-1.7.4-r1.ebuild 1813 BLAKE2B 91da4479a1a1385166ad0553b27610061e100486dd23b54dbfcdf97543aa6e180282b2f8283cbef50b3567308e9a1a3d5f611b104e46b3614083959cdcef0e97 SHA512 0d5f63840612f49787422e1a670b840db03f381d38cb686873a0bbd8e6cc86f2525b5dc826f4d003c769c03ec801920d389684fc7fa37838d78ddb4a2155f809
 EBUILD macopix-1.7.4-r2.ebuild 1770 BLAKE2B f707f59869697cb0650f4ea63571fa7ca71730bda7131b4b43adc4272bcd073f745f96544bcd30263f43646ee434c7df46689a10c3af07c1793ded2ae9a621d1 SHA512 35e71d8325425b5e7be9303ca0a822e8f46b2a36fe1470e7bbfd215f0227b8a5dbe4b0ca19d07c92110e760a086c9c41d09f5827efa2c7b937d04c5e987c3642
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
index 59e739739fd5..2d547a63583e 100644
--- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild
+++ b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
@@ -74,7 +74,7 @@ src_install() {
 		cd "${WORKDIR}/${d}" || die
 		insinto /usr/share/"${PN}"
 		for i in *.mcpx *.menu ; do
-			doins "$i" || die
+			doins "$i"
 		done
 		insinto /usr/share/"${PN}"/pixmap
 		for i in *.png ; do
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index 8db98518a742..82924169bda2 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -3,5 +3,5 @@ AUX menumaker-0.99.11-AM_PATH_PYTHON.patch 2579 BLAKE2B 67b3924544429c998229b439
 DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
 DIST menumaker-0.99.11.tar.gz 205196 BLAKE2B 5f1fa9cbf4fd739499db86f9173fbbea2c96900597d13185f2a2f2b5746a0a2c05d12b115782488cb5b1df1f48638bb831dbee4bb14c414fc11328f43d241c46 SHA512 b45b8f2de4e63bad673bf4463ac074b068d4889cf37644962d51e1514d07bef827679d060d1503e59ea4bfc460fdc643d850921b3a02babd1ea57249511ffa5a
 EBUILD menumaker-0.99.10.ebuild 1104 BLAKE2B 2782727d4c1dd000ef0faca3582247a635fa038a044662affd70acb5d20d2a6b687910244c133bf338191d0585c2c464b89c576603baddcac82ad05879578e29 SHA512 e2acb93e90ad017f234cf2da40461fa0c1d23b1db87e77f6d929eb2ef9119e05af49428e3343fbcedc45e11b756960344178a3d69fc3d8af6a10a5847f962ce8
-EBUILD menumaker-0.99.11.ebuild 1095 BLAKE2B 090bc1cff45b7354bc2ece658b4de91aa25a33d46b75ac39077d2f0e96bf023f938d33a52f72577145b3a1b5d686188133882b3f9cf36aa8359fd6adf1aadbf2 SHA512 0838c88c1a979f90b20c1ff466fd0fce40f8f12ee294c056df25fa5bf9bb08fb8d91564dcee3100a78ffe2579fb58bc5481a94e19e0a8a08800e1de648a09011
+EBUILD menumaker-0.99.11.ebuild 1099 BLAKE2B 5a3ba34a96916299b2910b565f4362bc94a137c3d282e1055e0a62c8c307afc03fd19675c55a72d0dc7b1c5d885f163f09a8174080d41e7a2173b1672e64121c SHA512 03f7074d8c386ffb60b8dbf6608e7db9cc41f9e09c0d19f6458b3c27f6f977f16d68a836f9e0a24ecb97c43338b807005ed5396124b9f7a9e4461cbceaaedf4c
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/menumaker-0.99.11.ebuild b/x11-misc/menumaker/menumaker-0.99.11.ebuild
index 14d2b4ab3443..81798732faf1 100644
--- a/x11-misc/menumaker/menumaker-0.99.11.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.11.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit autotools python-r1
 
diff --git a/x11-misc/mugshot/Manifest b/x11-misc/mugshot/Manifest
index 649ac3f6804d..65b1f8210d37 100644
--- a/x11-misc/mugshot/Manifest
+++ b/x11-misc/mugshot/Manifest
@@ -3,5 +3,5 @@ AUX mugshot-0.4.1-use_office_phone.patch 996 BLAKE2B 4c8647647f424775a1557f176b2
 DIST mugshot-0.4.1.tar.gz 121660 BLAKE2B ce0c0d4b76184f35e4ba5204b984393412924c0288b09fe51ec0e6635b1556e24ed98ce4a893ae57f25810bb39ce035fb40b6990e1b6516406cb0f670acdbac0 SHA512 f7790b3f80fc98d9b19e9b9dd74eafc41ae7598e38f70e148502056b4bd375922271cc72cf4664280f1449b2f5e1d89052ecc5d37c6dc453041e5312f736bbbe
 DIST mugshot-0.4.2.tar.gz 121020 BLAKE2B c092e25273dbd8ef9cbfbc001fb5f86b134ed8f9bf5d84993d5f46664f17eb74eda5c121ee70b5f0c4b0adb5aa1fc4d21d8c59d3f0cf4a4f67991d06690f5aa5 SHA512 721629cf4a7e4d84fd8505279cf88c88ac88c7b6c995ac84a2fd6a9b978c92716bbe20d7b0301ca70e99c007698e4cddf41b6cf1111bf496eec4d39591cd9ed1
 EBUILD mugshot-0.4.1.ebuild 1383 BLAKE2B 56ab49a4fce25c48c20501c836e912a2428ad94fd433c578250ce7ef5d1cabb745b321df330d0197b09b9a59a44a48d768ce71916a72a809dd4ce273f0cf17a4 SHA512 3b1d071637e5bf52803f6eafdfe4d1d182a1759d58700bc26e2bf165b0f7d1f93abde45ca7810714b72b74cdcaabb10b03a9c16d2439b1c92e27192af4dcbbcd
-EBUILD mugshot-0.4.2.ebuild 1414 BLAKE2B 02dc1988ee6d855feedda855ca86480f20b1d876cc3538c2097e9033032d60948bb4305843c0861f64eb4e75dca30fe909eb8a1164d1b7f7ccaa9bdff9b7903a SHA512 dfaa9c8e353a3150d72db7fcf531636428b46a43ffefc13dba3b4e9328b02704e9b9ed45c5a3eb330d4525547c1a0e135d92440d8aaef1c96538ba45149d04cb
-MISC metadata.xml 1062 BLAKE2B 4605018f3dbdffef5f56c7d2c31b709f9c97e7de79b1186590e154972cfc606b1644f7f1891aecb485da24423b4c5f8d79e0a54696a9c4bc6d5a0f94d4366244 SHA512 11760483e66c46f574994cfd078e2d3cac936c571bbc869154442bb32b1e9239f1d1014d035a3caf1c5d3afa80fc2bdf9129ee572db23616744e26d51ab0de78
+EBUILD mugshot-0.4.2-r1.ebuild 1538 BLAKE2B d18c836d77b8271af443274cc3e012590b17e895f3e02cb3d41e2c190371b69acbbeb1bde1211ce25768e73346545b43c200bb86eb63abf99b7e8a86cf2eee01 SHA512 9a9141b1202c67c46119ca878766e1fd9a14689832939cfa53b294ead19f1b133164df9ed0d560dfdf4106c487ac6b6494ead718c8c059c758fdf85beb70cf1c
+MISC metadata.xml 943 BLAKE2B b39c09aa84b6a1f25d001e073b2c369af9ebebb7448fff5b3abc83898516963e117c33d1c03fb6db72422e4b20c065ed78e711326f28912e1ed5321b232bbee1 SHA512 3b4e66543245b2db7d1c255adf30112834935ab552a7d6773921838510417e000fd41c63fcab7e6be8df043f3daeab1cfcbebccaebf44f6185abfcb47898a3f2
diff --git a/x11-misc/mugshot/metadata.xml b/x11-misc/mugshot/metadata.xml
index bea9f9a88f76..d3d7bd83c151 100644
--- a/x11-misc/mugshot/metadata.xml
+++ b/x11-misc/mugshot/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Mugshot is a lightweight user configuration utility.
 		Mugshot allows you to easily set profile image
diff --git a/x11-misc/mugshot/mugshot-0.4.2.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
index 49f8a2302259..d73d30cc473e 100644
--- a/x11-misc/mugshot/mugshot-0.4.2.ebuild
+++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_USE_SETUPTOOLS="no"
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -16,14 +17,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome libreoffice webcam"
 
-RDEPEND="
+COMMON_DEPEND="
 	dev-libs/gobject-introspection
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
+
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	dev-python/pycairo[${PYTHON_USEDEP}]
 	sys-apps/accountsservice
-	x11-libs/gtk+:3
+	sys-apps/shadow
 	gnome? ( gnome-base/gnome-control-center )
 	libreoffice? (
 		|| (
@@ -42,11 +48,12 @@ RDEPEND="
 "
 
 DEPEND="
-	${RDEPEND}
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+	${COMMON_DEPEND}
+	x11-libs/gtk+:3[introspection]
 "
 
 BDEPEND="
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
 	dev-util/intltool
 "
 
@@ -55,8 +62,10 @@ S="${WORKDIR}/${PN}-${P}"
 python_install() {
 	distutils-r1_python_install
 
+	python_optimize
+
 	# Since DOCS are installed twice, remove the wrong path
-	rm -r "${ED%/}"/usr/share/doc/mugshot || die
+	rm -r "${ED}"/usr/share/doc/mugshot || die
 }
 
 pkg_postinst() {
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 0c31d3cc510f..d02bcca5fe1f 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,4 +1,4 @@
 AUX peksystray-0.4.0-asneeded.patch 798 BLAKE2B fa17b9f091ccb94dc11c6086bc1bf648b08b4da3e192fa1998f09375e747cab854f25b72614998ec5289e2992ae1dcbd06dc47ffce5acb299bb4106dab35863e SHA512 d3f4c392d38b2e0f143d7e7dfa7a12ecb82e8d93f6651e254ee17d078487f6d95316f88d66a125ffc25abd2574a053f9a2b0e946bbba7f8a7d5b12903dbc8f21
 DIST peksystray-0.4.0.tar.bz2 73810 BLAKE2B 4ac452f14acff5afb8e14fc07a18d5efe6b68696c7063d8cd337c14b9bc0cdcb573ff830f9cc7e3b7057154a3e2a179da26977696101fbb56750320a3913b3d3 SHA512 9dc5d1df630b7447575011e971a9657a5987bdd6098c81444b7579c46bfd7747f4df18fa00376e70b046c52ae7ca95d6cb66ce8a57070795f2f8d497fa025341
-EBUILD peksystray-0.4.0.ebuild 554 BLAKE2B bfea69bc53205417709b9e6cb74e4cfa59319b3e76eb5bca9a50480a130dafaee741614aaaa2854f36d5419aa3bf62d526b48ca6ed05b4565d3cc555376f6720 SHA512 1f5cd4aa6252412b8870b1bfc5dcbc4137cf3a2ee156ec5a9326c3f1f57258ac04610134ecd081ea962432278abe3bd767026c1e732c32b6b46a9bbb79a8ef60
+EBUILD peksystray-0.4.0.ebuild 547 BLAKE2B 42c4115b62a092d851564ab0601a8722cbcf980bbc46035a571c5113de0a29a12c276f0cac21783b3dde562d9e93887ed6dcd20656f2eb00ec2885050817ff0e SHA512 4ff02d178772e466f82105a23556170ac74f7f8b1420cd6cf6006e0faf40001108cc5a98faa650d013978dbc759bfce2c8ba7992a946f6abb140d20a11f281c7
 MISC metadata.xml 300 BLAKE2B 750e120260f327b198e47b84c2ebfafad92c8e0e4565bf01b06df63ee8ba8c092d1a7f2474bc9b422d786393521c4a2439fdad56f7e5a90974872b904ec55eb0 SHA512 9a298c4fd2d42e5f14b22502fc97899123eb6bfa42143a1efd7df086c2bd97030ab04a731839e787774b216e08cbf829d7c9802b15a0a9ed412e94455e52f484
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 7b9185bd136c..470c7f0efdc0 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -24,6 +24,6 @@ src_prepare() {
 }
 
 src_install() {
-	dobin src/peksystray || die
+	dobin src/peksystray
 	default
 }
diff --git a/x11-misc/picom/Manifest b/x11-misc/picom/Manifest
new file mode 100644
index 000000000000..a04e33105123
--- /dev/null
+++ b/x11-misc/picom/Manifest
@@ -0,0 +1,5 @@
+AUX picom-7.5-no_opengl.patch 680 BLAKE2B d0d0e9cf752ac003bc312b736dd64388924b6a0371180da0aac7578a85b988c554c7d30a4e419b930775020b99480fed2c1fbd95868989c94ad9997727fdacfc SHA512 b15c5a471bf343667d3fbc14d16d04789eaadcb2cb906668f6235a085c3a91c2bf0e1f0822a5dc5bab5272ca7b1dd3de97087faa6916526ca49e703ae69772d1
+DIST picom-7.5.tar.gz 219456 BLAKE2B 54113547b575ad6aa1329e92ae331b7d49207fdcdc6b49d31d8ab125f7335730a7e53b260c6a6c33d5350bec1e9e6357fd34023dc7837de165289446f8f492b8 SHA512 6535e5eab1a243bbee62448bc48830b7ea3566f94b2c45d9ca76fd8b8056e1f00e55f0e4b58110364d2c4f56652cc005622d644c1db1db41d2811ecc19e6d44a
+EBUILD picom-7.5.ebuild 1319 BLAKE2B 3eedb0c1c067387f223bee4876ef26d6a4398edfe799ddb8e0863fbc95b7710473a7c1221e74d130ac24f60b567c6d64f53b8c13d4f058b159297a56a5207b10 SHA512 d83a6f837462b0853f9ff0e42497440be1008914209ee609cf48c0e96bec1531d79155192dcf5621b5ade55fb9e837d789ec93a8dcb68808fb93fb388ab82c36
+EBUILD picom-9999.ebuild 1037 BLAKE2B e56f67c6bfaddb20669f4a298cdafbb96870757ce2ac9659b05758f82c8dc893f3188b606150b859b7def9c61abc9acf20b2c62d4b4a623fb3c3dd841ee8e88a SHA512 3102f7c837005513855a3ca06d4f219cf3fe816b1e546e9c0e98f913fef6acb980979efcd5b1decd759f799ee2178a9b37a2bb5487caecbbd57a7365a27dbb4a
+MISC metadata.xml 577 BLAKE2B 03bf133766c29ef57009d5f5ccec8d6557dbf2acde1a234dadcd6a49fdb20f0b59c2dc4c6aaca4dc9f668e31d067e98491916c040c1992e6e845c0efae9dda10 SHA512 46f801d5a03d4dd377232a866a40d90316f5f93746cdb89e179df65c0dc333d338e49070dcc5f49eeac6625c1376c678fbdc326e140902c0bb28cff4ea4c515b
diff --git a/x11-misc/picom/files/picom-7.5-no_opengl.patch b/x11-misc/picom/files/picom-7.5-no_opengl.patch
new file mode 100644
index 000000000000..ca9f715140ee
--- /dev/null
+++ b/x11-misc/picom/files/picom-7.5-no_opengl.patch
@@ -0,0 +1,27 @@
+From bd5a5fb56812ee5644e4c4bd1fdd82b9899317a7 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 12 Oct 2019 13:29:10 +0000
+Subject: [PATCH] Unbreak -Dopengl=false clean build
+
+In file included from ../src/x.c:17:
+../src/backend/gl/glx.h:10:10: fatal error: 'GL/glx.h' file not found
+ #include <GL/glx.h>
+         ^~~~~~~~~~
+---
+ src/x.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/x.c b/src/x.c
+index ed6668a8..2f802f1e 100644
+--- a/src/x.c
++++ b/src/x.c
+@@ -14,7 +14,9 @@
+ #include <xcb/xfixes.h>
+ 
+ #include "atom.h"
++#ifdef CONFIG_OPENGL
+ #include "backend/gl/glx.h"
++#endif
+ #include "common.h"
+ #include "compiler.h"
+ #include "kernel.h"
diff --git a/x11-misc/picom/metadata.xml b/x11-misc/picom/metadata.xml
new file mode 100644
index 000000000000..1cda4a2c157c
--- /dev/null
+++ b/x11-misc/picom/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>voyageur@gentoo.org</email>
+		<name>Bernard Cafarelli</name>
+	</maintainer>
+	<use>
+		<flag name="config-file">Enable config file support</flag>
+		<flag name="drm">Enable support for using drm for vsync</flag>
+		<flag name="opengl">Enable features that require opengl (opengl backend, and opengl vsync methods)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">yshui/picom</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/picom/picom-7.5.ebuild b/x11-misc/picom/picom-7.5.ebuild
new file mode 100644
index 000000000000..5c07720ed5f7
--- /dev/null
+++ b/x11-misc/picom/picom-7.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+inherit meson python-r1 xdg
+
+DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
+HOMEPAGE="https://github.com/yshui/picom"
+SRC_URI="https://github.com/yshui/picom/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+config-file dbus doc +drm opengl pcre"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/libev
+	dev-libs/uthash
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/pixman
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-renderutil
+	config-file? (
+		dev-libs/libconfig
+		dev-libs/libxdg-basedir
+	)
+	dbus? ( sys-apps/dbus )
+	drm? ( x11-libs/libdrm )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-text/asciidoc )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no_opengl.patch
+	)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use config-file config_file)
+		$(meson_use dbus)
+		$(meson_use doc build_docs)
+		$(meson_use opengl)
+		$(meson_use pcre regex)
+	)
+
+	meson_src_configure
+
+}
+
+src_install() {
+	meson_src_install
+
+	python_replicate_script "${ED}"/usr/bin/compton-convgen.py
+}
diff --git a/x11-misc/picom/picom-9999.ebuild b/x11-misc/picom/picom-9999.ebuild
new file mode 100644
index 000000000000..2141a6126a2d
--- /dev/null
+++ b/x11-misc/picom/picom-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 meson xdg
+
+DESCRIPTION="A lightweight compositor for X11 (previously a compton fork)"
+HOMEPAGE="https://github.com/yshui/picom"
+EGIT_REPO_URI="https://github.com/yshui/picom.git"
+
+LICENSE="MPL-2.0 MIT"
+SLOT="0"
+KEYWORDS=""
+IUSE="+config-file dbus doc +drm opengl pcre"
+
+RDEPEND="dev-libs/libev
+	dev-libs/uthash
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXext
+	x11-libs/pixman
+	x11-libs/xcb-util-image
+	x11-libs/xcb-util-renderutil
+	config-file? (
+		dev-libs/libconfig
+		dev-libs/libxdg-basedir
+	)
+	dbus? ( sys-apps/dbus )
+	drm? ( x11-libs/libdrm )
+	opengl? ( virtual/opengl )
+	pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig
+	doc? ( app-text/asciidoc )"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use config-file config_file)
+		$(meson_use dbus)
+		$(meson_use doc with_docs)
+		$(meson_use opengl)
+		$(meson_use pcre regex)
+	)
+
+	meson_src_configure
+
+}
diff --git a/x11-misc/projecteur/Manifest b/x11-misc/projecteur/Manifest
new file mode 100644
index 000000000000..defb9793aad7
--- /dev/null
+++ b/x11-misc/projecteur/Manifest
@@ -0,0 +1,3 @@
+DIST projecteur-0.6.tar.gz 286242 BLAKE2B 80385b946fbd8ba8f6f5db4c495f382252a5c644d0626c0e6f0b95c9a1785a3fdba8347115c456517da1c5627238883db7b253a98f3aa4912dc75adc54af1f82 SHA512 d97cd9facb0db0199ae0c569a1e4c881f30901a31966f23a94d093cab5582af1b8199d7b7d2d074d852dc2c22f4ce249b9690e99e8b4d79444d17d22bcabcbc0
+EBUILD projecteur-0.6.ebuild 776 BLAKE2B 64a92dcb133efc515f6b08716d76cf5622d74b29c992836b0178b700fc8457de73815733a20736801d378966348b6344681304e7b3d048748b208b29bf2c2a3b SHA512 c0affe2a60c4052688c313c0b1bcddc2e8b149252f38ddae8a96eb440e7fa95369955db2b5707799b3212ac7a73cd747c8d20fdf7cdd9d5af911648f4e6784c0
+MISC metadata.xml 612 BLAKE2B 84ebf5cc3be489a0f7483e81b43dcee7067ec325a8a6c58f2350107921d0844bc7d084d7a35cddc95296c2f1046c4e098fed2b8748f0834df90c152dcd70e91e SHA512 d51be761cc4f93a47230bb63685fb367d7b0846b048733d192c6e36e9ac87f49cfcc28631ab4980dbc50213a9bbe23d3b0db665c5257e1e0e79804d9752e822c
diff --git a/x11-misc/projecteur/metadata.xml b/x11-misc/projecteur/metadata.xml
new file mode 100644
index 000000000000..429e23db7082
--- /dev/null
+++ b/x11-misc/projecteur/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		A Linux application for the Logitech Spotlight.
+		Features: A configurable desktop spotlight,
+		configure color, opacity, cursor and the center dot,
+		multiple screen support.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/jahnf/Projecteur/issues</bugs-to>
+		<remote-id type="github">jahnf/Projecteur</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/x11-misc/projecteur/projecteur-0.6.ebuild b/x11-misc/projecteur/projecteur-0.6.ebuild
new file mode 100644
index 000000000000..2891b3b14b88
--- /dev/null
+++ b/x11-misc/projecteur/projecteur-0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/p/P}"
+
+inherit cmake-utils udev xdg-utils
+
+DESCRIPTION="Linux Desktop Application for the Logitech Spotlight device"
+HOMEPAGE="https://github.com/jahnf/Projecteur"
+SRC_URI="https://github.com/jahnf/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5[xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	virtual/udev
+	x11-libs/libX11
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+pkg_postinst() {
+	udev_reload
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	udev_reload
+	xdg_icon_cache_update
+}
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index a808e7567509..8bfb6ad6b49c 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
-DIST py3status-3.21.tar.gz 398586 BLAKE2B 9ca738aa36da54752d95766d8e03ef2e6b89724fbe88e2fd5154f7624f83fac7160a203cdc3400acd053afa69ac99724211401d1e951f8195bf4139d490a4cdc SHA512 4d04b44777bc0f9eb07da266b0719fcd6a707cfdb95e1b98673d244b290276e6179584881ae605933966bcf7682181554669badad1ca56ef604e6e9a3feae6a2
-EBUILD py3status-3.21.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
+DIST py3status-3.22.tar.gz 399414 BLAKE2B eb7da2c86dbebf59ff62f29ca81e697e4c326e36a130513b64cd03de5d79dcf5354a676405242cd0149af6acd43dc561aec6818bf4d6417fdcf8a67bfdf9cad2 SHA512 5139d494bc101cf8f29eb058fa4ae00f7876adeac83d300e342a0566f0b553b60e971bbca4180bf713ec9c4e9d4b2cfec36920f7c6dfc9dbbe8d9f329d62e0cf
+EBUILD py3status-3.22.ebuild 727 BLAKE2B bb056869027dd91f5608fde7b83ee4771bace3171bec976007b436ff84ee09d21f198dc354120655faa7cbbefdd949519140a09803c3069e7dd022eda0ce3456 SHA512 b93f5666683892101224570bc15e63ab77cb8430c892c3dab13aa1a095d0886bc67c230ccafe00e7175f7403241df98fd191731c15c52c80568c00d8f7947ac9
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.21.ebuild b/x11-misc/py3status/py3status-3.22.ebuild
index e0e182b53d5d..e0e182b53d5d 100644
--- a/x11-misc/py3status/py3status-3.21.ebuild
+++ b/x11-misc/py3status/py3status-3.22.ebuild
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 91865893a66b..0dd1a7cf8114 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,9 +1,5 @@
-AUX qtfm-99999-cmake.patch 1480 BLAKE2B 47b7ece97e9d7851d425042b287a0b2f67ac816e1df92eb3f90b830303a672c71707abe7ee855a45630184da2fd1f58cec8a3319b520d7113ae9180646acb8a2 SHA512 c03941d097f70696b113500893abdab87f58de139da13c83a90355b6760908d7e78434190f86d2105d9978f03d7a931a851fbcf25e87b131d1aca5ee508770af
-DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
+AUX qtfm-99999-cmake.patch 323 BLAKE2B 023794991cc9a91792388e8d56d54542f50cf42ebe0d3a4bbf534d59acb869ada9465ab216b0e2a7978dd60d7ab9a15198f3e272707400d5d6f14b823ef1ac6b SHA512 74ee9c0e39bd826bc73aedfb79208e18bfc1348a49e7c0290d7a96375f3c56ec5d074d463bcf8256cb6ee5155b2d88f7c4c20544193c574db30356260c74bc52
 DIST qtfm-6.2.0.tar.gz 411064 BLAKE2B dce16b79753de31c58b36aa51b2f5555a12e19778ce81ca980bb5775f694d5315df97f4ac7b060653748a3ec2bc69b0f88599bca44696ce8b6a8026b30abbf9f SHA512 44bcef3d9e4111388aa93fd8c51d65a5210e969071d79336a4451a78ec7503867d8c667325eeafa5f85ee922dd787746e6ac94e17a61c07914c12364cfa8951d
-EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
-EBUILD qtfm-6.1.9.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
-EBUILD qtfm-6.2.0.ebuild 1065 BLAKE2B 995db393d18c4b3d4c914da2c0f447e2010ebd988cb7f58f985534c56718375614523ded5e2c892aea02205bf397f8062691689cdde3402f9f3efef66f613416 SHA512 f40f47446a8c16faf7bb67ac56b159e3f7daa747080e87737641d9448ec2b0f302ade8d3318e904a3a36021c6e0cd5deac653b44be5b856784cd09e07c329f1a
-EBUILD qtfm-99999.ebuild 1030 BLAKE2B 34b38de342c95c52f8aec35b9124ce13d06444f4a8a4ca31815e7cd6b931f2a8c301e4411cb5d4a578d171636dc32854f5fc5c3d99cf3db2f6aa0ffa648f41ca SHA512 18826a59a8698f7d07cd40a60fae10c8692301b3dfd993f908e1c8ade01f49f965390d2f87a9f2173aab4f49ec8b7e4a03a08348fe52d25c1b040aee133ba3b5
+EBUILD qtfm-6.2.0.ebuild 1063 BLAKE2B 11a90f7c2a39a1d13376d0dd811476c74e612c3465ad377c324c486d333b5d4454ad98f99d1c90099e27f509acf054832662adee2a878b14a88995b3a9dc1cec SHA512 cae5d0cc10fb49a56cc60fc256daaf332c5b114472eabf9a9d59368711d06fd550904bcef6115627c2d076928de28dc2d80ff87685fa6929b23d951cea1236c9
+EBUILD qtfm-99999.ebuild 1029 BLAKE2B 954d8340cd54e00502ea6d53a178d398aa897cac6bce74e4ab3361850c07dffc9a864b21462ea7c699b2c3ec34d65a801b6c95d58159fd87d449a9a35d979751 SHA512 711343c211d1e4892baa76c6a441aa12fb383e3ccd8d07c49879d4f03a54690f27ce925e2abf411c178d0411bf1ec659309b48d4449273285d8f7e96d66b5007
 MISC metadata.xml 535 BLAKE2B aecaf2f611f0c47f5ec04b5fab8d45d7d0cf4c3b029a4605f2dadcf11237fd3fce56d10e8fab1611e716c70f303ca93deba25c3f884aeb7c798b9e411be7a024 SHA512 28844f26bfd8c62e896340bbe7f8466903eecf97e8eba6f5003c407258692ac76fc2799836c7a27643b1c4f9a5ba7033366414acc8f60b4f72b352e740026a7b
diff --git a/x11-misc/qtfm/files/qtfm-99999-cmake.patch b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
index a89d090510df..815453760fe2 100644
--- a/x11-misc/qtfm/files/qtfm-99999-cmake.patch
+++ b/x11-misc/qtfm/files/qtfm-99999-cmake.patch
@@ -1,47 +1,10 @@
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -36,7 +36,7 @@
-         add_definitions(-DMAGICK7)
-     endif()
-     find_package(PkgConfig REQUIRED)
--    pkg_check_modules(MAGICK REQUIRED ImageMagick++)
-+    pkg_check_modules(MAGICK REQUIRED Magick++)
-     # ffmpeg
-     if(ENABLE_FFMPEG)
-         pkg_check_modules(AVDEVICE REQUIRED libavdevice)
-@@ -66,7 +66,7 @@
- find_package(Qt5Concurrent REQUIRED)
- 
- # inotify
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-     find_package(PkgConfig REQUIRED)
-     pkg_check_modules(NOTIFY REQUIRED libinotify)
- endif()
-@@ -123,7 +123,7 @@
+@@ -121,7 +121,6 @@ set_target_properties(
      ${PROJECT_VERSION_MAJOR}
  )
- if(ENABLE_MAGICK OR ENABLE_MAGICK7)
+ if(ENABLE_MAGICK)
 -    target_compile_definitions(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
-+    target_compile_options(QtFM PRIVATE ${MAGICK_CFLAGS_OTHER})
      target_link_libraries(QtFM ${MAGICK_LIBRARIES})
      if(ENABLE_FFMPEG)
          target_include_directories(QtFM
-@@ -161,7 +161,7 @@
- if(ENABLE_DBUS)
-     target_link_libraries(QtFM Qt5::DBus QtFMBus)
- endif()
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-     target_link_libraries(QtFM ${NOTIFY_LIBRARIES})
- endif()
- if(APPLE)
-@@ -192,7 +192,7 @@
- if(ENABLE_DBUS)
-     target_link_libraries(${PROJECT_NAME} Qt5::DBus)
- endif()
--if("${CMAKE_SYSTEM}" NOT MATCHES "Linux")
-+if(NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-     target_link_libraries(${PROJECT_NAME} ${NOTIFY_LIBRARIES})
- endif()
- if(APPLE)
diff --git a/x11-misc/qtfm/qtfm-6.1.5.ebuild b/x11-misc/qtfm/qtfm-6.1.5.ebuild
deleted file mode 100644
index 88902e6b9aaf..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_prepare() {
-	sed -i -e '/^docs.path/ s:$${TARGET}-$${VERSION}:'"${PF}"':g' fm/fm.pro || die
-	default
-}
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.1.9.ebuild b/x11-misc/qtfm/qtfm-6.1.9.ebuild
deleted file mode 100644
index e80647d017f5..000000000000
--- a/x11-misc/qtfm/qtfm-6.1.9.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit xdg-utils qmake-utils
-
-DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
-HOMEPAGE="https://qtfm.eu/"
-SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-apps/file
-"
-DEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	eqmake5 PREFIX=/usr XDGDIR=/etc/xdg
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index e330a1bea393..8ec496a5bd70 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/rodlie/qtfm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+dbus shared"
 
 RDEPEND="
diff --git a/x11-misc/qtfm/qtfm-99999.ebuild b/x11-misc/qtfm/qtfm-99999.ebuild
index 012984f236ab..61cdeb65e860 100644
--- a/x11-misc/qtfm/qtfm-99999.ebuild
+++ b/x11-misc/qtfm/qtfm-99999.ebuild
@@ -37,7 +37,7 @@ src_configure() {
 	mycmakeargs=(
 		-DENABLE_DBUS="$(usex dbus)"
 		-DENABLE_FFMPEG="$(usex ffmpeg)"
-		-DENABLE_MAGICK7="$(usex imagemagick)"
+		-DENABLE_MAGICK="$(usex imagemagick)"
 	)
 	cmake-utils_src_configure
 }
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index bae0c7d316ab..8c6024cbedf8 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,3 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.12-r1.ebuild 1942 BLAKE2B 1fa6db5f74d95241f8660e8a70cfcf7e2b1c1ec999b3f31dcb8c5bb3249bba03776d658fac3ddabfef883a1bda0af321fed01fd7643ed17cfc2325fc6783f03f SHA512 b44ceb94269c892838fff899fba525cf5fe561fec39977ef3c84a95a781074f516fa3f49b49898052b3aa38641bb4a31c4dcd9f7ca55a4dd701873c9a9d91d1f
-EBUILD redshift-1.12-r2.ebuild 1944 BLAKE2B f8cdd23da354c73fe549924029e08dce3044ed3f1b2a53fb5f3f98d244b4f5f0b6dac45f7df146a87e6945e88195ac0f718a2428a5b0fb28d82401b31be4ee73 SHA512 53c4ca2fea3a7ceefb2dfbf95dfa1f2a3d242c6fd8e98e003b5e7cc9557b3b59550bb1297beb8ad234b5373fd244acb1d9e0127ab33d3699714b600007f5e650
-EBUILD redshift-1.12.ebuild 1925 BLAKE2B 4009bb9d76c2088d519e70046a8695d046009d8c38d7c10f88c7fb8ea61d2aa74b67c2a59e279a80935a3e5fdf22d2e927e08f43f344f1257eeb07ddf0744728 SHA512 4e0456eaf95571ca8b58faf8db6e81290fe6eb6463f0a78260e190da16374aa6ae3f16fb1a0307961133433db2a39a2152bcb08367ae5e3302fcd7e678b80ded
+EBUILD redshift-1.12-r3.ebuild 1979 BLAKE2B c8477ee501a0f20c4eaa47a493b1dd9d57479cbbfbe138da5b4130267cfe35b08ed15f3b043e6c7ee706d9632dd5eda6ac343756d731e5b12e3e8fe9f88ee181 SHA512 75925f7e15c02cb83c9d2861e3d696699c4ac64350332eb650e1a801c99b84df4dc126303daf6f16e7ad9b369a200a892d2c06f582cc144cddd54114a3d2a349
 MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.12-r1.ebuild b/x11-misc/redshift/redshift-1.12-r1.ebuild
deleted file mode 100644
index e53725fb2471..000000000000
--- a/x11-misc/redshift/redshift-1.12-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit systemd autotools eutils gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="ayatana geoclue gtk nls"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	ayatana? ( dev-libs/libappindicator:3[introspection] )
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		--disable-silent-rules \
-		$(use_enable nls) \
-		--enable-drm \
-		--enable-randr \
-		--enable-vidmode \
-		--disable-wingdi \
-		\
-		--disable-corelocation \
-		$(use_enable geoclue geoclue2) \
-		\
-		$(use_enable gtk gui) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
-		--disable-quartz \
-		--disable-ubuntu
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/redshift-gtk install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/redshift-gtk
-		dosym redshift-gtk /usr/bin/gtk-redshift
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/redshift/redshift-1.12-r2.ebuild b/x11-misc/redshift/redshift-1.12-r3.ebuild
index 7ce1fd9516b9..b0a34731e938 100644
--- a/x11-misc/redshift/redshift-1.12-r2.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="ayatana geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
@@ -53,7 +53,7 @@ src_configure() {
 		\
 		$(use_enable gtk gui) \
 		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
+		--enable-apparmor \
 		--disable-quartz \
 		--disable-ubuntu
 }
@@ -70,6 +70,8 @@ src_install() {
 		python_foreach_impl _impl_specific_src_install
 		python_replicate_script "${D}"/usr/bin/redshift-gtk
 		dosym redshift-gtk /usr/bin/gtk-redshift
+
+		python_foreach_impl python_optimize
 	fi
 }
 
diff --git a/x11-misc/redshift/redshift-1.12.ebuild b/x11-misc/redshift/redshift-1.12.ebuild
deleted file mode 100644
index 8f866b931797..000000000000
--- a/x11-misc/redshift/redshift-1.12.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-inherit systemd autotools eutils gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ayatana geoclue gtk nls"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-	ayatana? ( dev-libs/libappindicator:3 )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		--disable-silent-rules \
-		$(use_enable nls) \
-		--enable-drm \
-		--enable-randr \
-		--enable-vidmode \
-		--disable-wingdi \
-		\
-		--disable-corelocation \
-		$(use_enable geoclue geoclue2) \
-		\
-		$(use_enable gtk gui) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-apparmor \
-		--disable-quartz \
-		--disable-ubuntu
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/redshift-gtk install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/redshift-gtk
-		dosym redshift-gtk /usr/bin/gtk-redshift
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index 0f3e1d1373b9..144baeef9006 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -3,8 +3,8 @@ AUX rofi-1.5.0-gtk-settings-test.patch 322 BLAKE2B 652e0c20262bc18abadc8e540d4b9
 DIST rofi-1.5.2.tar.xz 377732 BLAKE2B 560c5a4d30d143cbb5ca9030086d614a8f56a5e17b75c1b3f3a2e57bbd16de304b733bc4fd6093e716c993051e238811e9e65ffbf165d2ae4723f0bde1b15b42 SHA512 8fbbcaa040148d204878380f7cb96fa31228f72b68a97a5bcf8d8cd69740f6b185f5e5d2bc2e1d35e267a84b21576eb356c33be827fd1b767460665493360c16
 DIST rofi-1.5.3.tar.xz 383016 BLAKE2B 8898af3df161b668b506e5d56a031081c911efc2be37f2dc687e068b58afe906cf9d4186bb166fa953de98eb758d4d125443c6122ccd5c2a861b25cd0473f70c SHA512 6dc4b3c2818f4606e42e8185032788d40c4dae9e67596b3b7f767e8f6ca2963b85602baa4287474520ecdb8e333ae211fce5e7252f3b95e0f90b862040aad117
 DIST rofi-1.5.4.tar.gz 535259 BLAKE2B 8560dfee631c66a6f2178c0af6926ef317ed6d2cfe3ae46264e5b1ce429113ce810e4fed4c86a81acbbd51c85ad2593f40a39d982d7da0aa8ccc55537cadd2bb SHA512 181dedb0905bfab76f7ad313d299f4c80ee4efb11a2c6345b16044b7fb3f54bc7e304ee9352e562932e55108e328e5f6bd2c1d7fd9bcdec3d8022c2dc4f8d394
-EBUILD rofi-1.5.2.ebuild 1026 BLAKE2B 09114dd10d8c217a679290e931d7379248e041a8eb8d80ab0edcc473f2313bbe222be7bcb50193021043e9a84c877a7375cf8845ac925f23061a45126117c85e SHA512 d790bef15510cfebce3e9bd4bd11e7975c7759cbe1ff4b11fbcab67b2fc3feb5e87b485c180dce1241ea2a5e0775a7c1e985d4da7ac06c48fd37345c834c3a4a
-EBUILD rofi-1.5.3.ebuild 1028 BLAKE2B fd3c587b7a3dfe641b349de61853e74cd4113e9bcb3b6dd065ff1e52819ba15bd7cb1baa70b47cd0538dceedfc908ba18c122b2ece9b77cc3f36adf970559773 SHA512 33afb70c3c6b34977fa9f85a33ec0ff7bc93bb7bc086a9e2c3f557f9064097a8a510b4e891aad020ac3503103c6d785a40b994a6777432ef660b00b75769cf9b
-EBUILD rofi-1.5.4.ebuild 1028 BLAKE2B 2a2f1910076144c81b866d753b08fa6f6ac9d1619416b7b5cbf138e1504597dd14ed6459041a7a26d0384f12c037bbe5f04ebbc5b61d9269908534a1e0a3a592 SHA512 5ac15de8c11b4fbedaf59a3ec773447c0e1bf4f41f22e7226b8224009c82d745fbe53cb5c3018109fa0e0bd6712022f84ef24b9cc1a47ebf54fe6782cfa294b6
-EBUILD rofi-99999.ebuild 987 BLAKE2B 285f9b609c87ba1fbf1ffaff7321c01cade1fa23fd9537d185df6c6e207b692fa42b9d356826afe2e9ec31d7e71e5bc71db95b303d2a126b268b59176a637a37 SHA512 bc3fa1c97c0995c49836a753b7b2fe53f342009bca7f79310c121d8da431e74fd4f1aa786a583c4cea1fa5d66218923a355af092a9d418559b33361e77dc2841
+EBUILD rofi-1.5.2.ebuild 1053 BLAKE2B afee9e957584e67ded803e89aa986369bd29ef33405c29bc9e351609775d12f943df0b29bb8e518d5f739b5b02e4ae072d9c845bc94a3731802f157b43857082 SHA512 8668478992eecfc9de41dba312507a1a6da6efb2397757c495bd11e7d03f96aad7a6031ba1ed71dbc208274e39f1ffe0adfb3aa7158d37911cccabf9e6ecaf3e
+EBUILD rofi-1.5.3.ebuild 1055 BLAKE2B a96e23febe9caad878d7451f3fee8f40b990d195f88bb6d4fb1e9af61e1820a67cc08e9beb33f096f35009144ce1a3701995ba4f9ed12ab9e7e0f044c7130dc3 SHA512 0df25001fb622679aa08792ed630a47d8fd1a9374d51f063ff41c891ebe42dd435ab11160dc926906d1311e319421a8a56ab8067926312a0273bb1f6efd3b7b1
+EBUILD rofi-1.5.4.ebuild 1055 BLAKE2B 7b1911c35a0a3fb7b2531d3529d6297f55e013fa42659d064fc1fc4a73bdd03c1c09568207692f70bcc707586719ba4f7e5326eda67903052ae0a7bfef57416b SHA512 1e17936aeabcdd1dd1c854976a4a41799a7a825183b93e8f245587baf908199360668921f4a6d3356f9a1c15c22078672a975a4c970b909ce9df635071c149de
+EBUILD rofi-99999.ebuild 1014 BLAKE2B e14a555da1dd4b72fb5b885e2f6dcef028f9e245cde72e9c323d3d9b78d73838c79f8cc092ab2e7817468d5da98a246836fcd30a68840c101682d19075269bb8 SHA512 09cecb99658f34c2024508b098be0b0416eaf454c9e9ae892131370768f9a87bdde2b675160b3020e65ace72653614132ade104f739a9a0726f440fc69377059
 MISC metadata.xml 495 BLAKE2B 0a6c59c1d1db2ae103cf8165f39dfda9beb4dad681379f6f6bed7cf3f0a44f06e9cbd77457dfea4bcb0c42e3df8c6e2c7c83ea4a9185e1a4131db214d26058cd SHA512 afcce018b90e20d190e8da510c57b27b92508a40972fc5e573c185561dd0daa3ce3fd57c689c2ec65902087aaec7d1273ed151abdc5c6be76706f694c1c9510f
diff --git a/x11-misc/rofi/rofi-1.5.2.ebuild b/x11-misc/rofi/rofi-1.5.2.ebuild
index 28358e44e207..0c49e367f508 100644
--- a/x11-misc/rofi/rofi-1.5.2.ebuild
+++ b/x11-misc/rofi/rofi-1.5.2.ebuild
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 IUSE="test windowmode"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/rofi/rofi-1.5.3.ebuild b/x11-misc/rofi/rofi-1.5.3.ebuild
index 5c664f0c427f..b6894cba5a94 100644
--- a/x11-misc/rofi/rofi-1.5.3.ebuild
+++ b/x11-misc/rofi/rofi-1.5.3.ebuild
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test windowmode"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/rofi/rofi-1.5.4.ebuild b/x11-misc/rofi/rofi-1.5.4.ebuild
index bd6bafcb7798..ba83a26d19f7 100644
--- a/x11-misc/rofi/rofi-1.5.4.ebuild
+++ b/x11-misc/rofi/rofi-1.5.4.ebuild
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test windowmode"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/rofi/rofi-99999.ebuild b/x11-misc/rofi/rofi-99999.ebuild
index 20cc98b76c5d..04b40fd1fc7e 100644
--- a/x11-misc/rofi/rofi-99999.ebuild
+++ b/x11-misc/rofi/rofi-99999.ebuild
@@ -12,6 +12,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
 IUSE="test windowmode"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/glib:2
diff --git a/x11-misc/screen-message/Manifest b/x11-misc/screen-message/Manifest
index 8a00dca1ef1b..33192f96fa9e 100644
--- a/x11-misc/screen-message/Manifest
+++ b/x11-misc/screen-message/Manifest
@@ -1,5 +1,5 @@
 DIST screen-message_0.24.orig.tar.gz 348147 BLAKE2B f8973c1af5165fa21061c8202788061a78100c94325f9e3dcc9628ef0e02cef43017a58439cf1ebb49378b84182ca5a3b6650306e38f691c87e0ced3992f1173 SHA512 0553c43fc4357c756d2a6ce6dab7e8d3fa880faf90a4bee68b706a0cd8b2a0b92a2e77bd3930e473deaeca75afadcadd946cd3d5c9d116786a4bd0f5cee80506
 DIST screen-message_0.25.orig.tar.gz 348684 BLAKE2B 04d067b71b5d23862a8750a3f403938e2ec243bd25c79f601770b89f86ddcf066e05a3550c26be8479707d5571e67f187d5d556af6662682099f35e45704f1ba SHA512 30fb47fa0d0707c7219517df5384f559c4a56b5b259d2d1940b50e05834052142d97c8c776d9b22d52f2fe502b7bfe15ee5667f7d2aaa8dc3a29f5677560be41
-EBUILD screen-message-0.24.ebuild 642 BLAKE2B 4f3eaa9fcdd2032dc54285c2ff3bbc22ab45616df546d9bf07ce2563566a096c92b17712aa5348fe63624901e5958dba9cba34313148b817bb490bcb6f05482f SHA512 5d0dcb76d0446a80d19432031a11499d41da9e3f48db4a7488e51af86672e12629902e55f8aba55c06e8e235facda7afa3abd90fe71e80294535c21b3a3af9d6
-EBUILD screen-message-0.25.ebuild 642 BLAKE2B 9279b7d1dd034f646d6634cea9c5b03e0a16abcb7a337b0a9429d897d16c0233496cd199d2a4a36cd74f272d86eb958d4bc31809cce51cdec0f10f7094cbdc4c SHA512 bf45174b3989a225cdc84bd07a4069458a77b8a9094184498ed1331d2011d24e2e2083e8155b691b1abc747cace41c5e87c163c26d639ec2090dcd9d9349c8d2
+EBUILD screen-message-0.24.ebuild 635 BLAKE2B c21bf30ced19da5ba1ec5aaf62eba64bd9c6877469b21dd5764765caafc094418695538dd9833f0ef85fe7dcc7f21f3d2bd2e1cd12a5f1b52df337eedcd13600 SHA512 15eed290a2f17d0856a86ba9abfbaf411439dc8d2bf0fee4148e4d3172b3cfc807ff8dbcaec468cfdbe5c2ef118a53aa4aab2aba2e6732a0d5e33d50e606e321
+EBUILD screen-message-0.25.ebuild 635 BLAKE2B ff183f3000199f70f8acb38403adab6c6a656572965c4a1d613397c2cfc5d4f81af2eb83d06a05f4bddc8e5d797c3252a3cf50d6d58cf4313a9b7845d172dd64 SHA512 524953611648ad4c4246b8b53cdd0f447ba4b0393e53f9821369864fc4e052aa85e5f21421af22a8e2b9b2f4298d5acbd27c365c6f2251744065fca38b1a66af
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild
index 660c376e0ee0..9ddb6ea960fd 100644
--- a/x11-misc/screen-message/screen-message-0.24.ebuild
+++ b/x11-misc/screen-message/screen-message-0.24.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
 src_install() {
 	default
 
-	dodir /usr/bin || die
+	dodir /usr/bin
 	mv "${D}"/usr/{games,bin}/sm || die
 	sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die
 }
diff --git a/x11-misc/screen-message/screen-message-0.25.ebuild b/x11-misc/screen-message/screen-message-0.25.ebuild
index f3df7c0075dd..2c0b46504706 100644
--- a/x11-misc/screen-message/screen-message-0.25.ebuild
+++ b/x11-misc/screen-message/screen-message-0.25.ebuild
@@ -20,7 +20,7 @@ RDEPEND="${DEPEND}"
 src_install() {
 	default
 
-	dodir /usr/bin || die
+	dodir /usr/bin
 	mv "${D}"/usr/{games,bin}/sm || die
 	sed -i 's|Exec=/usr/games/sm||' "${D}"/usr/share/applications/sm.desktop || die
 }
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 9cca61b1f3ad..df33e1db87fa 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -9,5 +9,5 @@ AUX sddm-0.18.1-revert-honor-PAM-supplemental-groups.patch 3616 BLAKE2B 71a4c6f5
 DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e5db4d879eed2a7cae1472b90124d2ca65404edae8727a047a9d761b72382dc9ddb206f8dc35b5101856cf377 SHA512 4440acfc6f98ab8efe8e3a441e8dc9ee98615c3544f8adc899bc4f0334e4f1b0d37c1ef823b32cc466adc8fac942cd188b33eb49795e0468a136a959c65c7566
 DIST sddm-0.18.1.tar.xz 3402972 BLAKE2B 99ab43d374e9a3d318f692a6d496d8a6d68927af3c8e8fc2208d7355ec90649a14758b39f5733dd32f942ed569de88085576d4f5f8666f4f97079e0fb6dcb99e SHA512 ff0637600cda2f4da1f643f047f8ee822bd9651ae4ccbb614b9804175c97360ada7af93e07a7b63832f014ef6e7d1b5380ab2b8959f8024ea520fa5ff17efd60
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
-EBUILD sddm-0.18.1-r1.ebuild 3115 BLAKE2B 28a915bba1937f1c58e11c3ab5e9e815a3a0a1b60d84b02def057a7c1fd391d3047f16223b7382386738d101abd7269758cb8dfb05375b5bf7089d46bd3be115 SHA512 5e2bb8279b1ff7ff392c6a0a10251beedb57f0ca204cc182fe6221452f7ff93e72ba26cd65664f2c91b8814aedb5746ade2a655c1a947214ff790e90fc3ff3d6
+EBUILD sddm-0.18.1-r1.ebuild 3142 BLAKE2B 5bd177c229306976db79f0725b0fab2b100a2090673500865641d66ced0f4037cb721ad17f0155773b691d21446fdb01c34b8f3266daba2f459aae382e4d3dbc SHA512 f6f3aeecf9384a18cca3d2b26f90542ca6d947f59738e274e8d77c5ab9ceb9fd82e22a7fd7d1ce370aeb762fef399ed1a6823b16ac9b2ec8b615484dae40de47
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.18.1-r1.ebuild b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
index 6aa05f682d1f..bc72ee39cb81 100644
--- a/x11-misc/sddm/sddm-0.18.1-r1.ebuild
+++ b/x11-misc/sddm/sddm-0.18.1-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit elogind +pam systemd test"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="?? ( elogind systemd )"
 
diff --git a/x11-misc/seetxt/Manifest b/x11-misc/seetxt/Manifest
index 82dacd8de432..cc68f0df608b 100644
--- a/x11-misc/seetxt/Manifest
+++ b/x11-misc/seetxt/Manifest
@@ -2,4 +2,4 @@ AUX 0.72-0001-fix-linking.patch 1182 BLAKE2B 812fc30468d4ba59802660df6f2c7e8782e
 AUX 0.72-0002-fix-shared-files-install.patch 1081 BLAKE2B 8fa5e2e94962d7c0686a9fa8e642b44cf862f3ce678ef3703d723fe90412fa94b98a03de3a043d046a58fa61e85b7159a95253bd89b1f718422b342c83220848 SHA512 9d3fd3ef0e18274fac97408045de72b64a91daa9246e728e74810e70eef33150acc7d62a1e3a2eea5ec21c61866f2e5312bc219b09b7445d852e68516d049620
 DIST seetxt-0.72.tar.bz2 141695 BLAKE2B 60d652b9099fb1b039c78142a90382f63cd71a9eedb687e23ef720db43e7e21cde6d6bfd4759eb38887e5db3cc33b87894b102da25ef88ac31e6cf53632ad623 SHA512 3d6e604e3ee8b0d382dcf60a507c54162eb28d5a9d61edc631a40a95f550276bf4e505ea37966a50d7f38ba952408d8d06b91bc71a8eb32322cb047a4ffc27ea
 EBUILD seetxt-0.72-r1.ebuild 767 BLAKE2B 9487fe23f9a1f7fc87ed62d2172412edce8f13f39e037079f439e59345a4177de3a31a8987fbe559e6f6fb850d91b0410f189ab48f0066278f7de3e85e6fb3f4 SHA512 57ae2bdd2a538d2300c5688b4d37f7782a4a78bb2dcf055eb7cabf2c489698776e3d12c3292f356238ee30607647dffd4d49f3028318fe5ca6bb0646092bf64d
-MISC metadata.xml 377 BLAKE2B 0a8dcbbb888355c23ef7bde226d338ad70679c903372585aed7355c2de65ef7adef8f8146d12523ef25a7f9f21ab664714cf4ea6bceddd0b432742db8dd111c3 SHA512 049289ae46dc53942d53d3a5782296f93c7be610986ee8f28b81d27287a56d10a01de80df81983daf1fe16a2f4431a43419fe906f374ada06b5eaacb88ca427b
+MISC metadata.xml 294 BLAKE2B e08046654c3172e703132f65821f0a5b0feed6f0d30b0960d0976ef322ea9382ab19cb3f768a3bf5d89f134086b4ae9824248e42b735338205b58d88acf96023 SHA512 11d125ca45f33597d1e0038c53ab2e4ce7d108a2da0bee40955e2295e4186f9e8bfb9118d738a8781395bc9c0614053a1797e4edc7171fbc75cbb63eea64ad4a
diff --git a/x11-misc/seetxt/metadata.xml b/x11-misc/seetxt/metadata.xml
index d0df61afb9e5..89bdea614842 100644
--- a/x11-misc/seetxt/metadata.xml
+++ b/x11-misc/seetxt/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>dev-zero@gentoo.org</email>
-		<name>Tiziano Müller</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">seetxt</remote-id>
 		<remote-id type="sourceforge">seetxt</remote-id>
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index 562da7e77f61..ea728047790b 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,4 +1,4 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
-EBUILD shared-mime-info-1.10-r1.ebuild 1759 BLAKE2B ef93bbbd091b7e4530cbb795a10ca2c1a02bfb89e6e9cf760cc78471ea6f8a696e39e1d238c0abfc338df0176ce5d049dfd761f4c3f0382f27d53d7f47fa43e8 SHA512 64258a4a461c32005660875903b93271f94a838f2df17a2ee9306961144e3576c7b427a68a8ef35df710c1bd3b6d067b2aed522275904f5e6978d02a8d26b07c
-EBUILD shared-mime-info-1.10.ebuild 1472 BLAKE2B 5ce4f70a6417ccaad0d262c4ad576b6b6bbdbe7b6d2af033b937593b96633df0768ed6c8495532f3c8d8c0f53916b3856ccbb98df757df3f3b5d0b986bf00ec1 SHA512 6f8c959366f3a2b5a3bb7c1659b54f1b2c8427d232749b454633ced240e870a6abb8f0a499b2ea1d3bf44efbd47a13686b29a48a85186b40a5b95ea00155296f
+EBUILD shared-mime-info-1.10-r1.ebuild 1775 BLAKE2B 55b933b231e745b1175bf9a8d9e80351dfef2be0f5b86a6ce1cd0f7104b083f2b29a0b8d537c4e638dea502d4ef704a76e1d35f611a819040f3f57fdce4169cb SHA512 11ab7fef615e959483bcb701d307ae0e28b571c6f63cb918671b22aaaf07210b9258dfbe718b45ebf5c73a7a1eaf01ebc575bae81478540f4b012910d0492e81
+EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 12ac9176a31d1ff61eb6a0b4b90a51b2e8dea042250e92e0a4d4cc4c688eb023bdb909970e33ac80de7dd0bd41dcfb9621bada4f2fe3e38ad88fd2d299a25fed SHA512 f0586ad64518021ee917dab3750aa03e068193b3bc569b7626d6ae99e701b2c989ac4aa9b8550f8a1bd3bc58fbc6860819da5c675c119e6f44ad0f4613ce38a2
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
index a6b8f274a815..e93e11841859 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10-r1.ebuild
@@ -10,8 +10,9 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2
 	dev-libs/libxml2"
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index bb690b733ed8..68717bcfbdec 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.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
@@ -12,6 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2
 	dev-libs/libxml2"
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index f78aefbc03dc..d2334b153cfa 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -3,6 +3,6 @@ AUX shutter-0.90-webphoto.patch 640 BLAKE2B ed41f01bf59e60f04abc5f8dc98cb32731ee
 AUX shutter-0.93.1-insecure_use_of_system.patch 887 BLAKE2B c4ee5de1448dcb2babef9eabbddf93499ed4dcf9a295ed3c25c0997233216fc00cb8a866d8b1b6ad218110b6f6d881c51086da6606d88c6f8ab890eabf691891 SHA512 0a4f1f50dba2b25899484d56205349b42d4a5c3f01fe30c90c4cfca67d2d0936e70489ef220ab820439b57ebf3e72820b01efa57d30dde3931f197e81727681a
 DIST shutter-0.93.1.tar.gz 3432204 BLAKE2B 7c61942c1ddc288b912e8addd31111309b2b7305582f0d684f364552e4695ad45a54b2ef39b456f4410ee1434f20422c1abf0fffd7c15525e25810fd58a28008 SHA512 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04
 DIST shutter-0.94.3.tar.gz 3375447 BLAKE2B e996966722999ee11ed3c185fd17a77e8982688ec17253f3558f89ccfd2e3afefec34d9214acffb10009fc1a28f587a5b994e32d7bb3538cde5e4f398b8e7b95 SHA512 7f67ed6fbc94aee4b6caa73662ab20684e2d8bdfd7208dcd407bdce4e1b93f2aa1fa256ad6bce66b92c741500726b90e5701e7f31bc831709568e5c4c27bff3b
-EBUILD shutter-0.93.1-r3.ebuild 2676 BLAKE2B fc4767f3cbce96fe38aad85358aa7ea20572bfc13c7464a4431c84f42fea07052e884b330fe82fa2d7da6b1a53e493733fb5c3988e7f5b997effddb42e576968 SHA512 7ad986250d29414ba93b93e8afc0f1920eac8847fb2ada6eab7bfdef6c0cc337a0f487ab6c7b52b54f72e587d1ae5eeb94d5b08cb28301f30769102a728ca075
-EBUILD shutter-0.94.3.ebuild 2731 BLAKE2B 590cd324a867106ba2762dfc63aab6100e100d488efbc1490c8e545686e0d1433142c133ee8113e3e4a4c4db0079b3c309120730af878260ec4c6fa23568fc38 SHA512 fd27882c3d7a9ab7e8d776d34971381cfebf3baa84483865bb21e2c6253146e899db4cb986a986508704135b99a8af8feb0fc93b1e15e2363c1c0267f2c77f7c
+EBUILD shutter-0.93.1-r3.ebuild 2544 BLAKE2B 33c93851f8d326cda5cb30ffd52af9d70587736e2f7ff6a38b2bd732250677cb035530a85cbe6027122d356707dfe5fd3aabee2b4f50b116ff4a1b8c122a0d63 SHA512 7425565cfd47c82983512cffe3a2c139d09c10380f3d580d90ef3832cae7f0c58ec531093f5c77ce8ed68a7fd49c8ad4278f6b183df4f8b99dc896cfb3d8bd5a
+EBUILD shutter-0.94.3.ebuild 2599 BLAKE2B 76073f34d30ba32692c4ce1ce89ac6b4c6dd69ceff261a4a88c6811a09f13d447cfe1e881c824ddd052ff3e9db6acf4c3517773de64b3c504b5799e36a3ab935 SHA512 f2675c32380199ffbaa8041dd7529b74d882c7c4473bc4642daa8a3ac8cf0e7052230e11b893731952eae96d3bbf1e5460de75f9f2148b1f1e2f6bf280d046fe
 MISC metadata.xml 318 BLAKE2B 3e11d3fc694ec5a14878e69c1eccbcf1e4152ac240a266ece373ce2522af05ec7ee4409c1afa209ab464d5fa6985aee388014cd435d42dc1d28ea8ec339bd1ee SHA512 46572230d719235fa4ed51361dafe34de6e8cc3057503b957f422516651e6b9ac99a131abf8e6a5b677f4d76163628ef5940d76c466a2d4ab1f9d60f8d64fef1
diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
index 56732b72603c..e16c4a878a4e 100644
--- a/x11-misc/shutter/shutter-0.93.1-r3.ebuild
+++ b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
@@ -54,18 +54,18 @@ src_prepare() {
 }
 
 src_install() {
-	dobin bin/${PN} || die "dobin failed"
+	dobin bin/${PN}
 	insinto /usr/share/${PN}
-	doins -r share/${PN}/* || die "doins failed"
-	dodoc README || die "dodoc failed"
+	doins -r share/${PN}/*
+	dodoc README
 	domenu share/applications/${PN}.desktop
 	# Man page is broken. Reconstruct it.
 	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
-	doman share/man/man1/${PN}.1 || die "doman failed"
+	doman share/man/man1/${PN}.1
 	doicon share/pixmaps/${PN}.png
-	doins -r share/locale || die "doins failed"
+	doins -r share/locale
 	insinto /usr/share/icons/hicolor
-	doins -r share/icons/hicolor/* || die "doins failed"
+	doins -r share/icons/hicolor/*
 	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
 		|| die "failed to make plugins executables"
 	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
diff --git a/x11-misc/shutter/shutter-0.94.3.ebuild b/x11-misc/shutter/shutter-0.94.3.ebuild
index 1bdd2fcc248d..18f36792dd4b 100644
--- a/x11-misc/shutter/shutter-0.94.3.ebuild
+++ b/x11-misc/shutter/shutter-0.94.3.ebuild
@@ -51,18 +51,18 @@ src_prepare() {
 }
 
 src_install() {
-	dobin bin/${PN} || die "dobin failed"
+	dobin bin/${PN}
 	insinto /usr/share/${PN}
-	doins -r share/${PN}/* || die "doins failed"
-	dodoc README || die "dodoc failed"
+	doins -r share/${PN}/*
+	dodoc README
 	domenu share/applications/${PN}.desktop
 	# Man page is broken. Reconstruct it.
 	gunzip share/man/man1/${PN}.1.gz || die "gunzip failed"
-	doman share/man/man1/${PN}.1 || die "doman failed"
+	doman share/man/man1/${PN}.1
 	doicon share/pixmaps/${PN}.png
-	doins -r share/locale || die "doins failed"
+	doins -r share/locale
 	insinto /usr/share/icons/hicolor
-	doins -r share/icons/hicolor/* || die "doins failed"
+	doins -r share/icons/hicolor/*
 	find "${D}"/usr/share/shutter/resources/system/plugins/ -type f ! -name '*.*' -exec chmod 755 {} \; \
 		|| die "failed to make plugins executables"
 	find "${D}"/usr/share/shutter/resources/system/upload_plugins/upload -type f \
diff --git a/x11-misc/trayer/Manifest b/x11-misc/trayer/Manifest
index 6da53ecd2979..33f012b18337 100644
--- a/x11-misc/trayer/Manifest
+++ b/x11-misc/trayer/Manifest
@@ -1,6 +1,9 @@
-AUX trayer-1.0-as-needed-and-pre-stripped.patch 681 BLAKE2B 9cfc48673198f86c059685dfcdda3fde0c7a1b3bd531c34bf9d48e3c9e08e912657da7198e84fbc39d6ee07e510416eee9b55dcb37c919093c210e6bdd7c8ffd SHA512 15712e3bc1973f649d5906d42f40825d9f972baf5fcbdf77d751e29da84ae3b539c1fd1807ba0211f36f25876e9475977472d16389d6e1d95426c6b789c650e6
-AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 1300 BLAKE2B 7badd5397e756d352f8f7afd0ef2008ff3907b3016a2062bbee263a93e064a912e110407d4099685d0196ebd590f42864a2af2154910f6f132df25092991d62e SHA512 76455b1cbe29979b14ea22a9978d1dff9fdee0ec08027464fd0e93d41ddd4fb5149e3936ff63fa0682e30c6ffe58bf11f7a78ce305fc5aac1d5fa4ebaa29a1e9
-AUX trayer-1.0-dont-include-libXmu.patch 524 BLAKE2B e81700086751d315feee7e00844866536daca99cd1caf04ab7fed2f2c90a16fdbb91c5110f887c66b0118eea178bb795faceaeceefbc91c4a4df402fbd57f84f SHA512 6dba64b746f655db3c7666f8504a4a3cff06bf91cd475d576a4e50839b3a2fb63c190f62082dec694559fc1d0cf7272d93f629b7ef6e49bf3599d6f36bc22dd0
+AUX trayer-1.0-as-needed-and-pre-stripped.patch 300 BLAKE2B d941ab99841ed60de03866e53be1ea517dd6a7fc10bd10aed053b8ef378cd85e2b65e5da1fa1cb0701970d6d3a287777ed292118486d48af7de0bb32999f4f65 SHA512 5dac4a877f32fa63d18013c8c67666520ceac51de55a2e42c5f03db60487e82b7aac2f43e07ba40e7f2ff48e7fca56f11eee6eb90759db37cd0722164f14cc9f
+AUX trayer-1.0-dont-include-gdk-pixbuf-xlib.patch 745 BLAKE2B 8fc70b5b9bf8d0764e0da5138cb89a57874e5987f2531ea72837aeaf152db98312d774bb1c7692c3e935ccf90133c05f3dd5bdaac1db0092bdaa528c0a401db7 SHA512 48efbf9de7c608fa4981e658eb815ef5d40e113ef85363bd09db7ed8a09ea807b38b359380f8f5499e4e9e996cd1a6d3f26dce4a5348a654aa67a6a6d0e75d73
+AUX trayer-1.0-dont-include-libXmu.patch 190 BLAKE2B 34460fc49d3c6836bb9a41840a808c16b0ca6400face67330b0e3feeeb633a25f8e6ecc542f3fba59d9b48b2673c3162e4c3797fd29b32aba77af110d6432f44 SHA512 b17ea529431e36e82c5aaab6548410a1f839d978ece5ca42ac90732ca899012b9b871a5b9a37d3b2ee05238222c02b1ac4c6edbdb70f6a04e39267fce1c2fba0
+AUX trayer.1 4448 BLAKE2B 663b00da3409d8366fc110fd2f67876f9b6cba4059410ac4d280c647022fd763a6e999dd953e02fec0d7130e16c5034b0c865766c0fd6c8bfd7ddf648c6ca258 SHA512 c55299fbec8f9bfcaeb262a3d2833af4ec111354c4e18bce219568b4a788b298d3d762f657c2fcc787c6ac8959934e9d459f6a808e618cc4769e2989c59659a1
+DIST trayer-1.0-sourceforge.tar.gz 29713 BLAKE2B 6a874781979c512e4fea06b0dcef30be73821e502553ebdad38ab2e152d070f6633dd6f8059d5532a51648ea10cbdfd752a65da11d2a992687a6f3ee4d289d01 SHA512 9903a78a1c185515e87552732449937daa23187d54a3ccbf19bc9fc569d6a440600c879fe78edbea3eff6b66a1f3fc5054d474dfeaca53af3521a6f18b454049
 DIST trayer-1.0.tar.gz 30445 BLAKE2B f95df1496392064b803e712e57a4ec76ed6e9a62dadb254eb044954e38620590cd486dc37d46d56598a7f2db5f27051db47e78df2d788092ccf3cdb7707978e0 SHA512 c46093ee18908b7cf8e52d2f10adeb0eefc90562b87862a5459cc4563e53528107ee1dba47b1cb88e378bdac40d64a1d8cb9ecbf014aef997c44f242b49534f7
-EBUILD trayer-1.0-r3.ebuild 821 BLAKE2B 7029f6eec63577a2065505996e1cf6fe4f59a44f290086da6551e7782536a486978c451c36fcba0a653f9c2a986950dd3bd0c790e332965dbd0afb18d0120c1c SHA512 d93e6bb8119d547e2234ebd2463376002b5ca8088e04412b7a82e2cc6aa143d792fec0708644f916071b737ccd71ec856db0144d99e79f7bd650d1f0a309eb0b
+EBUILD trayer-1.0-r3.ebuild 844 BLAKE2B 362597df72f4d78bdb9284b02477714292b90115eb95fe5581ed009328679762800653cd3daf345e4844ac814524ecb84e1d255183f801d085f26e6a95205add SHA512 cb43354e391789acc533667d1a0a7aa84b8f39ac2b21c1bbb2b59bb08a36036c18fbbe52ad07d6df87db8c2253063b943d22f4823044ebfff2a4a3c08751e5e5
+EBUILD trayer-1.0-r4.ebuild 998 BLAKE2B 587eef597495479d1d355f0983036c4f8eddbfde46bca935bbb739e0ed161a1c276c1d0ef0de7ba1cd575bbd7162c63bc698362deefd15203194bde6e4afcb72 SHA512 d63de02bc9027c2e5aad524cceaadd9c715d6ecd148617202c3a2aec8039abdfb12c0a890faed702431683242558588f0ed56fcc5f291b6eff9682694f8191d5
 MISC metadata.xml 220 BLAKE2B 11299b6e9582bb55f5decff226d1917da6e8d665c1ff3f95a035963a51f1ab529c28963908fda5a64b9ba0e0b608b354a36d605ef5826cf1698937316c8b4932 SHA512 8e96ee3f78ee96ef4b61c89b6c82a43f03d0a96dcd3af136fbabd1cd2635a27d98d9ffdbe9a87d9fda9b0feca21c7d223cdbd89d35b1a096e7fe3655a9621607
diff --git a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
index 9db338424220..84f54a4bfdfa 100644
--- a/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
+++ b/x11-misc/trayer/files/trayer-1.0-as-needed-and-pre-stripped.patch
@@ -1,15 +1,3 @@
-From 6d0c1123441633660c2ec4f336e1e800b4dfebb5 Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sat, 25 Mar 2017 12:18:13 +0200
-Subject: [PATCH 2/2] Fix for as-needed and pre-stripped files
-
-Gentoo bugs: #141707, #252098
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 9d7c4fb..faaa85d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -36,9 +36,9 @@ endif
@@ -17,13 +5,10 @@ index 9d7c4fb..faaa85d 100644
  TARGET = trayer
  $(TARGET): $(OBJ) $(SYSTRAYOBJ)
 -	$(CC) $(LDFLAGS) $(LIBS) $(OBJ) $(SYSTRAYOBJ) -o $@
-+	$(CC) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) $(SYSTRAYOBJ) $(LIBS) -o $@
  ifeq (,$(DEVEL))
 -	strip $@
 +	true $@
  endif
  
  TARGETMAN = $(TARGET).1.gz
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
index ccb1e12869b8..ecb013a37ad4 100644
--- a/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-gdk-pixbuf-xlib.patch
@@ -1,19 +1,3 @@
-From 1aa5f4164b86fd0c5cf174c8403442060cad497d Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sat, 25 Mar 2017 12:17:09 +0200
-Subject: [PATCH 1/2] Remove useless include on
- gdk-pixbuf-xlib/gdk-pixbuf-xlib.h
-
-Also fix underlinking, bug #369591
-
-Thanks for leio@g.o for reporting
----
- Makefile.common | 4 ++--
- plugin.c        | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.common b/Makefile.common
-index 0d50340..ec2bc3c 100644
 --- a/Makefile.common
 +++ b/Makefile.common
 @@ -16,8 +16,8 @@ endif
@@ -22,13 +6,11 @@ index 0d50340..ec2bc3c 100644
  CC = gcc
 -LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0) -L/usr/X11R6/lib  -lXmu
 -INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gdk-pixbuf-xlib-2.0)
-+LIBS = $(shell pkg-config --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
-+INCS = $(shell pkg-config --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
++LIBS = $(shell ${PKG_CONFIG} --libs gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
++INCS = $(shell ${PKG_CONFIG} --cflags gtk+-2.0 gdk-pixbuf-2.0 gmodule-2.0 x11)
  CFLAGS = -O2    # overwriten by command line or env. variable
  CFLAGS += -Wall # always nice to have 
  ifneq (,$(DEVEL))
-diff --git a/plugin.c b/plugin.c
-index 7fd5398..a6f8fbb 100644
 --- a/plugin.c
 +++ b/plugin.c
 @@ -2,7 +2,6 @@
@@ -38,7 +20,3 @@ index 7fd5398..a6f8fbb 100644
 -#include <gdk-pixbuf-xlib/gdk-pixbuf-xlib.h>
  #include <gdk/gdk.h>
  #include <string.h>
- 
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
index 8b9fd291d15f..56f3000ff69c 100644
--- a/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
+++ b/x11-misc/trayer/files/trayer-1.0-dont-include-libXmu.patch
@@ -1,14 +1,3 @@
-From 710efb0c8192e704a83fd3d4b8b3c0d6be984246 Mon Sep 17 00:00:00 2001
-From: Harri Nieminen <moikkis@gmail.com>
-Date: Sun, 26 Mar 2017 10:08:05 +0300
-Subject: [PATCH] Don't include libXmu
-
----
- systray/main.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/systray/main.c b/systray/main.c
-index dff5455..79cbe34 100644
 --- a/systray/main.c
 +++ b/systray/main.c
 @@ -2,7 +2,6 @@
@@ -19,6 +8,3 @@ index dff5455..79cbe34 100644
  #include <gdk-pixbuf/gdk-pixbuf.h>
  
  #include "panel.h"
--- 
-2.12.1
-
diff --git a/x11-misc/trayer/files/trayer.1 b/x11-misc/trayer/files/trayer.1
new file mode 100644
index 000000000000..a00cdbadecd1
--- /dev/null
+++ b/x11-misc/trayer/files/trayer.1
@@ -0,0 +1,186 @@
+.TH TRAYER 1 "Feb 14, 2005" "FVWM\-Crystal"
+.SH NAME
+trayer \- a lightweight GTK2\-based systray for UNIX desktop
+.SH SYNOPSIS
+.B trayer \-h
+.br
+.B trayer \-v
+.br
+.B trayer
+.\"
+.RB [\| \-\-edge
+.RI \| left \||\| right \||\| top \||\| bottom \||\| none \|]
+.\"
+.RB [\| \-\-align
+.RI \| left \||\| right \||\| center \|]
+.\"
+.RB [\| \-\-margin
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-widthtype
+.RI \| request \||\| pixel \||\| percent
+.RI \|]
+.\"
+.RB [\| \-\-width
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-heighttype
+.RI \| <pixel> \|]
+.\"
+.RB [\| \-\-height
+.RI \| <size> \|]
+.\"
+.RB [\| \-\-SetDockType
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-SetPartialStrut
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-transparent
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-alpha
+.RI \| <value> \|]
+.\"
+.RB [\| \-\-tint
+.RI \| <color> \|]
+.\"
+.RB [\| \-\-distance
+.RI \| <length> \|]
+.\"
+.RB [\| \-\-expand
+.RI \| true \||\| false \|]
+.\"
+.RB [\| \-\-padding
+.RI \| <size> \|]
+.\"
+.SH DESCRIPTION
+.B trayer
+is small program designed to provide system tray similar to these in
+.B GNOME
+/
+.B KDE
+desktop environments for window managers which does not
+support that function. It is similar to other applications such as
+.B peksystray
+and \fBdocker\fP.
+.PP
+System tray is a place, where many applications put their icons, so they are
+always visible. Such icons may present status of an application and allow user
+to control the program.
+.PP
+\fBtrayer\fP code was extracted from \fBfbpanel\fP application, you can find more
+about it on its homepage: http://fbpanel.sourceforge.net/.
+.SH OPTIONS
+This programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h
+Show summary of options and exit.
+
+.TP
+.B \-v
+Show version of program and exit.
+
+.TP
+\fB\-\-edge\fP \fIleft\fP\||\|\fIright\fP\||\|\fItop\fP\||\|\fIbottom\fP\||\|\fInone\fP
+Specifies a screen edge to use.
+
+.TP
+\fB\-\-align\fP \fIleft\fP\||\|\fIcenter\fP\||\|\fIright\fP
+Specifies an align of the icons.
+
+.TP
+\fB\-\-margin\fP \fI<size>\fP
+Specifies length of margin (in pixels)
+
+.TP
+\fB\-\-widthtype\fB \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP
+Specifies method of calculating trayer's window width:
+.RS
+.TP
+\fIrequest\fP
+Follow application icons' size, so trayer may shrink or expand dynamically.
+
+.TP
+\fIpixel\fP
+Set a fixed size, given with \fB\-\-width\fP option in pixels.
+
+.TP
+\fIpercent\fP
+Set a fixed size, given with \fB\-\-width\fP option in percentage of a lenght of screen edge.
+.RE
+
+.TP
+\fB\-\-width\fP \fI<size>\fP
+Width of trayer's window. Ignored when \fB\-\-widthtype\fP is set to \fIrequest\fP.
+
+.TP
+\fB\-\-heighttype\fP \fIrequest\fP\||\|\fIpixel\fP\||\|\fIpercent\fP
+Specifies method of calculating trayer's window height:
+.RS
+.TP
+\fIrequest\fP
+Follow application icons' size, so trayer may shrink or expand dynamically.
+
+.TP
+\fIpixel\fP
+Set a fixed size, given with \fB\-\-height\fP option in pixels.
+
+.TP
+\fIpercent\fP
+Set a fixed size, given with \fB\-\-height\fP option in percentage of a lenght of screen edge.
+.RE
+
+.TP
+\fB\-\-height\fP \fI<size>\fP
+Height of trayer's window. Ignored when \fB\-\-heighttype\fP is set to \fIrequest\fP.
+
+.TP
+\fB\-\-SetDockType\fP \fItrue\fP\||\|\fIfalse\fP
+Identify panel window type as dock.
+
+.TP
+\fB\-\-SetPartialStrut\fP \fItrue\fP\||\|\fIfalse\fP
+Reserve panel space so that it will not be covered by maximized windows.
+
+.TP
+\fB\-\-transparent\fP \fItrue\fP\||\|\fIfalse\fP
+Use transparency.
+
+.TP
+\fB\-\-alpha\fP \fI<value>\fP
+Percentage of transparency (0 \- nontransparent, 256 \- fully transparent)
+
+.TP
+\fB\-\-tint\fP \fI<color>\fP
+Color used to tint transparent background. Color is given as a 24-bit C hexadecimal integer, for example: 0xff0000 is red, 0xff8800 is orange and 0x00ff00 is green.
+
+.TP
+\fB\-\-distance\fP \fI<length>\fP
+Specifies distance between trayer's window and screen edge (in pixels)
+
+.TP
+\fB\-\-expand\fP \fItrue\fP\||\|\fIfalse\fP
+Specifies whether trayer may accomodate extra space when there is too much
+icons.
+
+.TP
+\fB\-\-padding\fP \fI<size>\fP
+Extra space between icons and trayer window's border.
+
+.SH SEE ALSO
+.BR fbpanel (1)
+.SH AUTHORS
+Anatoly Asviyan <aanatoly@users.sf.net> \- fbpanel
+.br
+Rafal Bisingier <ravbc@man.poznan.pl>
+.br
+Maciej Delmanowski <harnir@users.berlios.de>
+.br
+Grzegorz Nieweglowski <hoppke@dobremiasto.net>
+.br
+Thomas Rydzynski
+.PP
+This manual page was written by Tomasz Melcer <liori@interia.pl>.
diff --git a/x11-misc/trayer/trayer-1.0-r3.ebuild b/x11-misc/trayer/trayer-1.0-r3.ebuild
index 1d79f1312512..f130f5ec280a 100644
--- a/x11-misc/trayer/trayer-1.0-r3.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r3.ebuild
@@ -31,6 +31,8 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	emake -j1 CC=$(tc-getCC) CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
 }
 
diff --git a/x11-misc/trayer/trayer-1.0-r4.ebuild b/x11-misc/trayer/trayer-1.0-r4.ebuild
new file mode 100644
index 000000000000..eab20e264425
--- /dev/null
+++ b/x11-misc/trayer/trayer-1.0-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="Lightweight GTK+ based systray for UNIX desktop"
+HOMEPAGE="https://sourceforge.net/projects/fvwm-crystal/"
+SRC_URI="https://sourceforge.net/projects/fvwm-crystal/files/${PN}/${PV}/${P}.tar.gz/download -> ${P}-sourceforge.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libX11
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-dont-include-gdk-pixbuf-xlib.patch
+	"${FILESDIR}"/${P}-dont-include-libXmu.patch
+	"${FILESDIR}"/${P}-as-needed-and-pre-stripped.patch
+)
+
+src_compile() {
+	tc-export PKG_CONFIG
+
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" -C systray
+	emake "CC=$(tc-getCC)" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+}
+
+src_install() {
+	dobin trayer
+	doman "${FILESDIR}"/trayer.1
+	einstalldocs
+}
diff --git a/x11-misc/unclutter-xfixes/Manifest b/x11-misc/unclutter-xfixes/Manifest
index c7471d4cc0bd..b15d35dcc16d 100644
--- a/x11-misc/unclutter-xfixes/Manifest
+++ b/x11-misc/unclutter-xfixes/Manifest
@@ -1,3 +1,4 @@
 DIST unclutter-xfixes-1.5.tar.gz 7998 BLAKE2B 3eb6e259d85ca85eac3776fe1f4ff57dd3f2a8573f478880d174b3fb75ba23e54281e12b9d62243501539dee4225d3c64c5bf32a3c6aa1549f729ebd617ab5aa SHA512 0b8823d5ab64193f7e5fe03ceecbe0f475bbe36f78c4a0295705a80e9df1e5a8c4f65eb749b55e5b8b06aa3248e4f2fc1daac1b14b84aab157bdfbff39bba095
+EBUILD unclutter-xfixes-1.5-r1.ebuild 608 BLAKE2B 0595141d50ea69ce9c9d917a716e59ee6224352afc677189483e6516657e70e72221aaf2ab28537bc0b762f7216354d3398c328dbc99dcbcedce8ddf32ef816d SHA512 6b4233a6d69e71bda7b19aaebb4ac74827c75eb06389b1f82b44452f0953fda1aff541330b5e56f40bd05eebc86c4edeeaa3b0e2786f2e252ea6a3fed6d113ca
 EBUILD unclutter-xfixes-1.5.ebuild 596 BLAKE2B 41d1f95efdbb17ed54b50761df21021c20a863fc70eda72948f7e590690d608fc23284f7635aefa935d85abf4c767a01056ccb2cefbd569a82cb6492879e93f9 SHA512 1f6a8675b04a66a9c9355be297d4e90074071c3b1f2d854749074ca2dba4396fb3fa70a7623caca5243d67073be7601966ace08e0d467c243bcc756972665078
-MISC metadata.xml 337 BLAKE2B 6d8b204b2317f4e6f7193d5d9403770e88ea31d6411e6f5b49fcf9a268a97537a03fe210850fb0bc6d63754f54811ac0a8f5f7f4abefda786dc661900b9e8d63 SHA512 94716543bc856a197bcdf2d7c6e14330c2ff68f18964e246c4a427d75238ff172a9b9073714a4fcb8853a438379c6d7e6892bac769f727a565315a18ffad2456
+MISC metadata.xml 258 BLAKE2B 04a59fae336050f9b98d9fb78a883299aeee3969b8667159b3a01c518ab35768ea19f8b1f95e77b1da9e4431230f57a7a6fa30657fb2f84eeead9b0cf61131ac SHA512 5902ebe4a72169c10cbb7434b499767355723dd1322b8ab2146772926c97fe6fc64855ef75c2bb3da741cb8a3b2ca8981bc003f2a3e7aeeb1259eeada363efbf
diff --git a/x11-misc/unclutter-xfixes/metadata.xml b/x11-misc/unclutter-xfixes/metadata.xml
index c140615696b0..3b4eb9e4c1b1 100644
--- a/x11-misc/unclutter-xfixes/metadata.xml
+++ b/x11-misc/unclutter-xfixes/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>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">Airblader/unclutter-xfixes</remote-id>
 	</upstream>
diff --git a/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild
new file mode 100644
index 000000000000..3e79355700b4
--- /dev/null
+++ b/x11-misc/unclutter-xfixes/unclutter-xfixes-1.5-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A rewrite of unclutter using the x11-xfixes extension"
+HOMEPAGE="https://github.com/Airblader/unclutter-xfixes"
+SRC_URI="https://github.com/Airblader/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/libev
+	x11-libs/libX11
+	x11-libs/libXfixes
+	x11-libs/libXi
+	!x11-misc/unclutter
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/asciidoc
+	virtual/pkgconfig
+"
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/x11-misc/vdpauinfo/Manifest b/x11-misc/vdpauinfo/Manifest
index 79038e83bd07..3871570b803c 100644
--- a/x11-misc/vdpauinfo/Manifest
+++ b/x11-misc/vdpauinfo/Manifest
@@ -1,4 +1,6 @@
 DIST vdpauinfo-1.0.tar.gz 88567 BLAKE2B 6f0834bf6a8fb83204b70858ac529010ab69c55de4b2c6b8b8864ea33aed385bb9125ad12a82a28086dac43f39f06c2b757718142d800b5de2263513e9c5f02e SHA512 54c177424bdae65374a13c0546ecda0e25e7357f9e779fb48dc018a9c11593039f87715ea18b320684dca22455df9b41a4eea6b0f977956efb6ab85b8b99297e
+DIST vdpauinfo-1.3.tar.gz 12159 BLAKE2B 41dc31ef2f45272221e2eea969d7801cc9c8bfd693e64f7d157b17645da654b7f50d780df698736b3e2ea9c55c7d3b6e7ce75f96aacd50bbaa4032dfc753a43f SHA512 2271053c17d389ea600742ffe14e863921f18e504e07cb5db33c98745d2f71aece908408bca0161b3c2fa9cd67de8c741c132a774a4fd9443c7124168a4da79f
 EBUILD vdpauinfo-1.0.ebuild 468 BLAKE2B c05da34e957445e60eb712db339defb72093fd0ce39fcb56c93dee9d67002d9d57507da439e54aed3fb9b89db7f8555fb9e67e63e90aa940a6bbcb8ea84f0d88 SHA512 5e6c58eb2a50a1a7040ed6355016730443dcfddb3a76da8efb38e235974466fa31d8fcbfb12cfc9f9fff7fe175a7651cadc8df3a44a01aaf8cfe71ef936e5bdf
+EBUILD vdpauinfo-1.3.ebuild 581 BLAKE2B 1bfd459d35d74308dafcacfee48795845dd08481d2686e2acddf60ba947b8541955f52dc56403e4f6ced403f269f130163d1151071c352bc700ba33d90e97323 SHA512 92ee9230e5b4e7ab1efebe3bd408236f7f89c46e62df2709aac2bfc01df86f5b4d8abe1adcba1e04b64f841921249ef5ea1a47cb2700b60fff7f19c29ee5a16c
 EBUILD vdpauinfo-99999.ebuild 515 BLAKE2B c350d4c00d47de2ee887f1f2054afc61c3952740f08b6d8bbd366f61181868d462528c8e05120820232f12cb38a6336dcd622cbb59021aee22260e2664ad18bd SHA512 0f638788bf19f242501804988f27118cf49cd5aba4b219f01013f2f7d414a6031dc9079d524c6343421120de41c0ec406c0468dd599f9510ddf7d4beef2c14ba
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
new file mode 100644
index 000000000000..a862c8c71559
--- /dev/null
+++ b/x11-misc/vdpauinfo/vdpauinfo-1.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Displays info about your card's VDPAU support"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	>=x11-libs/libvdpau-1.3
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 57c0eb046b43..2e2e40c8e0ea 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -3,10 +3,7 @@ AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
 AUX virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch 5047 BLAKE2B 75dadf6d80456a702a3591b04b771410768e65c009da576502ada0fd192f480b20c6e0b12e470950be3306df7944f3b6bd890d0f4f97b778052eda63309cc0ea SHA512 a7d7dfc54f1fb00c00e8ae3011c7a28b4029f20049b9d792e2e8833fba79eb64f57c6ca6778d6d8bf4f383a2b08013e0d3b3db869ed8c08da549c89f095c4d3d
-DIST VirtualGL-2.5.2.tar.gz 1172965 BLAKE2B 2aac9db4fdbec49c5251f9ba85fda81efd5025891a124991e9787e9bf869b054e419c6c377c0dcf5988a1785c16159c12a4c45d5d7419f3d6c17a09316dfd7e6 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd
 DIST VirtualGL-2.6.1.tar.gz 1278335 BLAKE2B 62abb082eb8c82fecff33dd5b5036ebaead99b837cf0dc42581790863f09814858fd7a23a479c0c4ac5e59a4cc99af58903016a5109a6636191ce98d6da3d0bd SHA512 36580e55e11ba3e93945d62e865fe0b63ecd5aa1ee3889fb4d0940c68da06737fff4689a77638f5c8c57dbc9d020ba821bdec9aa2f6b2f0f144b18f1c3d8c5e5
-EBUILD virtualgl-2.5.2-r1.ebuild 2614 BLAKE2B 0bfd84d0fd8d3e5a0ea7565e6613b3b9588047038d4aed9d47349b1b20e9e767095410eccbb433a72635b8e153e854d778bb49e7071c809f10b8a53e08f94650 SHA512 f537777092ab9ae86076553ccb6f52b268ac8228133a3f370cabcdfc7744b4e03d4268e1ae6e6c70db9fc4b34be798b826aa77fca91d6fbb1aa81910d19c3421
-EBUILD virtualgl-2.6.1-r1.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
-EBUILD virtualgl-2.6.1.ebuild 2625 BLAKE2B 58e25d1fc1235b4b560aebf2b9fc5fe95521a2a1cbc34a4a60eec583fa4251bbe5347cd44c56712a2c5e19e8e5282596197021b031cad2e3f35bc716deadd697 SHA512 731403a3fdd9630e634ada1b0f73d7a5ac75522e9fc313bf0b63ff5bb51165f9d1aea10910f3656168b381a6786c97be1e8e9aeb9af0d661a1bd21f00cda8db0
+EBUILD virtualgl-2.6.1-r1.ebuild 2710 BLAKE2B 922ca3fa4e9230db03968aeacd5bdbce1560ef81404deaf39e528bf334d80f8bdc7759c340601543ce1007180820c9a990e2f3b4a1eba3a3ccd1b9e9ba27cf13 SHA512 603c12da0ccf3f1a9fde29470b30230c878f061497df85954db2376620d9f962ac5da86f40b599dde8913e404e80d9b7bb0ab944105bf253080e0439a692b6eb
 EBUILD virtualgl-9999.ebuild 2712 BLAKE2B d5ae149a1bfa905ff96a6caa40d0daea92e825b70303591595834bb43948bf2994ea6c56c33fc3cf47cec890bbefa7d95b623d2b6bda568dec56f8f897a695fa SHA512 ff1fda99385b88521420c738b0b2467b76dd4b2a6be47b13e8351e246d01cc923b4b87eed53a81e23d72826f27fb24f8b23e86eb9b3541325a25446006649d55
 MISC metadata.xml 736 BLAKE2B b0fef33f453e573f7742dff774acdd66aae3a8ed586718eb2c88fb5776c8c8040a94285971022ea52a47a702911a6d0f0f669e0cc8facac09d127a73ab6d083d SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
deleted file mode 100644
index 6b5db86e75b8..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-MY_PN="VirtualGL"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch"
-)
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
index baca3aa94532..90a64046885d 100644
--- a/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
@@ -12,7 +12,7 @@ else
 	MY_P="${MY_PN}-${PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
diff --git a/x11-misc/virtualgl/virtualgl-2.6.1.ebuild b/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
deleted file mode 100644
index 05ef6a703773..000000000000
--- a/x11-misc/virtualgl/virtualgl-2.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib flag-o-matic multilib systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
-	inherit git-r3
-else
-	MY_PN="VirtualGL"
-	MY_P="${MY_PN}-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-DESCRIPTION="Run OpenGL applications remotely with full 3D hardware acceleration"
-HOMEPAGE="https://www.virtualgl.org/"
-
-SLOT="0"
-LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-IUSE="libressl ssl"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
-	)
-	media-libs/libjpeg-turbo[${MULTILIB_USEDEP}]
-	x11-libs/libX11[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXv[${MULTILIB_USEDEP}]
-	virtual/glu[${MULTILIB_USEDEP}]
-	virtual/opengl[${MULTILIB_USEDEP}]
-	amd64? ( abi_x86_32? (
-		>=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32]
-		>=x11-libs/libX11-1.6.2[abi_x86_32]
-		>=x11-libs/libXext-1.3.2[abi_x86_32]
-		>=x11-libs/libXv-1.0.10[abi_x86_32]
-		>=virtual/glu-9.0-r1[abi_x86_32]
-		>=virtual/opengl-7.0-r1[abi_x86_32]
-	) )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Use /var/lib, bug #428122
-	sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
-		server/vglrun.in server/vglgenkey server/vglserver_config || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	# Completely breaks steam/wine for discrete graphics otherwise
-	# see https://github.com/VirtualGL/virtualgl/issues/16
-	append-ldflags "-Wl,--no-as-needed"
-
-	abi_configure() {
-		local mycmakeargs=(
-			-DVGL_USESSL="$(usex ssl)"
-			-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/"${PF}"
-			-DTJPEG_INCLUDE_DIR=/usr/include
-			-DCMAKE_INSTALL_LIBDIR=/usr/$(get_libdir)
-			-DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
-			-DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
-		)
-		cmake-utils_src_configure
-	}
-	multilib_parallel_foreach_abi abi_configure
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	# Make config dir
-	dodir /var/lib/VirtualGL
-	fowners root:video /var/lib/VirtualGL
-	fperms 0750 /var/lib/VirtualGL
-	newinitd "${FILESDIR}/vgl.initd-r3" vgl
-	newconfd "${FILESDIR}/vgl.confd-r2" vgl
-
-	exeinto /usr/libexec
-	doexe "${FILESDIR}/vgl-helper.sh"
-	systemd_dounit "${FILESDIR}/vgl.service"
-
-	# Rename glxinfo to vglxinfo to avoid conflict with x11-apps/mesa-progs
-	mv "${D}"/usr/bin/{,v}glxinfo || die
-
-	# Remove license files, bug 536284
-	rm "${D}"/usr/share/doc/${PF}/{LGPL.txt*,LICENSE*} || die
-}
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index bc42d996bdcb..76e010f5805c 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,4 +1,4 @@
 AUX xflux-gui-1.2.0-disable-gschemas-compiled.patch 1540 BLAKE2B c1071aecced986b9bf8662de558ce8cd3c822ebfcc7d3d6601eba9ec30438bfcbc763e26eb31113b00b75e07f463125872ed8897c490ddd32cf96b0798e72557 SHA512 bd03efe531f0b55df89bbf2b6e6dbdbf7c48c214b9969d3c458d093a13603011b956efc0cc6695401abc7abfea18ed29be6501784a66edcf63f8ebd6793b3c15
 DIST xflux-gui-1.2.0.tar.gz 31831 BLAKE2B ad6b29f75cf5c287efdb4c1eaa12610a6fd2d4515e7f77cb991f0140d9de1128981ae274a1503f7c5bb83ff84f8dc124ba64e5abdd2e97c1d7157c84df51bead SHA512 244c11efbf58112d3d84209142faafbbe46b33df1edf13e122945ff767fc6a394c147979c0086bd88cb41ee7c80b5bd87016b3e158f3a959f3aca8bda47707d2
 EBUILD xflux-gui-1.2.0-r1.ebuild 1039 BLAKE2B eb128a1ee771ce8a69a687299e362073263e942e378a033a2757078de1e00c22c3c27288fd657dc7d5426991a9f389d3cc692fbecc679cfab7652aa357f358b8 SHA512 4b48755c2347c868e2b23e099d7a3035c057e3c3c1269d7f3b85ab2e8973326869c22b86a0ca06e84c958e9891b12845a9fa999720c18666fdbfa0a16a2f855c
-MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e
+MISC metadata.xml 737 BLAKE2B d576868e8ee0b92e6439103d674d5a87e72d3794d202d1d8d1d200e5d479abdee76d31211520c5c04a53ed6a4567c0c6396cd2d08da0a82b3fe85c7b2c0f32d6 SHA512 60dacd24dfe19906d233434a547e0ef87d33ef5cfc9b3175df28ac65b9744fdf653bf449c4fdcc754950bdf5e859985735e889cd7755d7fae0458d067a5aba13
diff --git a/x11-misc/xflux-gui/metadata.xml b/x11-misc/xflux-gui/metadata.xml
index 05c0e0cb1f51..9a5cd0ccd7bd 100644
--- a/x11-misc/xflux-gui/metadata.xml
+++ b/x11-misc/xflux-gui/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		The f.lux indicator applet fluxgui is an indicator applet to control xflux,
 		an application that makes the color of your computer's display adapt to
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 1215d5adc66c..4e91b050693c 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -3,4 +3,4 @@ DIST xflux12-20170103.tar.gz 340461 BLAKE2B 81e8567cb7ce0980cb2fbee4a455d023fd76
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
 EBUILD xflux-20130927-r1.ebuild 637 BLAKE2B 9e69e04e8cb2feab648340ae3b76aaca316d9fb2d57ee22174f4cf6c7b9ed322deae0dd14730e084d7f1df41e6420d5dfcbb2e7bfaa7fa0dcf03e0ddca661c93 SHA512 4d145d9811958436ea856b62bc9c466c97e065335feb823aafca9e2c47d23799375bb84bb660b00a7a9aed33d5dd38039f88b798c29a2380f68ccd47535b2fdd
 EBUILD xflux-20170103.ebuild 559 BLAKE2B b30a6fe9c52000f49ccdd19a3314b052716f231482b1e969bf9b180ddc6d8aa9cb0a2a6f0e0c72fa790be2f6e009e26c82f7c88d951d7482c3d639b9a114901d SHA512 527b047e6958a0052f5be7bbe02f3cc9b2208b1069bf6f7b17ea6f72193de735358adc36f8ebe9366614b1bc712e2f0b6c73dc8a080c24efc82a0ede7fffbcc5
-MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
+MISC metadata.xml 502 BLAKE2B e38a2fa9481c035a6c901f46bdd4f36559c5f77602beea51725b859762ebbeecfe19cd2b65cb3e62a1cc6ad2c5cfe1a809cd4abe8bea0810c94ca08aa2423c23 SHA512 b05329b8f3dd77fdf1e6058d84276cef4024f985b6a8be924a060d2d86871f78c03f834cb9ee08bd7eb44b79fa0ee79ae589e379ec737883307595400f2d7ad4
diff --git a/x11-misc/xflux/metadata.xml b/x11-misc/xflux/metadata.xml
index 4eae2cce3dd6..77ca72bcdaa5 100644
--- a/x11-misc/xflux/metadata.xml
+++ b/x11-misc/xflux/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		F.lux makes your computer screen look like the room you're in, all the time.
 		When the sun sets, it makes your computer look like your indoor lights.
diff --git a/x11-misc/xfractint/Manifest b/x11-misc/xfractint/Manifest
index dbe3a8f686fe..623ad28ecd06 100644
--- a/x11-misc/xfractint/Manifest
+++ b/x11-misc/xfractint/Manifest
@@ -1,5 +1,5 @@
 AUX xfractint-20.04p09-ldflags.patch 1067 BLAKE2B 4faddadfa0105ffedef7552264971bf685121a74ccd449b12f33d525af61c9fa0557fc3e693848883d88a5b868c96f8e3bd2e14764182ecb2655b6ba64a12294 SHA512 af78e1facb6e436fed67e56871172fef742df1eafa75c55a75752dda855f81f7aff35cfaf042cf1f7502f66d4a9c7bf831b781c8641299873cc2537fe5da0ace
 AUX xfractint.envd 63 BLAKE2B 1622655f8b51034a4f3e7c9d7b11fd7628a33b30a17df15b6af8d5aaccb824f14ab4659fbd356cb188d8c0f1f0d2c1537a8bbcf1fa560eba9c5a2ced7bd7d7f1 SHA512 1e923957e93a53af47a8bc3205c350b9fe4bbfa9f955c5eb5673c1ce857808bdf0ad020c643c7f81dda1c0b5caf2480005c2f31eabdaa39908ef68649687b5a2
 DIST xfractint-20.04p14.tar.gz 1336285 BLAKE2B 946c34551acf131845f1ecf17d4fe82214535627e8ea68d704efcff4b93c525d82f004bde8ae1bac11df8c82caa3bcff4778b2f8dfed1bdb494ba036e62256c5 SHA512 7d13c719f4f4b0680455b9b7f86644928d8145606973d208e5bf0d26b4f7b04ddbf8d2080ea35c872b21e079f1a116f3ef94e9acb36a45d43c16403c473e2acd
-EBUILD xfractint-20.04_p14.ebuild 1023 BLAKE2B 53ce08959f500c3009cef2a2ffaf79003f72c267e6ac8f0be7abdd99742e1167b7bec189358b05191e4e89c909a1f6f8a48cfdf050ae3b4424a8fb0f67866181 SHA512 a4b17fe4250c175562fb0825461de23fd020c5fcc33d8c66ef3d3bef38a374814b595a4bb54ec2be829c1d93b18a8a82f8fadb9dc6c187ffe0d2d76b3990967d
+EBUILD xfractint-20.04_p14.ebuild 1046 BLAKE2B 41ae48fe45aeef7169d01d2ae52f5484655ec45ba8f7a284466b6cbacb96bff08322fe4c4f0669dbb888221866d6947f81b50c56a6f98175b3970db0e5930db3 SHA512 bbb5ecc9db4ef63e664aa99a7d6ab242ad74c3f0ae57d3e52efd7bf7232fbe9bef8b6aff43393cb3e5ff25e711950effc86c817da9d6b69e513a908d1cc343cb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/xfractint/xfractint-20.04_p14.ebuild b/x11-misc/xfractint/xfractint-20.04_p14.ebuild
index c7397b6ad558..b06f10dad010 100644
--- a/x11-misc/xfractint/xfractint-20.04_p14.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p14.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A fractal generator"
 HOMEPAGE="https://www.fractint.org"
 SRC_URI="https://www.fractint.org/ftp/current/linux/${MY_P}.tar.gz"
 
-LICENSE="freedist"
+LICENSE="free-noncomm HPND public-domain"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 2722ae1d8e5f..177e10f73fb5 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
 DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
-EBUILD xkeyboard-config-2.27.ebuild 1257 BLAKE2B 82ff338d351e3e91999ed7717d7dee92098d9306f6d6722c75fcd0dc4c047f01f48fe0c0685117ecaff9b13cf03efb878a05b1bb8df4039475d8739e960ae679 SHA512 c8fe092fe39b8889cb1fcde3e612d669f01dff3397e7c384a12c428170a7c1ea64f900f803db48d4012b5b918df9efe109a88ba1994524fe12effe37ba073a5a
-EBUILD xkeyboard-config-2.28.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
+EBUILD xkeyboard-config-2.28.ebuild 1258 BLAKE2B 1098f824b448d3b6beab9657f9589bd71cd0111bd58a968bb139301231d1ac677c5b21f2aaf231eb245cd6159f4ba7ffc9e7ca5adfdcff8f7744290bcabddff7 SHA512 3ccb42a720e2304539d4d09f1523b703629303c08616ce84dba5ccfbcfcc5bd459e8ad7f7af3280ee473ccf587026e8425536008f7becb44b3296f09e5a96a51
 EBUILD xkeyboard-config-9999.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
deleted file mode 100644
index 29052cada6c0..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="X keyboard configuration database"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
-	inherit autotools git-r3
-	# x11-misc/util-macros only required on live ebuilds
-	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
-else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="
-	!<x11-apps/xkbcomp-1.2.3
-	!<x11-libs/libX11-1.4.3
-"
-DEPEND="
-	${LIVE_DEPEND}
-"
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local econfargs=(
-		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
-		--enable-compat-rules
-		# do not check for runtime deps
-		--disable-runtime-deps
-		--with-xkb-rules-symlink=xorg
-	)
-
-	econf "${econfargs[@]}"
-}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
index d2d56f95cc31..0cc5883a831f 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xlockmore/Manifest b/x11-misc/xlockmore/Manifest
index 900aba1c5ce8..08e6689e7d3a 100644
--- a/x11-misc/xlockmore/Manifest
+++ b/x11-misc/xlockmore/Manifest
@@ -5,9 +5,9 @@ DIST ax_pthread.m4.xz 6356 BLAKE2B 784bfa3fcae2499230acba588cea5591f62229d721cac
 DIST xlockmore-5.50.tar.xz 1632968 BLAKE2B 2e692d16d70e3186ec1f31c192414b286f8815f2f428a6f7f43b3de0117c51c4ad2fbdfb91debe2ecb75c8683212b5d33bee62d81374552703d578b02d3af036 SHA512 627a905c4641d6083676a766931f23c06e2ac5af9b43447ccf03143d329d24b786aac6b248318929399b5fae98f1ec17e676466b5cbd09f180377c483694c569
 DIST xlockmore-5.58.tar.xz 1878452 BLAKE2B 90b19c7c7c99188b056e69d80c0e89a0030faba46f942bd5e278403cde00ba66fe626f457dcf03e049280c0eff1af0dd3e598dda8e2d8d7eee194e38e97124b5 SHA512 470107a9f00c94db8f1ce20c33d04a3b0cbd3d5616aeffa42f98d3a75053cfd8a05a63e38349a88cfc3056fb7bdf3beeaa4277dc83121c35bcff071955ed9511
 DIST xlockmore-5.59.tar.xz 1935296 BLAKE2B 3a7027dad227179dfe3917108f8960a751cc16481fef541e80c656f99832de6d203cad1815f0f31f66aa2338d06035a99dce18664af2bc0b8e4610ef25339d20 SHA512 02758869ba597ef32ed1e594fa88141644264bbbc8edfe9ae8742a4508fa3e38d059c9ffbb9fa9bcc323b92e1763f96c8b6d054494849df465a08bc6be71bf33
-DIST xlockmore-5.60ALPHA0.tar.xz 1937452 BLAKE2B 2d28455064e7648a89ed9cee981215a1c13b21dab5b11f08aeb6bcc0618b9a4d06dad3bf340dd0895a766d23bbd7f9a32bb1dc00526b9501b3c45c0b38289a83 SHA512 d91f5a14ba2da47d52244a44f58c47c5f8553c439d48051e2221bd8a94d05a402b249b87cd6d5d18aa10e3370e6b8128de0066171869628939ce2de76ffd4b90
-EBUILD xlockmore-5.50.ebuild 2163 BLAKE2B 52abfa6475f3fb306d1e12b67635e528adda29e090ae49f937183928210bd4e68ccdb06098de572f19e6c1e10215190ec8ec247fdd5dfb955e4cb8ab349d8435 SHA512 dfe920659978ed6e48f975e46433841c677375b01893be7b1495687869b863908c37b6316091fd08fdf9b7908e532a02999792fcf9ce27f38a8809df5a5d41a6
-EBUILD xlockmore-5.58.ebuild 2375 BLAKE2B 8a83968aa78a3a3055f5450f4c582ca2235efad89053c06af74e0f44e51e362e699665e8e6f47b33124a58e79fc053e11a909b4842fcf82b155db5e43998768b SHA512 a541a9e95dca77248761fb3b00277a42240da352ce2c9e2cce589f521f60648213d83ca6c2f6772a89907397a86581abad0e7bb1f165c6db38891bad9232b3d2
-EBUILD xlockmore-5.59.ebuild 2378 BLAKE2B e76f0fff986d24fc94a770104dfd46591afea04c0e0b3534bc031c3f5e8cc0123a10b8cd26731bfb428cc885f925476cc3b33b3627a0cb715f1767b01a003392 SHA512 52c181b813bfc1c8f0660c27c0319539ac12b7e5680e364febaed17ccaac139d062ff81b079135af06d6e06f48222c5851f6a78460a11170551b01be21ce33aa
-EBUILD xlockmore-5.60_alpha0.ebuild 2378 BLAKE2B e76f0fff986d24fc94a770104dfd46591afea04c0e0b3534bc031c3f5e8cc0123a10b8cd26731bfb428cc885f925476cc3b33b3627a0cb715f1767b01a003392 SHA512 52c181b813bfc1c8f0660c27c0319539ac12b7e5680e364febaed17ccaac139d062ff81b079135af06d6e06f48222c5851f6a78460a11170551b01be21ce33aa
+DIST xlockmore-5.61ALPHA1.tar.xz 1936260 BLAKE2B d943647b61ded11aadaf4d9e7038c4ff6d622222f44b6d2221b40b9ae238ed679c0bc612437d07e97e293fe856f16ffd39a0fc612d723d0530e99587ffa31b94 SHA512 9e5c7bb9396d883324c35fbf906066784326bfbd9d6c378be9d6293f091de5d56ada41661c4cf52869a2d1b36ec7bba2fdc38b3748f62f84d2d498a8936a2b53
+EBUILD xlockmore-5.50.ebuild 2165 BLAKE2B 12008f0ca6933760f3a1dcdff60708dfd2e73ee22df4a469ba1b91ca372f315da8badebec3628d6ef75e0bc8319a2c5fd3265648ff9ed5b5012ab66a65312b9b SHA512 8130ac6f135a2642b18ba0f41d4660c4ac954e999dbf339e51d2a655ec74715071aa20e1fd2d69dd658f3b9325fea651f8ef4a7006ad8647ff380aabeb2b440c
+EBUILD xlockmore-5.58.ebuild 2377 BLAKE2B 3db2db0790d565d2ab3d28f505eac181c7da13bfda528c3c9ea95663ac6929f9f19e9ad6a4b46039f2b7d7e747c2c4d26dff92d489214f4f789282f435c73a3c SHA512 42f8a540350375ff0a9224d43224a849bf0bb763e4f27fc32499e394558963bf57d62dee1fe7efadd2be4d808910d3a70ae3a5a23ee2adf45c506b5595e14d85
+EBUILD xlockmore-5.59.ebuild 2380 BLAKE2B 4f5eb6ff4fb36e92ffb3a74a54bcb7af70f7b37dba71cca054461dbad53219ed78a9b8ac4584b3fbf19a9651213454e468a348a4235f6f1bdf8f3c17696959fd SHA512 d205325482f4141043c428f023907cfd4ce1d57fe57a62d6401409f96ab64d5b62e9ceffeece92d86ad2911ed8ae15b04a40399f7a5f0f186b368b1f1e5ef76f
+EBUILD xlockmore-5.61_alpha1.ebuild 2380 BLAKE2B 4f5eb6ff4fb36e92ffb3a74a54bcb7af70f7b37dba71cca054461dbad53219ed78a9b8ac4584b3fbf19a9651213454e468a348a4235f6f1bdf8f3c17696959fd SHA512 d205325482f4141043c428f023907cfd4ce1d57fe57a62d6401409f96ab64d5b62e9ceffeece92d86ad2911ed8ae15b04a40399f7a5f0f186b368b1f1e5ef76f
 MISC metadata.xml 446 BLAKE2B d638ac6f12a203ae9ada10ae4c33e3a3d9901e350b6e6925c50078d66b29343cae42a67f84d5334182c1e816bddb05d062eb7b7e47c9125b273db118c4de573b SHA512 c8fafb010e63c39beeee5b53ad37354d19e98ac4cf33f29606b0af379811a0738c9c70d1fb7c31a5673d4a6365fb658a6a8bf49135b748bea9069a690ce543ed
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index b57f0c067952..5aec6deace74 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -5,8 +5,8 @@ EAPI=6
 inherit autotools eutils flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
-SRC_URI="http://www.sillycycle.com/xlock/${P}.tar.xz"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
+SRC_URI="https://www.sillycycle.com/xlock/${P}.tar.xz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
diff --git a/x11-misc/xlockmore/xlockmore-5.58.ebuild b/x11-misc/xlockmore/xlockmore-5.58.ebuild
index bd9d33754767..24bb3f710e8c 100644
--- a/x11-misc/xlockmore/xlockmore-5.58.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.58.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 inherit autotools flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
 SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
 	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
 "
 
diff --git a/x11-misc/xlockmore/xlockmore-5.59.ebuild b/x11-misc/xlockmore/xlockmore-5.59.ebuild
index b6375c41cc74..a342f90d3df7 100644
--- a/x11-misc/xlockmore/xlockmore-5.59.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.59.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 inherit autotools flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
 SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
 	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
 "
 
diff --git a/x11-misc/xlockmore/xlockmore-5.60_alpha0.ebuild b/x11-misc/xlockmore/xlockmore-5.61_alpha1.ebuild
index b6375c41cc74..a342f90d3df7 100644
--- a/x11-misc/xlockmore/xlockmore-5.60_alpha0.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.61_alpha1.ebuild
@@ -5,9 +5,9 @@ EAPI=7
 inherit autotools flag-o-matic pam
 
 DESCRIPTION="Just another screensaver application for X"
-HOMEPAGE="http://www.sillycycle.com/xlockmore.html"
+HOMEPAGE="https://www.sillycycle.com/xlockmore.html"
 SRC_URI="
-	http://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
+	https://www.sillycycle.com/xlock/${P/_alpha/ALPHA}.tar.xz
 	https://dev.gentoo.org/~jer/ax_pthread.m4.xz
 "
 
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index 25e87769b3fb..cc47e5a91541 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -14,6 +14,6 @@ DIST xscreensaver-5.42.tar.gz 26903469 BLAKE2B a82716a3f1f19f85eb1bc7a8ba1981221
 DIST xscreensaver-5.43-r1.tar.gz 26973508 BLAKE2B 67b57214e8a41ba895df6e9efcac3e712f24be06ee7914b38d3a8e639d4945c927c4ac28469d2180bc4a3999a4b89d2a60e633799ac5204c42fa17ad76dd21fc SHA512 7ccaf30fb05ae2110f742f1a5c99f83cd4c8e6749124066b5a418cf3e0ba1b8ff09858eeec29c11b0c8ea428b95b2916481c50cee6a5d952ec941b3ad1b6adcd
 EBUILD xscreensaver-5.38.ebuild 3385 BLAKE2B e3de5033620cba11adac6b1c60ad110ced71228f6186e78632a871230bd5a1fa71ad89692bccee58836d10c1602bcd83aca1798a8565381920f65f94ff499100 SHA512 a51df05efd08870545ed04afa71e01608560a680958956d8a1a1e4c31e2c1aee0c7fba9e92b7e3d868845cf4769621338206fbf7bfcc4511223244f7d78d864d
 EBUILD xscreensaver-5.42.ebuild 3379 BLAKE2B d1c4caaa30884a7246c779a9395ac5b75edc83fca264bbe1878054d8e5843e8cc8973269ea4ba7dca1795f59be5a769b07e466d028648cfebac05cf9ffe6424c SHA512 31be7e3ff82e3d5427c8fbc2aca4cbfbf70ec448b6e856b5a78811116d3fd322c37d4669f3f65ecf30a5f343f7b731f09328b1356620bb94cab2a758f539667c
-EBUILD xscreensaver-5.43-r1.ebuild 3354 BLAKE2B 06eba2635de71983d774615b5f6e99d7bdf986b366d0960c782239272ce5e6581cf173b868e0c3107904f0a933bbce0223ac2375c1142e2a17efc2a4a8606bc7 SHA512 9b6d2474e5e06dac6cf07a4ce26491f713f8de979c4a2d28e480afed2cacaff9b064ea61ab80a74bb4624f02c3c334d3c5da7da9cce77c28f0874bffc7249da4
-EBUILD xscreensaver-5.43-r2.ebuild 3381 BLAKE2B 4bb9eb02b27bcc82ec26231bce1f76273064d0e257707de5d1818ead57d647a43b950a07305df6399ef0a939efa9658b4706a7048ebb98a62cf22526cabb0b59 SHA512 55bfabf2ecd68ede80bc6e6a219de56f2f6ccf89d2fe118b848d570043fe4058ea1cdd74acddafe2762393dbbf609cdacf6fded708ed63c7e32d4a43461f209a
+EBUILD xscreensaver-5.43-r1.ebuild 3420 BLAKE2B 3222b8554ece3427fddbfd0aa5ec2d25f50141697a96cbc8b25bbaf7bd50384b0673554b873ef4503643f95eaf71265a0f385ed8dc858b05e1e48ed8ddc6a9bb SHA512 6aec191f0ff65feb864a8571240c39c4272cace6be74ff598431316163f653e528dc5a84c9d81afe5736ac7db9fa02f755327d4247784e2591e35c9d929a5da1
+EBUILD xscreensaver-5.43-r2.ebuild 3447 BLAKE2B e5639b3a828298a202d8157b06eb39ba9623d043982b2980f8eabe2a8bce0695ca8b94cc1627d3351f927c4144e3ae572fa9413d755cbedfea2ce8145a86b695 SHA512 c74a05ac217c7dbcab97210ac7111f56aa8efbba2c24f2717da7b5e482d3aa664bc35f104ee8469f466d514f0d79d3be520babba5f4ea588f84dc20874b7c443
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
index a3724193e8b7..0e7b5548e757 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
 	>=gnome-base/libglade-2
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	x11-libs/libXt
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
+	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
 		gdm? ( gnome-base/gdm )
@@ -102,6 +103,7 @@ src_configure() {
 	export RPM_PACKAGE_VERSION=no #368025
 
 	econf \
+		$(use_with caps setcap-hacks) \
 		$(use_with jpeg) \
 		$(use_with new-login login-manager) \
 		$(use_with opengl gl) \
diff --git a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
index d5c1aeca6ef0..31c271493a21 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.43-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
+IUSE="caps gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
 	>=gnome-base/libglade-2
@@ -32,6 +32,7 @@ COMMON_DEPEND="
 	x11-libs/libXt
 	x11-libs/libXxf86misc
 	x11-libs/libXxf86vm
+	caps? ( sys-libs/libcap )
 	jpeg? ( virtual/jpeg:0 )
 	new-login? (
 		gdm? ( gnome-base/gdm )
@@ -102,6 +103,7 @@ src_configure() {
 	export RPM_PACKAGE_VERSION=no #368025
 
 	econf \
+		$(use_with caps setcap-hacks) \
 		$(use_with jpeg) \
 		$(use_with new-login login-manager) \
 		$(use_with opengl gl) \
diff --git a/x11-misc/xtrace/Manifest b/x11-misc/xtrace/Manifest
index ce8dc2917c86..c5d745293f80 100644
--- a/x11-misc/xtrace/Manifest
+++ b/x11-misc/xtrace/Manifest
@@ -1,3 +1,3 @@
-DIST xtrace_1.3.0.orig.tar.gz 183803 BLAKE2B 286c9ed04cd13dea72aeeb1b81643278fbfc4f64ae8c032287ad36ff560e469b8a9c3d338ac8803e45d13cb83e02d1229e5ea64a6611d509eb08ebaf1abab7df SHA512 8078f976652b18503f68020e8ae716fceea506c62582ae23b00cca67b6d6c76a9d0955567a5bb011f1ead6d99996cdcb80f93c5f4c3f9e65c4443599caec3399
-EBUILD xtrace-1.3.0.ebuild 759 BLAKE2B de7db44f74d255d3b59bc8e0fcb388d036d1b27a858f37d8560ecb5dd985c4e207aedca2623539ae294d145737bb8e4b36c1b47f2304dfd4c52c7cdb3c096402 SHA512 659ee76594b62c83983bc9ab467986b8afd882a4c84fc0c0668771d198acee88d789410b6f4ad5df4707706b458d3ede735785523e871aade1ef883436d1b62a
-MISC metadata.xml 462 BLAKE2B 829bbed0c4f9dbbeab92198c75d05feb41f1e75e59e7b4514878b3b055f9b7c0016d71fbf3ee87a5d6035e6897760e6726c577b29ea4bbc59191b07269a0f067 SHA512 c0c3fdac4ac2b920d347e265918bd2a4ed61637157502028aa8e02111c1cfafef6249c15639b1d02e01e6394faa2ebca0ab2e282e4e4a86bd2975ebca265ca78
+DIST xtrace-1.4.0.tar.gz 109032 BLAKE2B 61e1360923eb6b83e47e8d6eb8882b362ef4f257b699d6de9c43556a0e9fe767edab90dfe2d5d792297be244d976a7a0ff7b2df37c87f5e63c7b4731fd2d089d SHA512 97363c5518eccdde15f2f0567d2bc46e8e54638e0b2ef33b207526d660a9f607d5176651dc95aa48267808701406f74de55bed972a931c84462446e3b74c6a7a
+EBUILD xtrace-1.4.0.ebuild 760 BLAKE2B 1aac1f9232fb1a2b83f17df7ec85c2ff66f4ddd3460f25761841eb01847a5f6dba6bd88cf5673b8bd2ba04ccaaf0300e9c69608cd043fb8532b1597e802a3fa6 SHA512 5f9889adfb3c2e4eef2a3fc137e1cee87212643aa08187cc3d970db1a05f67dd99dde320837ae72816094cb97ed5efc6dedad0db9fd9e0948186691595088709
+MISC metadata.xml 255 BLAKE2B a2162fdaa6e5e8ad6a0310f1e03075023f8548ab4f689c43652ccfe84418ec1ee31bc7c9351cbc8bbc08db8e1b5cb3fe700b6d0ae3bf0c751933b883704ee59a SHA512 a406e5b0292decc477b110f62832679ec16a81044082ef04854421aa6fbac93bda9ca2205a6a39347610ce2564db2cd0fdc314a4924258b00fc15231ca73df95
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
index 91b9837c7dda..867145a2f0fb 100644
--- a/x11-misc/xtrace/metadata.xml
+++ b/x11-misc/xtrace/metadata.xml
@@ -1,16 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>nightnord@gmail.com</email>
-	<name>Andrian Nord</name>
-</maintainer>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+  <maintainer type="person">
+    <email>maksbotan@gentoo.org</email>
+    <name>Maxim Koltsov</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-misc/xtrace/xtrace-1.3.0.ebuild b/x11-misc/xtrace/xtrace-1.3.0.ebuild
deleted file mode 100644
index 178f5231a886..000000000000
--- a/x11-misc/xtrace/xtrace-1.3.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils
-
-MY_CODE="3694"
-
-DESCRIPTION="X11 protocol trace utility"
-HOMEPAGE="http://xtrace.alioth.debian.org/"
-SRC_URI="https://alioth.debian.org/frs/download.php/${MY_CODE}/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
-IUSE=""
-
-DEPEND="x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-DOCS=(AUTHORS ChangeLog README NEWS)
-
-src_configure() {
-	local myeconfargs=(
-		--program-transform-name="s/^x/x11/"
-	)
-
-	autotools-utils_src_configure
-}
-
-pkg_postinst () {
-	einfo "To avoid collision with glibc (/usr/bin/xtrace)"
-	einfo "binary was renamed to x11trace, as suggested by author"
-}
diff --git a/x11-misc/xtrace/xtrace-1.4.0.ebuild b/x11-misc/xtrace/xtrace-1.4.0.ebuild
new file mode 100644
index 000000000000..1585b28744fa
--- /dev/null
+++ b/x11-misc/xtrace/xtrace-1.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="X11 protocol trace utility"
+HOMEPAGE="https://salsa.debian.org/debian/xtrace"
+SRC_URI="https://salsa.debian.org/debian/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+
+DEPEND="x11-base/xorg-proto
+	x11-libs/libXext
+	x11-libs/libX11"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --program-transform-name="s/^x/x11/"
+}
+
+pkg_postinst () {
+	einfo "To avoid collision with glibc (/usr/bin/xtrace)"
+	einfo "binary was renamed to x11trace, as suggested by author"
+}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 30628ccfcc5c..43831ddf3e7a 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,7 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.71.1.tar.gz 2883082 BLAKE2B 66d1c571a67e12d8d38cbc6d8bd32918f98f47bff0aa34971986896b3aeec91170cd1f2a87a411a8fccda502addd3de8176cc70ebfbafedc87c462a751e87036 SHA512 0da59955f730cc0bbee033a292c7e531b1a302c950773aed68bd8a18bf1485826086522c4144f24f500e9240ebcb9b592b33dda390923ca0eba6ab57273c0896
 DIST zim-0.72.0.tar.gz 2590406 BLAKE2B 0d77052e9eaa62b855be30eee64863197498ee54949f8610528ccd86cf32e7c9c55fb2faca719a4d92e0568941dc6b100299e76a33f8c49bddc5e367ec98d923 SHA512 60f59c2cf2ebb920515ecbc77e7fb1ddb9b0a6f6179503176b582b6b87ada759707ec4ccee929896a8a7d489f25ff13f7a6ff61fa637ecdb3d02640182cda0b9
-EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
+EBUILD zim-0.65.ebuild 1801 BLAKE2B 46fdc83458bf3f3ad8b21962b20431773390d24847407ca0f22ffa73ab015b6badd91da80eee16f628d7343095db563e2de047d002c7f8da8f4ce8fdeaf226b6 SHA512 56606b28d7ce853dca3509c93c95672b36a5bf760d0535bd1f37a19f41d7c59890ccfaadbe0eba770e0fdba6551bd63f6ed43203fe3ab76d57b827d48de4bf79
 EBUILD zim-0.71.1.ebuild 1912 BLAKE2B 453cfa5a308a9e00622a508b27aae0f0511b241a8f1ca9f3555964defec514617430e3b88e92c10b2814e2ce727c8f975e273315dfbbcb8759fc4d85e593a1dd SHA512 a6b3845fb5a20895e96027221e2fdc4a23958e2ee9a7cd8e220037c30294288bc7bc5a353ce6b9a5e46cc8a2c6cb9c1221382b3fafe4ae7a3d38db175a4777ac
 EBUILD zim-0.72.0.ebuild 1895 BLAKE2B 066acc255bb356c9841b4e7eae17b3baa632b4b9c7ad9dba8ec926ba1590484a87f0525ab8e73dadbb9bdf92c624da37e84ef117bbca2e03ed9449695799826e SHA512 8d05dbf1c1db89f4dbbc0de727b8be11a6c908bd08b11f9b4601af9feb78a6e80422bc8dd3a11869abdd73295ce48d4bc3bf9eb86238b48a55288ef786a8f5ae
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.65.ebuild b/x11-misc/zim/zim-0.65.ebuild
index 6b678c0e24b9..0c5e544634d3 100644
--- a/x11-misc/zim/zim-0.65.ebuild
+++ b/x11-misc/zim/zim-0.65.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=5
@@ -17,6 +17,7 @@ LICENSE="BSD GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/pygobject:2[${PYTHON_USEDEP}]"