gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /x11-misc
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
99 files changed, 202 insertions, 696 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 12333389c74a..6800f633acb2 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/compton/Manifest b/x11-misc/compton/Manifest
index 9cdd6b507134..4b0c108815f3 100644
--- a/x11-misc/compton/Manifest
+++ b/x11-misc/compton/Manifest
@@ -1,4 +1,4 @@
 DIST compton-0.1_beta2.tar.gz 144239 BLAKE2B 993c091aa0eab4171740a26c4ea8e9da66368fbcddbbdf9c466dd2cb2dbe0a685dc6c2027a5b56d08df4fd42d21784dd2cbb7cf56869feb1b74b4854db20a5f8 SHA512 c3a019d90e32559d44e3a4969bcc15a15837db9c9519ce8cc70b1bd3d0cb16d29449f68cc2f6a8d834569c9620ec6533ab85c1586da957c69b1ae341d9584535
-EBUILD compton-0.1_beta2.ebuild 1621 BLAKE2B 61720ff7bdb21efd8701b49410f67a3bf2c0386bce543f5c9e5e58431c7017f5e281eb7e26a41b5dd1895d9e45731418bd6e43da9f246f582964f8f23ad6f792 SHA512 6acf0d8276c5ee7660d8133f376e4d5281f66c4118ae40d126f1f33d9340c5ee5e19d3a65ec98b637b970a54a29cc31aa4d34be04ed672f0c5de685902edf7bd
-EBUILD compton-9999.ebuild 1537 BLAKE2B 2e7c807a0ddfe672a3946394ed3bc16288ec72a050a2f0f0c30829d2283737e39ebb3bbdcf047c71ef478d23e7f2566372ff17f07fc41822f3ce5ee25156a678 SHA512 8b8aa77c5357b2d2c6627223d3a942388c22245646c035fff599b33e1b6df6494dfd1ee4d9cd0d9ecd5c1681510f30602f028e436104cd752762bb02b23c43c2
+EBUILD compton-0.1_beta2.ebuild 1616 BLAKE2B a90f758aca2f89ba4ed9186d23fe54b654a7d256bd64e14024bb0f62ca353145360383990f035334397edeabe95927c377d4a93e2d1e8f954baaf969f0f3f808 SHA512 00bfd8b08b6752b250ebd1dc7695dc118cac68b64a04d3ec20967c69b4143eec61f97d6032e72c1cb92bca46c3ad6884bb1dd3c631629eee5607eba0e26062a6
+EBUILD compton-9999.ebuild 1532 BLAKE2B 5d057277a01c432d816b0198b79363215a1e342854d7d65feaf3e53b6d94ec38841a47729799b7ac71e06c7620c31532f9f2800bea7977d6b4156b46b61ae923 SHA512 cf6f7d09ee30d94f400eb5aa608a915913e0b20b5b461d03aa6d9e05b4c825abec091cbe0a0a6fe78d80cdd491358a79b5ad83bb52315df53ef4641bc18cfe88
 MISC metadata.xml 484 BLAKE2B 903744ba49b9aaae86cec59c83f96f02da325d17813d6ceaedd88eab1450ae76eac7a40c9e1b44086651efd21e5580b605b9095925625fa3bb1e6c708ed8809f SHA512 d01d17901f47f7e2c0201c0a6665d0e27693ac42b27ef8dce8a78763ec775a41fed88b4565db434351a2c9d01e762121bca3f347f467e77e71bde66f019640cb
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index 7d94d23b5320..74466afd44e4 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit toolchain-funcs python-r1
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index 3837f2f126b9..0c8bdd5513e1 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 inherit toolchain-funcs python-r1 git-r3
 
 DESCRIPTION="A compositor for X, and a fork of xcompmgr-dana"
diff --git a/x11-misc/dex/Manifest b/x11-misc/dex/Manifest
index 3e8d8159a5f8..e1cbf31f89d6 100644
--- a/x11-misc/dex/Manifest
+++ b/x11-misc/dex/Manifest
@@ -1,5 +1,5 @@
 DIST dex-0.7.tar.gz 7679 BLAKE2B 7ebed8194158b273e8a0980f7070c615081052eef7ee2023784ce3123a2004b5e7dc402bead2f985d3a6898509f978404f8c093f668d74569577c7d7759ee121 SHA512 ee1f8c6ef0b374aadf6ad0ee6482bb23f740f67888994839c381b71b3655d0cbd7d3d5c99abe5f3bce856cb767a1b4bffdbcdf6c70969226b44a59ee76943bce
 DIST dex-0.8.0.tar.gz 8665 BLAKE2B de62557d207d257286cc706c07969b10b0d753b197333f1d24c0c0a22a897fb2e3c64a25f71770424e6cc365d028c9a1e994fcf35c68c96be7281d24ce19b1e3 SHA512 d87a7306b931736aa302dc883cbd9c635397eda2c119133a3ae8028869a4302ce3713b43cc85fdb2f804d1a74ab2499ef32a2680d5d6be039831006e617aa70a
-EBUILD dex-0.7.ebuild 653 BLAKE2B 0f2ffb2bd5e673fd583cbb426c0759d18a0cb35c694e7590b61f2d6421ed2425a9129169409e66694347661de059830cd641d92c9789065d09a1c1b561b5cd66 SHA512 851ae08423d79e1caf147644f054887fd7c4d2582618aa8bacd78f6e38fa66217a063ef5c232d5fdbe32df5691a7b07f72dc577c61e6596d9c8ec02c7a50c55e
-EBUILD dex-0.8.0.ebuild 762 BLAKE2B a02025ee01d7feda9d301cdd9a7e8272276d83fd47d42cdafd873f8843fbd58c755e96ce4bce3b431c63690cc907df07676979f402873eb94fbab77f1809554a SHA512 9f0e9c8fa2877e2722066056766677fa9d40c49f5373a64feea8b237bbe669bb2c8fe6736e236c707a4ec6e1cf2a1af942258efc4776046cad4dc713aa25c6ca
+EBUILD dex-0.7.ebuild 648 BLAKE2B 0373aa70c622c182dab26b97ca4c28e2c080ddf4ab747b140f57b346cf739ee36f034ce1ef13605fc7de8702e3db78600fccf229f6245aed6898cbf1f5830a76 SHA512 08c78b33e12b04b061894a9e0771a086446e64943450811256291435737c3089d6c9edf28f4a5810f13bf2e488dd0afa728f46642f34b372bc7e827054761450
+EBUILD dex-0.8.0.ebuild 757 BLAKE2B 90de8752a8d1d49216d8140b7426f199108a826bde7cc2164e9adec17aba7b5435003811a368585a9eafaedccd2a153b2a60987cb102217d097fd0f46410a9b1 SHA512 1d792a33b9ddde5d89e6875b8c41a5299ed85489cf49763c4566b27b97aea2e24131aa84173e79f8693f3a93ada27809e364888dbc6ebacda2f51553f4835ddc
 MISC metadata.xml 320 BLAKE2B 13f35e27d7da69c6167f9187b75cf012fe33359467336f422478e113814b062bbbde0fe5bd4d25b3eac41cde9a45e55b61f912425049365e82afc0557371e818 SHA512 18ef7b2115ecf22f12afbeb064823e3cf2faba91730748d53fc182e557d5f1efa371fca86266fa58ce88d5c249785e2b6b6c9b29f7d504ac3867cebc55860fb6
diff --git a/x11-misc/dex/dex-0.7.ebuild b/x11-misc/dex/dex-0.7.ebuild
index ac989255eaaa..6a33b5291fc0 100644
--- a/x11-misc/dex/dex-0.7.ebuild
+++ b/x11-misc/dex/dex-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils python-r1
 
diff --git a/x11-misc/dex/dex-0.8.0.ebuild b/x11-misc/dex/dex-0.8.0.ebuild
index 78866ad5a1d6..884e68324b45 100644
--- a/x11-misc/dex/dex-0.8.0.ebuild
+++ b/x11-misc/dex/dex-0.8.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit python-r1
 
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 4a6dd84294a8..53bab499cf94 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -6,7 +6,7 @@ DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a5
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
-EBUILD dmenu-4.8.ebuild 1331 BLAKE2B cd9a7d863e5f1ebcf407a9b8679770e5710ef473329b3fd21c2502cd238a8e35325f2cd1b6feb1746230d17364a0f1fa1ce1d346f71ec97e977221e3100f3d6b SHA512 d7616941e416beb543b0abd4b7ed16e7b157c36fe5e454ef7a1c9a5a78ec4de5c10ee34b7f4b749b6e77c012b82437acf87a374d883c56047cdee09fd30ced6b
+EBUILD dmenu-4.8.ebuild 1337 BLAKE2B 3982faa7c70a14d9af9172da682a27c40a631a001ec46cfa1f4a6b413a4db033f27f21b1ba9dad630bc726bfbcf2150826edada2e270e5aebf037e8b17f88059 SHA512 2c891ac9e9c21df2787f337a7bf8139e1c0efaeadaeccd9720f7bdf21c15ff23b0963029cebf1f38056ad5b8e124d16c346b9644085344de23b3f36781b24b2e
 EBUILD dmenu-4.9.ebuild 1417 BLAKE2B d2f8afa1e4ca55a0e6856e3b689e898fbd0bb3909d2a4a6db7cbea56717987159672ad6204c7f3b8e78c43de89768febbeb0d81a5a4108536e4889fd9200899c SHA512 9b7f90974a4ded07a37fa6f7c241b7954cd621176dc7ad3e552662f5f21e44d67b8473bc7b6ade8c8ecf1f1571a5dbbfcc2c8af321014d8bbe74b42dfb9e438b
 EBUILD dmenu-9999.ebuild 1370 BLAKE2B 158e394bd5b609af85717452f913921291556333224d07bd82b5b75d7e70a01d4be7ce17014d41a4647904715e97c004c700bc516f34b3ba0385489d7b3cb293 SHA512 71a19ebfb39776e2de6cdee238c59461ae2f95e24278ef6d3c84ad54c681e7deb39edddc7007d31b2135062912f40b9681716bc8a71eac4d242e2cd20a127dde
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.8.ebuild b/x11-misc/dmenu/dmenu-4.8.ebuild
index aaf42bf59d99..916ea5565a58 100644
--- a/x11-misc/dmenu/dmenu-4.8.ebuild
+++ b/x11-misc/dmenu/dmenu-4.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/x11-misc/fraqtive/Manifest b/x11-misc/fraqtive/Manifest
index 57e2450ed6ff..89b6c91e019f 100644
--- a/x11-misc/fraqtive/Manifest
+++ b/x11-misc/fraqtive/Manifest
@@ -1,4 +1,4 @@
 AUX fraqtive-0.4.8-qt-includes.patch 438 BLAKE2B 537ab2c470dd14f977cb53278cabf5a4e05e7973b69142f17d4bec1732c588ef181697e1be2c703d273ec1a6d26a53f1374482edb5d422924042c65917d7620f SHA512 0e5ea8dce236a5cdb8086ab0671360aeb15a4d0ac9703969be28373315288d59ccd31b013f932c77bfb5a64faf917f311c30c7cd25c006f08be5a5f40f5735c4
 DIST fraqtive-0.4.8.tar.bz2 260484 BLAKE2B 0bbbd983af324c38fb73db043e808de6cbf8e3e39073163b748215a2a3a374e53e4118b7fb0993685d3eef4ef6b65afcc51c5a7d23f4ab91ffc2dfd41305171d SHA512 8b4be81dd14fe086dbcffda123395ccb30a197e7762e590bc3ab7dc1d0aafb44dc45e1445e2f83198a0c1f4b9ea0d54a7de1989c3b85c0f2e5f474a67255d942
-EBUILD fraqtive-0.4.8.ebuild 1178 BLAKE2B 0654ca73475ca8468e633ef72d93a4978ccbeb280fe33934eb0469679b73a7cbc4a7b2351f7de7e1394b3f1df385deb1093b75283a0ef7ea541e399b683f2627 SHA512 879eaed73ee04e303bf92e7f07002965f1f861e04413919c9b3eab5c1581f1f3659e75987e861a86c37d06e40f09ec75a24369c4b48c6e7650f53f976d6b9a32
+EBUILD fraqtive-0.4.8-r1.ebuild 1017 BLAKE2B 2f88f329cde8d0aca9bcd1625c9c0d3b80f1834178d5df4a515799d6e037933475b8fff783f2d4ba57b7c649522eaffc397fb21eddc96ffd4a7e3d401d5d8210 SHA512 c467b51b56fcc2e0dd30dd22ff54ad403401f390f335c62227305033532b5947b02c5cb5f6a45ace514059a5658bb6c662e1c9853a0fae9c134f437bd87c10af
 MISC metadata.xml 364 BLAKE2B c40b388c714f4e116db4a5dc2292bf9da6bf0906dd3da66add62a5339e157e7ba728e135e58e818fc80d7cb3ed5c4fa72b4675efc15c30eeac9a8badda8a79d9 SHA512 b3343bcc5cf584c4bbacb0d54e353bca91c3112d9d906dc920ead427fc964e7a71bc632e810f6047a293d00325dfafe532067b6d0d5fb9abcb797ae83c587604
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8-r1.ebuild
index a97d45c95d52..331b0ef776a4 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils qmake-utils toolchain-funcs
+EAPI=7
 
-DESCRIPTION="an open source, multi-platform generator of the Mandelbrot family fractals"
+inherit qmake-utils toolchain-funcs xdg
+
+DESCRIPTION="Open source, multi-platform generator of the Mandelbrot family fractals"
 HOMEPAGE="https://fraqtive.mimec.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
@@ -13,20 +14,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cpu_flags_x86_sse2"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtopengl:5
 	virtual/glu
 "
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
-src_configure() {
-	epatch "${FILESDIR}/${P}-qt-includes.patch"
+PATCHES=( "${FILESDIR}/${P}-qt-includes.patch" )
 
+src_configure() {
 	tc-export PKG_CONFIG
 	sed -i -e "s|-lGLU|$( ${PKG_CONFIG} --libs glu )|g" src/src.pro || die
 	local conf="release"
@@ -37,10 +38,10 @@ src_configure() {
 		conf="$conf no-sse2"
 	fi
 
-	echo "CONFIG += $conf" > "${S}"/config.pri
-	echo "PREFIX = ${EPREFIX}/usr" >> "${S}"/config.pri
+	echo "CONFIG += $conf" > config.pri
+	echo "PREFIX = ${EPREFIX}/usr" >> config.pri
 	# Don't strip wrt #252096
-	echo "QMAKE_STRIP =" >> "${S}"/config.pri
+	echo "QMAKE_STRIP =" >> config.pri
 
 	eqmake5
 }
@@ -48,15 +49,3 @@ src_configure() {
 src_install() {
 	emake INSTALL_ROOT="${D}" install
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index a0eb01d470bf..48abc5bc3cbf 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,7 +1,5 @@
 DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
-DIST gigolo-0.4.90.tar.bz2 249532 BLAKE2B 87cd22db54434eb20dd6d3a1fd569cba8de00acb8b53a3dfa0c51b14d36644d1a92aa2863e93f11d219d7ee2412a426d24e9b1f59c7146eb60bd46362a8fcc28 SHA512 9517e1a31abdbfa15159912ed261c6981a6c207b0f74f5ed84ccd8dca18a3ab011cc97f423b67b7a21866b35a56a5c9494ec5ac4dd0d214cfe1eb5a2bc429711
 DIST gigolo-0.4.91.tar.bz2 248666 BLAKE2B e258e494b4260158df4db4d3c6cea813667122a2b57059a71c35338d879a191264f8ed315bf686cb48fa3879ecf0f37c170852fb731f81020a69ee2dbaa71e1d SHA512 35cad4a072980ca688d414ae14c85c9463364c44dbccd0a3286a8fa767135cab24577ec6ca66dcd9f32263d04ea4ea4ada4330f849911ab3289ac9e6dd45583d
 EBUILD gigolo-0.4.2-r1.ebuild 707 BLAKE2B 3e9ff659fa2c0c36ef33f71d62c4a706917e3d6e2074fe77644b283b7052d2ce0635a31d50686b4915efd1b2a18e161edc60c5b82f36a71e51d9db8e1ed2241c SHA512 f342f5f9aa1bc19757f599aa4dd78047d37bb0ef1df172b8f9139ad92a4e52386b22faa42cec253c6e11df7d88f18335de0c122daffd8034242754b7b1bed053
-EBUILD gigolo-0.4.90.ebuild 707 BLAKE2B 7e40365958c8890762795ab9e5e477f69a1910d7cf21b7b6415a9202a358729ea62c97705a40a61d5064ba2486e3414589ab4a370d1ba4e81104ae6e688ff152 SHA512 17d83df32dc8ba31d9c893d2ed9f87ff234c330adfd62968e03778a83145f6324d091b41997244175ec52d628ac457e940f71537dee89270091dc295947d11c7
 EBUILD gigolo-0.4.91.ebuild 704 BLAKE2B 72ac4bd1f1071a5f48a6e01ef142952e19cc76f38b1165ff4df54ea3b09ff30073c4025f076a955e536a5033024420cacadb69a870f0fa01e652042c7e0858a4 SHA512 b9cf5b7c221121359edaa12046c26e517ed287da5ed3fe12422233f032b3ef6b55f545c7629e0422f3ff49acaa5cf46b929ade4ffc07f687657de130299443bb
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.90.ebuild b/x11-misc/gigolo/gigolo-0.4.90.ebuild
deleted file mode 100644
index 68700a0bbf9c..000000000000
--- a/x11-misc/gigolo/gigolo-0.4.90.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="a frontend to easily manage connections to remote filesystems using GIO/GVfs"
-HOMEPAGE="https://www.uvena.de/gigolo/ https://goodies.xfce.org/projects/applications/gigolo"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=x11-libs/gtk+-3.14:3"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm COPYING || die
-	default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/imake/Manifest b/x11-misc/imake/Manifest
index 579c633af9ee..0806cd91cdeb 100644
--- a/x11-misc/imake/Manifest
+++ b/x11-misc/imake/Manifest
@@ -2,5 +2,5 @@ AUX imake-1.0.7-sun-compiler.patch 462 BLAKE2B a1b0ce3d7776e855a9fc0d819f9338c4a
 DIST imake-1.0.7.tar.bz2 156543 BLAKE2B 63e7f2fcd907ba5508e9e592602bd455d66ce134f82a3387ae9cee66a6b65190e38a0207980df62c2603d060acb5f380446dc6f117c75edc9c5c6f611d98dbe2 SHA512 b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08
 DIST imake-1.0.8.tar.bz2 159398 BLAKE2B 2ea03a06daab883a35ac4ef5c5598db89c84b2bbc41105902f64ffaf66a2e5cebaa28bef0ee7d258eb7279eaa95671b8798701423cafffe87d8feced5bc1b63d SHA512 5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728
 EBUILD imake-1.0.7-r1.ebuild 1169 BLAKE2B 9a7b575c8bcef987da07ebcfa6e8d9aea73d474dded2ef0898ed414b99e40f011b4687478f346be4eb7851d168c4ed1f7ee294905021b63540d1eb74d5890b33 SHA512 674bf165c5be1520af53e7876aa45603191e80fe3a4b418c6e551e6112db3405bdb4b05525e7ab18ab2eb9164a1555070ceaf7391c113424c1ef9c0a995c0f47
-EBUILD imake-1.0.8.ebuild 495 BLAKE2B c569155738b96bee86ca70454faa46a879c7e4c74bd2e60e7ccfe3c5610c00126f8e9c8e98b2ab41364b87606e71dde884f2008ebdd35c37d29bd48d59253a87 SHA512 6af016f32e488f23f3ffa716a32b0dec744bb10989269bf9deeac228b5fc9970fb800cc35d39892d8a93b5066b51a44b4adfb90b583d973ec5331493145b6af9
+EBUILD imake-1.0.8.ebuild 488 BLAKE2B 4a83a07b4738b9f9cbe39dacb2c106ae574c8aecf0677efc0e44415992429008d662f7257ce4a947bb5f1620ffc8eb7b521fc8100b1660d027d266c930df9cde SHA512 62024bf6406b37b97f9eca10022a5259e4120139d71dd553f8a6b1568dd8375da8accaf1e28a886efe8bd302845ec3b189396974297918b423ee84cfa3e64427
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/imake/imake-1.0.8.ebuild b/x11-misc/imake/imake-1.0.8.ebuild
index 7761ca459ad5..2c4382704c3e 100644
--- a/x11-misc/imake/imake-1.0.8.ebuild
+++ b/x11-misc/imake/imake-1.0.8.ebuild
@@ -7,7 +7,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="C preprocessor interface to the make utility"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-misc/xorg-cf-files"
diff --git a/x11-misc/j4-dmenu-desktop/Manifest b/x11-misc/j4-dmenu-desktop/Manifest
index 0388b6947904..4f43397266dd 100644
--- a/x11-misc/j4-dmenu-desktop/Manifest
+++ b/x11-misc/j4-dmenu-desktop/Manifest
@@ -1,6 +1,3 @@
-AUX j4-dmenu-desktop-2.16_system_catch.patch 5533 BLAKE2B 69745ebc955550ab3c02d31b455e8d36210aa845c09e3c1a5f61a829c0dfc779e093d818c977f98b1c5089f0a43662bd0b75d99bebeb83f9ada85175987134ad SHA512 dedb23a4b946a31778fdc1451ad2841d78bb6bfa00661e6e496fbd329f1c7fa6a3a3fcf52b35e1c02b049c1b2e614c9eeae6717851f56b6e89719cf017807c83
 DIST j4-dmenu-desktop-2.17.tar.gz 33531 BLAKE2B c1dd82a444efdbbf2af644ee6cdba6746a81228c5f6b2d212d5ea248628855f1cd1c4dff091ae278eb8c6458db4934b60acd8e2dd9a9c88b32537e76878824b3 SHA512 7a41bb60a6b3afa7bf6229f08674d5f31e0152d0788a17edc210986d1b1f0d4fad13ffaa13c58ed7a0c5d2e67f8f95bb2a0f6556aeb0f2cc24c7d885b346325e
-DIST j4-dmenu-desktop-r2.16.tar.gz 32553 BLAKE2B c1c7f0f2a59421b2e244a8f65251b296ad44ae37c10cbffb62bdefb168b6104e3d89c0a43b74feaf0afcc52ac78c8d46204ed397f131e526c447379b066b9b88 SHA512 d5bb0902d4bdc474fa20bc9d8f79de90a92bb4941f0d325dfcfaa1347ea3ad355b87da8194bc3f654970e9ab8848e6ecb5093f3c75fbaa8dbc40199fe6ea2837
-EBUILD j4-dmenu-desktop-2.16.ebuild 904 BLAKE2B eaa5872c1fdde74a767910a477271343d01f7426248c9178f0d14d6b4cededc765d117d4870e683533fdb7aaf3c487a013da42f394872558c5d733ec9e7f0e56 SHA512 08b252636cd5a7186c1a739abb44b331302e0ea87566ad26c6baba152969838ea82d93d5df43c71cd2f71f49381ae94003f7ff94b51192d44b238145cee43eee
-EBUILD j4-dmenu-desktop-2.17.ebuild 808 BLAKE2B 7a5664e935bc33dcb765ecc9db16d3e05e8dacc2a605259cc76ad444d8f4e569fbc15a9021d2af4e11858ab94c68589c45a42ed53cbe432ef06fd0d7122565d2 SHA512 6334119b64677c378ed8b1ed1ec20a4a597faca4987fc3fbbb8df17ecddbfd16323181e29564160eebc743babf83d33005dbde9ea18dc04a5bf832b7e26fdaf2
+EBUILD j4-dmenu-desktop-2.17.ebuild 807 BLAKE2B 0bcdf7380a4b4305327d066cf8c10ad069e8e9e1c25177742f42fa2b04aacc13c6350d1b5c2c42f714e262004e5fd52dfd7de7e9ec1827b30be63578d2ae693c SHA512 d7a413ff8a273f80fa24cce11c5d3d867709bff55fee9d7a8345c17986c35d6f398a47ae794de0bce58fe3f146d7f8e0d093e72adbaa35cda0096186edeeb55c
 MISC metadata.xml 818 BLAKE2B b7c476e13a8de66b8f828895f478988d2f7381ff2ca823d7e0a74bb931f1b5288dd4d574cc8e4e5d2f5d4c7b1cb24c9d4fd9bb8cd1a9710d43ba2e6db90430cb SHA512 4444201bda84c9fc9eaffca6904df20fd06bcdf772a09a16d20d08015fea6672edb9e17435b35933b9ce71552831560b361732147c510ab1d79cea43073de8e1
diff --git a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch b/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
deleted file mode 100644
index 7becf7d3f75a..000000000000
--- a/x11-misc/j4-dmenu-desktop/files/j4-dmenu-desktop-2.16_system_catch.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-From 210926d23d0f40277b549ca490f876f93c3ffb6d Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 16:44:03 +0000
-Subject: [PATCH 1/3] CMake: simplify GCC version check
-
----
- CMakeLists.txt | 18 +++---------------
- 1 file changed, 3 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 392db54..78a71c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,21 +2,9 @@ cmake_minimum_required(VERSION 2.8)
- 
- project(j4-dmenu)
- 
--exec_program(
--  ${CMAKE_CXX_COMPILER}
--  ARGS --version
--  OUTPUT_VARIABLE _compiler_output
--  )
--string(REGEX REPLACE "(\n.*$)" "" cxx_compiler_version "${_compiler_output}")
--string(REGEX REPLACE "([^0-9.])|([0-9.][^0-9.])" "" cxx_compiler_version "${cxx_compiler_version}")
--
--if(CMAKE_COMPILER_IS_GNUCXX)
--  if(${cxx_compiler_version} VERSION_LESS "4.7.0")
--    set(CXX_OPT "-std=c++0x")
--  else()
--    set(CXX_OPT "-std=c++11")
--  endif()
--elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-+if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
-+  set(CXX_OPT "-std=c++0x")
-+else()
-   set(CXX_OPT "-std=c++11")
- endif()
- 
-
-From e6e05d0170554246118c2dffe5395a982e1af250 Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 16:53:39 +0000
-Subject: [PATCH 2/3] CMake: clean up and reorder CMAKE_CXX_FLAGS
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 78a71c0..1b3f2b0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,7 +8,7 @@ else()
-   set(CXX_OPT "-std=c++11")
- endif()
- 
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} ${CXX_OPT} -Wall -pedantic -Wextra -O2")
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
- if(NOT DEFINED NO_TESTS)
-
-From 7be5116d0d6d80522517a58bb6e45ca1cdcd9612 Mon Sep 17 00:00:00 2001
-From: Diogo Pereira <sir.suriv@gmail.com>
-Date: Wed, 24 Jan 2018 17:51:28 +0000
-Subject: [PATCH 3/3] CMake: add option to disable downloading Catch
-
----
- CMakeLists.txt | 90 ++++++++++++++++++++++++++++++----------------------------
- 1 file changed, 47 insertions(+), 43 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1b3f2b0..17605e8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8)
- 
- project(j4-dmenu)
- 
-+option(WITH_TESTS "Build and run tests" ON)
-+option(WITH_GIT_CATCH "Use a Git checkout of Catch to build the tests" ON)
-+
- if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7")
-   set(CXX_OPT "-std=c++0x")
- else()
-@@ -11,53 +14,54 @@ endif()
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_OPT} -Wall -Wextra -pedantic -O2")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- 
--if(NOT DEFINED NO_TESTS)
--  include(ExternalProject)
--
--  ExternalProject_Add(
--    catch
--    PREFIX ${CMAKE_BINARY_DIR}/catch
--    GIT_TAG Catch1.x
--    GIT_REPOSITORY https://github.com/catchorg/Catch2
--    TIMEOUT 10
--    UPDATE_COMMAND git pull
--    CONFIGURE_COMMAND ""
--    BUILD_COMMAND ""
--    INSTALL_COMMAND ""
--    LOG_DOWNLOAD ON
--    )
--
--  # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
--  ExternalProject_Get_Property(catch source_dir)
--  set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
--
--  # Includes Catch in the project:
--  #add_subdirectory(${EXT_PROJECTS_DIR}/catch)
--  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
--
--  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
--
-+if(WITH_TESTS)
-   enable_testing(true)
--
-   add_test(
--    NAME j4-dmenu-tests
--    COMMAND j4-dmenu-tests
--    )
--
-+          NAME j4-dmenu-tests
-+          COMMAND j4-dmenu-tests
-+  )
-   add_executable(
--    j4-dmenu-tests
--    src/Test.cc
--    src/TestApplication.cc
--    src/TestApplicationRunner.cc
--    src/TestSearchPath.cc
--    src/TestLocaleSuffixes.cc
--    src/TestFileFinder.cc
--    src/TestFormatters.cc
--    )
--
--  add_dependencies(j4-dmenu-tests catch)
--endif(NOT DEFINED NO_TESTS)
-+          j4-dmenu-tests
-+          src/Test.cc
-+          src/TestApplication.cc
-+          src/TestApplicationRunner.cc
-+          src/TestSearchPath.cc
-+          src/TestLocaleSuffixes.cc
-+          src/TestFileFinder.cc
-+          src/TestFormatters.cc
-+  )
-+  add_definitions(-DTEST_FILES="${CMAKE_CURRENT_SOURCE_DIR}/test_files/")
- 
-+  if(WITH_GIT_CATCH)
-+    include(ExternalProject)
-+    ExternalProject_Add(
-+      catch
-+      PREFIX ${CMAKE_BINARY_DIR}/catch
-+      GIT_TAG Catch1.x
-+      GIT_REPOSITORY https://github.com/catchorg/Catch2
-+      TIMEOUT 10
-+      UPDATE_COMMAND git pull
-+      CONFIGURE_COMMAND ""
-+      BUILD_COMMAND ""
-+      INSTALL_COMMAND ""
-+      LOG_DOWNLOAD ON
-+    )
-+    add_dependencies(j4-dmenu-tests catch)
-+
-+    # Expose required variable (CATCH_INCLUDE_DIR) to parent scope
-+    ExternalProject_Get_Property(catch source_dir)
-+    set(CATCH_INCLUDE_DIR ${source_dir}/include CACHE INTERNAL "Path to include folder for Catch")
-+  else()
-+    # Use system-installed version of Catch
-+    find_path(CATCH_INCLUDE_DIR catch.hpp PATH_SUFFIXES catch)
-+    if(NOT CATCH_INCLUDE_DIR)
-+      message(FATAL_ERROR "Catch include directory not found")
-+    endif()
-+  endif(WITH_GIT_CATCH)
-+
-+  # Include Catch in the project
-+  include_directories(${CATCH_INCLUDE_DIR} ${COMMON_INCLUDES})
-+endif(WITH_TESTS)
- 
- add_executable(
-     j4-dmenu-desktop
diff --git a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild b/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
deleted file mode 100644
index 4770b776eb0f..000000000000
--- a/x11-misc/j4-dmenu-desktop/j4-dmenu-desktop-2.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-MY_PV="r${PV}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A fast desktop menu"
-HOMEPAGE="https://github.com/enkore/j4-dmenu-desktop"
-SRC_URI="https://github.com/enkore/j4-dmenu-desktop/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="test? ( dev-cpp/catch:1 )"
-RDEPEND="x11-misc/dmenu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Merged upstream; remove in next version bump
-PATCHES=( "${FILESDIR}/${P}_system_catch.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	sed -i -e "s/-pedantic -O2//" CMakeLists.txt || die "sed failed"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_TESTS=$(usex test)
-		-DWITH_GIT_CATCH=no
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	doman "j4-dmenu-desktop.1"
-}
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 8017519a1386..c94e1d9cbba9 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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/enkore/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-cpp/catch:1 )"
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 5a2327052d0d..057bbf2a43b0 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,6 @@
 DIST libinput-gestures-2.40.tar.gz 18082 BLAKE2B ef01449a6fa381361876909487460f2a11e86887b1a3885b1459c218206e80d76ccf53dbebe39d39c360bee5da7a32028673d2165c244df584ae6e8078957d33 SHA512 70c22f7225f4a1f7e0a4d0a83f84370f2649ef01d9a72756b2d4bb4be92ac2265c9aff9302642609065da0e1769b719f616e2d8ee843aca01ce66f1891732890
 DIST libinput-gestures-2.41.tar.gz 18098 BLAKE2B 792ebab29cb5ea24cbb696eac6ed651632db4079d8470784f45a1055d99c9672f8bfa7e8ddc08b80417c91a47f540fdf13f7a071c73bb7a654ce66508f181a38 SHA512 7f718275d5b4b722df52adb597f0344427500ca730c154cf6fd3de2f06d7081e6214cc954addc34594f17f10c70d081fecbfc1a22d16726b6ea820019dae6d83
-EBUILD libinput-gestures-2.40.ebuild 1302 BLAKE2B 5616faf55e1b06d9286107f3b5f1ed335be2f90a7a0b4d81c197f8dfbc7d62ee1d1cf009cdb7df768dea8e0e65952c35542b04808a599d9d67929ab772b36701 SHA512 30a5b865bc890405023bab20036d1c353253c344850aa9b833e544ceba916fc57caecc672859e239f338d02836d1d9a08e159390591c32d40a8c55dc96f38dbe
-EBUILD libinput-gestures-2.41.ebuild 1302 BLAKE2B 5ea227453385c7050cd6e6ba0b4317c5dae054e21a9738ac7e067eaaf33b4839f9c4d6936cf2cc930c77adbde0653768ac105aabf9d2d526c2d1fa4994121a3f SHA512 f35000239f1ba1ae158bb642aa78e8530fe65b73ded36bed97f5d97bb9e02e3ea16c86759342cf9ae661aa52e69843c450353b13e0e6601d53944f9ff6037803
-EBUILD libinput-gestures-9999.ebuild 1305 BLAKE2B d324f46c616f20588614678f741383cf5e2dc7f916f82e493bf282cfc4a9be6a0f2abebb7c819831ce6ed5a9fea30e009ec71ea323f66e44d614ad4c28d2c3e7 SHA512 f552a25ee6da9a229bbd1002dd905c6bfeb5f435cbefc9c549c5047f3faee1fa06b4c4f0bfa341c2c658a0c8aae5f29a03da456cdb6e4517a52ef8dba8474f3d
+EBUILD libinput-gestures-2.40.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+EBUILD libinput-gestures-2.41.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
+EBUILD libinput-gestures-9999.ebuild 1302 BLAKE2B 5e9c5767d82dee15a9dedfecccfe06ed93b1c828e39926f883ab28d08afc3c8aec63020cb23f18e54fe57baa8f48694cc3a2f1e59c820c47204633c835d4eacc SHA512 a594e23bb52e4ceda5a35c03df6dc392d777d717e055c9eca58e442ea516a74ee0aa47500cf264e79b335776d0498b659e39392c61ccdf4a9eb710cc6a839c65
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
index ebd4d9f424c9..73b3a4132933 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.40.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4..7} )
+PYTHON_COMPAT=( python3_{5..7} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild
index e82dec9b3e7d..73b3a4132933 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.41.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4..7} )
+PYTHON_COMPAT=( python3_{5..7} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 87acd6131454..73b3a4132933 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4..7} )
+PYTHON_COMPAT=( python3_{5..7} )
 
 inherit gnome2-utils python-single-r1
 
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 4380a3fd9331..447e3e5ce320 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,6 @@
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3ab4891a119f1d416c8011a80d06e1916ecb5903f4c1af432052cb05a72aa38cde38293dd90eed00295fec5ff758e78576e10e SHA512 1ae31a36e19a2e8825bb0bfe4eef51f317306636bc0f14df9ee4c89c81d60ce7193d74e053ce59ae50c6fe05d27be73fb5a83cce732a0df4a3b4390539418fad
 DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2084 BLAKE2B ff426d325619f5c5cfa3743489f1fec4d1aafbe069aab8b1161e3fd725fd952b2964c4e359cfaa5f84634670c61121be2b136c8ed14d55ecf377cbdbdd0fdfc9 SHA512 d4b4f3abc92be4cd211603a976ace4aafb6442c837e3b2d6edb03849cf4da860c47abaffcd342843915cac26d147930b3a5e6ab72bedc218b89519ad14dac405
-EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2070 BLAKE2B b02fa7a18a45fe31a7e94ddef55b037dd0ebaa40513d38b132ce4312a150e797b43fcdc348cddc578628cdc96655916697287166a55568d920b4c9462623da04 SHA512 0a2d0a5dd3af18c833b0e948690d1382828f8178f19df5db36b5b2bad53c6ef35b89d2dc39e0847a31913ea854750037f52c206ecb20ac388aca46864f0ae03f
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2083 BLAKE2B 2a5513d297d356ba2983b3a767d4b053aa08742c83810584312835167a51ec1efd6a3022e39f42fc5f7e5265cc539beef6de2da58404dea0bb64166f0950542e SHA512 e23fc5efc3ce300a2e579e9b11b87a449a8cad55ee0262ded871b09a195f63739666435767988f9f41d0bbb14bdd4bc54fec1d9bab2a54a94eeb3dc6596cb73e
+EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2066 BLAKE2B 94d70ad4542c3438c99592e4d6a133c3ede5d3a80d02df9fc715ba3ad4606d22cab24a519ad3d17fa11dfa31b1fb8946359d1f6058c78f44268a0b22e35980ab SHA512 45f9a5d858d517356919821ed1f70c67b21f0e43de5ef4163b9f84344130c093fd7e1e71f2562e63f58c325442d3251fa0e87f63d37fc6bb71c485310eae5228
 MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
index 199f3d937304..09ed49940b3d 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit autotools gnome2-utils versionator
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
 SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.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 )"
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
index b842a5130ef2..04096992f34b 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit autotools gnome2-utils eapi7-ver
 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/~hwoarang/distfiles/lightdm-gentoo-patch-2.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 )"
diff --git a/x11-misc/lineak-xosdplugin/Manifest b/x11-misc/lineak-xosdplugin/Manifest
index f826fcf38e5f..93556dd3f1f5 100644
--- a/x11-misc/lineak-xosdplugin/Manifest
+++ b/x11-misc/lineak-xosdplugin/Manifest
@@ -1,4 +1,5 @@
-AUX lineak-xosdplugin-0.9.0-gcc43.patch 480 BLAKE2B b657fa0d8f527af0734b88cfb81d801d7bb15728e576df8e36ab228c243fcb32ac1d5bd7759b9c128208fe40f5d2c3d73987fc81582aee871c26873d4de7cbbf SHA512 ac737e37540d39fd664a544afe42ff410e8bb32a0cebebf084b3852408d1140ec048cd290c980d7bac3c1e9623963b5d27aad85e29f415e509655655e61aad8d
+AUX lineak-xosdplugin-0.9.0-gcc43.patch 260 BLAKE2B 388a7c6e3e89ec3d4ab779127df0a3f83dae83dda8ac60889a8a29189e82e6b41f9c324f076cd3df8da5e22bcba97e92aa7df4ad46dc4c44fe6c665fd7746435 SHA512 3f4d9c929ba3bc1c831bbea2fefa78229e73f9d2f863bbe0e0695eeff84eac6d5d162c6ad4fbf608811c169ec8e75c811623858196c907a59a652498f5cc9fae
 DIST lineak-xosdplugin-0.9.tar.gz 802367 BLAKE2B 76e9f0fd088a1323eb72deca02aa325a908b4308f2d76e10e33c57af7dc41823a6b5572ef861ba337af9b76d07d650b31539aba7d0a4815b19d2abba3ad0cf7c SHA512 5f38616a770dea9336e1af93c209ab1c5232d783e301d949e54ca44dc5b9dc462e8fad6448c6ffbb81d6494f5da91f507da2ed3835e62ecb6ef794f68b5f8009
 EBUILD lineak-xosdplugin-0.9.0-r1.ebuild 754 BLAKE2B 2cf92b49777f7a9f4fa86faaafb4449eafa7024dd91a031c35722992f373d06f8e062abcdf67555fd5e3fd7e29be06792648cd6ae140aa73f752a2551cbd47cf SHA512 9eada73f60942e9b8e5d29987e4f180b8623e6f7f70e86a7cc524cb6f71e46829141cbd326f4b229f8f144e51f0471340d2aa8e2240a016ffefbbc88da9b2d5c
+EBUILD lineak-xosdplugin-0.9.0-r2.ebuild 719 BLAKE2B 0e7be4ed4e0abf92018140c826030e55e2dfccfe9af52412dbede36f888a8ef2d6b1176746a5ea294496a63bcf767b1f47ba345f6cedf62d68d48719cdb29cff SHA512 df6a3352bb2825752d7480010f65b27d2fe6a1b374423761d9e305e90daba61cd4ff680ae5a70f95995ff7488c6b60b3e554f4bd2fd2797406a473cc7c148443
 MISC metadata.xml 352 BLAKE2B 4110d9b5e116df93d0d52f464d392dc4b55d95615b20db7c92e8792ff684e60c84ed9c9703272eb7ce70688de54ce1943c99d90b2f6d81ed8342898fbe710346 SHA512 1abdaf434e7034702a0dfceff233083abc0bdaea90e215687ace13b6d005502da7193794cdc7beda708e741c5562313b93fd41677fa07d4f68bf8ef7cfa81939
diff --git a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
index ed3f4017fb57..cb8473630eef 100644
--- a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
+++ b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
@@ -1,6 +1,5 @@
-diff -urNad lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp
---- lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp	2006-02-08 18:32:13.000000000 +0000
-+++ lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp	2008-03-17 04:35:12.000000000 +0000
+--- a/xosd_plugin/xosdctrl.cpp
++++ b/xosd_plugin/xosdctrl.cpp
 @@ -21,6 +21,8 @@
  #include <lineak/lconfig.h>
  #include <lineak/lineak_core_functions.h>
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
new file mode 100644
index 000000000000..aea5af6276d8
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib
+
+MY_P=${P/.0/}
+
+DESCRIPTION="Xosd plugin for LINEAK"
+HOMEPAGE="http://lineak.sourceforge.net/"
+SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="
+	=x11-misc/lineakd-${PV}*
+	x11-libs/xosd
+"
+RDEPEND="
+	${DEPEND}
+"
+
+S=${WORKDIR}/${MY_P}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_configure() {
+	econf $(use_enable debug) --with-x
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PLUGINDIR=/usr/$(get_libdir)/lineakd/plugins \
+		install
+
+	dodoc AUTHORS README
+}
diff --git a/x11-misc/lndir/Manifest b/x11-misc/lndir/Manifest
index cfb55a2bdc3a..b5db64af5f7b 100644
--- a/x11-misc/lndir/Manifest
+++ b/x11-misc/lndir/Manifest
@@ -1,5 +1,4 @@
 DIST lndir-1.0.3.tar.bz2 114392 BLAKE2B 2e9feb3057f1508a118c4dd6212305e626ba25dd32296d35a553b5c42cb441e494d386d4c9afe15f150a9a8da2b7fac0ae7a128948544c4545ea740d7e7e21a6 SHA512 c9f03c825c627935abe399bf8292bbf69304cb9e9d65a4c860b49e32e2ed4dde25bf658a5ab2116cd215381d0a52f464a8a53469c27adddbd9fa2bfd135a7289
-EBUILD lndir-1.0.3-r1.ebuild 329 BLAKE2B 9db3fce24ee36408c424c6aca65d16e8e56a7db7dad4d9733363b09183b8e7eb7b49f6a846fd4731bc212aee653d96fed30af6033cf3adf05d6236961c638152 SHA512 c5696fbfa2394fac512f6a2ab005af434570b3cc8fa2689d5aa61bd17dcf491cde2d894d9bb12e7b68bc166bb0f27f4001d8c5e4d7f619be59eee3fbd04446ec
 EBUILD lndir-1.0.3-r2.ebuild 886 BLAKE2B 4cdfc54e747b4cde1fe88c9befd259e77862c138a05bae7737708c06bfdb161389dad858e147c93a2e030b6cba3f630db5087c2f72227f15c8b27ec6b6fde7b8 SHA512 aa967e0fb3c117f7eb06936d6c37c3c23ad98bad8b81cfe7cb046bbbb0edd36cb416f50bdb15df319dd911af58d7c660ab9ba4383656e205e8b18e07d008bc1d
 EBUILD lndir-9999.ebuild 891 BLAKE2B 1d12ad80e23faf59a408764f979fed8fddbe8459b86dc1b995f01edebd0a86ae1dfc2a7df9e5fc39bc4bcc7751aab0de2b1cb71235ade7d87d68f5204fc4ad7f SHA512 d2c4d3484e37809bdf780df5ac2fdc5c85e9938538e4b7cbe25c19c64f23a1d5d9dc0c2fbef2c64206d83042f0585bb1f7dc54dab5c2df30d52213046cdf3f9b
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/lndir/lndir-1.0.3-r1.ebuild b/x11-misc/lndir/lndir-1.0.3-r1.ebuild
deleted file mode 100644
index 074102cb4eb0..000000000000
--- a/x11-misc/lndir/lndir-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="create a shadow directory of symbolic links to another directory tree"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-misc/makedepend/Manifest b/x11-misc/makedepend/Manifest
index 70e24d5c45df..61a7dfab255e 100644
--- a/x11-misc/makedepend/Manifest
+++ b/x11-misc/makedepend/Manifest
@@ -1,5 +1,5 @@
 DIST makedepend-1.0.5.tar.bz2 143498 BLAKE2B 78a7911e1a433bd2839c2d1372883928dc018a2576781cc8e01ffea3d06ecaab494c11a9eb36045b36091f51c6363d4a903562431256abbab26dfbe7b3fb8289 SHA512 e28d71c3ce4f74ca6479771fcdd123c19ab18e3f2aa690a7798237f21f13fca4c4d66d7b7b1d708c2c214b8e17f8fe37e6cf5b75a4d2b88514c50addea2600cb
 DIST makedepend-1.0.6.tar.bz2 147616 BLAKE2B 6e9538e435d602ab3bcfb35a5398d6f11a23e4c9fa19bb2e3f651967d3fb1945557af2a5d84fae3e46112aae9ec411894cf8605e4856a46b120b660ff4b95ea4 SHA512 eb0e8ee8ab7515806d7d98a060cdcd392ec38e4225e5e05db26daa6651f185d0b764aab403edeea904d4d23211b1f7db20daeee6eafce8abe65225784ed0aa42
 EBUILD makedepend-1.0.5-r1.ebuild 1009 BLAKE2B c1b1dd08ebb9e2eab8f5abcc6a146c57e437798d650cb9258b8842cfc900975c00988b913e747799b7bf14a1296d7044a9fdc5f94e85fdeeb3b2252049bfef0c SHA512 47f120c4e76b28a0e7c5e1edac6ba5c60c7122def70a13cfd436afa6a1026cb908b3532baf5cb492875b33f1c0b2e560c5f0490e05a9b9c9f0c7ceddd9e3614a
-EBUILD makedepend-1.0.6.ebuild 449 BLAKE2B 3fb8cfe0906169f2f73cb0a5613553bf360368a530eab1bda1fb4bc15020d1020a26a97f4b25391db4760dadeda07261b1d5d0e0cb99c587a40792bee53db018 SHA512 bbd17eade417a0282360bf05a665d06b5b3aecbf9e4e38695f3a3ccf32c1e4be303350acf25b6aec8d1faddde2d66fb74e2cf322bf6c87510e9d2f39e6000d84
+EBUILD makedepend-1.0.6.ebuild 441 BLAKE2B 35b74d8c4c5a402f48d118119813714b37be876ca0e68968e04ee807772c042e5bb94f47d8b0ca2ecc9e83ccdb2d00fc51968a471fb36ba8964ffc5b179b6249 SHA512 387575bc27fa5bfb6c38a7989aebf3486bc42766608346e9e67c85f3b81a92052ae1896d436bc47c2394f8a05a3e3101d52ca7017ef19265752e1fc8487d5e24
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/makedepend/makedepend-1.0.6.ebuild b/x11-misc/makedepend/makedepend-1.0.6.ebuild
index c12c080262f3..63e6f46c4964 100644
--- a/x11-misc/makedepend/makedepend-1.0.6.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.6.ebuild
@@ -6,7 +6,7 @@ XORG_STATIC=no
 inherit xorg-3
 
 DESCRIPTION="create dependencies in makefiles"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index f96620bc7ed8..7027edb9b8a3 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,6 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.18.1.tar.xz 330940 BLAKE2B e05d2b69a66037a49cf0a1aa44a417d9fb55fecc1dd713861907b38d0361d6a9d79faa95094027add0d0e549a979eb237e8e71e1e2102664813b7745f34316f3 SHA512 92edb738e38b879a94985d97c961fd900853e330cc49024cf33a1b564734e86c076b47a05c64ec7ea34a170425b97f80aedb60ad14db98718c4609c464e091e4
 DIST mate-notification-daemon-1.22.0.tar.xz 360676 BLAKE2B 0eb50a6179b5b90243e8206bbbb6c3ce1bf65cf3b2969e0c259e4bdebdf6e86d769f74020509cc170b087a02c6295007f83efc950407f803be6e717b0fc900ae SHA512 1345604dee1315843ad5a6920aab7cbe1544c8f7c7ccea686e5684c7ea5272fa09d27edbcc996f6a568f8b3760f561b84901c44f93f1b3ae2d5ddcd3c3ce86fc
-EBUILD mate-notification-daemon-1.18.1.ebuild 1032 BLAKE2B 5ebe5bee75855a462c86e3490738dbc92b566700907addf857cf11fb4c259da209e425f93e2a8b58b90ced736eb2f1c861b681b52984c4a22458850637b564a0 SHA512 80c2d4d22ad21388adf2f8aece0af19d927290b2d0f4808cb0d52e35c409a1ed8b7f02da0ad6c7c0ca569a4510f47237b7cda8df3e53c2e82b5e41663daeb9fa
-EBUILD mate-notification-daemon-1.22.0.ebuild 1007 BLAKE2B 405fee97b5332ad0b90001c82d74777e822549e06e80ddae9068aeea853f13e43c149af5a9e8adecdbc694ff683e4eec6715309c5ab607100dda31eefa20bbf7 SHA512 6e3b94fcb60b6c75063a4102618e90d8a448e34b89afd126f4bb64243634f257f0e0da553166661cbee2c7ec7bc28eddd53dd87cf4031c39d464363d6ae42507
+EBUILD mate-notification-daemon-1.22.0.ebuild 1005 BLAKE2B e68c9ac86fba969e02e49719abaf1a8be0a05c6b5085e241d230925f8bb1d9b4b44c0b5e67d0c42e16963040fd4500006a9b0b5b03bf5b227c23fc4236a33223 SHA512 84dc52905d706a6307feadb8061681ecde3325409f2b402c911643d2d5b86036a0630cbfa9e83bdba2a29197f5a3722307d98eb8f4f0b1047b0867cbc254f803
 MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.1.ebuild
deleted file mode 100644
index 9047edef2bc7..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.18.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.78:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/libX11:0
-	virtual/libintl:0
-	>=x11-libs/gtk+-3.14:3
-	>=x11-libs/libwnck-3:3
-	>=media-libs/libcanberra-0.4:0[gtk3]
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	>=sys-devel/libtool-2.2.6:2
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure
-}
-
-src_install() {
-	mate_src_install
-
-	insinto /usr/share/dbus-1/services
-	doins "${FILESDIR}/org.freedesktop.Notifications.service"
-}
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild
index f9f44a9d3f4f..ec55ea9dfdbb 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="MATE Notification daemon"
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index 977d68de7c89..adc01b08c963 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,7 +1,7 @@
 DIST menulibre-2.1.3.tar.gz 231336 BLAKE2B f15f962b41071f40cebdaa3fbab082932f1acad30026b89bb2b4672a860b4f7cc3caa668eadee48195a091783b6a8d5558ca44ed05034640247cad02394d3b93 SHA512 0a9040bcb311fe993238e5d1fc459db2400466c538c729ecd5bf2ff20cf9c7300ef2543c56ae4ef7cfa44cd66768ee9a9001ab997fd2507d8d74a246b2029c7a
 DIST menulibre-2.1.5.tar.gz 443986 BLAKE2B 5397e1f9d4371c017c8d2358e65bdad58b0ac10765f00fa51b2b20d9e404f19229da00719c6cb209020e5894708882d42adb30f4668e82929e0d1904ca7d3cf5 SHA512 d1bcd055d7f5c77df02470b4b6362ea5af8a6f4dd41f217c73673b63f413c3edca0ae18ccb6cff179a514ee0218613c3201e7687ec36de34436556b8a60a0856
 DIST menulibre-2.2.0.tar.gz 430567 BLAKE2B 7910f9f8e23b2ca3254b5a83a7c16315620bec38ff458a2fe3f65328b8b08ba424d853abb1fdb7334fd2b38da54b632a8d5b178a7cf876873d52c1903adcdab2 SHA512 d08d61fee3c5a9716581716c116d5b82c3221dff24093c765f6ad72d9dc17fde40ebdd2f17bcee7952b22bc4c78bdf1057cbc57af3c4651dfa6dc01cbd3ecbeb
-EBUILD menulibre-2.1.3.ebuild 1726 BLAKE2B 25f6a035bb3a32ff4ec22a6c0147c0b4c6e23501d030a5620a9068f223d17d34f70a09b3b27fe68dbd9ada6a2183d0c57aac7261c065ac033ba1ca0d61cc50d6 SHA512 35b0a13f101aa205ce6fce26f345b46d5fae1131e4bce61caf8630bbc1109f7e4e353da300e83b921c5edf33421b9f6d3951de38bf6c38baeb3e546eb14551cb
-EBUILD menulibre-2.1.5.ebuild 1728 BLAKE2B 90daacc086f6f5f06721a9427b5426fd90c2ede7f5cab19dbfacb52ecc58998614ab68682548deb0ae924316a1088fc5c7d0c61b5a7c9867a875d9f647be7866 SHA512 ede22acec5b50f1f181430840ca679900c8dc23435a96768c6b07f340f807cf28e470b7ec777c0a49b624312563c4e8ab19078802a71d493a7ac6877d577bbe8
-EBUILD menulibre-2.2.0.ebuild 1752 BLAKE2B 18cb81a49f89bc0f4565f5410c873a2755c816ae8f016ef8569c8237e6a22d54d46880ad15b068b5f6eea77631267ff7ea9ed3a8c35253c461cc7ae600ab66cd SHA512 dcbf585bd50f0f83db8d3aa0c3f8051fa757335acbf32809b88de1184bfca06744f965a5d231dd22b43818fcd4790cf299f34342aff36cdc0b6889ec4d722f59
+EBUILD menulibre-2.1.3.ebuild 1721 BLAKE2B ce36a304c02ab5bcd8fe7d726cd2177e691aaad42a5e3c9045a6889c106f1db7af1d24380eb8359b7c48c5620423eafadda65567a945c9e2842c52dba3d246ba SHA512 a8f5203ff12c28e6fec86ddeea2f893e6c06a2d357829894da600cf9e6cc52d89fe895e886055e1e526e8917b897c90eacf5d4fda6e15b67e80ca55b97c53a14
+EBUILD menulibre-2.1.5.ebuild 1723 BLAKE2B e129bd9b2267f65ff31ba1d3162925b2c20f33507db2fc84158233ff23db933646fae498cc648611176c638c862b277f668ec80c26156d9e62e7fd577399fe48 SHA512 1c129bf2a83e3365aa7eb4805bc87660ff162339ed09be9f332abcc1a94f08a551564446c04c2dd8c3a847d08168f0f5d5c83ffc673a08451cc194de5596cf21
+EBUILD menulibre-2.2.0.ebuild 1747 BLAKE2B 2d2ac9931f476ec15dd7f832f46e688165767280d4fa5f11aa90610fe715d9fa71130927180fe92dc4ccd1208d67c28af0130df64609266129cf1000b67a56c5 SHA512 0b3ac7dd75e67c4d7d7184f55277a0bca97047f0b31b153f2e0e8a38fa7218aa052d66c3ed3710b1f78e66d29042f23932961ee2a4dc88d2cf2349206c7abdc5
 MISC metadata.xml 353 BLAKE2B 6064836036ff045dce0bc62fe8b822aefcd75b1cbb5746e12c2a2c5399802c1412b4f6bb9f9582785d5f8cff63d61f9f0c71505fd593e649e26c30f7c7019d6a SHA512 256e7ca3b20708caea270d07348c477b3d9e8300739092ad80468f4ab60e5e85b21246cf906d51a1929e627d27ed62bcf23136a3b8edc684c4ba1b53e3282454
diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
index 133e9d8a05ef..0ab8c17daeec 100644
--- a/x11-misc/menulibre/menulibre-2.1.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.1.5.ebuild b/x11-misc/menulibre/menulibre-2.1.5.ebuild
index f05ba92dfc02..8cd4a64b1072 100644
--- a/x11-misc/menulibre/menulibre-2.1.5.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menulibre/menulibre-2.2.0.ebuild b/x11-misc/menulibre/menulibre-2.2.0.ebuild
index b66386de4eb4..97b0e080e86e 100644
--- a/x11-misc/menulibre/menulibre-2.2.0.ebuild
+++ b/x11-misc/menulibre/menulibre-2.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1 eutils gnome2-utils versionator
diff --git a/x11-misc/menumaker/Manifest b/x11-misc/menumaker/Manifest
index f910c369c2e7..415c39afd1b8 100644
--- a/x11-misc/menumaker/Manifest
+++ b/x11-misc/menumaker/Manifest
@@ -1,4 +1,4 @@
 AUX menumaker-0.99.10-AM_PATH_PYTHON.patch 2517 BLAKE2B 45fc07e14f0b89106464b925e68fc3b9b8ea23c14e5091150ed45c7a3a7bf84e310d0cc2437b021f4a83c4d162200b44c5deb23c1a40740dba4379dd682ad964 SHA512 8ba6d7898f5346a6e64ac1cbf17f914c44835f603c9d5952e226063c2d7d3ad64597e41a8a0bbfa4dd12966ddbf53722bc4c28d3ee0e5c860073e08f56fa2805
 DIST menumaker-0.99.10.tar.gz 202580 BLAKE2B 2fb53359a6e4b14fe8966c3fbb6d0f381a3ad9e52463d37edbef47a409b0ecf4f17bd7221395987d4cd49f363007aa97f0d6182595a571f1baab4e7977c06bff SHA512 e7a731ac848089cbdb845fdb0e344b48e70d3bb7220870127d3616549d31fa62b61a48e3efff52d7767b597a4407a8548e776c16976072d0aa7f5c96740cd207
-EBUILD menumaker-0.99.10.ebuild 1119 BLAKE2B d1db58ede27c04633a9d696a8c708bf3924be4b62b1f27dbb5bd85ad70a3ab894e71fd26ff38981d2bc61e741c3b6e7394a0df407c66ff7a56b97449c61dde63 SHA512 f25d24f5d459c06f14ea99bd3967c499ca80887cbc8dec417502b7f15062efcf88e778f1d8597dbe1f02c3ab90be90882b107c0aa69546825e199258e6ba7c02
+EBUILD menumaker-0.99.10.ebuild 1114 BLAKE2B 98ea44a42dc7599ba5790c8d2ae2968a14b88455fc0f88b60a7a089108bb29c33074cc1c81250f932dbfe44b295b64896e28a3f8e1fc6b833180011832823dae SHA512 b8d07d4b5e886b07231c66ea5deae6e56c3ebf431a6900b39c0a6f87ab93cedb3e4596c10aa3eb1ae6c8e094ef521e9b528bbff41d2df545387b4c36827c29c1
 MISC metadata.xml 439 BLAKE2B cee25e15ca49508e651ba46d0598ee61f0c959bdf46a28337ab0d6071683e6779e8e0d50e36d9aa84ef761f251773ea101eae4dbf1a3b7494d08d2f8778f90e4 SHA512 5f68ee720bbfc364f200335a1045982b4c82aab73e24a8e5143d8a776919b6b676088c5af49ea74cdb09d09cf1f055b596471915f173ab6afbb17bc553a6b07c
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index 16187245d17c..a3ee47cd857d 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit autotools python-r1
 
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 20f228f43c94..43e43066de49 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,5 +1,3 @@
-DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
 DIST mozo-1.22.0.tar.xz 178924 BLAKE2B 6cc74cbdb7342d926483948391798cc9b0be66b63bba758b7ec8cea3f5555ae01f1ecf279053612ed060a283076bdac1a9ef8bd15e3cfe61d96685aeee168ae0 SHA512 f3d60e94d9bf5fdd435320856563622f0687cc2844a3d51473bcef5c442f4938a4030533271ead2fd88fb0ce805c16b40d629e5a69fc642e7e670a1afd5745db
-EBUILD mozo-1.18.0.ebuild 1244 BLAKE2B 905b4b829c793d2f92e1dbce3789899dfb453723b40d8583bc1a3d4436c8ca670c70ed477ac6ba239f0116291a2496860215ec3b5e8c6926b4f2cf6e252f3044 SHA512 89c75d5549f13452ca1e642f46aa6011e055fd82a435e9ee027a6a3cad5caba90589dac45e6dddb8e299eea3cd5516aeef4caab3a655c72330dd9f2e234132a6
-EBUILD mozo-1.22.0.ebuild 1246 BLAKE2B 592a0aefefe293aac4f5939dbd2273905ede3fcd2710b707da5951a91f0e3e172fa3e38ff1b718c27e07d0a7476a4b4c9d6dbaa2e9edfc1c8711d43f7d7b33d4 SHA512 a6a3d232d8ac51fe27eb3d399556831bd4cf40f339b3205ae063339c96ec3f5cec35d1255793b9c50890caef875ab696f2e46be8f97f534c0203c3cb926c7ec1
+EBUILD mozo-1.22.0.ebuild 1244 BLAKE2B ae23b51bacfed9815d26460f2c7c0242f4a3eb7c28d64e4fc53a73270268ffc684f02857fade291e1cbb808f8358516327b3ec1bfbf4fa7772f4339fc91d8cb2 SHA512 fa4dc0fb9fef1d17abe494d869739f0c80217dfdd7e12acfb312a6ea3ba1598526d9f2e4243367a913a03a8767c8a9d97be0bdc679c5a6503704b2636a3b7da1
 MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/mozo-1.18.0.ebuild b/x11-misc/mozo/mozo-1.18.0.ebuild
deleted file mode 100644
index 8a7e1c796b20..000000000000
--- a/x11-misc/mozo/mozo-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection,python]
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	mate_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir mate_src_configure \
-		--disable-icon-update
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir emake check
-}
-
-src_install() {
-	installing() {
-		mate_src_install
-
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
-			-i mozo || die
-
-		python_doscript mozo
-	}
-
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/x11-misc/mozo/mozo-1.22.0.ebuild b/x11-misc/mozo/mozo-1.22.0.ebuild
index 9c950c49491a..06ccd7815121 100644
--- a/x11-misc/mozo/mozo-1.22.0.ebuild
+++ b/x11-misc/mozo/mozo-1.22.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="xml"
 inherit python-r1 mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Mozo menu editor for MATE"
diff --git a/x11-misc/py3status/Manifest b/x11-misc/py3status/Manifest
index ec12b56d67cd..c4953e0a769a 100644
--- a/x11-misc/py3status/Manifest
+++ b/x11-misc/py3status/Manifest
@@ -1,3 +1,3 @@
 DIST py3status-3.18.tar.gz 313465 BLAKE2B 4a24de8ad0622ebd508d0896c5aff462a4fea716da5678de68525f70e462cc7d51c7a3a1dd62f678ba75d91d857aa1c039864d8a2a2ae42c2301243c402c6909 SHA512 bde32110284ab1454b0ff16ec58337a4295327a3b9f5cd40029607a4001e5f399746da3e66cc3bddd4448421fc3bc8dc5d961b354531a6cf536842e5115d4cda
-EBUILD py3status-3.18.ebuild 727 BLAKE2B 621132a7919075196ee01dcd783993edf13f18eba3ce709374450c7541710b771d534aeea706ba0e90635235b3232af30faddddaecdbfb15fe3634a7901990dc SHA512 72a418e869cb50e2f370d8ece9a6055e499f0c60f04df8ce1b4ba72992128a7f9e78efadda4c3d77802b5db67df3691451c490dd35b581105949b09c4bf81371
+EBUILD py3status-3.18.ebuild 723 BLAKE2B 6f46c99890c6dbeb4095c7ef14e7ec49679d79ed784d4b9be735bc12aad01d76b75103348fba9f18da684bf3c60c671ab3dd87c8c55ed26a35b19baddbb1af22 SHA512 65c77e5fe021b4be7bfdd1f6b16e3f587d28590f9c31428feec27ac49a9718c192006510e2163948a4d99d571014ac67a501325423746e743e1b8c7a668f9060
 MISC metadata.xml 742 BLAKE2B fb30bc364ed1b07670aaff51142a99a185c06b7f20661e3ed9cab9b3a21040fcbc15db807102af9c580a6c80071267c6883fe4d5a152c109e14f9d03e213f2ec SHA512 2a30e73f6450a2227574cda7f1f0d10a6eaa6f5919fac21c51578e025efe02a831582237013648b66b1061241c51f6598ac6f0c31e6edc9d05a4d5be8417f2de
diff --git a/x11-misc/py3status/py3status-3.18.ebuild b/x11-misc/py3status/py3status-3.18.ebuild
index f7ced049aa03..308d67dd7903 100644
--- a/x11-misc/py3status/py3status-3.18.ebuild
+++ b/x11-misc/py3status/py3status-3.18.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SRC_URI="https://github.com/ultrabug/py3status/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 6d1de1e448e4..2aaaebe6a5f3 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,7 +1,7 @@
 DIST qtfm-6.1.5.tar.gz 217207 BLAKE2B 3a818458e6f3d1dfe91860681eb77b809a455d16eef7810aa06e73b9600e6d032c178624c1dbde6d609353eb79ad43e65205f3c3ba84f21b854b8ef93b65be72 SHA512 10a0e1fc8f8948b0564a9b78967403c4a10639c10194879b48bbe086110af0d611a310ab185a2351043df879dbba1e7849a03dde54b6554b74004cbcc27f3788
-DIST qtfm-6.1.7.tar.gz 247617 BLAKE2B 4cd8cf22859d4d42f526d668fb1fb47a8a6d59c770c46cc1fb0fc05b752af8bb3c4bcaf81e977283544953c04006080754285cb411aa036c76a041ee2499f365 SHA512 04e14df63f9827fd00a923c91b6c66a022f3c2318df182222b15dc388a7c9fde579981b78d8057a57de29da348f42cfb0a1fe6169f3fbdc50a9f25f78d6d02a6
 DIST qtfm-6.1.8.tar.gz 248195 BLAKE2B e99e9a545a3c534af9e8bd5443f8f99d92b63ece1adf7544272e5c5940e4ebb34dad52fb1d5023c3bbeeb6abb50dfb8f46d2034fa01a23bf649a761bc31f9a3d SHA512 04f82e2cb9bb7a9d68c86ffcb7d5a238e68ade38fad145d699030f743343d33b438234cbb132ebf12a1dad67c331bed14bcbb6e89e78a6d1e812461f2102c15b
+DIST qtfm-6.1.9.tar.gz 248313 BLAKE2B 4c9970754925de3210cc688f8f9ad8caea753b78e8e8377ee8a0a6dec014ab3c4459f20882b00c6d16c7bc36878cf8f483b38af0e9102d097679b12a6a6e0db9 SHA512 44765e219f4774f30e43027056fde04d23579e8c91b72215432ff4718fc702f85ddb9752b166eef8aa1aa89ab7bcc6a14585fce05f447c264087ee8274d4bfea
 EBUILD qtfm-6.1.5.ebuild 974 BLAKE2B 3d7249409b2be57539da80d0f8f704b02421d6899acad39a5d872cd51ea8c8bac02e1798236e365cf42ff8533698d6f505ab07aff0687faaecf3f9871ee45fad SHA512 b89233b56aa90bceab362084d284e224760b3c127ea34388d5e5717fd7cf42a9f1957fffded546fa02a3330801567aeaa39214875065c54528343dfb0f621233
-EBUILD qtfm-6.1.7.ebuild 868 BLAKE2B 82c82d234eae4faf1599c6688d89820c02b3767e1de5da591a8259a48e41c5d976385fd15ff3ad2c18ad8e596922f7ba4a1a9a6654d0d0d127e2d88b50c0eb43 SHA512 72b513c67d291a6466469ed0ddd3454967c0c81185c19e8c878394074ce05ac2f00c7ef8c296b99d8ca7e04b6598c5663e52b0ceb3d67c4ccee7a4c505986489
 EBUILD qtfm-6.1.8.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
+EBUILD qtfm-6.1.9.ebuild 849 BLAKE2B 046fa2ff66eeaccf6d6196bdd0b18bc63d70b39c69e830b6dab9dd89d220231938f8f96d4c0b8b6bce843b59160f9b5e54c25a2168c721fb760c1a05f3b9daf7 SHA512 e81f70437fbecde940af03f50be928fb231c4bfafec22abf21d27da5b77b1ee2fd764745a147f497074930cbafb530628c7c8eb4bc1b293f0b678f0a3f3f0ce8
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/qtfm-6.1.7.ebuild b/x11-misc/qtfm/qtfm-6.1.9.ebuild
index 47ad9c333070..e80647d017f5 100644
--- a/x11-misc/qtfm/qtfm-6.1.7.ebuild
+++ b/x11-misc/qtfm/qtfm-6.1.9.ebuild
@@ -1,8 +1,8 @@
 # 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
+EAPI=7
+inherit xdg-utils qmake-utils
 
 DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
 HOMEPAGE="https://qtfm.eu/"
@@ -37,11 +37,11 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
 	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index 235bf80204c0..bae0c7d316ab 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,5 @@
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.12-r1.ebuild 1944 BLAKE2B a3d87bb5fb5835f3476e9e2e8ae5584de15a38aaa53d1133e03bac9047c0f9d7a0d3ee6d66ec7370718b635c6d2af366bc2d7ff90696f785da16b12ea39b0b1f SHA512 750df3819a7d20bbbad2a27caa9385c86f3d1db9e934661977930805c389b8dcb9dfc62e888aa7a2f1a2115dc50943de667a55799498190287422c895beaf6b3
-EBUILD redshift-1.12-r2.ebuild 1946 BLAKE2B d0762f2d3c559d6356a3161ef76f685a6cc326aeec93ca907939d4d8cba21c81be0a3fe626fcd40294d0c9b3f79f139df3be05fe73f53866383f21210b3b6506 SHA512 a217ada5841b968eeb1005d884ab39712fa07fe1970f40eef2e8117ef7d981a4a71dbdc1ee472f4a8d7fdc13cc46de6f0cb83da4b062e84b38ac066ced9ddc9f
-EBUILD redshift-1.12.ebuild 1930 BLAKE2B 0e03e5e7ab1fc0824597fee61d33221796920c2f8a41bf7714f7fc916e9efdb4828a72010062de7d41f4f6e71782eb195e54602e34431167e3170b8f15222b15 SHA512 4e5dacc4c9b84fa6f4103f0e37bb8fbe0607859b3216ba6fc3b858ca9eeedcd92d7a4f650bc68f4fcd953d06d4b72b723ae11d73f7570e86ac16e46bdc0e446d
+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
 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
index 433d41e22857..e53725fb2471 100644
--- a/x11-misc/redshift/redshift-1.12-r1.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit systemd autotools eutils gnome2-utils python-r1
 
diff --git a/x11-misc/redshift/redshift-1.12-r2.ebuild b/x11-misc/redshift/redshift-1.12-r2.ebuild
index a027c4ed7203..7ce1fd9516b9 100644
--- a/x11-misc/redshift/redshift-1.12-r2.ebuild
+++ b/x11-misc/redshift/redshift-1.12-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit systemd autotools eutils gnome2-utils python-r1
 
diff --git a/x11-misc/redshift/redshift-1.12.ebuild b/x11-misc/redshift/redshift-1.12.ebuild
index a57c7586c9bc..8f866b931797 100644
--- a/x11-misc/redshift/redshift-1.12.ebuild
+++ b/x11-misc/redshift/redshift-1.12.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit systemd autotools eutils gnome2-utils python-r1
 
diff --git a/x11-misc/rendercheck/Manifest b/x11-misc/rendercheck/Manifest
index 316c4a01f66d..4bd7812a27eb 100644
--- a/x11-misc/rendercheck/Manifest
+++ b/x11-misc/rendercheck/Manifest
@@ -1,4 +1,3 @@
 DIST rendercheck-1.5.tar.bz2 143656 BLAKE2B 50de34193aeb4751f967fbc04b54e75909672dc7bbac29a1fbf6ac0e648ac032c877bc215586feb44c89cb7625fc2ac2317d03ff30dcab83625290d85aad6cda SHA512 ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616
 EBUILD rendercheck-1.5-r1.ebuild 578 BLAKE2B 116ad0049242d6329516f44b7ddd58e51a6e9895c3c80e317e6e17f3590fa01a114b7ff53bf443b28810ea6513c2a599892dfb9b257ae9c893208908d8ae241f SHA512 2cd0f51b9399c8d32dd806ab6b1a1795cc0fb925b7b0acd0b863b474a077b3732290a98ec0a823eb33d85f00e3707833e2f3d3848bb7874fdcfebe3b1b7121d2
-EBUILD rendercheck-1.5.ebuild 430 BLAKE2B 843e4cecd470d8351a824e1a148e37cda2bd5c0ccd74dbdd169a6ea6334f4fd2fecff97d33f147c21bd46789d6f819b4c7717cd43ec9e1c91e835fac2dd67766 SHA512 c6e48c5a61c05940c36ce3653c46b90a8143d5ed380ae266a3c24fd3f9da3357cdf116214b5de0a3f9be443e210f371da18777f30f0ee722ff10ad86842aa52e
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/rendercheck/rendercheck-1.5.ebuild b/x11-misc/rendercheck/rendercheck-1.5.ebuild
deleted file mode 100644
index 34a45007eaf4..000000000000
--- a/x11-misc/rendercheck/rendercheck-1.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=app/
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="Tests for compliance with X RENDER extension"
-HOMEPAGE="https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/test/rendercheck"
-
-KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXrender
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/safeeyes/Manifest b/x11-misc/safeeyes/Manifest
index c117aa3da8cc..f11c97cb9c70 100644
--- a/x11-misc/safeeyes/Manifest
+++ b/x11-misc/safeeyes/Manifest
@@ -1,7 +1,7 @@
 DIST safeeyes-2.0.8.1.tar.gz 314379 BLAKE2B 9a54dfcda3027ecb12261b5e90f5526c4011ddc07bcaa8f80357b60738a5a03673136c5597e0f1414894b548d10a52da13f7cac4bd418c0534c341bcf3b5397a SHA512 06b53d6baad479e4143ae65cc37d01367ff73875083817511903692f493f01f5704a1f37ac95c4ec4aaa66040ec0aa1424e6a76fbea0676584fd531c1547b0a7
 DIST safeeyes-2.0.8.tar.gz 304438 BLAKE2B 5f6b36ae0d214e33035d1a3f7856c2eacd8407b2586365f7c914d69a5744a4d1488f5bcbc1d1c7112b9f237ccdbfa7839c426048e88d2e19e56cf550da33ecfa SHA512 6e7669d9ee6b2167c23307108544b3a3b4a4161fe819569fc7920a7e24af94701b053a2e147f83ce0300a0112e2a66d500055fc722eba89208b6c0cd86b49f38
 DIST safeeyes-2.0.9.tar.gz 291147 BLAKE2B 61f56b7c73964f1663eff4da7965c54ff413535d55fcb3c4dbe2b5caef6f1d8e7330d5191711b87f274cbbf4458d0dff2c0dd6f5531755c556d81455438b46cc SHA512 6a168686faa716bc1da9966250bb55654ccab926775207ff1c2104b2da802ccbd50f916ed9f7cec55ffe2b5b12ea63b5bdefcfbf35f044a7fb9ba9cb4918b2b2
-EBUILD safeeyes-2.0.8.1.ebuild 1008 BLAKE2B a5074842d4b8dd9cb2d24ba9356053ed7d25adb83e07823d2af8c02df4867b456465ea9adc8cbdad337ee617b62e5e084998586a1260ed4eb97e3b53760bde7e SHA512 fdb698288b783b2e70a976ad798d779a44a7ff31b7388db0d3183220d85a372a973975dd4fc2af3e54e7b84d4b15b81bd60665ba5ba9f1b7100f2e96f8255eaa
-EBUILD safeeyes-2.0.8.ebuild 1008 BLAKE2B a5074842d4b8dd9cb2d24ba9356053ed7d25adb83e07823d2af8c02df4867b456465ea9adc8cbdad337ee617b62e5e084998586a1260ed4eb97e3b53760bde7e SHA512 fdb698288b783b2e70a976ad798d779a44a7ff31b7388db0d3183220d85a372a973975dd4fc2af3e54e7b84d4b15b81bd60665ba5ba9f1b7100f2e96f8255eaa
-EBUILD safeeyes-2.0.9.ebuild 1008 BLAKE2B a5074842d4b8dd9cb2d24ba9356053ed7d25adb83e07823d2af8c02df4867b456465ea9adc8cbdad337ee617b62e5e084998586a1260ed4eb97e3b53760bde7e SHA512 fdb698288b783b2e70a976ad798d779a44a7ff31b7388db0d3183220d85a372a973975dd4fc2af3e54e7b84d4b15b81bd60665ba5ba9f1b7100f2e96f8255eaa
+EBUILD safeeyes-2.0.8.1.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
+EBUILD safeeyes-2.0.8.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
+EBUILD safeeyes-2.0.9.ebuild 1006 BLAKE2B e40e2a4ae85d99ed796457fc491362deef24714b21297ed10d665d4bb391c9108c49e8cefa50f4c35744bb5388fa25493fbaf9bdbfe7e01cff4aee658506fc6f SHA512 1c47df7a35b673d655e6a6db0a346c3aa80c8fa2a29ab3bc8966bc42be3492f55355e477695f53743d57d94c5fb8ff0faf60aa1d86fceff3a2e41ad1be93fb6e
 MISC metadata.xml 346 BLAKE2B 317884987f99b4eb097fbd1b7166eefab1a7e565340c6dd28a8d485cf926cc8dc8b610a57bb39d6ccf03896bb09b50bff440c1066bf00cbfd059b7219fc4b5af SHA512 f73ca2191cf257ffe2fe79094187eee3cb8eb9eef4108f29e52713ab1e3ccab1148fb28a73e09c7cc723523fcf3b5fadd15528ca015864b38967207dcfb68609
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
index 1980a39f2965..aac9bb4a3101 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
index 1980a39f2965..aac9bb4a3101 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
index 1980a39f2965..aac9bb4a3101 100644
--- a/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
+++ b/x11-misc/safeeyes/safeeyes-2.0.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit gnome2-utils xdg distutils-r1
 
 DESCRIPTION="Linux alternative to EyeLeo"
diff --git a/x11-misc/sunflower/Manifest b/x11-misc/sunflower/Manifest
index b36b538a183b..93409ddfd5a6 100644
--- a/x11-misc/sunflower/Manifest
+++ b/x11-misc/sunflower/Manifest
@@ -2,5 +2,5 @@ AUX sunflower 82 BLAKE2B f0ff1d683ac90ce80d4c9aa168681829f44cbdf94d95bc35441fc82
 DIST sunflower-0.2-59.tgz 790126 BLAKE2B 32df1ced73ba0bf5e814e52010eefbbd10657bdbb602dd3a48dc08b865195c3d1efa631bfe2d421f0a12a2f01521a2c6248fe5b9ca8fcc268423f0c9aa3d252d SHA512 e97076eb1c57d52b8fd95501259acaaa9a429f9daacc30ef587cce2f3419433f5aa4554e0e86beeceda208b4be425b98c64c6ced04e36e86b2b4f803176c37f9
 DIST sunflower-0.3.61.tar.gz 975053 BLAKE2B 5845ce0e81cf98b7488c9c34b8a3b6702e01abe9976bd4186691ce3804164d707d3ca999896e3f8d60e5253891d94f39e2fabdb50170afa8ec0f937df141db89 SHA512 f55c2fb15889f903375776f989498827dcab287e87d4015c50f12780dd2f0271e1e127533a10ca94f44ebd44727018917cf92e828bbe82b7653d8ed559ee1cc3
 EBUILD sunflower-0.2_alpha59.ebuild 2181 BLAKE2B 227baca89b619f4a135b4512c89870fd6f8da2f3a283ca92da0cc6ecbb1e2302e1a08406bc9cdc07a4d1cbeb78b91cecf9b8f7dd1c425053bb7b32807337d3b2 SHA512 3797f36f11bcfc52ca8609302535ef9630005a9ba3ef44be50e2cc9aeea70ba226c1f6d61af3b1a9929c7c168b35c0b23dc038cf5c20151c07f55bbb16cf347f
-EBUILD sunflower-0.3.61.ebuild 2169 BLAKE2B e7fe17e6403de0ad66816d7491aab3450d8c32865cb03278ec78ea700e9810b120a55256c75d95ad31d89c01d127f4c1695ff795673d9af06a4e513a89dfa0ec SHA512 30909c488a254eae2f569543927c705d0865138f708a51fe570aa3c682759489cad5bbfe3db7ddfcbd9231f534bb3176bafd04de78b449d0637de49d8ece42e9
+EBUILD sunflower-0.3.61.ebuild 2246 BLAKE2B df05d167049622e22af106eda9da2c6b059da3b6c99a43b512a5ff8344e73fef6a7e7d4b2223660e60ec9b6ff35449ef38d746a3d9e93a9b0168d6b82dc11020 SHA512 69d28c2d545b004b4a8d89eb9e0db9997ccc5d1d84a6b248317ccc18430220776fa1630946d24b2ad0c090132d503553284c19509659e3f5bde07d166187d269
 MISC metadata.xml 331 BLAKE2B 16f51cce07665f2b4c089d6831dc0b4640e7b21d2415f4bdf644afbd19242cf4c7b45fd62ea937fb75b30d8b948940ad66f1fdead711bbd83ef50a2638b401d2 SHA512 dab5d495adda997004324ba91ded752f50eaaf1c6392f8943d48d54c5cd3363137dd4d742a7b939e5affe3d3e805ed393c9397797dce1c820d4e596f7f2aeaf8
diff --git a/x11-misc/sunflower/sunflower-0.3.61.ebuild b/x11-misc/sunflower/sunflower-0.3.61.ebuild
index 70998acf88ee..a556eff77ba3 100644
--- a/x11-misc/sunflower/sunflower-0.3.61.ebuild
+++ b/x11-misc/sunflower/sunflower-0.3.61.ebuild
@@ -24,7 +24,10 @@ DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
 	>=dev-python/pygtk-2.15.0:2[${PYTHON_USEDEP}]
 	>=dev-python/notify-python-0.1[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2"
+	gnome-base/librsvg:2
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+"
 
 S=${WORKDIR}/${MY_PN}-$MY_PV
 
diff --git a/x11-misc/sux/Manifest b/x11-misc/sux/Manifest
index 21da18d21fa4..2a6b31f2d081 100644
--- a/x11-misc/sux/Manifest
+++ b/x11-misc/sux/Manifest
@@ -2,5 +2,5 @@ AUX sux-1.0-dash.patch 279 BLAKE2B c878e89af286f239beefd8f7a2deb9c7783b410c291ba
 AUX sux-1.0-r1.patch 1695 BLAKE2B 0ad2d5b021aed37904871904e135ef416a5c102557621ee158dbac946890b1e24263b5bb238e02816b96cf0d061d80aa03c78f9862804dc0b5c1bd1fdce251a4 SHA512 10e6b34aa1eb26bb51e33534a9c6c32ffb72c8b4eab86aec13087d915f49eda0bd6d6b6ec393ec8a1ec2f170f7fe00557019a235a10ae08f3d15f5a3c105f26f
 AUX sux-X11R6.patch 810 BLAKE2B f9844e65997e4c75dc9d5b41f9733b72bb072db13169d62f6986b28c89a027c8a91766cf4a03785f80b1d28cbeb22943ccb4ea3f9b5d2fa29c6cb171df8a6316 SHA512 5f34860c054c0eca0e7d2626cac3ff449c52310993628b756cebb96d589c9acb7b6fc726cb303d97f17233362bf7ed8c68fb836be529ef05aa1a7d9de71256a5
 DIST sux 9403 BLAKE2B 26df0f3759b4f4f70479d1532459e3e04da05098045bed7b1066a89f6c636a1200f28866c7ba251d54c24d621b658686889f2306ed797719dfb95a55fb7b3430 SHA512 cf1afb736299e349a14837f89f0feb6a5beb1af35be8e6baef74d03e7278a9d9c331d2759ec21e5cf8b43197734f96464b82ff5904968428bc43a45d2ad0c598
-EBUILD sux-1.0-r4.ebuild 602 BLAKE2B 453ea3fa2595acc57b2781661b1278b5aae9dc78ac177a200bbcea373602b8f547848fc52d0b211c55e483c08e5e72d83b3fbed8d6c48833a29b32b123342779 SHA512 0ebfe13717e06829d6df9a36ed5a0699f5c3981cef2cb9c62133da6d8c979dd5792d089830b5a55b6a953aa840f1465c806f8e446fb08654b4ca4ace55741d67
+EBUILD sux-1.0-r4.ebuild 606 BLAKE2B f641a13916782f25f59ee7902c8604d279fdc51c1333d68404455dd602f49b99dcf639db8a626bd798403e6b007db3f655b3c67d9809529abdf127af65db81de SHA512 55139409624514d9735262bfa18573e1e39fb27bf23b6274fc400a72cb1b4a00a81da26d8616a9857f97b9ed2f9acf024b7d9110f270b9535a36deefc26f8745
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index f3ff910a3c19..edbd4293cfea 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="http://fgouget.free.fr/sux/sux"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ppc sparc x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/x11-misc/touchcal/Manifest b/x11-misc/touchcal/Manifest
index c629db17541c..92f3e74fa10c 100644
--- a/x11-misc/touchcal/Manifest
+++ b/x11-misc/touchcal/Manifest
@@ -1,3 +1,3 @@
 DIST touchcal_0.80.orig.tar.gz 109075 BLAKE2B d33c60c25502fd4dd5af1264b15a88732e392afb6ee5a0d0cc163f5e310c26c2c968e662da306107124fd5528e045ea9042c2525f911e11cb0fffb3298eab5f5 SHA512 e4687eb2b401d16814b256c97725d0ef7646e3fa1fc020dc0af41486d6a959c968095b6d2131d6042791db37ee02fc6c9d7cf06a61722af1b4aca5e7c0a3618d
-EBUILD touchcal-0.80.ebuild 435 BLAKE2B 22eff7f402f4804bbe36d369dd86652adcbef8e76554f645099b592a1e0d2f563bbe026948c15a0157a0eec7cc2083fc83745a468e88195410e5b10c80b0357c SHA512 b096d01a215fb4466ce1ebb68a64ca568399dbbe5d5b978a31d6e612a21bb176735657b892ff5655a54cf8f8422230502b4e4b8409417ac5d6993ceef829c3f1
+EBUILD touchcal-0.80.ebuild 442 BLAKE2B 95c6ef3a4ac54093adbf30fa7b21d56df512c71574e9384d274c51e54da63b1c3efae57cb820daaebe56cf4407896dd6ee51a1b691b78b40968b71a74a4bbdb4 SHA512 e36e9bf8d9c9c67ade8be372bdc8ccdd8ef6dd451954266fcb2802baead22bc41bb895944625d4210161eb945e302a42a03f4fddba27c49811974f575bf01353
 MISC metadata.xml 245 BLAKE2B ebe9520a9d0d939a66c4c1fe20f030c85f65af8acd55b823a037335957bad36fa7adf597f79d44c5d1475f4cf2caddb514e24739814a048906dfc83c5d6912f4 SHA512 a77a007ef0ae6b022a5d89748b262823a04305c08f618982472fe9e1cc5f59692516a4f11cab608ed4183f23e14de9c48a66ee2a1ac55479fd2a4cc7afeeba02
diff --git a/x11-misc/touchcal/touchcal-0.80.ebuild b/x11-misc/touchcal/touchcal-0.80.ebuild
index 86e873d57670..c20620986a9f 100644
--- a/x11-misc/touchcal/touchcal-0.80.ebuild
+++ b/x11-misc/touchcal/touchcal-0.80.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"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/vym/Manifest b/x11-misc/vym/Manifest
index b23bf06d4777..b73579bbab26 100644
--- a/x11-misc/vym/Manifest
+++ b/x11-misc/vym/Manifest
@@ -1,6 +1,6 @@
 DIST vym-2.6.11.tar.bz2 6769869 BLAKE2B a528bb84275800f2aefc8a67b03d7b5dcdfab7e8f0f64f42bba46cda8c9dfad6e16aaeecf778b8bbbd99aac5d28bcbe2ff1c3546806395bbaf40f659e42cd31f SHA512 d6ae8346152ab10e12a68f25b4c13c4d40e1a8471df348ba0df9c05bdbe60f86a97912fcca268ec510246fe655a7dcc2d2e9a9332daee09a2a7dda7d6f880aa1
-DIST vym-2.6.8.tar.bz2 6768801 BLAKE2B ca111afb133bdaec168103d708fdf8e48ecc46da0dde5288a400fe884f0de8bc3b8582a76ee8fbc01d5c2fa1e07dfaf6f21882ddc1f892c80ebd9965e188d26c SHA512 9ade39454bdfe509e82e1acddb5be0b101eec9fe0c96198b29c8e8353125369b8052ddf6d36096cf119ac2e87c8d15298c560d4c579507c65d19d654f8847e0e
+DIST vym-2.7.0.tar.bz2 6776315 BLAKE2B 1b25f1fc6b08f9582c2df716db9f9361d89cbe1d96862595eda59708bebc08db1d28755516e4096b63427cd069c59c3542d58c6572ac723a97081033b5e97eaf SHA512 4da1ce7f62e29dca798646a114544b5b4b2d42b0b030113eb231c5cb0d8c990c78fcfb78bd47ce1f3efb43647fa8033d1d8eb87907f6c7f486b4dea552e345e8
 EBUILD vym-2.6.11.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
-EBUILD vym-2.6.8.ebuild 1409 BLAKE2B 0603472bb4ae494911dd38511e59e41104abd92b99efaffddff178e5a5b6d7ab5d1d0f31f5d2ade4535221227b2807e411b05e630b8983b8d3284a2ccece6af2 SHA512 de7db950fdde7195193a1be7808caa1d3dd0ca33d66e66c3a388af5096d0527472db5b745c8069b42969f53a3677c451f3eba0579d1306221539b276633967b7
-EBUILD vym-9999.ebuild 1267 BLAKE2B 1a5b6681e2ad552da3713b95c343d9d2030888c7b4df5b48d1d5384182c7373dca0939e853998d3f046c2746f8067cee50f590aefd3b9e4cd2929088ea90d6ad SHA512 d12682ecd23e5d2953f6496e9c0e56a58b1c6924b19002a47aab67e75f72fe4fe6451d6bf9e067958e8296ba95908cf674ca44e654dd74680cf3494978771f7a
+EBUILD vym-2.7.0.ebuild 1404 BLAKE2B 7a59a7574a500296fdc3ced293d086aa673c0d6640f23242d6fade6d3bbc24ceb0a57b29617dd5a3260af9023c6b695e90932b70d278bffa05c88c584a473944 SHA512 7949993038fd707ce724e5a63e4f4405f20e4ef5b6fa8a4906da67a1ee163ecfaaee1ccdf654e2820739c367ca251b45dd6d4a5fa3828f2beb241198882ce54d
+EBUILD vym-9999.ebuild 1389 BLAKE2B acc59d6a479129646d31b4e9693ca90a2317ddef792c5a76af2399090e30a69fcb6c09788b3d53b2b6b599192996ca8738433aba0488df32edf6ef7507660181 SHA512 421995c8d0379b65330a6d1e52c57322632bf883e8d628b9ddc60767385e158619f187ba9860a2bb405e297b7cbf67f8330bbfd2dc4f9a88a3494e67f44e6c60
 MISC metadata.xml 349 BLAKE2B 2cddfba3480871cb020e1ea5ac3c8af1f0c5be07b9e41880fbf5a36301cd283e941e8c7d8ac47dc27613364e2a003784811c721d31ce2c768d83ea7d86dd2982 SHA512 968e3560ba95072811086fd007ec5397467a9e520ec3bb368c7c3617b94d222fbb3c3929b5b9694e1bebc6af9e736dd17a43321e38e1999c562192687561cca9
diff --git a/x11-misc/vym/vym-2.6.8.ebuild b/x11-misc/vym/vym-2.7.0.ebuild
index 5a6721089991..8420300310dc 100644
--- a/x11-misc/vym/vym-2.6.8.ebuild
+++ b/x11-misc/vym/vym-2.7.0.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils
+inherit desktop l10n qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
 HOMEPAGE="http://www.insilmaril.de/vym/"
@@ -28,7 +26,6 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 "
-
 DOCS=( README.md doc/vym.pdf )
 
 src_prepare() {
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index 1b1cdce9ac6c..60da3ed21f61 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 PLOCALES="cs_CZ de_DE el es fr ia it ja pt_BR ru sv zh_CN zh_TW"
-
-inherit eutils git-r3 l10n qmake-utils
+inherit desktop git-r3 l10n qmake-utils
 
 DESCRIPTION="View Your Mind, a mindmap tool"
 HOMEPAGE="http://www.insilmaril.de/vym/"
-EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code"
+EGIT_REPO_URI="https://git.code.sf.net/p/vym/code"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,12 +26,18 @@ DEPEND="
 	${RDEPEND}
 	dev-qt/linguist-tools:5
 "
-
 DOCS=( README.md )
 
 src_prepare() {
 	default
 
+	if has es ${LINGUAS-es} ; then
+		DOCS+=( doc/vym_es.pdf )
+	fi
+	if has fr ${LINGUAS-fr} ; then
+		DOCS+=( doc/vym_fr.pdf )
+	fi
+
 	remove_locale() {
 		sed -i \
 			-e "/TRANSLATIONS += lang\/vym.${1}.ts/d" \
diff --git a/x11-misc/xcalib/Manifest b/x11-misc/xcalib/Manifest
index 22d6365086e6..7db76654276d 100644
--- a/x11-misc/xcalib/Manifest
+++ b/x11-misc/xcalib/Manifest
@@ -1,5 +1,3 @@
 DIST xcalib-0.10.tar.gz 36769 BLAKE2B 419bcbe4c87bd8af5869537d334ec08e1e1d262d8a3ef550a5e99451ccfebce37025b95e7044ca782faac6f933e5a0a5b65c8ced10ea1f5aab8f3bc93290d959 SHA512 c52252c903125bf95592d35a75c818be196dd92a86ceab39e0a933162e04e160f2303d20e5892e72a23a7e8067c1e8d785381b4c327980a6fab22ed093c28f41
-DIST xcalib-0.9.0_p20161210.tar.gz 36687 BLAKE2B 7b1634a4390ba1aa90b246176e928d2bdc7f8478771744628dd454eab43ea9b42d479950c5748baadb8d081462ddc036a34f30653bc8f7871ed09e05441ad2c3 SHA512 31d9159a67082cd0c63d6ed0e34872cd776adbaf14dca754a6ae2355d24a972a6db5811a3d7e69e24c88534c7f63e8d1285304272bd293e3a93c35c240d99907
-EBUILD xcalib-0.10.ebuild 512 BLAKE2B 98f688b1cf413f822359a05d042dfdc837a6a6d654069c6caf91dbc60048d622de49e2b860c64544b6d935c0103c88d42d1a932d55157862b5b2b777ffa834ff SHA512 bdb2a98adb45ad962000ab48e2abdaf7ff295a57780c4ab74116346c0e54dd58dbcdd216a0b1988ac8a65792a18b3757cfef3ff2dc3422f46abbd415cfc063ff
-EBUILD xcalib-0.9.0_p20161210.ebuild 579 BLAKE2B 73b25dfcfe1981a3d1a9682f2b6c0b76dc467145141ec26d33c6dbd4fc1e780f098ab1b9fc5bbd1de46c65750e54cbe822458eb18fbec34d1ac71a7e026bd177 SHA512 2f0bc696674d734e7f2f59d42de0c13dfef8cfa182018db61c3241518d203f518642cc31e58969670bab15ee144dbbf8d15cb4cb040f5cfb97c30cd7a81e5a9f
+EBUILD xcalib-0.10.ebuild 519 BLAKE2B 9e0e3803ff3015619ef732f0d4f7151cbc0d04ea0efed4185fbf2dc24e00e8a4bf69ef03761a92d89a92eb16d8a3546ac0f5c57b58626ad44ccc18d11170e632 SHA512 8b1972faa23fb8ca876d263bd401a97fde64d479f026238d6059b1f665aab331458258375f3578364dcb3b506440906261d673210bb18ba0f7e30d825ca2e703
 MISC metadata.xml 261 BLAKE2B 42a18dafa16eda94e27fadafc73f3f15f247cc12ba0073ea96d0f1abd24860b2c2ad943174178d4ff96b8e05300570eae7550ae33f4048b8587e58e876479f85 SHA512 998e9c0c2f1a166088ec7e42ad68edc520448dcaf96eeac2eeaf329e5064ae216d025a483be6dfd9b22bb434e8675fe93a4e49beb745ef5b673a3670686caa28
diff --git a/x11-misc/xcalib/xcalib-0.10.ebuild b/x11-misc/xcalib/xcalib-0.10.ebuild
index 67cb6f0ee2ba..b97a56578667 100644
--- a/x11-misc/xcalib/xcalib-0.10.ebuild
+++ b/x11-misc/xcalib/xcalib-0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenICC/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
deleted file mode 100644
index 39b237e5d264..000000000000
--- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A tiny monitor calibration loader for X.org"
-HOMEPAGE="https://github.com/OpenICC/xcalib"
-COMMIT="95c932996cfc9f792dea4a6c49fec3c1ed2267ac"
-SRC_URI="${HOMEPAGE}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	x11-libs/libXext
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/x11-misc/xclip/Manifest b/x11-misc/xclip/Manifest
index 5e567d92272a..912419550864 100644
--- a/x11-misc/xclip/Manifest
+++ b/x11-misc/xclip/Manifest
@@ -1,3 +1,3 @@
 DIST xclip-0.13.tar.gz 30461 BLAKE2B e5249c81aceca59f71eeee985ab4a4c9006b6afef98f3f6addd7adc590abea47d3e9df8110ccb6c0c065cf4356a2a2a0866e08604adbac75e3589bb97403aaa0 SHA512 191a86194a1503a47c6641a55855dc4aaa8c2c99d2e6f1d46e727feec85a6639041f37ec2265c05c178c0c7d791d3e88bde89223f879effa878812f078485ed2
-EBUILD xclip-0.13.ebuild 560 BLAKE2B a329fcef83642bd643cc8e1fe473a9397e015cfd3f13bf7b5ea637e79564d13784ae51066c110b77b15f61aa5998d9cadb19c1326b45bab5e5514fcb9310c948 SHA512 5f9dc5a72a73f9033a4cef2326be1256da2b4373cc196cf73fa7251fc63d8e603057d5ddd97b4c491560914d53729fec028643d1b2bffe8daf6bb56ee5d33078
+EBUILD xclip-0.13.ebuild 563 BLAKE2B 1ec5ee7372f1c1cc3bd33a52cfcdf801e406e7d776ca07d736a7e7dea5016baa2c7aa6d63c131b880e3eecbd125f412dda5da9ec07c2cf94e0f39044dba688bf SHA512 b6e93a8b4a2c3c9c97afb523386299da939e3520df1b0175390a7a8ed6f26a9dd4c18c780e4f82c96afd203bb962dbbcf2c73c26dc0d7f888f07719890155b54
 MISC metadata.xml 364 BLAKE2B feee6d00129ab16e53f20b00c4a69d5def638b3231316079b63354b089817e3c84d300ec2da1966593a51339f941232ec466d6f99d5e0f365260306287121d2b SHA512 fb7dd60c82f3d739a58c1451434d15d14906249ef5bc350dcda11ee6d5366f04981d93a98a290e653b8271269c3f21978ed50894da0bf5da9fdaaa9b2def4cf1
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 0f925d76b525..8faeb8b5ff9e 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/astrand/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	x11-libs/libX11
diff --git a/x11-misc/xcompmgr/Manifest b/x11-misc/xcompmgr/Manifest
index 5e9f4c307bde..0a28801dda27 100644
--- a/x11-misc/xcompmgr/Manifest
+++ b/x11-misc/xcompmgr/Manifest
@@ -1,6 +1,5 @@
 DIST xcompmgr-1.1.7.tar.bz2 136667 BLAKE2B 3231cca0cebc13aade6f008414d77461913d274303289c28b8eb366640905cf9bbb4715d5aa7ad8eb897ac94db099b040e408b2e3867dd2ad46940b3bcfe518f SHA512 f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c
 DIST xcompmgr-1.1.8.tar.bz2 138806 BLAKE2B 85a7cd04c97c3594ab9acf7888aa0024b60027654dc8fa609c8f2fb801b5cd58105aa50c2afe9c322a02657eeea6e57da3f35720ac63c191a81c62fbf9ee4468 SHA512 ccf29426ffb0797a53653d1ce152de5eee0cec284811fed4b8e634ea0d948180531e4619d96f47e4f9594432c57322624fe0fdaee2c9200efac427fc0904953d
 EBUILD xcompmgr-1.1.7-r1.ebuild 925 BLAKE2B 7e60d31646a305ce57ea6139e78519d6d0a1e222653e71b4deddd84936ed7642e17b0f3760fe6c48a20b19b608a902ccd2574ca432104b6b865a954b84d7011e SHA512 c77097b068b1a6913bae00aaf5ea207a6a8162bd70dd0e6c04c6e389a91ef341b595db99b43f6203078eb6e0b444ec255d848f7cf74eb51cb90727d9c43e2ef8
-EBUILD xcompmgr-1.1.7.ebuild 394 BLAKE2B b2ce9a086777839382fbccb4e2cbe6a5df2c870f62b57a04301392faefbdec43c88c1cb5895109cec57ca89903cf65966c958054cfac088b285ba00043b90978 SHA512 ef0bf9c23e466d5cc66e774ee7a6a22ac0a60827b18f88d5962c48d80aa4891e8709f885607553a9e166010a6289248b9e59ab90aeb3e5ba1f068b49fbe40f4a
-EBUILD xcompmgr-1.1.8.ebuild 420 BLAKE2B d1c66233cecb511224e0951f2ef5e5610ff035e59f4c6e122c1191e6df2f6910f1ca5ad872d5f64e01a638011170734186a1cff5ee826213c51922133b857b23 SHA512 cec38252fb269a920c1a731e33f048015552f256b856d1065264c8303fed8243a4ef18ea896ab958ae6d03d6f31f39525759aee5f2a52d58a054571b017ea4f3
+EBUILD xcompmgr-1.1.8.ebuild 416 BLAKE2B 04a4b8a7c34925582f4dfbe46bc4fdd34c7eef8482b0ae8388d839e2504da536955cefeebbfff7299f0910bcae1131a3c66143c344b370e4a3c639a1a5fea1d6 SHA512 29dfa74a8e4f1ae64ce39f147eecc806dcf3cc0d5ec814b6a0bb7677c0ba184c1e0bbfbc91eafc9adc4ed025eee471c2202acb9ef26c751b0ac01b2efaf196a2
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
deleted file mode 100644
index 259f20c25389..000000000000
--- a/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_MODULE=app/
-XORG_STATIC=no
-inherit xorg-2
-
-DESCRIPTION="X Compositing manager"
-
-LICENSE="BSD"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libXrender
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXcomposite
-	x11-libs/libXext
-"
-DEPEND="${RDEPEND}"
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
index 677c731f0799..edaf48fbd64b 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.8.ebuild
@@ -10,7 +10,7 @@ inherit xorg-3
 DESCRIPTION="X Compositing manager"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index 8cdf109f2804..595d9ee456ed 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 BLAKE2B f86237859636046ecc72bdd62ee5c6a3726ad701aabe04f14bff6541554d3e9de82265cb95b353714adba5d6c8742f94150df9b6f3e4043db9e6885e61e569c1 SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1122 BLAKE2B 577885776234f0d6aeef63a39be55b63276a235ceb982ae2ddf23c0009bfe58a8885d83b8f3a47f93443be33b5e68741568d44429ade2887fd25a250712bee7b SHA512 552c83d6480c78b59804773150434e25aa9923ca397a3e0d63ad16d882c3a6649b66bb2ad54cf60f85cf324e6fa9c7c88fd4526070dfd1157f8aa34ee17d283f
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1118 BLAKE2B 819113a800e5316c7e88e7a7eeeac5c2efa16413dc760d3ae018cb7a7178571bed551e54135b25a4b52b8179f0120e580328354f64e1cd4c3fcba10f0928d25d SHA512 36422980b21761ff740034a6675a0bc90278ed7be099830bc5f38af7f64b06ab2e6c7f5d86807f73e74939498195f3a97fc0e03e4e5907fc946f506dc0192c98
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 0097701ff430..fd618207d99d 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 02f116bd98ba..0dcda23d1430 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,4 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.17.ebuild 958 BLAKE2B 9e7803c311d8af146e587079c29655213ed46f77f0f69488f208ad0ff8f786688172c3cd400ae552299bef2a0917301e961862fa1be4883bee82007fd73ab157 SHA512 26b9143f2464459b31bda07c382c341b4fe86f866410dab2bcd9df901149c7788790a14ff027d44ee21b271d026d654f684a8128200808413a68bbd3cce2f301
+EBUILD xdg-user-dirs-0.17.ebuild 954 BLAKE2B 0b04b398715fb0a950c22623bb3efdc4fbfca5c132adb19415ea80f96a5020168986fa9dc8d475b349d8c612a5e7b7831ece2132a4334d27e31dc3b305ea74dc SHA512 b36cae046bc1f906e62546fa1943d8d910c324b4879e59a614f0548bbed449d3c72bd8192aca7a610d3b2ed2baec660b071ffacda38ec16f0481d2cc2eecac91
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index bda8f32b740f..74943da43461 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdotool/Manifest b/x11-misc/xdotool/Manifest
index f1fb01b88de5..a00fb0d58d02 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
-EBUILD xdotool-3.20150503.1-r1.ebuild 1298 BLAKE2B f2167214cce8182e0074d2a80670aa6b37ceb66dc612016e12b0d6abdd0d7d22913757ad7cdd5ddf05969e0fa6a1ce6806d25e89675efade5fd1440fbaec1859 SHA512 37ea78350290a4bdfdac0c238b491ec464484e8bdb4bd8f64b2688a9f56728a93ffed84f913a098d0aed6ed5a3323a68b3bc353cf6299dc76f596226afee230b
-EBUILD xdotool-3.20160805.1.ebuild 1357 BLAKE2B f56164ad1ae40329da1eb7f7c5bac981477928c0b2d378ce5630bbd73dce27ebe6a7bd5fe044d6880afcdd93652802ec6b86827b0b8a0cb60ce84acaf68f8e59 SHA512 447c20a653cd9daea7564c60b0e9f84fc1451bfc00e7e72fe553e9bf0459141523cfb44831d3664abd11b1230cd094cdb447a49f3c21696c19ae2d1fbb8315b1
+EBUILD xdotool-3.20150503.1-r1.ebuild 1296 BLAKE2B 2254e8e361b00d268b515fc5c9bb0b964cf800109d9b642d7fa892f37f18e4cde8cc962757a2fb5032240c7b18ea4f6281891b08e22064cb38ea5f684adf7cb9 SHA512 b6adda51b715bb0a1171b9c1ba515c03a960e2cd46522625c4d701b318e35efbcad9927e0a9aa0653e51635b4f41d84bfc4f7e3f0f6fafc0d25d37e3e65cc0ed
+EBUILD xdotool-3.20160805.1.ebuild 1352 BLAKE2B 7aed50517d84f99f9c25b1ab9196fff81ea614d0ab80a6cb7ad59d3764499e9f599720dd81f03ee0b1e5233e114d01be517044f6a6fb51f5c0d0cb7b9d14a5f2 SHA512 0ceb0e3bf1186ac6217d2713468f9df16448ddf93386cc05eb624e43654f1c755349d600c67cd4acc296f2980b96ba0b980d18de728140453cc01d88aebb2148
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
index ff99623dbe7f..eebea7adaabf 100644
--- a/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
-HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
+HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
 SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index 8ba3a06aae80..ba53a8cc47eb 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ EAPI=6
 inherit toolchain-funcs flag-o-matic multilib
 
 DESCRIPTION="Simulate keyboard input and mouse activity, move and resize windows"
-HOMEPAGE="http://www.semicomplete.com/projects/xdotool/"
+HOMEPAGE="https://www.semicomplete.com/projects/xdotool/"
 SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/x11-misc/xflux-gui/Manifest b/x11-misc/xflux-gui/Manifest
index 9728a5eaf56c..cd5b2afc8ab3 100644
--- a/x11-misc/xflux-gui/Manifest
+++ b/x11-misc/xflux-gui/Manifest
@@ -1,5 +1,5 @@
 DIST fluxgui-a3b55da976053fc978b29d191db52dfb8da2f8ee.tar.gz 30667 BLAKE2B bb9b3d3fa2f40acf3248e5cdd91a82c3f736937c03451aba41280b25fc541a3db23c6a57f2ef97ac1ce415d289c0442a387462415827009c68f169f91da589e2 SHA512 d4571f3a64c1f532642f86d4de50d5807afb856179debab77e4495dc48060c68a635d38990d174fbb67169317d7107356344507285271b0bb058f056c1e39a37
 DIST xflux-gui-1.1.10.tar.gz 18828 BLAKE2B a249533ace4ff6293ff9b99a455943c1f099628bec97c2730473f8a9550ba38e78e775a10a0f77c160180f5f5d354ac8c8ac924c1a2eb9f48861491583c93285 SHA512 5e8057e47fe2cc8a59758e9ab6b3adc6a8281b42f6b517e3e1327e5470c82a326c853d5d389fd62f6d6c439be4ab70a6c8771ece87e5b8c90a33775f8b7cd54d
 EBUILD xflux-gui-1.1.10.ebuild 850 BLAKE2B dbffba8824bd5afb7a743b902fb549bf692285e1350f2b128fdc6cd9641c73ce5059842569d67d1feb99dda8554e911b76da48d21a30b292593296606416de97 SHA512 5333d53788145b32e13bdbf92ff52fb6e2cd1a3ee80d3a3450e8fd52ffced4380132dee758ea005ea57f71c76a01482902c7e9f6948316c46026e744b7495b7f
-EBUILD xflux-gui-1.1.10_p20180910.ebuild 849 BLAKE2B 7e3202b31dd7fd095c4cca58bc692637c6e2fe4640dd968b5f12fc7a13954f6860d512f34d35262278de5c31decb9ba09c6754cd802d80b198f4f556f731a30c SHA512 8dc730ec8c6c8fc6810c3a0eaa415ca6c1f5322a1be115a18d4d85162d53b8824aa0c701739faddcbfbc37b3c4172d5eebdaaee6bcdec79cb4e90fb8848efa51
+EBUILD xflux-gui-1.1.10_p20180910.ebuild 845 BLAKE2B 6a78c9a48e26a5155dfacfddfd5ce804982d5e6cd3e9eaaefe565f828bb42794c91251be13fdfceecd5d69ae227619eeb58c1f285e5a3dbbea003a4fd814baec SHA512 5ae70a858c02e42be5e7ffb181e92c6ca997353958376e328eca6e38219c6511a353ffd3c7f7a9843ef5d18041fa93e69d2107955a48cca201fa26bb4ddfab24
 MISC metadata.xml 856 BLAKE2B a9b5a2682ebacdebcceccafbacc98785964a37d32067bb358d01957fd62b57d2ea897d63abd7d7ab091aab2ea5baa401423656a038478610ea7425f74a09da35 SHA512 584c1896675cab40d1e0dee33deabda4b1cf951fbc4ff8e6c98b05334492db575effb91e801da76db2599f3860871e7150135b0596400484d4e7ad00d7abb82e
diff --git a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
index 8da11cf0d46d..7a2c2383e72f 100644
--- a/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
+++ b/x11-misc/xflux-gui/xflux-gui-1.1.10_p20180910.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ DESCRIPTION="A GUI for f.lux"
 HOMEPAGE="https://justgetflux.com/"
 SRC_URI="https://github.com/xflux-gui/fluxgui/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/x11-misc/xflux/Manifest b/x11-misc/xflux/Manifest
index 539eccfe2584..8ab7fab5e9f0 100644
--- a/x11-misc/xflux/Manifest
+++ b/x11-misc/xflux/Manifest
@@ -1,5 +1,5 @@
 DIST xflux-20130927.tar.gz 335911 BLAKE2B 56e683a6969f129c7dcdfd4b13a23523ca5ce3d19feae947a654ca02437e372bd998a71048d00c5b7bf653eb9fa57c696b8d5bb1b3dfd75a0b17e9213368c1bd SHA512 c35003b9cc6bc95f6ce98efc2e69ea94c99ed31671ec5d1f5919294edd7e504d23aa1df29ec0f1d1c68c4ceafbcd386e1207ef4c9957d7a5079ce96c2ac6d924
 DIST xflux64-20130927.tar.gz 339845 BLAKE2B 15751b75b7c0603044c4e7e98a9b23ceab7e245b12833ed1b6e8bc1d1734c5838777b7561d035bdf6d6d781105cc48dbda6c262895c310cf9710529a088b0a97 SHA512 6204558b8fa1063ee19fe444f740ab4ddfdbc412459b2f5cea94ddbf11818e0c9bff7e066a4958c1ab5c160b1aedcd18fa7fc4cd800a67c5d51ad1206f203e52
-EBUILD xflux-20130927-r1.ebuild 639 BLAKE2B 0f40bdd0f6c7e6df81a78f6cea1892f4fecb833ab88e4c698f453643d25007536eaf2033382e115b8cb0b2b1360f70ca7e0c88d47c217a22e9f66df05ccd79c1 SHA512 cda72609c5434435b92ce9ca2e9dd0eae002631c13188031aecb5046ef21ebc3b37f348df64be8f990bf4828b1ed793b94f268058c84615c379ad7955473ab29
+EBUILD xflux-20130927-r1.ebuild 638 BLAKE2B 7e18978627cf797c8e8dc11ab8f76f92a66a3c3b456ef9c0e2232c34e99de5babeda96dced2906901d7bee0538ff0404c3eb7c701483ad0f3eabb4d9066db2e1 SHA512 6fb5ce6cd5979a1613eafe274f7a97e6e60076169e03b3ec5457d2ace7c6dd9724a4289336a3ce31a63458ef3668a8e574ffdf592837bcaee9a70c4f57247618
 EBUILD xflux-20130927.ebuild 652 BLAKE2B b0d542127d818f4f99e7f8cdd4dfb8a4dcfa06bb1a5abfd9972c5ed900d4b744cb229246a945fd296a2dc85ac9985be88768226057cb7221e41a5d0e8cb053cf SHA512 25ea901e469797293fcee0db63a415efa6f156c574f2174def009c71e91e9d36cf0560b37c21cc5d814ddf9a71b1a4ee2c124967209e38ad5a25fe4c0dcd73bd
 MISC metadata.xml 621 BLAKE2B d4a3d03b35bde34b0b6b1af8518d3b18486876766037a4bebcadeea32f247f2660c970d89638e91315dd7eff42ccf818bb868c92ea94e52db3793cc1285008e2 SHA512 9f2ae158aea2c8d2e0191c5df7825b0b6b802a564637ccfe8f431cd0dda9569a7af0c08925e804b2139de1ba1a8c346db0b305273b0f54fc1a4581bcdb959718
diff --git a/x11-misc/xflux/xflux-20130927-r1.ebuild b/x11-misc/xflux/xflux-20130927-r1.ebuild
index 49418c455247..4f56590f7b46 100644
--- a/x11-misc/xflux/xflux-20130927-r1.ebuild
+++ b/x11-misc/xflux/xflux-20130927-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="
 	x86? ( https://justgetflux.com/linux/${PN}-pre.tgz -> ${P}.tar.gz )
 "
 
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 LICENSE="f.lux"
 SLOT="0"
 
diff --git a/x11-misc/xkblayout-state/Manifest b/x11-misc/xkblayout-state/Manifest
index 51bdd5f2121e..c58286b22bc6 100644
--- a/x11-misc/xkblayout-state/Manifest
+++ b/x11-misc/xkblayout-state/Manifest
@@ -1,4 +1,4 @@
 DIST xkblayout-state-0_p20180118.tar.gz 6853 BLAKE2B 1a8b3a9c89d9647bb8b9f6a2261f2e06f44f408823939268d60364fe532b9501e3c36d8f66cc1160f0b5432874d48046f848159842d09135a6cb4af658a8b248 SHA512 7618e920f8044324b7f4eb58d4e22ce076056d2d911cd950e6a862303c4b37f31f5919fec69c63173a7ff181d51849def4f6a78a407baf3012232f2f423bed00
 EBUILD xkblayout-state-0_p20180118.ebuild 697 BLAKE2B c294550d36b8d8129ce66911c15e9d5355ba7c6ea7d5bab1e46ccf909f7d688c03d0e10497bd34992edcccbed3a5dcdeb55a4eafc458d5d2e24949618c73d337 SHA512 9762346f84f66042ef71510b9b9cc1f5e207f51e9510b6ab66856b93e40c5e2df3f113eaf1250c0fa28e10405fa149879ad402a112d43622443af9091be514ff
 EBUILD xkblayout-state-9999.ebuild 538 BLAKE2B 57aecaae58c9b79fdd3000c5a6b62e189e2b05c5579dc693d83146d3a17e668e98fe9b92493fa11972c88e2dfbad9c9ab22af2b2050854a67c6148e9747fb96e SHA512 5b4cb88183806eb03b2f8ef7f6dd7cce462519509f944f0e1a16be3383bcd3ae5cd3f86f6a96ce64aec0f53bc43bcc1496bc19e6df965c75399d0006d0a7638b
-MISC metadata.xml 367 BLAKE2B b8db3256ae431dc01c1e76c8be9088cac93d956aabaabae59247451c96baa54679a655e1a5d1e52c1d9c9eef476decebceceedfe850d2c9b4add611ec3a4e074 SHA512 fa954108bf3d089d95ccdafda4daaf6ff4b13c8d5791e3aa01579d8a23050180ddca511656a5a996579b571e5a643d721984290db3b5e3584ba9c322949fcdf7
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/xkblayout-state/metadata.xml b/x11-misc/xkblayout-state/metadata.xml
index b5f0b450d001..1b2becffa26c 100644
--- a/x11-misc/xkblayout-state/metadata.xml
+++ b/x11-misc/xkblayout-state/metadata.xml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>karl.j.linden@gmail.com</email>
-		<name>Karl Linden</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 1b2f6a6a28fe..d0861a1c0532 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -2,6 +2,6 @@ AUX xkeyboard-config-2.26-Fixed-broken-pt-layout.patch 5000 BLAKE2B a535925839ee
 DIST xkeyboard-config-2.25.tar.bz2 1055253 BLAKE2B 80de6393f7dc2af18c4ef0e31458c4ff10333213fc109e01db809f8362af53315601e276ed856edf0b15e264b499f6335c380cc33ba6e11448e686c6a0295fa0 SHA512 2d9d6bdd885edc8e03e5a2c136c3b29b4ea795122709fa210bf151c4e7416a44fa2928bb29137ee8c6691d8646c1f645748576dea3f940ce84c8d4d0f91e09eb
 DIST xkeyboard-config-2.26.tar.bz2 1061733 BLAKE2B d07bbe28d5621aa146fdca089f60ebf293aa9b39b60fb6f7335cef934ff9edc6a11475ff00b7279a960cd9941f91260f25b7502fbe421bd8bf5c0da53f7a3471 SHA512 5c8a31f7a6ad5daed8a3fceb56230b2e2fc04a25f52a43b3b4ea81e4a6ab15c52869f749c4b747d855cd4b618c04bcbb40e85dec7eab31fbe3bd45e8c9b755ef
 EBUILD xkeyboard-config-2.25.ebuild 1255 BLAKE2B f1883e83820a59cfccdef343cbd001eb85583542421d4f13b4814c421e7c9f651bf68a41334e43f567d21866061938e957e16e92ee9091cf8fe6a3f9bdf62971 SHA512 71e9921d25b4578bf7ef268fbb5927d2d896f15756b5d4348aa5ad3a86c33be54f717d7106efa59572a82eb9542f6cb1260f65a09ae59ab2d1fe5df35eaee921
-EBUILD xkeyboard-config-2.26-r1.ebuild 1328 BLAKE2B ce54e3255ff2dcb79e6abb45a5113e4cc89d89c0e5a953c6a68e51d8015e41f0a7b9908f8234688180ca095496e8b5ce36b8d8ffd097ec5fdc93a8bad279b571 SHA512 de6f6ee2fb40a20b1877c3eb03e2bfc52566f6599182974061c3243f0dfc0b1460eaaa42d1127cb2b01b85e53e18745a0769c003a42cc9045f31333fb460df31
+EBUILD xkeyboard-config-2.26-r1.ebuild 1320 BLAKE2B 130eff90e5249b0d31274002452e770cd67468198ea27f8756f84627b1e60f8cbd8953afdca98859aa27504207ed8c7502487798b42dbe79e759de9203356f7e SHA512 6247d2ca9442b713d9ed15107aa39e18dbf8a5e483c84583d040fe499a506caf20201890841f39257b53ee5b83908c803fab0358387c01df31a97be54f8cfe24
 EBUILD xkeyboard-config-9999.ebuild 1266 BLAKE2B 16798865be0a1659f706780c07c79caabb51f1cb9b2079e595122ec9afc49dcce769e784fd0e7ff0ea8f3581c7a03aff30fe773cbe7803a2a9f7ef627994efa4 SHA512 ec7096942471274e3ac0b78e5bfe8fe569259d3571ce83a4dd92cf5de2f52999b3d05e11a6aa8f31f8c9994d8c8dc77829ce3b65863ebf2c8d1e7bdc26d4cac5
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
index e98b90a9e218..36813e407261 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.26-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
 else
 	SRC_URI="mirror://xorg/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xtermcontrol/Manifest b/x11-misc/xtermcontrol/Manifest
index 72834925a0e6..160f116de233 100644
--- a/x11-misc/xtermcontrol/Manifest
+++ b/x11-misc/xtermcontrol/Manifest
@@ -3,5 +3,5 @@ DIST xtermcontrol-3.6.tar.gz 151916 BLAKE2B d5ade1c89d0bb45b401b59e5e13586d54c55
 DIST xtermcontrol-3.7.tar.gz 151984 BLAKE2B 246b17e0b38540cfe022321129d76ae196c8d0b50b2a2fffbb523029321c5e8fde093fc5af16e5a550fc39eb2fcaf1fca4882de2948c45397c9bd4a9a11a06cb SHA512 b23da5dd07ea8fc59717752e937cffb36038870f3ad486d43b8d0477826916255ae8f00f894293efb2dead46ff9122c7e27200d5fc15b7bd91d9df1b649e2081
 EBUILD xtermcontrol-3.4.ebuild 373 BLAKE2B 836d55e50d4021a1d005c4b111cb88e11498b36ad837233e3dad2ac2424f1a4398647818674122c7ba39a5b79996e5e7ad2f650039bfc7c6e4abf46c7c55e61f SHA512 f02e93b2c590a6f4d9a70b896eeccaab5d42e383b64252baa1be51c6de53362f91704ca6491b16af3a6c4333d15920c20baaef20275319e28d35eae4637d22bc
 EBUILD xtermcontrol-3.6.ebuild 370 BLAKE2B 3887e3c1d10d8ade6ac8ccae6697cf61f971c9e3ea70a165c99e048b1a5ced4b989938a725e294fae7d813a7d9daf109e412224cd3fc8ee92c3f322f413a1eca SHA512 bc06f3c76354a529020800fc1d25e6796d8f3f2ee89aab13709f680ab910d1f6e8cc085aeba54c018b42756b26144993d192182b43bbb4d2ec41d31582a0f464
-EBUILD xtermcontrol-3.7.ebuild 376 BLAKE2B 1c0db06e71789c4b1243d08fc20b6c12c431a939bbdd3fe8cc57c7aebd3325766cad953147e5fb49771a1bf1a1d91b79fa9b979550dd646516d08ca59cec1073 SHA512 bf758ee66689cfd9848488f8de1cf891cde98ba52e987c14422d26c6efada57e8b4af8aec42a080b1a7e1eaa20e21a1f9e91c27f3aeb9f7ff7c4b43a5df96ea2
+EBUILD xtermcontrol-3.7.ebuild 371 BLAKE2B c6b1d1758071d2a4d7baffc72467bd3741d04cecab94f8027e80df12930ddcf35d8eeace16ef7e7083d4470db3a460fb614d8de42905841214cf550f94b073bc SHA512 19d6af48afac14d245f9e418f92093fc554705b5c8f04fb9131a024452704177659090c57e3f4c8c3dd207942717714f98a33af54b232899d591876c56ad2393
 MISC metadata.xml 689 BLAKE2B fce013dc9ec9488e94202966a807b7e28491fc553fc243008846f845462034a8645a68a2122832c2118a3911856c0e0fce13c563ead4da707375eaa16cc81fe4 SHA512 ee635786fb7c6876636390fac2aa50cf01946dcbead809021f7bb795ef713bf21ee04123f574d4d7d12402f93c9262f3bcae46fdd0580dd316321cb42421687e
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
index 601cf7723b41..a70fccc5c3a1 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.7.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://www.thrysoee.dk/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE=""
diff --git a/x11-misc/xwinwrap/Manifest b/x11-misc/xwinwrap/Manifest
deleted file mode 100644
index d0a06f542859..000000000000
--- a/x11-misc/xwinwrap/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST xwinwrap-0_p4.tar.gz 4905 BLAKE2B 38ef0a61e7a90ec2bad798b6ec2cff6d22082d001c2cb8cc39cec905d0acf9c6cd2f01c852d60dc72b45ae8c98b961db2963e033f08a0cc98270e6b0a95b24c5 SHA512 c209e1e0be366e63180f1e58844e7870d83786e912edd2e21912c6d404b44e9186a5f91be6f12ccb78c96c5bac23df02cc6d3d8fdb54743be3ef2586604bd853
-EBUILD xwinwrap-0_p4-r1.ebuild 779 BLAKE2B 1f3c45e78e7db21d04a1add122e1a0656a92428b615023d8c912bf12c84438a95a827796307adb379d690c3e5f98c8c9a1e21942a3e9fa6ca7fa15a47a4c49c8 SHA512 098e10ee32191ad09007e581de99cc77c50b01e302b8479ac9d06ca1743f8859aebc626cf618b3acbcce494bc6fad4a29990e6b57fdf7c382e6619ba4fd377ff
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-misc/xwinwrap/metadata.xml b/x11-misc/xwinwrap/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/x11-misc/xwinwrap/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild b/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild
deleted file mode 100644
index 2118202409f1..000000000000
--- a/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="replace a desktop background with a movie or screensaver"
-HOMEPAGE="http://tech.shantanugoel.com/projects/linux/shantz-xwinwrap"
-SRC_URI="https://bazaar.launchpad.net/~shantanu-goel/xwinwrap/devel/tarball/4 -> ${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-libs/libXext
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${P}/${PN}/devel"
-
-src_unpack() {
-	default
-	mv * ./"${P}" || die
-}
-
-src_compile() {
-	local cmd="$(tc-getCC) -Wall ${CFLAGS} ${PN}.c -o ${PN} ${LDFLAGS} \
-		 $(pkg-config --libs x11 xext xrender)"
-	ebegin $cmd
-	$cmd || die
-	eend $?
-}
-
-src_install() {
-	dobin "${PN}"
-}
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 510127e2762c..70e1614fa753 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -5,6 +5,6 @@ DIST zim-0.70_rc1.tar.gz 2889546 BLAKE2B ca0c2274472f7e3f50e2b51ba59a75ae1422e7b
 DIST zim-0.70_rc3.tar.gz 2877315 BLAKE2B 1467bbd6bbd11e53120193a5f77dc7ab52eb8f1478c3dbc98e229d784f4432e862ab578277b79058eae43943bfbe8812b45153130779f7c84f14b342d3ba7357 SHA512 32fcad48c2deb9739cb7d3214138cdac7c6499008f884ba61aeb51ec387d600b87c7848abf7982fa165c4130446c307e57ee1762f7107894b70d96ded528bc0e
 EBUILD zim-0.65.ebuild 1777 BLAKE2B 29f8c8c7bd19e0580603df7a246160f57f42f08c4e474abd8852245dbe7e1656e8d8e17bdc7952771c571ea94c35c18d80e67c4990e8206c5baa806ff2847977 SHA512 d3d2cb0eea9629277c38883523a7cda05a275b729c34805c9eeaab11ea016d46b05f325efb7d6af2a093d3c71fac0b8e50e46b642a62275772cb9f2a870de6e0
 EBUILD zim-0.69.ebuild 1849 BLAKE2B 7bad44da4be87ee0b8c9a9dde44264035bf7ef330f22db53a0086badfae364285f1d51592671e36f05af67a3e025c8f58fe394bdbb370de94469042f0254bdf1 SHA512 5346b7821aa43fd866af288a9cb8ff9374cb463a68123ae931d1f4145bd8e8bd3ea23ae8faa40c95a5dc9f0ac085fd21d108aad8aaaf5c396a830e96e4628250
-EBUILD zim-0.70_rc1.ebuild 1975 BLAKE2B 353454f5ea9e44f5ad8a191fa795eeaf80f14ce709c7bc71688f65d438dc3861276dd717b1141d684393a90aeb90182133519695a78a37b12d9e9624d9312cb7 SHA512 40693d96c405ba43e3ad1f2d112fd2312303ecc133316e485ad680c78c49cd9d36c3b84608b8fbd0dbcfffae54aa3f85f196afb394bb0a0eecc0169d62bcc9ab
-EBUILD zim-0.70_rc3.ebuild 1999 BLAKE2B 60396c782d89816504beb13a5b40f53f62588947384394f54a7abbcceaeb2bc6b000b5c31e7b8702ea8e59c54b3adc9ccf9190c40677b4e2c67daa094af5da7d SHA512 ffcfa8797f19fc0b0f63ff14b40f289abda49c4a3863f5ef9b5bce24cedfdf5bbeafc54cdaeefa033092177d0344e9af7f8fc98dd58494b87d1c7327c493d87b
+EBUILD zim-0.70_rc1.ebuild 1973 BLAKE2B efa0216cb6d684b8bf80ac222314b6b82451952400bc52ebd6f929d64b277bf66ce4579ccafb982959811042671149171d716b0ae298ea6d0a0ea097938936ef SHA512 8513f71ce97cfe4dd3f88cae73606532ae43d990b01081fe380918f382649f992a4fb6ece0408d7c9d9e5ba066bc2bc25672dd9058f55e8a3dbbc28f4381b7cf
+EBUILD zim-0.70_rc3.ebuild 1997 BLAKE2B 3519ed057e64d10dd82543fd5220b425cb184f83eb1ae2c9e96d4573ca36b7655ffa5f3afc844e48ffed91c80e3b04391e495a429f8e0c07fc7d1323b0dbf547 SHA512 9717ae89253b7ff0410243d0c1ca9f98fa80b8fc58b4d76a7f92d0f9f2ffb55626db58e722205507213fa8e3e36266b1c64992959673f41ea814df80f2c65e8b
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.70_rc1.ebuild b/x11-misc/zim/zim-0.70_rc1.ebuild
index 9e40d67b06e5..a5588627e697 100644
--- a/x11-misc/zim/zim-0.70_rc1.ebuild
+++ b/x11-misc/zim/zim-0.70_rc1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 gnome2-utils virtualx
diff --git a/x11-misc/zim/zim-0.70_rc3.ebuild b/x11-misc/zim/zim-0.70_rc3.ebuild
index 78b40b796324..2b4aa0e45ed7 100644
--- a/x11-misc/zim/zim-0.70_rc3.ebuild
+++ b/x11-misc/zim/zim-0.70_rc3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 DISTUTILS_SINGLE_IMPL=1
 inherit xdg-utils distutils-r1 gnome2-utils virtualx
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /x11-misc
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)