gentoo resync : 03.11.2019

43 files changed, 258 insertions, 686 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index d640268d1b00..1f1756e853b8 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index c7261d8ef4bb..cd9885638675 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
 DIST colord-1.3.5.tar.xz 1263488 BLAKE2B de70f3f76e81d3cec826f444e4c6a1603c03b7d97fedcd04a0b9e1977d1e487d7e1327c8b2738b3cf74e9717fb6803d543786c749d3a244faa1a6480e77e3436 SHA512 a0084ad2c08ae88c8023b8bade68f6cf25e13c77a6a37ef127b2914e86b06e6a7a783f9ab3585243d975dbbe1120d5daae13bdb586aefe519bf675458683025f
-EBUILD colord-1.3.5.ebuild 4340 BLAKE2B 888b461d4c762c35fa77d1bdd1f6ac89123f8cb6335dee2fa2100c711b06d8b12973c67a4a13099bd06bfb6307a3ba5600251283f08dac7524d10fe491413aab SHA512 880062ce2e5908396df892e108d1bb524d8e7a62bcdb8deed719c5d591d64ac2b3b4fd5c1d1147e84a8b2065b6e6d7b2546c5d0b2643c22b0a2068aaa4589ec0
+EBUILD colord-1.3.5.ebuild 4341 BLAKE2B c239dd6bfe44d503ae2179975ff2a1fad78693f713a923ee1895ed67c20ebc32f6eedee35ae73191426bdf591c2e0fb4f7d6ab3963e8d73e33341d0ca9185d38 SHA512 edaea01b5ea268247cd77a520eaa273250b6531ddf6d10aea7b3db879d8d51799ef09d808926fbc0d9d8b55d10c511708d7aa8c1a1f2bcab3a1f5e6d70084d39
 MISC metadata.xml 563 BLAKE2B b35a641da198a98fc9dc69dc0a49b0796060df467dfda31fa7cb1dab328a618e283f5ee9e05d7ad34742052e9441780b243f62f71329d88c1d93dfa83acc46a0 SHA512 e358961e8d31c2e9582d93875bdabe119e574b62d674e5b16028cccfa2e0604d39384fc2c5683aa343b9cf6d543f8fc35d2eef35662de43ea97fd0f50536df3a
diff --git a/x11-misc/colord/colord-1.3.5.ebuild b/x11-misc/colord/colord-1.3.5.ebuild
index 35e1273e8b79..e440c9471305 100644
--- a/x11-misc/colord/colord-1.3.5.ebuild
+++ b/x11-misc/colord/colord-1.3.5.ebuild
@@ -36,8 +36,8 @@ COMMON_DEPEND="
 		sys-apps/dbus )
 	systemd? ( >=sys-apps/systemd-44:0= )
 	udev? (
+		dev-libs/libgudev:=[${MULTILIB_USEDEP}]
 		virtual/udev
-		virtual/libgudev:=[${MULTILIB_USEDEP}]
 		virtual/libudev:=[${MULTILIB_USEDEP}]
 	)
 "
diff --git a/x11-misc/dunst/Manifest b/x11-misc/dunst/Manifest
index 8690395eb614..2e7330469e44 100644
--- a/x11-misc/dunst/Manifest
+++ b/x11-misc/dunst/Manifest
@@ -1,5 +1,5 @@
 DIST dunst-1.3.2.tar.gz 121575 BLAKE2B 97f0011ce960a7852dca5a2917e328de2cc1a052ad0b7c2f07e878e3b6eb5281e49a070a574885b9a66eb6dc30ac07fdfd6322b44cbb7dbc1edf8d193a68b538 SHA512 eb7bff16a19d8f60e2f0eec419a0ffb2f8822b5ec2ffbe535303a71cc7d4ef528e5dbf2fe5f8f2f6f5bfd1ad2d39eab79b68054af924e118c646e059b6929465
 DIST dunst-1.4.1.tar.gz 160124 BLAKE2B d618b3bffc8f4518f58d28e108a8aadf1ff71164f581632bc198b3d0a81f6efa0fff73513fa5d46ec4a7058bb1beb8d8a51cb01e4621c76f8d3f8653cc6e2270 SHA512 43667898e123ef0dea59e2ca55a76686785906e44b453b2a86bdf361045b3f6b751a2e81fa9f562127f80bf47f8c9248960c37f8365dbbe409d72ddc3deb34fb
-EBUILD dunst-1.3.2.ebuild 1075 BLAKE2B 89736d9a5e43f9e4fc19161b5de87c95c118da9dfb9dce9c3d3abe7fa1337ea875b01510eb8e640d7a20248cee14284f5f3fb6a53a832944797cce6d0c9bf56e SHA512 d947586261ef7f110c1aec75f73de72071f45ec90be1732c8d3ce586fa47e365e878555567144497f954272989ddb3d03632d8e765bc539b09fe4b31439dd3c2
-EBUILD dunst-1.4.1.ebuild 1047 BLAKE2B 347c276d48f404f9020dfedd3d386f203be02b2209131ff039e9998e5ec8d2225b3d5954d0e90a614b2a9336179ea760d916838647b7456d85bfbf455061a254 SHA512 3b1855db88be8572bbe8bac7a28a42a21354a143a4566fe1ba0b41037d9234690815efe4d10e43c0dd9fc7ad78302e2c3bc1cb23e2cefce842eb0b0a35329aa7
+EBUILD dunst-1.3.2.ebuild 1069 BLAKE2B 69823f7cd90f4e97c5d2955633cd7a6bfb94200a88bc92c8e525681f0b1418968576d586cb2dfe01713d069244cd27476d21b6bf534cc33e96af8eb4da410ba8 SHA512 054afaa928d9366bf2b5537234c61d8fb1083c0d887f785d04bbb20c96714dd93226e7dcc3aa7481461551a83a812d5c474048bb8f837551c631ce0308f1c8e2
+EBUILD dunst-1.4.1.ebuild 1044 BLAKE2B 4d20f3082274218103bb731b0e8f16059bed680a9fa84697ca289ff1eafad549b99896b3d9e748a905c55cf0b87db17c9169a935840adde738292ae40de7a637 SHA512 98eba6766655758a649c9613711c531e63df55b27b26e4dba0b174295d18b199c089ad1f6f399d7eee4df3aa56d7bd803ac677c17ce34446be65d5cb69d82539
 MISC metadata.xml 448 BLAKE2B 088d419b835ebdb800e07ae00892d0c01bef6f862d72ac3976d58202e532870c1c0f8e96ea292c95e9579bda48b5c81952f954afee300e250a21167af639bf7e SHA512 4269d385c94e1dcfcd89f9ba95486da2a7feea2370fe1cef33051a3886e8c7612911bca2da15fa049d6692994c8c342e308fdfa2645a5f576ad93080e8d54d73
diff --git a/x11-misc/dunst/dunst-1.3.2.ebuild b/x11-misc/dunst/dunst-1.3.2.ebuild
index 0bd294ebd432..84d3fba63c54 100644
--- a/x11-misc/dunst/dunst-1.3.2.ebuild
+++ b/x11-misc/dunst/dunst-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/dunst/dunst-1.4.1.ebuild b/x11-misc/dunst/dunst-1.4.1.ebuild
index b4cd7451bb5a..c4b08b6ace54 100644
--- a/x11-misc/dunst/dunst-1.4.1.ebuild
+++ b/x11-misc/dunst/dunst-1.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Customizable and lightweight notification-daemon"
-HOMEPAGE="http://www.knopwob.org/dunst/ https://github.com/dunst-project/dunst"
+HOMEPAGE="https://dunst-project.org/ https://github.com/dunst-project/dunst"
 SRC_URI="https://github.com/${PN}-project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/x11-misc/enlightenment-extra/Manifest b/x11-misc/enlightenment-extra/Manifest
deleted file mode 100644
index 9662662193b7..000000000000
--- a/x11-misc/enlightenment-extra/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST enlightenment-extra-0.0.1.tar.xz 374872 BLAKE2B f067ae5115033d5b87783584327ecd5e08b3b38998d2f9e20b70b135b7ec25106fd92abf5314c2af580cfbcc66ecd65ca7e434429708e1abe8d02dd4b0e2ba98 SHA512 40cf1a19c48cb6f14fd7fbed3223eabdbc69260834480e4463495af36fbfa1d00b7bfe3777998a17e5081b14e66080dc3013a6d3a6c610a175a08c99b4e5529a
-EBUILD enlightenment-extra-0.0.1.ebuild 851 BLAKE2B 2b9771b8eff4ab903638c5885649543ec48493bfce9c2d634bf573d2264df8cf8fde23ff4903f613876f63a179c4d7db133380eac1b2cca7924b08648fd5813d SHA512 da363d5c03c857c66bdf5649d5a6b777ba318296cbafbcf235883f364472db53f4ddd6460ff5c18035777c472b1c2df21172169543e33fe81275f56af0a79bcd
-MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild b/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
deleted file mode 100644
index 376f6d84bf52..000000000000
--- a/x11-misc/enlightenment-extra/enlightenment-extra-0.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="${PN/enlightenment-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="An app for downloading themes and add-ons to Enlightenment WM"
-HOMEPAGE="https://extra.enlightenment.org"
-SRC_URI="https://download.enlightenment.org/rel/apps/${MY_PN}/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/efl-1.18[X]"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_prepare() {
-	default
-
-	# Fix a QA issue, https://phab.enlightenment.org/T7167
-	sed -i '/Version=/d' data/desktop/extra.desktop* || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable nls)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/enlightenment-extra/metadata.xml b/x11-misc/enlightenment-extra/metadata.xml
deleted file mode 100644
index 6b0a0fb3a729..000000000000
--- a/x11-misc/enlightenment-extra/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/x11-misc/gigolo/Manifest b/x11-misc/gigolo/Manifest
index 66a72c43813e..246cbc30d6bb 100644
--- a/x11-misc/gigolo/Manifest
+++ b/x11-misc/gigolo/Manifest
@@ -1,8 +1,3 @@
-DIST gigolo-0.4.2.tar.bz2 243877 BLAKE2B 7536d8fc1a10abb465b2150785f593c88b4d0a40fc76e1f88388a1631f874ccf0169dec9328b1051c39d6334257c765b409aefeb008a4dfd30bdd9e61d43d269 SHA512 d6d8c65674097fb3eae586e4c71b0f36ba64df00b2ac84c32bd83cfb0fd690ae998c22cea02194acd1f018cdfd01b42f840867425ed183fb0ad98c8d97859532
-DIST gigolo-0.4.91.tar.bz2 248666 BLAKE2B e258e494b4260158df4db4d3c6cea813667122a2b57059a71c35338d879a191264f8ed315bf686cb48fa3879ecf0f37c170852fb731f81020a69ee2dbaa71e1d SHA512 35cad4a072980ca688d414ae14c85c9463364c44dbccd0a3286a8fa767135cab24577ec6ca66dcd9f32263d04ea4ea4ada4330f849911ab3289ac9e6dd45583d
 DIST gigolo-0.5.0.tar.bz2 246473 BLAKE2B 23459a57467fefcc13c61483397837da51294fe7945619e0580b034dac14da192acb349b2334669f35ec43e1e421664b1765fb1e51164d7dca76769f27cef075 SHA512 5f33f24169c2a8e3a450926668e4611aa0a9c669edb6ef6e53bccd77228ac78b40c4916eb4a20afcd9d5d7e32373e8f13fd1cf43366e65166a9ef09366c9703b
-EBUILD gigolo-0.4.2-r1.ebuild 707 BLAKE2B 3e9ff659fa2c0c36ef33f71d62c4a706917e3d6e2074fe77644b283b7052d2ce0635a31d50686b4915efd1b2a18e161edc60c5b82f36a71e51d9db8e1ed2241c SHA512 f342f5f9aa1bc19757f599aa4dd78047d37bb0ef1df172b8f9139ad92a4e52386b22faa42cec253c6e11df7d88f18335de0c122daffd8034242754b7b1bed053
-EBUILD gigolo-0.4.91-r1.ebuild 849 BLAKE2B 3931d06fef3c8885abc8baa7d5a9c1c724cad0562d2f7cbc5c105b0ac6790ec640d0a10d1376c8c8ff4753da9913efa82b1696d617f24c6a5a784a1c38d28794 SHA512 c2b1cce69c9645eb87ffdaa37ec3b06c72212e2b861b3d9382821bfac3b63072725606b1b4abfa3a9ebcd1e44738c583e5adde1721a536e7ba53cf00bb8acf51
-EBUILD gigolo-0.4.91.ebuild 704 BLAKE2B 72ac4bd1f1071a5f48a6e01ef142952e19cc76f38b1165ff4df54ea3b09ff30073c4025f076a955e536a5033024420cacadb69a870f0fa01e652042c7e0858a4 SHA512 b9cf5b7c221121359edaa12046c26e517ed287da5ed3fe12422233f032b3ef6b55f545c7629e0422f3ff49acaa5cf46b929ade4ffc07f687657de130299443bb
 EBUILD gigolo-0.5.0.ebuild 702 BLAKE2B c05d352b9fba57108decb65c9a05c2d6ae8fc147dd1d5007f6b76fba846d114ef5ba6a012d01de013792071ad2a530acde7effeb6e0013eb75dbb9a6fe27e709 SHA512 62df9d4fc278e42ca269679bc375aba360f4ef231008f7f1cb4aef2e0275e061056fc331dcc3b3155bffa5e8ba9f7c972842cc1c76cf0d9896bb2a96fc0ceaaa
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.2-r1.ebuild
deleted file mode 100644
index 9a5f34798f14..000000000000
--- a/x11-misc/gigolo/gigolo-0.4.2-r1.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+-2.12:2"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_prepare() {
-	rm -f COPYING || die
-	default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild b/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild
deleted file mode 100644
index 8a8013bbe625..000000000000
--- a/x11-misc/gigolo/gigolo-0.4.91-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	# https://git.xfce.org/apps/gigolo/commit/?id=fb63ddf0fa4ed93789366aefb7a2a2b44e919386
-	sed -i -e 's:gvfs-open:gio open:' src/settings.c || die
-	default
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/x11-misc/gigolo/gigolo-0.4.91.ebuild b/x11-misc/gigolo/gigolo-0.4.91.ebuild
deleted file mode 100644
index 83d48b41e492..000000000000
--- a/x11-misc/gigolo/gigolo-0.4.91.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index d5e277572367..87a2fa36605b 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,6 +1,4 @@
 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 2082 BLAKE2B f53208b088b0376a2206c982aa05240baa82701d8ce2da8b671dde208aebfdf8eb3b77d5ff496586df3344f186463021b50eac26bd330e3936d4278873df2754 SHA512 6765efd4eeba09f263eca279d9024d98c11e3f390db3cbd159b92245534d9eb435955f0ed9f8093c42d8c788d425994e0ea38ce68fc803ab4ecde173450fcca7
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2067 BLAKE2B cc9bccbf51bf4442ce17517dbe2a8144428d4f5c66715dcd1730632a085c0c9e42acb4f659ec3b84b08063eb75884c5a3ddd8e4beed004d0c93a096329f76786 SHA512 daa125ad030a5eda55fc81ee3d411769e3fb4718613edfff9648f2df426d78c700a66094fa9971dad662f7b5e6d765241cc9dcbc6bea5753258007084522b497
 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
deleted file mode 100644
index 318ca61e70da..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="ayatana branding"
-
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	xfce-base/exo"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed \
-			-e "/xft-hintstyle/s:slight:hintslight:" \
-			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			-i "${WORKDIR}"/${PN}.conf || die
-		# Add back the reboot/shutdown buttons
-		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
-			>> "${WORKDIR}"/${PN}.conf || die
-	fi
-	default
-
-	# Fix docdir
-	sed "/^docdir/s@${PN}@${PF}@" -i data/Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-kill-on-sigterm
-		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately"
-		$(use_enable ayatana libindicator)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 4072b0d6af0d..d036d51945e9 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -3,10 +3,8 @@ AUX Xsession 1819 BLAKE2B 3d0502ca0d353c4bf16aec063dacde3a57da0062595821aaebd783
 AUX lightdm-autologin 155 BLAKE2B 0236489d922c07cc84e17b403e746af052b9fcec1671c4b41184a26399ff8b310083c17959327eb752f8ff9ada04a7ff012ed6708c7ff50324dd0a3cef42efd8 SHA512 d09be0a61b7eea18a5c5977182362226e82a39b238c401f636bdf0a83381b97a16efc19e67be10b76854c95186dd65f539431d2352ce87a4e35dd1d40e388064
 AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790ea9c2a0632abe8238a6187b3e01b4296a1187349864b30291853889ceaa519f5a12a98b2aecbb1ea SHA512 5b60788e35ebd7918b21ab52dc3f5cc29dd3aa45ddf6cfe75a72d1c541620f0438378a9bd681e2c151a465cf981e803b399f61b48ff5d0f2e1a3cc950c30d23a
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
-DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
-EBUILD lightdm-1.26.0-r1.ebuild 3852 BLAKE2B 1e4f195f81764e403483adf2cf96e80133f4ceef2e3cc9d19fcdec533c27dce1e02bcfaaab922f3caddb16036a271257ef7855125e9a95ec995c432b4d236512 SHA512 6c6d381e593e27a6896dca626e52d735f7300e8c6f6055fed81c927266f6084fd911a31541d2d2fd2e8d0d6dc0573e14a4e19e835cdad4658fe78b3d4579ed33
 EBUILD lightdm-1.28.0.ebuild 3920 BLAKE2B 9a50dfa326aac3c678291c95efad0d700f6a940b1bff0c5d8b414777e4029502d4260b6e9afaac7d770bb30231c07a9f98dc1799fc6875b609206e75a249e312 SHA512 3ae4cbeaf8a786861a2a88e47693ebd713350b6139991c91a57abe7a741009480fd82706ac98de1fdedee570d2475f9373a80ef0a8b21bcb9679c640185e5004
 EBUILD lightdm-1.30.0.ebuild 4273 BLAKE2B c05b7258f91bb7e33a2a7b66f062882ebf986f342f7eb711d3c50d4739d8a8bc71dc5a834e6d3aba56df65cbf01f4ca3c00137b31d6e802a312ddf501f889783 SHA512 057d9651bec29fa4abb83b53f97355385798d75c2048d1464e487fe2c1331734ade8e1b75c7c33da0d9b532cb9b4a690111839f8fb940ed45a0d9b9ddc7f54fe
 MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
deleted file mode 100644
index e33f430d4dab..000000000000
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
-SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
-	mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="audit +gnome +gtk +introspection qt5 vala"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.44.0:2
-	dev-libs/libxml2
-	sys-libs/pam
-	x11-libs/libX11
-	>=x11-libs/libxklavier-5
-	audit? ( sys-process/audit )
-	gnome? ( sys-apps/accountsservice )
-	introspection? ( >=dev-libs/gobject-introspection-1 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-	gnome? ( gnome-base/gnome-common )
-	vala? ( $(vala_depend) )
-"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-
-src_prepare() {
-	xdg_environment_reset
-
-	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
-	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
-	einfo "Fixing the session-wrapper variable in lightdm.conf"
-	sed -i -e \
-		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
-		data/lightdm.conf || die "Failed to fix lightdm.conf"
-
-	# use correct version of qmake. bug #566950
-	sed \
-		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
-		-i configure.ac || die
-
-	default
-
-	# Remove bogus Makefile statement. This needs to go upstream
-	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
-	if has_version dev-libs/gobject-introspection; then
-		eautoreconf
-	else
-		AT_M4DIR=${WORKDIR} eautoreconf
-	fi
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# Set default values if global vars unset
-	local _greeter _session _user
-	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
-	_session=${LIGHTDM_SESSION:=gnome}
-	_user=${LIGHTDM_USER:=root}
-	# Let user know how lightdm is configured
-	einfo "Gentoo configuration"
-	einfo "Default greeter: ${_greeter}"
-	einfo "Default session: ${_session}"
-	einfo "Greeter user: ${_user}"
-
-	use qt5 && append-cxxflags -std=c++11
-
-	# also disable tests because libsystem.c does not build. Tests are
-	# restricted so it does not matter anyway.
-	local myeconfargs=(
-		--localstatedir=/var
-		--disable-static
-		--disable-tests
-		$(use_enable audit libaudit)
-		$(use_enable introspection)
-		--disable-liblightdm-qt
-		$(use_enable qt5 liblightdm-qt5)
-		$(use_enable vala)
-		--with-user-session=${_session}
-		--with-greeter-session=${_greeter}
-		--with-greeter-user=${_user}
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Delete apparmor profiles because they only work with Ubuntu's
-	# apparmor package. Bug #494426
-	if [[ -d ${ED%/}/etc/apparmor.d ]]; then
-		rm -r "${ED%/}/etc/apparmor.d" || die \
-			"Failed to remove apparmor profiles"
-	fi
-
-	insinto /etc/${PN}
-	doins data/{${PN},keys}.conf
-	doins "${FILESDIR}"/Xsession
-	fperms +x /etc/${PN}/Xsession
-	# /var/lib/lightdm-data could be useful. Bug #522228
-	dodir /var/lib/lightdm-data
-
-	find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
-	rm -rf "${ED%/}"/etc/init
-
-	# Remove existing pam file. We will build a new one. Bug #524792
-	rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
-	pamd_mimic system-local-login ${PN} auth account password session #372229
-	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
-	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
-	readme.gentoo_create_doc
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-}
-
-pkg_postinst() {
-	systemd_reenable "${PN}.service"
-}
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 7883233adb50..399c6e4b5ee1 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -4,6 +4,6 @@ DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac
 DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
 EBUILD pcmanfm-1.2.3.ebuild 1525 BLAKE2B 91dd715d6cad05ca36b3e867d9a206e74f92f20ae2e7077e4af5773634019e0f7200f480bb211cbb0737c594258d8ae73c940fbef97385750113023fb8fe73fa SHA512 b226940a0ddc5968ff2db4ef462e745c9110a6b775d12cc299e3af88353272b8736712b8151c4a2532eefe2d0190d289677bfb0fc85bba6722147d7de9c01c00
 EBUILD pcmanfm-1.2.5.ebuild 1627 BLAKE2B d7092670f43bbe87a423bb5f1492676a09938dd695b0bc48b3adf30d39d309a851f462fb5231f0820ab27cf056df23e07bb72e067f43ab25ebb74b151863e139 SHA512 4bb01a683c3820e1a0d6c8d330e4f02d0ac588f0ad69cb3e96257906aecc4dd87eadf50b75b9c716bd0ab12778eafd64d3efcae379587102c0a385b3b06fca48
-EBUILD pcmanfm-1.3.1.ebuild 1569 BLAKE2B 52397fc6da7dc3afc8addaa8a50597f7aeb445f733f3a6260f06077a3f46c52b45a881149d48171f71e47b58f97901f6a2b87e567081c20cfd51a606311db0ce SHA512 7754b4a340c959579be9a2fc11ac540ee34eedc150f24f81b8ea3b5f06b83e2433c20f91c6b396e0902d35cd587a1b1e005d2ee3438d1d2d396e2fb66dd37e39
+EBUILD pcmanfm-1.3.1.ebuild 1565 BLAKE2B fc0f3ba5ca8a32de15f12ca95ad1abff2af31e237e747a9a0690806305bf2acf77d13f179cdace5772343b02a5d35f45926eeb12857188da8adf04f9cd3f8824 SHA512 1ea8ce53886860a24e528ce5f384abf62a86a18794e00bea1a20df6bb45ca817ecc70ef83270d62974709b16e7073fd930a9550db9d53a969b43c2b4b55923b9
 EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
 MISC metadata.xml 338 BLAKE2B 67489af9d290abeb2c77c1f87dd427ad7bed67ddbc6fd6f60d051ef6d76f6b156a01749c6a3a7c50c5c388f46e1e4fb796d27b4814eec44c23d6c72c79ac7fb4 SHA512 545f77be5c130d6853004c6a263611b821b6f79a937625475670eefbcf7de83aa15bcd0ec26fa6084bf1cf5e19c81c580f9f8258b63967877f6a2600df679140
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
index dfb4fe9d202b..235920582b53 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.18:2
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index b3c52bf03567..2fba58e7f19f 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -7,6 +7,6 @@ DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3
 DIST polybar-3.3.1.tar.gz 248790 BLAKE2B 30c2cd2ff537f3a2fe2fe7ce489b5a0ab76a54cd42bbdf8b3727e5f4298898e289c6ea10a460385d8bcdc8ab11749255573bf7d728a01eae895a1ed8a2214c27 SHA512 c0bfaf99dcd19f8fcca8bd041c0f9e5f11fb822c92cf12edc2c59e67896f566ee46d1a0d75f5583d393af3a1958c3244a4eb28224f6336e9eaa98a50d740f834
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
 EBUILD polybar-3.2.1.ebuild 1788 BLAKE2B c44044b3a7e3db34d10c9e018e52f192920f8a42fa6ea93e27c3cd0109143d8331c5f28e74958ed90fd569c632aa88257132c61625b0f5fb30cdfdb09f91b460 SHA512 db2abec6f14c08ed7beeff4fe90b2d832b5f249b64e5b0e4897316de597675bf06e4704ae8aa8635ec40fb3eca0e9be81c38889e82ddb7e98b73d99a69529980
-EBUILD polybar-3.3.1.ebuild 1997 BLAKE2B 7784a0e0ff06a7f580f67457ecc56c07482a97a9e45b0efcb6b13339c5fc2124d22471b93f57b76736c496d17b5ea3cab1259d76ca4e506553ee9245ca33deb7 SHA512 cf759703268f8cf122563032e902f55856d493b993992662a503670722228c44a1afb65cc698b0f998baba8d1390033a04de29bababfde6407553dd4be18448c
+EBUILD polybar-3.3.1.ebuild 1995 BLAKE2B fd192654a14c2843fb90b0e18260923f74e443d1350a7b0cac97ac8d38c980537d160626a92f4ada943ab6f5e083b899c02804b16cb0b1005d763bb64186edee SHA512 4fc06d174eed2b8a0483c5f1dc179e5553985e5f6dec2283d093d7a676282005c5e94ebadc7d174f2ddf34e6e83847cc74d0a72b9b52d300bfa0c377b1e39023
 EBUILD polybar-9999.ebuild 1841 BLAKE2B a87b383b2af09f0f3bea7e62625c3308b6584f0c251fda9cdf7e1c71532e61dc89a3fa246fbbcf7a6a2dd231f67c2d28d4f5cbef535fbab769b04bf915f0e39e SHA512 2f0c7459c3a8cde6c492bfebf73df841aed24580ab3e6ab7df8582930dfb76912a1aa768d1e6c3b37a701d6d29ad013207298ba6811361636105ffc8ccb7ae76
 MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/polybar-3.3.1.ebuild b/x11-misc/polybar/polybar-3.3.1.ebuild
index 304f98fa0c1d..9601feaf9222 100644
--- a/x11-misc/polybar/polybar-3.3.1.ebuild
+++ b/x11-misc/polybar/polybar-3.3.1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/jaagr/xpp/archive/${XPP_VERSION}.tar.gz -> xpp-${XPP_VERSION}.tar.gz
 		https://github.com/jaagr/i3ipcpp/archive/v${I3IPCPP_VERSION}.tar.gz -> i3ipcpp-${I3IPCPP_VERSION}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jaagr/${PN}.git"
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index 26d371b58079..f5bb7d1615c6 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -2,7 +2,5 @@ AUX revelation-0.4.14-gnome-python.patch 925 BLAKE2B 83bf8889d0de3a6d6077929ef76
 AUX revelation-0.4.14-random.patch 2127 BLAKE2B 9fa01845124172e9544679c144cc49f23104aed615a1e1087f7f6b63051027136435ef51e8ac794c78c7e554211a5f125a4641e9572c52a1279b8eaef3170738 SHA512 be5e805e58d04c0be29ad9c30a6aa867a869a4d0a8df31ce234fbe331d0191cc3bf7b82e11ec6a7c1c8306b68ddbc5ed29d9f5e8c9e3838b293896adb69c5d13
 AUX revelation-0.4.14-xor.patch 1874 BLAKE2B 44b4e6b6f1323201818c55ecedb464304dc5265a7d356224dff41021554f8611f05fabc2fc353bf7a43b7bc4e2afe32f16c7b57ef30539abeb307de50f7b270d SHA512 c4b76a92f0b6e4e1856948e1c1d4bb118bc8f2383e9ec778515fd87949814b60dd51b8dc814a070665c0138111b3ffd9d8fdad03c43bdbb0320ad19ddea23ddc
 DIST revelation-0.4.14.tar.xz 316096 BLAKE2B 163fe15fe9ae1f35613390cec6d67b7b0193aea1d613d8ed0b237c190680b700fe509e076911cf28233194c3e82917ae0772d9fbe842eada0ac8bffae256dd4d SHA512 0af5b7eea47a7706dd164f4f0a1da12fd2595e8add1455e4e4092e4b6aa1507faf2c94227dd838734bdc19fef9d268938362fca2d3cde59897580598eefa1145
-EBUILD revelation-0.4.14-r1.ebuild 958 BLAKE2B 405c6fd1723cf31a4b00763b8f102e88716e8130a2f5b146184bfd64fa5cbb700aa230ff1176f002b7ed16179cd7037da504c57ba0e7826e1abe65a4435c0b87 SHA512 31dc4c383c5992570206f779f9bec62c6ea2511d2997c19eb5e758ef2f422e00bdd4f8c8172583e983b573c97bd944cf2e4ef8f5e376ea64ed342f049d13841d
-EBUILD revelation-0.4.14-r2.ebuild 1053 BLAKE2B 480c69cf01fde86f00102b0a0a5ceece8debd8574b519d3861757186692b8580b04840be01350a4e87a5c122f1b576e09fb3eb696af0568b9d798a77ba799046 SHA512 a41a193fa0f0e6ec10b97c9d6f03f5816efd3844d82fc8693fc7f3a10f54d9d5ab7e1e5430a32f9a9bb821abc423286710769ce04a7f7f58e4fcd31bc54b2427
-EBUILD revelation-0.4.14-r3.ebuild 1075 BLAKE2B f9cae379d0830aba04751b0b36778bd61debd2d1d53bc6071f0da0743c7c09c8fbdc5449523b50794bc2b535f111dac4926704515f653d2f42c7a271fb2eeb0c SHA512 b1ff62fc65dac095d165ce82e8ff39b4a34331d136dc31e02453e8c546cc396237badbecd96e6e344e3a14ac2c34238440acab735efeeac02b50674e9b42b9fc
-MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
+EBUILD revelation-0.4.14-r3.ebuild 1072 BLAKE2B a0411524eed3e218ed385323826e86e9b4e113d93fa3158b3be3412770b772ee92e0d0b11781ab13517a7cefab84c79c9eebf9ec52c6482a617dcb8778868315 SHA512 f1dd8e89467500de3c40399f0de4af478ec0572d58210a992e63ed0ce224383554d45fba20840ac655da6c38c8ebc946758d07da7b836ae0de655f5f70892049
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/x11-misc/revelation/metadata.xml b/x11-misc/revelation/metadata.xml
index 8bf69628e798..1b2becffa26c 100644
--- a/x11-misc/revelation/metadata.xml
+++ b/x11-misc/revelation/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>graaff@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/x11-misc/revelation/revelation-0.4.14-r1.ebuild b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
deleted file mode 100644
index fa6097d412eb..000000000000
--- a/x11-misc/revelation/revelation-0.4.14-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-GCONF_DEBUG="no"
-
-inherit python-single-r1 gnome2
-
-DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="https://revelation.olasagasti.info/"
-SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-libs/cracklib[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	gnome2_src_configure \
-		--without-applet \
-		--disable-desktop-update \
-		--disable-mime-update
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/x11-misc/revelation/revelation-0.4.14-r2.ebuild b/x11-misc/revelation/revelation-0.4.14-r2.ebuild
deleted file mode 100644
index 3c4415d8beb2..000000000000
--- a/x11-misc/revelation/revelation-0.4.14-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 gnome2
-
-DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="https://revelation.olasagasti.info/"
-SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/libgnome-python[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	sys-libs/cracklib[python,${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-random.patch" \
-		   "${FILESDIR}/${P}-xor.patch"
-	eapply_user
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--without-applet \
-		--disable-desktop-update \
-		--disable-mime-update
-}
-
-src_install() {
-	gnome2_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/x11-misc/revelation/revelation-0.4.14-r3.ebuild b/x11-misc/revelation/revelation-0.4.14-r3.ebuild
index 268f3053c26c..8c636fe6e57d 100644
--- a/x11-misc/revelation/revelation-0.4.14-r3.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 95819a932378..c57f15ad6dfa 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,6 +1,8 @@
 AUX xautolock-2.2_p5_p1-waitpid.patch 777 BLAKE2B 82031ddb959208db99472a72db6c1e8079a0f22ac91084742ed93df51b27e42fcabce36009f811f5d456e6ff803a08c75651ef7fbb9eab4248d79d3e09f8cb27 SHA512 4ac7fee35265c996a6bc82e3895d69e702b33e164f904da3dd022ce0f591b721c8e74493a53633695f66e332464a63007548fd24181b00b7dcd4228475355411
 DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
 DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
+DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
 EBUILD xautolock-2.2_p5_p1-r1.ebuild 1239 BLAKE2B b1121134e2e9e4da0397ec4a01e321664faf086410a96f0d5f73c04a3a924fab4ab9e037ecaf2cb0d27b5fa50667fc7a16369f2df17e4f146a71508d06c15339 SHA512 fa6f130ffc11cd59ff0b81d1de4835fa5f37c9a5fd33fe9d6697da23dd14c66f6641b227ac346b4f494f410c8f1d0e5a19510fa3da975b320dff235d0e28248b
 EBUILD xautolock-2.2_p5_p1.ebuild 1377 BLAKE2B 57065aa8645601ef4047d84633226029a324fbfe057ca231db535169c8726c74ad47dacdf894bfba558d374c209b55c5eea51eddd0448cedead839a280ec8099 SHA512 4f2acd15acfb25139ae95d12e5755909364a0b6c60e83d1c7266ba46406f64ad19d03db775b9890dd5b786545db9c0871c98ac05c4f678c1bac06dd7817eb11e
+EBUILD xautolock-2.2_p5_p2.ebuild 989 BLAKE2B 64899b781cb5771b5545b06de677c208b6938329cefc8f263668c9100240ac3012a705654a822eb38a3d5af263943d6021938f76f21d110e935938b3923b3056 SHA512 60425c76f8c41d9765d5b49f09bb97e1ee57b61d425586b96e268a84ab43f15ff514bd20518f75a0d8a0d4d70e4b399d8afcf00a6290a850d4e4d032f8c4f7f8
 MISC metadata.xml 637 BLAKE2B d1b4ecdd6eda1ba1db1550aa7187e1cd90b6093fd257600b4b3506ffb560946ceefe52bedd4364c0506be586daeebbdb1467197047db7a72f23aee9f41680e64 SHA512 62dcaa38a5e6ed4b9f020379fedb6d59f87628ea036b74acb73f600b89d0eab640548c18b104306df3d56c055ce39adbadf49683eaa46ece7ca26c79539c32d9
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
new file mode 100644
index 000000000000..4a586f59b320
--- /dev/null
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs
+
+DESCRIPTION="An automatic X screen-locker/screen-saver"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
+
+DEB_REV_MAJ="$(ver_cut 4)"
+DEB_REV_MIN="$(ver_cut 6)"
+DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
+SRC_URI="
+	${HOMEPAGE}/${P/_p*/}.tgz
+	mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
+"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND="
+	x11-libs/libXScrnSaver
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
+	x11-misc/imake
+"
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	eapply "${WORKDIR}"/debian/patches/*.patch
+	default
+}
+
+src_configure() {
+	xmkmf || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}"
+}
+
+src_install () {
+	dobin xautolock
+	newman xautolock.man xautolock.1
+	dodoc Changelog Readme Todo
+}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 53978f46cc28..a6e35aa5f65e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,7 +1,4 @@
-AUX xdg-utils-1.1.1-ktraderclient5.patch 1542 BLAKE2B 4b6adf3d181f1a7869c14d475cf156ed5952d2995243086f276aa3dace6382ba55a47cc83bf4b06da60d1363ef5fa4b815adf159b682629cb87dc4030211fae2 SHA512 a9c1def45928026cbc460527862c73e78074e924fdf088c20afeda74c64103c42f9c551123bee3e627f0d41be632c4f4d250722719a33de20c88085d1d712b4d
 AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bfe38d70e5b1d1f792c20ea4de166096137d0c393a38b4958e1044aa2a6afd4437b9e4eb40d1223ea6b7dd905e93e0499a88478a3 SHA512 fd30975e48a3a7607a812bcc87d5a9595875695693609d477acbe9826a52c53b14c66a4118888eb6d8fcb63630c5f614250f4c8640d1ea99710b26714920c019
-DIST xdg-utils-1.1.1.tar.gz 295213 BLAKE2B c52bf6bb4d5e2cd2848b17dc4f478debe1d9d399a02f014d0507ed26330ce47ac77c047919fabffff06c3cc773fab6bd4744bcdd9338e0726aca8e690bb76c0a SHA512 6641b17daea7eecfee0d395e621dc42481582e505bff90a6df5eb0299ed2dca7a76520f000d9545a8424f06d41590382156a2e50f3d68d5c1ab825c268e90edb
 DIST xdg-utils-1.1.3.tar.gz 297170 BLAKE2B bd281df73d8c966d11b502dd7ec88d96dbc9683503f54b043ae4842f146b6847bd3dd6902cf993771848d9fcb55d26d67f032af2b8aa0795a6d9855535e57d5b SHA512 d1f819a211eb4104a90dfdc6fedcb640fd46b15ccfc8762266f8f538c49d74cb00027b8c1af991fb2a200acb4379986ae375700e06a2aa08fb41a38f883acb3e
-EBUILD xdg-utils-1.1.1-r1.ebuild 2171 BLAKE2B 7cfc35a2ac8a295244175603d699ae43ba2639adc26b875d9c733b2dec92588343ad5dbbc27fa7c034c363adbaf493827d304522155ee7ee5b117286e8fb6f9d SHA512 11a948c25c986dba7be2c46a2a6e55cd7bd1cc0a80d20e5340604d00426b10943f927f486d4b6c4f5f0148a565736498c5cac2607b265b87b6857da0f78da2fa
-EBUILD xdg-utils-1.1.3-r1.ebuild 2137 BLAKE2B 5bb2f64c50ddc0e142741b13fb5946b47da89c2812ce2cdc1840d1f7880fcf63140b8495b0fab1a77e5edbb174226c31bbaa1d0a090ae25558ee695746eac87a SHA512 27b4905740c6b3fde87355f1f75e79c2c5ae033df88c312f2609af672a0f9cd1e255f65af15d04d8329874821bfcaa48f68c6a61f8f87f2a42d3e2a26eae3548
+EBUILD xdg-utils-1.1.3-r1.ebuild 2157 BLAKE2B fe36df854985cc47bcf5c637bef41c4233edbe3345892ee77fea4638f3dc29dc88a590cd53b0ae668d9dea2cb5a48d3231f448ba55cc6119a533c1c383ec3b82 SHA512 32f9d27d6c6cbfcd34afe52bbe782c4dc2338b2643ff1dfa11f5b772340511191947f748993eb22692787407c2b92326e0e07f61ce35483e5dda271a5b46d912
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
deleted file mode 100644
index eee4684c17c4..000000000000
--- a/x11-misc/xdg-utils/files/xdg-utils-1.1.1-ktraderclient5.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 31db8136bdf61e7f9cb866f9d47c99c63343558d Mon Sep 17 00:00:00 2001
-From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-Date: Fri, 15 Apr 2016 11:17:37 +0200
-Subject: xdg-mime: support for KDE Frameworks 5.6
-
-
-diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
-index 129850f..63b8a82 100644
---- a/scripts/xdg-mime.in
-+++ b/scripts/xdg-mime.in
-@@ -428,13 +428,9 @@ defapp_kde()
-       case "${KDE_SESSION_VERSION}" in
-         4)
-           KTRADER=`which ktraderclient 2> /dev/null`
--          MIMETYPE="--mimetype"
--          SERVICETYPE="--servicetype"
-         ;;
-         5)
-           KTRADER=`which ktraderclient${KDE_SESSION_VERSION} 2> /dev/null`
--          MIMETYPE="--mimetype"
--          SERVICETYPE="--servicetype"
-         ;;
-       esac
-     else
-@@ -442,8 +438,8 @@ defapp_kde()
-     fi
-     if [ -n "$KTRADER" ] ; then
-         DEBUG 1 "Running KDE trader query \"$MIME\" mimetype and \"Application\" servicetype"
--        trader_result=`$KTRADER $MIMETYPE "$MIME" $SERVICETYPE Application 2>/dev/null \
--            | grep DesktopEntryPath | head -n 1 | cut -d ':' -f 2 | cut -d \' -f 2`
-+        trader_result=`$KTRADER --mimetype "$MIME" --servicetype Application 2>/dev/null \
-+            | grep -E "^DesktopEntryPath : |\.desktop$" | head -n1 | sed "s/^DesktopEntryPath : '\(.*\.desktop\)'\$/\1/"`
-         if [ -n "$trader_result" ] ; then
-             basename "$trader_result"
-             exit_success
-@@ -954,4 +950,3 @@ esac
- update_mime_database $xdg_base_dir
- 
- exit_success
--
--- 
-cgit v0.10.2
-
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
deleted file mode 100644
index ddf9215344fc..000000000000
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-MY_P=${P/_/-}
-
-DESCRIPTION="Portland utils for cross-platform/cross-toolkit/cross-desktop interoperability"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-utils/"
-#SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
-#SRC_URI="https://people.freedesktop.org/~rdieter/${PN}/${MY_P}.tar.gz
-#	https://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.xz"
-SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="doc +perl"
-
-RDEPEND="dev-util/desktop-file-utils
-	x11-misc/shared-mime-info
-	x11-apps/xprop
-	x11-apps/xset
-	perl? ( dev-perl/File-MimeInfo )"
-DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
-
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
-
-PATCHES=( "${FILESDIR}/${P}-ktraderclient5.patch" )
-
-RESTRICT="test" # Disabled because of sandbox violation(s)
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-	# If you choose to do git snapshot instead of patchset, you need to remember
-	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
-	# all the files
-	if [[ -d ${WORKDIR}/patch ]]; then
-		EPATCH_SUFFIX=patch EPATCH_FORCE=yes epatch
-	fi
-	eautoreconf
-	pushd scripts && make scripts-clean && popd
-}
-
-src_configure() {
-	export ac_cv_path_XMLTO="$(type -P xmlto) --skip-validation" #502166
-	default
-}
-
-src_install() {
-	default
-
-	newdoc scripts/xsl/README README.xsl
-	use doc && dodoc -r scripts/html
-
-	# Install default XDG_DATA_DIRS, bug #264647
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/local/share\" > 30xdg-data-local
-	echo 'COLON_SEPARATED="XDG_DATA_DIRS XDG_CONFIG_DIRS"' >> 30xdg-data-local
-	doenvd 30xdg-data-local
-
-	echo XDG_DATA_DIRS=\"${EPREFIX}/usr/share\" > 90xdg-data-base
-	echo XDG_CONFIG_DIRS=\"${EPREFIX}/etc/xdg\" >> 90xdg-data-base
-	doenvd 90xdg-data-base
-}
-
-pkg_postinst() {
-	[[ -x $(type -P gtk-update-icon-cache) ]] || elog "Install dev-util/gtk-update-icon-cache for the gtk-update-icon-cache command."
-}
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index b4745c6017ae..9dc2cd3e4b6c 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris"
 IUSE="doc"
 
 RDEPEND="
@@ -30,7 +30,7 @@ RDEPEND="
 "
 DEPEND=">=app-text/xmlto-0.0.26-r1[text(+)]"
 
-DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
+DOCS=( ChangeLog README RELEASE_NOTES TODO )
 
 RESTRICT="test" # Disabled because of sandbox violation(s)
 
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index c51f0c7004b1..2722ae1d8e5f 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.27.tar.bz2 1664454 BLAKE2B ac5e02903f46579a1df0423c01d2c07412642d00a5e73b05c0d112e4a65163c20c2df762438775afc52445eed47025c8e061fa0945140245679b693d740e904c SHA512 ae29177461f9d2c6ce1c56c0b8b147600e3f0ecd15e8754c9531811702d9a030a31f42679a88a9fb706bec458974c337ee2a0180f22573702caa7184eb94017e
+DIST xkeyboard-config-2.28.tar.bz2 1682987 BLAKE2B 8883787119bb46e4351d4023aee0f1a495b6acc87755b408ffa51d5082f84f4b1a083a8a0ee640b00afd35777bc8e8e0ef2187cd0bbb2600db81da8fef19298f SHA512 be38e61a7d3a1c03f9dc92fed5aada65fdb8b42272e874e01156a39de07f2a7c81846e9ba449aeb95661587f8d05217d549a1315ee0dd92facbb6158362e68ae
 EBUILD xkeyboard-config-2.27.ebuild 1257 BLAKE2B 82ff338d351e3e91999ed7717d7dee92098d9306f6d6722c75fcd0dc4c047f01f48fe0c0685117ecaff9b13cf03efb878a05b1bb8df4039475d8739e960ae679 SHA512 c8fe092fe39b8889cb1fcde3e612d669f01dff3397e7c384a12c428170a7c1ea64f900f803db48d4012b5b918df9efe109a88ba1994524fe12effe37ba073a5a
+EBUILD xkeyboard-config-2.28.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
 EBUILD xkeyboard-config-9999.ebuild 1268 BLAKE2B b3cf4dac632e36c230bb384c245785483b253e773e04b0bdb46aa6b2414ff465d854dda76a180c997b4b25fa04657424f1e322f7da1d5b7a2b38a42ee0cf4dcb SHA512 510a440ad821c65813f9ba1904d2cd0615a595c1c8ddb4b0f3a7812bfd7869eb81646aba3eb9233c4b8cd4ba48b81af2675fd818190d805f281b417fa631d87d
 MISC metadata.xml 337 BLAKE2B ab0893146e71b0d96879e7ec41c7c4e057cb92570227daef015b6fa1a24c55709cd3d19e16df5afe80f706995e12a44a9fc29826a552bd436b1e9381e44acde5 SHA512 6a43f86407638d3f156d4ae64caee882878dbd1ee7c23991c8f378d55cfb0afe016202866f95c328d8b4e59186efa6a7cb7335a1c86e3fbdda4c16a96e175cf0
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
new file mode 100644
index 000000000000..d2d56f95cc31
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.28.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit autotools git-r3
+	# x11-misc/util-macros only required on live ebuilds
+	LIVE_DEPEND=">=x11-misc/util-macros-1.18"
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	!<x11-apps/xkbcomp-1.2.3
+	!<x11-libs/libX11-1.4.3
+"
+DEPEND="
+	${LIVE_DEPEND}
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local econfargs=(
+		--with-xkb-base="${EPREFIX}/usr/share/X11/xkb"
+		--enable-compat-rules
+		# do not check for runtime deps
+		--disable-runtime-deps
+		--with-xkb-rules-symlink=xorg
+	)
+
+	econf "${econfargs[@]}"
+}
diff --git a/x11-misc/xnots/Manifest b/x11-misc/xnots/Manifest
index 95752a549820..c559e691b720 100644
--- a/x11-misc/xnots/Manifest
+++ b/x11-misc/xnots/Manifest
@@ -1,6 +1,5 @@
-AUX xnots-0.2.1-gcc6.patch 1341 BLAKE2B 0dd960662c8cd114d29c2f3b60850a884c6e909fc2055ad8f3e671269d4e90f26565046dacfa0bad1ad0ca7229297d377a2f5b8293a5de9d0962543b4728abf9 SHA512 3d7e976f93e1a67234bcaa55dfbfe980e9e5ba95f2d8c43c29ce9ef003bf93f7924218cee45892292f11db6e6af51879e37f4aeb4a20f946fb0c73dd8d95ded7
+AUX xnots-0.2.1-gcc6.patch 1134 BLAKE2B f169cdd6236c4f068aa2661c3d937d5d97035572a4e09322531f3ab3eefd2b2dc8f4f7b529973c342dad8bb80817bb7c2888c038cf1f2c4faf8f4bd926d2ff6c SHA512 236afd11f535ae142f380926ce0c8c7a6ff299ae1718b3a946aedb7daf63da949cfd282d8f4c87975ac4ac77ef7493296e95e51a49e0adc796d8a39ed5dce7a6
 DIST xnots-0.2.1.tar.gz 41442 BLAKE2B 26579cfb5508ed1e956b027c769c9c0924870867428cdf5b569e571fce57777267f0523a9ceebabe7f2c705c7b6a34549a122d162cb547e44d8489708fb9e83c SHA512 bb1a334150aac932839c8d9e04d8c9f1c419f5221a218fbbe3523060fbb8d62e616f89ec06a8237fa290de37db103e98a560953ef820ef016f35dd5c844eb65c
-EBUILD xnots-0.2.1-r1.ebuild 945 BLAKE2B 3a6de3e865466f62b90fbf36c890dc4cdc267055116ab66cc2db11b7baefb62e417835a8a34a1c8b9e3d52409a8dd6e275c39aced90e7e984fee1e7fd69e9e9c SHA512 a09ada148a66adf4b9c2e74d520e9023f99e1a3202e478bb95b2d55ae2326de9d459a47605970a6026d38f2ae4fa177a032c24e218a9866dadcec6c76bc169a9
-EBUILD xnots-0.2.1-r2.ebuild 1008 BLAKE2B f8c1a01680373e647401a5f227db0bca49470054d18da55527bbbe93cd3506361e55d16b19e5aaf4db13f2c9b5bfccf3c5d0b227bc131ac952806ff55aa09467 SHA512 8f9a0bf4dea5c2c63ae1424cc61d0a857da9e538a2465936c45ed4f94ac6893a1483fdcf4c037be794c0d8f05ec7d4641cc38d349eafff4215d7fbc29e7412ce
+EBUILD xnots-0.2.1-r2.ebuild 1003 BLAKE2B 51e9e4a85bb183f634f50e5a2a340f006ff05fb8a1c9941041295a5e9a0b791c3e8caf7a7ae9b39e3780bf4b943dcf48e60efdfd94bc6692874c99d2eba8e093 SHA512 533815f7dd9896083a2f535857d23c10f20325a3c8cc068e3fc429b70ae502386ae500fccbc4a286a7a2e8b02dfe441a326655c9be9eba31556796d4b1c9459f
 EBUILD xnots-9999.ebuild 948 BLAKE2B 7a7183891ab4b05a031b395ceb60e853eaa13d3235ebd0fdee2d4a6dacdf0d8dfdff10319278954fda63031872ca8e37c1b7e485fb7115cb9e2432986c495aaf SHA512 854cfbd3b99291da2fecc789f3f07f37cdc56b2e367020fac9367c1c843f5087db9bac2c71c15dab520815f24988b90af0063f830849a667fbd7f15854ac76c5
 MISC metadata.xml 410 BLAKE2B 1cfb5af15dcb1f596fc9eff076b7e4bce5af2d328f1f1040167117162b0ddfa4b1aca2a6bc30fdd54732f998ffebe6f51dd042f04e8a6e211bd115d3d3325bdd SHA512 fc75f0e956d59b3231440882242a1c9ef59f3e694c3c0ed16673cdb99aa92b58d94679d6b3385c373e8aa7bbf7b1ced73ed50ca26be76ebf54a72341c284bdbf
diff --git a/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch b/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
index df65f009cdb7..e3d14000402f 100644
--- a/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
+++ b/x11-misc/xnots/files/xnots-0.2.1-gcc6.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile b/src/Makefile
-index 4f8aaf1..7b527a6 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -28,7 +28,7 @@ else
@@ -11,8 +9,6 @@ index 4f8aaf1..7b527a6 100644
  CFLAGS		+= -DVERSION=\"$(VERSION)\" -Wall
  CFLAGS		+= $(shell pkg-config $(PKGS) --cflags)
  LDLIBS		+= $(shell pkg-config $(PKGS) --libs)
-diff --git a/src/main.c b/src/main.c
-index aef54d6..f1571f3 100644
 --- a/src/main.c
 +++ b/src/main.c
 @@ -228,7 +228,6 @@ processOptions( int argc, char **argv )
@@ -32,8 +28,6 @@ index aef54d6..f1571f3 100644
  				    config_file);
  
      /* Initialize  the global xnots_t structure. */
-diff --git a/src/xnots.h b/src/xnots.h
-index 52316fe..6b9f577 100644
 --- a/src/xnots.h
 +++ b/src/xnots.h
 @@ -330,6 +330,7 @@ void		correctNoteGeometry	( Note		*note,
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
deleted file mode 100644
index f177612e4c75..000000000000
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="A desktop sticky note program for the unix geek"
-HOMEPAGE="http://xnots.sourceforge.net https://github.com/thePalindrome/xnots"
-SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="vim-syntax"
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/pango[X]
-"
-
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	sed -i -e 's|LICENCE||g' Makefile || die
-
-	append-cflags -std=gnu89
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" NO_DEBUG=1
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir=/usr/share/doc/${PF} \
-		mandir=/usr/share/man \
-		prefix=/usr \
-		install
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins etc/xnots.vim
-	fi
-}
diff --git a/x11-misc/xnots/xnots-0.2.1-r2.ebuild b/x11-misc/xnots/xnots-0.2.1-r2.ebuild
index c92abc690cd7..4037d3a8f0b6 100644
--- a/x11-misc/xnots/xnots-0.2.1-r2.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r2.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xnots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="vim-syntax"
 
 RDEPEND="
diff --git a/x11-misc/xsri/Manifest b/x11-misc/xsri/Manifest
index 646a7058c620..376acad7a514 100644
--- a/x11-misc/xsri/Manifest
+++ b/x11-misc/xsri/Manifest
@@ -1,4 +1,5 @@
-AUX xsri-2.1.0-configure.patch 580 BLAKE2B 0f740d5c3ba8ab5ba004a75b6dc075a56413707bcbdebbc06d44b322add7b49e4b509e63695719623dd64c0c311447a8c10f3fa5bbc4ab85ec9a8652b31be8f8 SHA512 147d6b7eed2dc6805551603410c33acea38d1b0d7630d3aca0d783b880d19cf341f9a994b58fb6910f409e380163b2e12687f41e634cdbde4634f3a31eca5bb5
+AUX xsri-2.1.0-configure.patch 594 BLAKE2B 54f196a42d0c65abc6cb97726b2051716f9e2a39ebb124b27858bb0e021ed128402658dd92d70920fed05d18a9e9b485bc7702bc39f7233170e92e788fd08977 SHA512 2a6c86a1420cf05c123906412ee15b0ff6785578a162522df744f226612188f87b77294cc0792d170a0337f91a81e1c7130a24a8eb34ca534bfd4309f6297ec3
 DIST xsri-2.1.0-17.fc12.src.rpm 79266 BLAKE2B 56f269aae035961bb84637ed2fa282f91b3596f66b9e9aaee59ef1ef1b88da22f763a47815676e1e14c3812c410eadf145206f89facb4596db42a3948e7d6ebe SHA512 1e0948b4f03eef797fdef63732f592ebaa3aeff7010941c2df9ae0a3656a9c477adad48c72cf59531227f2427330cca13ae09c5c60739ec66411dcce10f44ee9
 EBUILD xsri-2.1.0-r3.ebuild 633 BLAKE2B 2d1173121c13b025a8fb014d0d2a89b4d0f6029e5a62f9b0208c98eaae2fbda89541204f0e6c62f57ee0496926ef46987c30f71ebbdbc96978a8567f68767e95 SHA512 bd7f0164b69907f6936c7ef4a612a3b08eebc9c230bdc74e57a4467d2574affb7640ba0860f3f8fbc124e791ee0fd72c8723abb405de7c6b5b7d8efea42b54a2
+EBUILD xsri-2.1.0_p17_p12.ebuild 818 BLAKE2B 8e2d0a6b547074efbdf9b9ceb8271c25318daeea8999265caa12f3749eb73c9bd5661f936eafe490c52a4230d8766504228b7e0b8ef8b16aa55c244992e33894 SHA512 afe4eecde8b2caa6927de89d914bde60b35546451bb6c171bc2e715f00d49b532859cc57f248636d52e887b5b0a5be66cd1f6cdfed6be7375dd90e7ad975b9d9
 MISC metadata.xml 272 BLAKE2B 4dbd2b5ae92564a97b2a06ab0ec6562e8dce2dd636aaf0788ee09f8688ca5d5b6483084a65366dfbe6d144d30170e5558bc5759adecb96abb405ea96a5147285 SHA512 ebe67da08587903b5b82fc194aa3c8f1ab65371f60d2c134928362e089550d9e9fd9531bffe8b676a345b5bf0ab209ce7f50d37d98201a88176f002e17582493
diff --git a/x11-misc/xsri/files/xsri-2.1.0-configure.patch b/x11-misc/xsri/files/xsri-2.1.0-configure.patch
index c000e7091092..d7a92f9c9fb2 100644
--- a/x11-misc/xsri/files/xsri-2.1.0-configure.patch
+++ b/x11-misc/xsri/files/xsri-2.1.0-configure.patch
@@ -16,7 +16,7 @@
  dnl library checks (not using macros/ directory)
  
 -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 1.3.13,,
-+PKG_CHECK_MODULES(GTK, x11  gtk+-2.0 >= 1.3.13,,
++PKG_CHECK_MODULES(GTK, x11 gtk+-2.0 >= 1.3.13 gdk-pixbuf-2.0,,
      AC_MSG_ERROR([*** GTK+-2.0 must be installed to compile xsri]))
  
 +AC_CHECK_LIB(m, sqrt)
diff --git a/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild b/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild
new file mode 100644
index 000000000000..c72349d5799a
--- /dev/null
+++ b/x11-misc/xsri/xsri-2.1.0_p17_p12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils rpm
+
+DESCRIPTION="The xsri wallpaper setter from RedHat"
+HOMEPAGE="https://fedoraproject.org"
+SRC_URI="
+	https://download.fedoraproject.org/pub/fedora/linux/releases/$(ver_cut 7)/Everything/source/SRPMS/${P/_p*/}-$(ver_cut 5).fc$(ver_cut 7).src.rpm
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*/}-configure.patch
+)
+S=${WORKDIR}/${P/_p*/}
+DOCS=( AUTHORS ChangeLog README )
+
+src_unpack() {
+	rpm_unpack
+	unpack "${WORKDIR}"/${P/_p*/}.tar.gz
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_install() {
+	default
+	doman ../${PN}.1
+}
diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index 2567357be730..6178558fa4b8 100644
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -8,5 +8,6 @@ AUX svg-appdefaults.patch 777 BLAKE2B 5fb362d421569377f907a07446b437270e01b75acb
 AUX svg-flags.patch 7143 BLAKE2B bb05bf9e8ad16983dd82670283c7c8a7915f358556eebd065b7a70b66c54b6c9ec37475f192bdd49c7734d5fc84c15939512b7f484667cf3dcd49aa2fc6a94e1 SHA512 e2d6bc62dc75d664007e4cb1d192ce4366ef9c859606e3ff4481d56bc8d0deeca32fa5727cab127bda832b5172ce7e33d5c2039463c9bc46df0679c24dd14ecd
 DIST xxkb-1.11.1-src.tar.gz 38123 BLAKE2B eb7cce9a6e64cdcf1a75e375f81f43edd312f443294959fe7b169e5bad1fa107a2e8294edc3b13f1022055027fdae8d52aa5fddef57bbb9f283a63e369b93de6 SHA512 081629ccee41016cd468bd411c8584298bf64d4d791bf803490f6286a330401b933f895fbff2f4a6d1fcfe86c0490267f86d334436c1cea743ad08d97b26038f
 DIST xxkb-flags.tar.bz2 2541 BLAKE2B cb8d181ea21dc29881450b2a12e381c72e98f70c225b25db53b183337436d30e300b34d983b060a8618b927afc7a43d10a015f841d4fba663a9856238904bff4 SHA512 c75929bf78a8aa84ffb615c85c2ad70110a9f7b0465891651a57e4772eae5e0ded61d10197f430f9cdd0cf707903af3d0af4250ff1743fdd59d9ff19bc0c33a9
+EBUILD xxkb-1.11.1-r1.ebuild 1582 BLAKE2B 3f8bfaf93f73ffe8ce9ae6abb654ac5fdf4922bb26bfe4286ddc53fcb22fa7c3aafaf3ad76e73a8ba3d120bd0a625f271f60e50dfc9bedee9634e7e06ee16e13 SHA512 ad4bc6f8a1371abe4deb4ae5c5395705259f05cb907c50c37c7c4fc2f32e8aa4e29e3799392fabc6a6837e253c6fec8726ed2ade2c1d968dfa6456ddb59f985b
 EBUILD xxkb-1.11.1.ebuild 1542 BLAKE2B af8a2aafabbd0087e7b0981c27bcfe06a3eeebadc645672fa88bc3da6d47d8dba49f320b0e9de0e03d75bce8e846019b41fc52080b92ee9a340b47eac4ac8955 SHA512 e1601cb58f20c623717f8f16e7cf4b49521d22b9816359f8a2be7e77ee9e6e402e7ae7f75a66046ff7275b667c1649336ac348ebcd10c7a93019701540320886
 MISC metadata.xml 350 BLAKE2B e482660157076064a3b6b3b70613bc6c1ace83e27e46fd0152794de353617c7f357d6d01bb2b9c0b3cd4d52c0855bd9651474bdaaa10c1e530b26f3e4b27df4a SHA512 0261ca73c33500566a7d6763654df4f6db22c29dab3fbebb781ba63a082bb2dbcff454afc3bbe1a72b19563a34516ed8670f72853e15634dcbac4d7a728957fb
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
new file mode 100644
index 000000000000..3cc40778ed9f
--- /dev/null
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib toolchain-funcs
+
+DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
+HOMEPAGE="https://sourceforge.net/projects/xxkb/"
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}-src.tar.gz
+	svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
+"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="svg"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt
+	svg? (
+		dev-libs/glib:2
+		gnome-base/librsvg:2
+		x11-libs/gtk+:2
+	)
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	svg? ( virtual/pkgconfig )
+	x11-misc/imake
+"
+
+src_prepare() {
+	if use svg; then
+		mv "${WORKDIR}"/flags . || die
+		eapply "${FILESDIR}"/svg-flags.patch
+		eapply "${FILESDIR}"/svg-appdefaults.patch
+	fi
+
+	eapply "${FILESDIR}"/missing_init.patch
+
+	default
+}
+
+src_configure() {
+	xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LIBRARIES="-lXext" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		PIXMAPDIR=/usr/share/xxkb \
+		PROJECTROOT=/usr
+}
+
+src_install() {
+	local myopts
+	if use svg; then
+		myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
+		flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
+	else
+		myopts="FOOBAR=buzz"
+	fi
+
+	emake "${myopts}"  DESTDIR="${D}" install
+	rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
+
+	emake DESTDIR="${D}" install.man
+
+	insinto /usr/share/xxkb
+	use svg || doins "${FILESDIR}"/*.xpm
+	dodoc README* CHANGES*
+}