gentoo resync : 07.10.2018

31 files changed, 92 insertions, 466 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 0920669fbcc9..0c1244f75bb6 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/cdm/Manifest b/x11-misc/cdm/Manifest
index 7f82e577afd3..7b0d55f28332 100644
--- a/x11-misc/cdm/Manifest
+++ b/x11-misc/cdm/Manifest
@@ -1,5 +1,5 @@
-DIST cdm-0.6.1_pre20130419.tar.gz 16056 BLAKE2B a92eabbc044b58e751b29bc05073052605b03460fa1aa62f15385c78e3c2ca033f8a25b40c646eed1602f3856e97d8dd6f987ecbc6ba50ad68aad4813725e72b SHA512 638d92c536609b8bf1d08f4be80933e5ff23acfe412ee6b72ff924edbe1e510110b7941caea9b206136ee5a75dddd998275e89c132feba0ed3df26ab1657bf8b
 DIST cdm-0.6.1_pre20180107.tar.gz 16541 BLAKE2B 19b7a8f6ef7541333b96bb3c2d6a9d3b7ce3bffdcf6653a3799d963d3b3bab3fe3553469a9cbf0f493109ad5308c739b25ce9e5801d0904f5d7b6e78b680e2fc SHA512 dc5587debb304636be25afdf60e8328b1eb9b961694813b089df504567f63cfeac6de17df715d589cec597f51044b8c121242ebefbe5bfeccf6aa072b1c03a40
-EBUILD cdm-0.6.1_pre20130419.ebuild 1867 BLAKE2B 1496f15109e6b493c6181493d74b712b8f60c24a09ffe485b08688667be553df4238df089b52db87b16e9e5c5b1837f20a3709dfdefa69c6c344bba66d398e8b SHA512 e8ca7ae97e632a8d8190a5019b373d9bd30c70cc888632071ce05bed16297d5166ea068dac0f97368b44f0c7ce844d065cbc1a361729664f3a42e8353ea01133
+DIST cdm-0.7.tar.gz 16154 BLAKE2B ca240e253ad4ed6b5e634069b98c90c00852fc6d6550ca1f72b3399435264055cfca31f88f6061daa3e2e3445bd1a8ad9f950b44968df4c77d6c8150b2782a34 SHA512 51591b953ec83c06a5a4407c6d6083ac11e7095c7fb22e491ed3d6626217462529d3dd3590c2a256273b3668c7246b13bfd1f2f682f5bd860ca8a34aaca0b6f5
 EBUILD cdm-0.6.1_pre20180107.ebuild 1851 BLAKE2B 6b9fe3ccc497f06c1941401b9246e1a5379be522b8b95d7b235fe3cf5a9cc40115a17797720dc9dc0e0d6dfcc73965a23f3cd4604f1a2ebbe2d103c5008467ee SHA512 ada7bacbae684ad50ae25c4eb92b23ab11c6c0d63e670c440f5b8f52cfe487ec12da1406008c9d3024f32212eee98347ea715417ed82d2fe9282c412a2b872ee
+EBUILD cdm-0.7.ebuild 1865 BLAKE2B d24fc52915b49253327b7f1719621da33e8532ce39aee76c373609cc72185f392e84e62dc623b999532f7979e9e25c65bc3871bd86d8e360987f714af23251b1 SHA512 eeb099553a7395f47d1c9f04a31a57094c79f34b768ccfa6127c5cdd6d373f136ca3c6426a72e0e71c0889e2778ca780ee3caf9d675e68758e5170ebbbd3931e
 MISC metadata.xml 717 BLAKE2B 08ac966702b39c5c912ab82c1115a3eb9166719fe1e87cbd193ba7ba61b8fca81546c86361ad9c5c51ffb7bfbfc283c4e89d250b58925c5d034d8f37d72e1357 SHA512 cfabe6705c7af59ba703ca849a7cddd649cad9c0dbd939c4fb5e2fcc2cd5383f5771f0d259b1259516037c9d8c41bd2b59a86d70109494d7e4a131ce232b5929
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild b/x11-misc/cdm/cdm-0.7.ebuild
index 2544ebcfa1a4..a2ed855b1c53 100644
--- a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
+++ b/x11-misc/cdm/cdm-0.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI="7"
 
 inherit pam eutils
 
 DESCRIPTION="The Console Display Manager"
-HOMEPAGE="https://wiki.archlinux.org/index.php/CDM"
-SRC_URI="https://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
+HOMEPAGE="https://github.com/evertiro/cdm"
+SRC_URI="https://github.com/evertiro/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -15,8 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="pam consolekit"
 REQUIRED_USE="consolekit? ( pam )"
 
-DEPEND="app-shells/bash"
-
+DEPEND=""
 RDEPEND="${DEPEND}
 	dev-util/dialog
 	x11-apps/xdpyinfo
@@ -26,6 +25,7 @@ RDEPEND="${DEPEND}
 	pam? ( virtual/pam )"
 
 src_prepare() {
+	default
 	if ! use consolekit; then
 		sed -e 's@consolekit=yes@consolekit=no@' \
 			-i "${S}/src/cdmrc" || die "Could not turn off consolekit in cdmrc"
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index b644cfdd3c89..42d6dabc038c 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -5,6 +5,6 @@ DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe
 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.1-r1.ebuild 1759 BLAKE2B 73e02d31e97346a014eb288309af245764e490fe37c51e274392435bd36e1c4ac1c56c3ca6ff2c53cae1a2ee1a540c3e8ab9dc6e9c9fb048ddb1bd9b14cd6e28 SHA512 b5c7c28333f7d09b9984e4bc26692919662e5a2e4b66bfc5683c1d8c5ff2e4f7733e9b544e6091f0f903eff993394665df6babdbaa18caea758fd782453e0f33
-EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2089 BLAKE2B 5fef01529195723be45e206b6f1f148d691f52c6b5cdfe385b16ca61ecd594c1072aa5838eed38c9ef5099705af1db35b44fff3f4e55b5b85434b4abc5eb6094 SHA512 7ebd430fae70dd07160fafdd77e72a0ff0c3f4e97544f052d1fa0c76d0cc0e177e3b1eb120cb5a2da1177fbab522ab8c226c94dd35999c05d33b13032e4f706c
+EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2085 BLAKE2B 5b74f1788e563c1b32615df7d1cb37f54cabe2d2e1420df73805e52ce32b31cf228334f7188bc6a0bcd586a47f8d50c1ae49577fa1dc34eb48ff29dc0202a1f0 SHA512 88497f45067513784612497866e0029927116f1fed2c9eb4de09f68e9244411742d45ea0b7b8bc757805d45c2a22b21fee054ad248ad7651b459a55c9afc2628
 EBUILD lightdm-gtk-greeter-2.0.6.ebuild 2070 BLAKE2B b02fa7a18a45fe31a7e94ddef55b037dd0ebaa40513d38b132ce4312a150e797b43fcdc348cddc578628cdc96655916697287166a55568d920b4c9462623da04 SHA512 0a2d0a5dd3af18c833b0e948690d1382828f8178f19df5db36b5b2bad53c6ef35b89d2dc39e0847a31913ea854750037f52c206ecb20ac388aca46864f0ae03f
 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 29d9947b7e8b..d0278ccc4699 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 Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range
 LICENSE="GPL-3 LGPL-3
 	branding? ( CC-BY-3.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
 IUSE="ayatana branding"
 
 COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a52105fbccc8..40729a78002f 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -10,7 +10,7 @@ DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
 EBUILD lightdm-1.18.3-r1.ebuild 3804 BLAKE2B 0a9e0ac82b6b671ebef81433faa82e0b98cb1e38438c86c9a411d41ab2847956ac34396c5201a1c9ed33932a9fd4c19f700aa12411314ec064e7557df485d1c2 SHA512 f84aba34fe5d2fcd7bdafe1b8c787876b5d99a4276b274d698a91af05f4d149e6ba3f794c4d9bdcabb41da528274ac0c2606cb13a88c6c101bc33481d63d1f84
 EBUILD lightdm-1.24.0-r1.ebuild 3769 BLAKE2B cf78459133c836c6702d362a3977f3149d88d7c31aa950799a6cb3cac2480c592f6a953cc3a437939ab0aedfe06ddb0db60493f3b38a2d3ec3bdffc51325a796 SHA512 68d690c0e7a48b0d5e3db8977f2f48f8041cf298beec1d6d65d3f591676bf960cc54d140a65b9a7874f52d00d8954574258ea5d37d103fb724468d1809b2c650
-EBUILD lightdm-1.26.0-r1.ebuild 3867 BLAKE2B c61a27aeb76a85368b47c06bfb02ccc1c90f80f254ac47de7eddd67d492c08014000c2dfae163e12eec4a7d162c7f44028e454604faad12a5bcc7d9ff683755a SHA512 96a3ecfe08c54ea795ab2155902b8b8cb0bd8fa5e0f3e97c76facaec5a293fa6d7897bb806d6d3d5936095bb826688a0d3ff1d43068decad7bca5f82d5208357
+EBUILD lightdm-1.26.0-r1.ebuild 3863 BLAKE2B 3b9b8f07798911884e83c357c0ad96c0f84057f9e77f3c1d183daf41b2f9c82a93260ecb1d6604b6bff42fa7f351cad07f637aeb356f5a2c4ba025c74fa62795 SHA512 3b1c19fec5028778e074170bf0811fc2ec089b0fbf7ab3911bad1813a99151ee7f7a8cddfcbd5c5651b69f9bd36fcc0d235ad48a1068526cc63de80f54eef26e
 EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
 EBUILD lightdm-1.28.0.ebuild 3899 BLAKE2B 8dae4273893bde7f0f6f0818e03f61e40bb5b7896d500e6ec804816e4aa190b2475bb1dfed979e336a010dc6d061505f82f1ba44698a417bd2ccd1ec9e88c340 SHA512 7258bede873fd974a3fe1e63678b518626b656922c0bed6a5a631b7ddf91c3fa996aa66f3139d97ff4bc868408d64305c0fdcef10662f016ef71c45257b9da6b
 MISC metadata.xml 392 BLAKE2B b3c495f83a30fe7dfee0e7f244c8d2d2df1a30fa8e50a071e0d63dbefa15189058d54ea3e881ab953c1cd9cd8dca74c37b0013da56f795422c0d0e9c2a0297bb SHA512 f44fb165a56a51fea1f3c1afddaab69971d9d56249b74eb7bf1263c120581d2e0b699f1f7fa94a9d3da57421b5d6070f03cb10643e3b3713c771f8c992457fa3
diff --git a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
index 4b348398380f..8d4e3781fef1 100644
--- a/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.26.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.ta
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 x86"
 IUSE="audit +gnome +gtk +introspection qt5 vala"
 
 COMMON_DEPEND="
diff --git a/x11-misc/mate-notification-daemon/Manifest b/x11-misc/mate-notification-daemon/Manifest
index b26145e97ae7..903c516e95ff 100644
--- a/x11-misc/mate-notification-daemon/Manifest
+++ b/x11-misc/mate-notification-daemon/Manifest
@@ -1,10 +1,4 @@
 AUX org.freedesktop.Notifications.service 94 BLAKE2B 1a97aac2db9c803c9e4babf9067283b564a1eecb1d251aee3a5e66b8a4f63d2554e3e09ea06749383ce3d5b8e77c8cc3bd87ae2dde48ae8feb4886ecaf7a3c27 SHA512 0575cbfc094455c0a2f04faa534a5e0d9cc41e6d9566ab9bcb0fcbce99e142213ded786ad00c36dc434ae1b9208d34d234a341dfc86adb72925dad0ee2b25f97
-DIST mate-notification-daemon-1.12.1.tar.xz 304752 BLAKE2B 045cb71199f555ebe2b179c36508b73c94fb3b43ebd957298946c06acaa9169ee9aed42444bd74a443a819370c189a5af2e3aa3e72b9fefe8476a5ce28bec9ba SHA512 ce9cd1737cc70b0e17fa856730b51747f78bb40639ff58e205a3f1432edf53aba38442d59b7a4fca6ff460cbdc6c611c0a05a46bbf5db92db0ce5e714e19daae
-DIST mate-notification-daemon-1.14.1.tar.xz 336196 BLAKE2B 68582f5c29e4a92187fd7b1b259350ba6ed783c92853dfb39b63faa58cc316dd9ecc7133710e0ec2555f534f2f61bce65b2bf190d5703d55d01dad550bc17839 SHA512 6913e0a7891726fb2f4098b4c7ba578344d29960e6d27a9fa917687f745aedb9482fb65ea9c6d8816a0c8e505ef586f13ac08b010e558b6557e14e8961b1c1f6
-DIST mate-notification-daemon-1.16.1.tar.xz 337088 BLAKE2B a4ba0ab6e66a7771ec7c7786201a5e5e98cf30111212e57cf15ae03b6a49756503e2e9d68f288497166d3c1ee350a29393247dc3c9ece655775384964fb8fcb5 SHA512 93c9a09801e54f7cd7f3c6542e3593886201bb59a9bca56af7454ff901540ef7fbb236c38786ba9444fe3aaff7598c549c274ce0a90fee27bcf28fc201f64b88
 DIST mate-notification-daemon-1.18.1.tar.xz 330940 BLAKE2B e05d2b69a66037a49cf0a1aa44a417d9fb55fecc1dd713861907b38d0361d6a9d79faa95094027add0d0e549a979eb237e8e71e1e2102664813b7745f34316f3 SHA512 92edb738e38b879a94985d97c961fd900853e330cc49024cf33a1b564734e86c076b47a05c64ec7ea34a170425b97f80aedb60ad14db98718c4609c464e091e4
-EBUILD mate-notification-daemon-1.12.1.ebuild 1142 BLAKE2B dbf150b144dc157b083beceaeaf2228a6b5772be4edb8b64e4428a43e60208d1622f0f6ab7f313de69dab6cf3e1b54acd0ebec8c08cc5cfd557a4f7cb1ba9594 SHA512 a613fd6ca276038f53d29bf26aa0fa69e4f1de1d86b2e50f0a7b95352ef34a864997e298ca5bfb69324bc4613f12a4d265fc55fb05b2d815f08ab57d2c61d5ae
-EBUILD mate-notification-daemon-1.14.1.ebuild 1182 BLAKE2B 73103c6bf7704647238f440be8b8432e2b4352ec042322f7ca9991fcd41f7a08c39d2d668792d06704f0144e730574976e473ab71bd68b763f32350b503bb3e7 SHA512 c1675a178a05379c5c15533290ca4548731c81ac1577b753227742c74b6279641f21d387ad36daa1879dfa38af3e5f8bed1989fb33b7b2203ececc843d29401b
-EBUILD mate-notification-daemon-1.16.1.ebuild 1027 BLAKE2B e3060b0e84f47d6c1dfc66d98c2e8ad86c69d2d60ed7155698c34d07edacf38ed7396c3d33764174535595b8b4687322ba888bb6d2f3ee3a3958f9a6ea6ae414 SHA512 a98ea3dc08effc311f49b0b4fc5f28146829895f9e3cd9e5dcb0bb56934f54d2579f37eb38b0c547386278f7407848b61dc5929a0256326a5fd02b93351e54b1
 EBUILD mate-notification-daemon-1.18.1.ebuild 1032 BLAKE2B 5ebe5bee75855a462c86e3490738dbc92b566700907addf857cf11fb4c259da209e425f93e2a8b58b90ced736eb2f1c861b681b52984c4a22458850637b564a0 SHA512 80c2d4d22ad21388adf2f8aece0af19d927290b2d0f4808cb0d52e35c409a1ed8b7f02da0ad6c7c0ca569a4510f47237b7cda8df3e53c2e82b5e41663daeb9fa
-MISC metadata.xml 429 BLAKE2B e6d7c9c85dee38c96c6160b31931e12284e62c507e35595203b8c8b0c187e9a3605c1b25df14f829f46203977c8a995251cb3b5ae09277c229ab997b99a4b87f SHA512 24f0a76380f18822df9024ebf95fddc8fb944ad6200f70a2f8952a6ab5028466793b3e26cbb4b6dffdbd685ee0ba6c1bbcd76d9d9bff87cac5c697a879ee93ed
+MISC metadata.xml 353 BLAKE2B 774bcae8807bbb16a1ee8bc12320e487ec817fb45d3169f4929cbd8c3f7f33a35eb1aad2682e5d87131567c56e6ffe8f2bdbda612c58926ddc3d78b14cb69e53 SHA512 3f46b4bb5e12fdb448e7b7f54db4f4a4683cbdbd89019156601abf80be0333690b65670fb110120cf613dd42ecdfb38b329ddde67fd265257d6ddb32e24bfbbd
diff --git a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
deleted file mode 100644
index 3ce818bdd6e8..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 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 x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-RDEPEND="
-	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
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libwnck-1:1
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/libwnck-3:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)
-	!x11-misc/notify-osd:*
-	!x11-misc/qtnotifydaemon:*
-	!x11-misc/notification-daemon:*"
-
-DEPEND="${RDEPEND}
-	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 \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
-
-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.14.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
deleted file mode 100644
index f8ba713dc2e2..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 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 ~x86"
-fi
-
-DESCRIPTION="MATE Notification daemon"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3"
-
-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
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/libwnck-1:1
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0: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 \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
-
-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.16.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
deleted file mode 100644
index d83471e84741..000000000000
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 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 ~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/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
index 95b491804603..249738c0cd36 100644
--- a/x11-misc/mate-notification-daemon/metadata.xml
+++ b/x11-misc/mate-notification-daemon/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
 	</upstream>
diff --git a/x11-misc/mozo/Manifest b/x11-misc/mozo/Manifest
index 5ee422c4b483..c05888158a7b 100644
--- a/x11-misc/mozo/Manifest
+++ b/x11-misc/mozo/Manifest
@@ -1,10 +1,3 @@
-DIST mozo-1.12.0-gtk3.patch.bz2 6562 BLAKE2B 1b594ad4f3fbab0534ee90be8b10aa219b836d349031175237863db8f32394f4e387f5114c5fa29c26c1c13d77dd8bc2b8ffa425e6f4e55b49c184cd5a3689d4 SHA512 9f86a77f29fb359fb59092d819634d2223b74c5eb149917b1442589306d989cfb87df2cc8c4f1e36fd086ba57a75274feccb4978cc0156e20cfd73712ea2a48b
-DIST mozo-1.12.0.tar.xz 163820 BLAKE2B 337bf187e9d14fb61750a306314eb5d4a57f4dd187cb7d0fed953fb91907e71a3afa57625cf68d96605dcaf63689305b07de94327e39b38012d9d64835217ec4 SHA512 93e760b791a74b6a6ca0377d5aaa060c8bf339dcfde91fcb146ef1e37cc25912b3c93fa2b4d612c0abf2bbd00597c80b58769bc88b57925ec4c465967f32c05b
-DIST mozo-1.14.1.tar.xz 171576 BLAKE2B b4ca3588e57cadd1ee814045b59b464487265a0eb391288d936d8c2290be2e28ed24e541eabe6a912fe54a238569e0832a62a911d52dc0758db3b7aee3ac3822 SHA512 62269ed358807d7ebcf04e6bcbfd3689f019396ebd43a8634bca752f13d6609e94b97688b5fdfa83b1168f0e1cdf284275dc08054e27ab507ce40c2de881bc76
-DIST mozo-1.16.0.tar.xz 172312 BLAKE2B d1fd10aa32b7619238584ab33637b7bbc6404f5741445f1c09fed2132c69eeb4f2727a43c0cd3d7673bf689e15750739d04dd84c39d5c611016a0401fd48415e SHA512 507a35bbdad944ec55ce81e5193af9e5697747c2fc55817b3e3913aca68f1d99caa75df1d79f3b7abc1ba354a5c4f34c868e054e20cb86e5d0a7d65b463af57a
 DIST mozo-1.18.0.tar.xz 173432 BLAKE2B 46c791b056c3fb8bb768599f4b474cd9434d6918d9deb740e2d65bef5853199822818e02a7cf9b653d3ef49453aff413b09ad92cda218f70db950b19b5f74363 SHA512 e333c572e5bc1d0905daed17eacd3dda10df5f80ed5b5b01ca3478d345a8c724e0161ccf51914f4982f16df71f252a3b08b194bec18e6aee05eb7af021369a12
-EBUILD mozo-1.12.0-r1.ebuild 1585 BLAKE2B 9a8efa5e5e5b8a3607b038b97a0fbc06e12a873c20afe7c795e91480aaa2606b420772e3692eb31169847ff47afb88680460eb3f538c508821a6a19937a4ace0 SHA512 d78543192113d0ee62d7b9942580a6bc9aab9b38fa4b822ed40b037062ed459c675ec3d2d222c2c8455b43bdec5404e192a5a72d5eb7d039d2d2b7dad4de7778
-EBUILD mozo-1.14.1.ebuild 1269 BLAKE2B 7b27dbfef7ba6f4cb6a5f5f22b6a5d962c502203dd69bf413a6db6f22c9fd4df5b78259c00006a805d8c197130dd7b4e6126521c54d5ad7d35e0be0f1223cc9b SHA512 82ca5080f8c219fc826cf2d54fb7563d9755d7a4a50ee1de370dd235c7b9a06e1d830749e177b40189a5d099572c9b7487e1d0724940644ef7ae47d06d2c4bee
-EBUILD mozo-1.16.0-r1.ebuild 1276 BLAKE2B f83da25567034b28429ad8d524d2bc1b8321de0b9e281a7cc9b2964507b68bc71d1a623159b92e7cd199c88faeaf5b17e4d64fa401d3c75ac5aed0dfef021881 SHA512 acbc78914cdb301b86b8cc002c5dee690c8ef24af612356e832e7fef98c69f9f4b41bda83f8d021bc35b13fa68b8e6dab2d300007533c6531973116ac1ce8ffa
 EBUILD mozo-1.18.0.ebuild 1244 BLAKE2B 905b4b829c793d2f92e1dbce3789899dfb453723b40d8583bc1a3d4436c8ca670c70ed477ac6ba239f0116291a2496860215ec3b5e8c6926b4f2cf6e252f3044 SHA512 89c75d5549f13452ca1e642f46aa6011e055fd82a435e9ee027a6a3cad5caba90589dac45e6dddb8e299eea3cd5516aeef4caab3a655c72330dd9f2e234132a6
-MISC metadata.xml 409 BLAKE2B 6f681539e5a6893c65760326ee1f6eecb3b3526da969e9398d36ec5e8bfe5ff540dd700be6b2b491bc8014ef1ba532ed2b0f3924efd80e7f2cbb656938779a95 SHA512 a99cda7183e71decfb25316fc3466140b701878a053a9375213760f0c1b6497b4d772731d60242b421e3283913884939911c561eb9116bb6972e7abcfeb2f1a8
+MISC metadata.xml 333 BLAKE2B 9901ffa7d882f0f741c95670130db70920ebbe94af75b8d9b72f48f8eb1b48d9425b7ff49dafbe001e5287ff3eafd2d60a8760a262ab6601fecc63642e242591 SHA512 eb3bc4b3cf1cfde5f96cd414138790deae0435e8ba41576e1e44b150defd5fdda0b921d4dbb0798b9653ad5aa7690247fb69cd25d03752f8bde8017419596a76
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 6931d558370c..dae74193c803 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/mozo</remote-id>
 	</upstream>
diff --git a/x11-misc/mozo/mozo-1.12.0-r1.ebuild b/x11-misc/mozo/mozo-1.12.0-r1.ebuild
deleted file mode 100644
index 9cf53b815bbd..000000000000
--- a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 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
-
-SRC_URI="${SRC_URI} gtk3? ( https://dev.gentoo.org/~np-hardass/distfiles/${PN}/${P}-gtk3.patch.bz2 )"
-KEYWORDS="amd64 ~arm x86"
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gtk3"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=mate-base/mate-menus-1.6[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	virtual/libintl:0
-	!!x11-misc/mate-menu-editor
-	!gtk3? (
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-		>=mate-base/mate-menus-1.6[python]
-		x11-libs/gtk+:2[introspection]
-	)
-	gtk3? (
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-	)"
-
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	if use gtk3; then
-		eapply "${WORKDIR}/${P}-gtk3.patch"
-		MATE_FORCE_AUTORECONF=true
-	fi
-	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.14.1.ebuild b/x11-misc/mozo/mozo-1.14.1.ebuild
deleted file mode 100644
index 7d024452e8bb..000000000000
--- a/x11-misc/mozo/mozo-1.14.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 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 ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygobject-3:3[${PYTHON_USEDEP}]
-	>=mate-base/mate-menus-1.6[introspection]
-	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.16.0-r1.ebuild b/x11-misc/mozo/mozo-1.16.0-r1.ebuild
deleted file mode 100644
index 8f48007b8fc7..000000000000
--- a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 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 ~x86"
-fi
-
-DESCRIPTION="Mozo menu editor for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-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/polybar/Manifest b/x11-misc/polybar/Manifest
index 3d462c46f179..08102d2adcbb 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -3,4 +3,4 @@ DIST polybar-3.2.1.tar.gz 242327 BLAKE2B eb7bfe6e6d58fb4389016b8e5c73feea3984ce3
 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-9999.ebuild 1187 BLAKE2B b42e5685622509643cd9b8c73c2d119eb0adfc5904c52ddce1b66cb0ae4735e05e46a8e18e98f62ee6f47080c57869704b11fc2af7e593292d9736ee4d533551 SHA512 e548c3f17e6ee4c2f5190d5706d83ca567eb3c2f5c2a8bdda6e9984e6d2ba36b1f38c6052095152ca02958ff2fda7af211ff13e44f1294a0c4c7bf2a998fa5d0
-MISC metadata.xml 500 BLAKE2B b465aaa93414c90da842bba99b5b2c8310107cb3cf1e763fa59f20a3d9a0322f1395caf64bdc2363ab128bd3b9d2b03006af47783dfb444217341e727d2f1d65 SHA512 8a4148eec8d8ea0fd1ca070e98a48db0554fb8efbadc00cae85ea3aabd0a2010bc0c3e9997543cb9587d30be0156e0826228861641a19e85541329ccddccd9c4
+MISC metadata.xml 580 BLAKE2B 965fdbd2a3799e0c8a9b6f03bfb7e21f1f413a226bd4748d860f4711d60bfadc2d6c2fdb37f3bf9933f2c494e7e6e0c0705c9a0ebef943ec2978f3aaf65c0176 SHA512 15b64a04e588b5edeec9aa5e579881c3e7c5a7f3fb66ed4443f32d50b850c437f65bc9050960710f2bb1e80ea52ccca9ecb19e8bf68fe66edddc8896a58aeeb9
diff --git a/x11-misc/polybar/metadata.xml b/x11-misc/polybar/metadata.xml
index 0d096068a332..7a2477b509ec 100644
--- a/x11-misc/polybar/metadata.xml
+++ b/x11-misc/polybar/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 	<use>
 		<flag name="i3wm">Add support for i3 window manager</flag>
 		<flag name="ipc">Add support for Inter-Process Messaging</flag>
diff --git a/x11-misc/shared-mime-info/Manifest b/x11-misc/shared-mime-info/Manifest
index ae7cd88f7007..4f4c5c5e86d1 100644
--- a/x11-misc/shared-mime-info/Manifest
+++ b/x11-misc/shared-mime-info/Manifest
@@ -1,5 +1,5 @@
 DIST shared-mime-info-1.10.tar.xz 616800 BLAKE2B a63c97aba9184e7926db01968aef2a741ef089a46ab9365eb8dad5a78f585f90171751baeaa3bc62ed0a37eed6e93d60598fbe1e7e63168106fc8aa05f2f5cc8 SHA512 efc2b63cae11e6b0332f8607ba57a885dec68a23ac299bbda3eb6e2c7ed071c7c40dba73e9cf23ab675fcaa86ea3777fa931a9f25000a08ec6a748734c88beda
 DIST shared-mime-info-1.9.tar.xz 607648 BLAKE2B 6ac4c0dbe3862be78dc4fb5711ca3c8137ae9dee83752b1811991f44bae0ba83036fb10c598c4a098933df8914a67212db97c8bcfefc80febd2ce3e4673846d7 SHA512 b4ab7bfec4cbc827fe0d459040967afb714c073ad27ec9ad46e51ebc49c56b2a85501a3c8c5c199b4cb5359fc46580d6f2dfdb49da1670216d5d2b56758de491
-EBUILD shared-mime-info-1.10.ebuild 1506 BLAKE2B 0770576b025a2bbf30226124bf9d662f31c92c0148b17d8d99b9ced6a65980855117be98140d5b727422cc77638627d59e37170e9e73efb0aef256320151a8e2 SHA512 174b112cf09e880d193c4b7dcc4bd5d07556256aad0096c4d119d411e6d4226a18565e4dca7d7d93376586248962d50301beaff092a848aa2cb968b3a0746552
+EBUILD shared-mime-info-1.10.ebuild 1499 BLAKE2B 35b714f53be2155c2b52fff34a1433ed03538dfd000a90aa9be84ee11a5449eaaedf5e98178d9e53d071e9a97375d5f28c34bd3d3658baf19e30f6f7b987a351 SHA512 6a01d4bbdaec281003bb7f580d75a7964921c0d3c8250f3adff57dbb8055954c24b2dabb211731a76142363c4c54468060be3519fcc6c2e63bca71205e91e9db
 EBUILD shared-mime-info-1.9.ebuild 1457 BLAKE2B 582d75bcee9c267dc39f7120cd734085a963621e82fa4ba91288420f3390767c03672aca23f1b367aba252f8ae24396be44084f8a90cbb3da213f081de2aad3a SHA512 112646b17c088c2e0f34f8bce8255738ebc5881f404437d2eacb3dc101bf3362b2409a2923dd33ee9198da804d0a4f9b24c052b87499081621131e751f6c8070
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
index 5f1052b62554..95efb722f106 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://people.freedesktop.org/~hadess/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/x11-misc/urxvt-font-size/Manifest b/x11-misc/urxvt-font-size/Manifest
index c9dbf5c5584c..4762a92405a2 100644
--- a/x11-misc/urxvt-font-size/Manifest
+++ b/x11-misc/urxvt-font-size/Manifest
@@ -1,6 +1,6 @@
 DIST urxvt-font-size-1.1.tar.gz 5490 BLAKE2B 5e9388c25a143a41d84511a03c8821058568d2032cfd4f3f9929d66d47273be0d091ec8787485cf2eb02a9a2f4a00160d745b72cf9c2c8c552c2308dd9cc8260 SHA512 923cf79dc11cdfd53bf7f0a5bc909cc80916f9e956f1aadc2cfa609d1c9c33211c0b023f5dca4c56a12acf7d3c70d7229e5a78783d20965964511b5f6ad01b1d
 DIST urxvt-font-size-1.3.tar.gz 6276 BLAKE2B 55d0585d8bd817bb39a0d4336f4627592ae7805c03484a273d4151bd81454fd740ac675649d6ed7643cb78de5d911f2aa3471426ffec8770673096a13999b810 SHA512 546c3cdc1290bac934b36acf74c6148c43385d2cfdd3141afe5a8fe369477cc219d1db5c9d98a53678de4d297fd541d49ebbd702f80f91dd41a11aeab02270e7
 EBUILD urxvt-font-size-1.1.ebuild 674 BLAKE2B b63126a49961d9e16c30ad8a3ce8925b20a1d23f8ebb92bda96961f7f9bb8552e6a68fdbf0294f99e98bd3ec4dc05f1c01be8ac4762a38c2a7d055ec494a64cb SHA512 469e221f2efa870c9fd40621cbbbdfc1195b7e73fbe7d31df123e4900d1ebb51c6a30eb1090765a04960adf9a2352cef46ab19332258544a5289d6bfe10f7af2
-EBUILD urxvt-font-size-1.3.ebuild 676 BLAKE2B 1af18bf3e152c753259cfe1c29463b155c230783d508f89e19ee9f68ce97d24322d90d9a0082f9bbede26b7e850d2ba6de312c62e44b752c995bad66d123164b SHA512 936d1d0cea2b7ed2ecfad24fde158353998f5d2c5792faf15634928dc8010b851330f31899b765d8d8f770becf0edbd018b79a328baff7df265c50e39952e629
+EBUILD urxvt-font-size-1.3.ebuild 671 BLAKE2B 1d3f2b503caeb75d8299cdeb161b035208d82fba9370e6f610333adfc62fc9893c8051879c479c47f8d6b9972a76ca9305cc270829a44a5e5699f79768d57847 SHA512 4565c5e074f4b8e848b95facb9bd9b6a8fbdbc58ac925808a8ceb767b6132e97cf2f5506745c19712c049bc12c1653ac8f6df029da37c3179396ce305e34999b
 EBUILD urxvt-font-size-9999.ebuild 676 BLAKE2B 1af18bf3e152c753259cfe1c29463b155c230783d508f89e19ee9f68ce97d24322d90d9a0082f9bbede26b7e850d2ba6de312c62e44b752c995bad66d123164b SHA512 936d1d0cea2b7ed2ecfad24fde158353998f5d2c5792faf15634928dc8010b851330f31899b765d8d8f770becf0edbd018b79a328baff7df265c50e39952e629
 MISC metadata.xml 337 BLAKE2B e279a1905d82d8a310c26ea83cff2147cc909dac9650a51b48aa1863d7a10573d284d786dc2ae95ae9a95d1c1b4717323ef470341f8ff9dbe4b7a3f65f3b2b28 SHA512 4278134484822c6a8c9a1538301100c0196f3e32b4c172f21fb56af4db4a0d759a5813f7ecbfee23a25fd2b8e4c880a9e2a593135bb4e70c1b4101ea4277b218
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
index 1c2ed2ed18ec..2820f18eea02 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/majutsushi/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="https://github.com/majutsushi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 0e98fb805615..02f116bd98ba 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -1,6 +1,4 @@
 AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12627b5b599cc5b612b6a38dcec45e36b9aa1f4ab2cdc31f29899b278088e61776bff51b5216adbf6c2497370c7966b17a50 SHA512 227b134d0782067f8c8688832036da8cb1afbcda247349db3502867e3f1b1eaa09885f2419762712ab9ce82655d4bb9a7ec17f63afdb9f00be5efcfd895ca7d4
-DIST xdg-user-dirs-0.16.tar.gz 255933 BLAKE2B 827e1ec8265592cc2abe4861945fc0cb32ce777fc951df3a00e4f7e53f53f49e1c57ae242c6d3ff62eacd75ff7965fbb482aa4f8d2b4c2aece3b535e3a83ee47 SHA512 245513d1b16adc970b4a3c0b4a078cdeda62d36b39e4561754d8331e76ee0013a769d8c2e43c94f8b5c378619ee58bca534721a8675ceaeccbb3fdf69cf6f7ae
 DIST xdg-user-dirs-0.17.tar.gz 257291 BLAKE2B 75b44a841b7961977824581dbbc760282fa3a5eed0a5496746ff6e09cabe4dec022d0f6fb129a877d8310c1fb214035f1e917c0e327dd5267bb83c47bbe00d5f SHA512 a02cc251f2d0a8bd0dad498901c8c6fbe8dae0e0e156abcaf27b1ded376a1ed369c2e59201d56ab4e38c9d521026fa39199177f3868c30e5c50cc03665dc335f
-EBUILD xdg-user-dirs-0.16.ebuild 958 BLAKE2B 8bc39473a803fbdc008203ac14d524b3052920a2477dfcbcaa152ffa229712a149f5f4653817482582bd0a69677e49c70ba7ae0d22605e6c483a01d0126f7d0c SHA512 b3bd6a03aa1a11cfb3303cd94c3409d9b4dff9507015a014c60b4e35905d42b3679d1d02d8ad2e31d15bbe80760cd454e0e4f178e56e4eab220faad783398c37
 EBUILD xdg-user-dirs-0.17.ebuild 958 BLAKE2B 9e7803c311d8af146e587079c29655213ed46f77f0f69488f208ad0ff8f786688172c3cd400ae552299bef2a0917301e961862fa1be4883bee82007fd73ab157 SHA512 26b9143f2464459b31bda07c382c341b4fe86f866410dab2bcd9df901149c7788790a14ff027d44ee21b271d026d654f684a8128200808413a68bbd3cce2f301
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
deleted file mode 100644
index 2fe86c80de66..000000000000
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.16.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="A tool to help manage 'well known' user directories"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
-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"
-IUSE="gtk"
-
-RDEPEND=""
-# libxslt is mandatory because 0.15 tarball is broken, re:
-# https://bugs.freedesktop.org/show_bug.cgi?id=66251
-DEPEND="app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	sys-devel/gettext"
-PDEPEND="gtk? ( x11-misc/xdg-user-dirs-gtk )"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-PATCHES=( "${FILESDIR}"/${PN}-0.15-libiconv.patch )
-
-src_prepare() {
-	default
-	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467032
-	eautoreconf # for the above patch
-}
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 3d5e163e245a..3d9168478508 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -3,5 +3,5 @@ AUX xdg-utils-1.1.3-xdg-open-pcmanfm.patch 702 BLAKE2B 1adcb274c1a5fcca4a99178bf
 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 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
-EBUILD xdg-utils-1.1.3-r1.ebuild 2144 BLAKE2B ed0e69e676a9e38fedeedd1a6c49a1d548c8217bc02f953b28e7553cb1ce92a1b96e890ab213eb5c8d129b662bc5658f14352c946ec6950b66351d971d4ebded SHA512 8e640e9c4f7360c74d561ac2724e0d0bef096226c1068ea0a5de9133aab06b0e88602b8212c3cd9b91d848d1aac1c238bdcc058231a09910419c2b57d2a84f19
+EBUILD xdg-utils-1.1.3-r1.ebuild 2138 BLAKE2B 28b572021c43fb8d04a2c27e88599cd2297af917dd72db1df51547c37a8519e56589bf989e8b6616510f8f2ff328ea21a8fe0625c3d2299ceb7063960d0a0f14 SHA512 751d728cc95288d3e9a4ed99f9a4ca4d9e524ccb0929574ca7702dda0c92654daf04c01598b812368597744a438db6a109022acbd9a30e1557de89344a6ada29
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
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 900de2256998..dd9b39c7adb5 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index c7c5589c178f..cf214e2e8efc 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,3 +1,5 @@
 DIST xosview-1.20.tar.gz 146373 BLAKE2B 7d53b5f2f8ce463917a1cfa65eedb60c835c6d530a19ede6bba6bfe295a01582861ca3fb7513b9a8590d9fe5111779a38db8723a2e38c911f002bce88bfc95f6 SHA512 25cd6a8cdaaff9121f0e8de7a1799d4c2706c5eb1111f3b3f8427b16e45a333fb4c675a1dec2ef6b40773e83124ff27eacc82f2b9eb6c836855930cbbf08957a
+DIST xosview-1.21.tar.gz 146428 BLAKE2B 899e0cb68489bd02e035765f8f33424d41996b80a7c16651f60a2e46538cf4eac1a9377342c2ed4f35da6cb00aa3961e34802c77fe26e4743a23e2d3dc443484 SHA512 9c42247d9e9b391b94c18ffc8c38df414f5293b7426aa57d3b357e680b02e9a3a2b332299905f2f529d488c23590e957cad9e088ddf753a6904905e2dff8074b
 EBUILD xosview-1.20-r1.ebuild 1209 BLAKE2B 4dd8a3dc63cd238022db4952abc2970b15de99e3d833221255de4c3c604eba709ed1bc81c398a06ab58fd1170fc9840322ae2d2d337296765230760ca3d97fbb SHA512 e0a95ad65e44bb364b7eaf3f767bc08a4f41f3483e9e5fd9fe67e7d870125bd664b88ef34a91ca9a1ef55410c5a18af40e5fa415b1f3ce85ea3eac40c062d286
+EBUILD xosview-1.21.ebuild 1210 BLAKE2B e2443c9ac1f85d22361ddc93a4dd50eaf92b4132ca37187e4f5716a7091e2bb689681ecb7d814929c4d0ecf3a03c782c98e47d223871a44c3e7b6b54981814d8 SHA512 3dc670f4f16e0513ca0d33686fe6cdaaff4b100006aea2728bddfab4a336a5feb38875c9ec860bc63efffa5af72fa828c78633f80c52728f920cd2356bf0fe05
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xosview/xosview-1.21.ebuild b/x11-misc/xosview/xosview-1.21.ebuild
new file mode 100644
index 000000000000..a88949d99bbb
--- /dev/null
+++ b/x11-misc/xosview/xosview-1.21.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs xdg-utils
+
+DESCRIPTION="X11 operating system viewer"
+HOMEPAGE="http://www.pogo.org.uk/~mark/xosview/"
+SRC_URI="http://www.pogo.org.uk/~mark/${PN}/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="suid"
+
+COMMON_DEPS="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXt"
+RDEPEND="${COMMON_DEPS}
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPS}
+	x11-base/xorg-proto"
+
+DOCS=( CHANGES README.linux TODO )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:lib/X11/app:share/X11/app:g' -i ${PN}.1 || die
+	sed -i -e "s:Git:${PV}:g" ${PN}.cc || die
+	tc-export CXX
+}
+
+src_compile() {
+	emake OPTFLAGS=''
+}
+
+src_install() {
+	emake PREFIX="${D%/}/usr" install
+	use suid && fperms 4755 /usr/bin/${PN}
+	insinto /usr/share/X11/app-defaults
+	newins Xdefaults XOsview
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if ! use suid ; then
+		ewarn "If you want to use serial meters ${PN} needs to be executed as root."
+		ewarn "Please see ${EPREFIX}/usr/share/doc/${PF}/README.linux for details."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 3df9f59886a6..83cd3533ef83 100644
--- a/x11-misc/xwallpaper/Manifest
+++ b/x11-misc/xwallpaper/Manifest
@@ -1,4 +1,4 @@
 DIST xwallpaper-0.3.0.tar.gz 104300 BLAKE2B 23ec3b4ccbaf910c9ba4afbd1d9237223654a85c90b0a147141b017a9b3917316f745e1dd70a89e385110d380d5bbba8ee7c2d1ed4188d87a98ba0e94c5a7b6c SHA512 c73583fdbd573329951178d7db36fb1ae18a4294207de85dfb93e367be0ed103e8de7e2dd8ec61a0a23541457c930e8b0e5eb12dd5024808de3e02ddefb6b4a3
-EBUILD xwallpaper-0.3.0.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
+EBUILD xwallpaper-0.3.0.ebuild 985 BLAKE2B ca30cbc340bc8fe03c97580d31e93a48fb81c67e9fceeffa491e0c193e297a7fa6981abac9cbc8e24913c2246c850c78e478021de5eea3f6f50ef4412ddfcb1c SHA512 514fa89bfafab2b0e2086d74eccf45f6e64b1d447167f5ba83c185ae0764cd5c03336f08a3755a80b947eb80ed9abf6666648288ccdf1c6731aabe0fca73fde2
 EBUILD xwallpaper-9999.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
 MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
index 45080788129f..bcd7c89858c7 100644
--- a/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
+++ b/x11-misc/xwallpaper/xwallpaper-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ if [ ${PV} == "9999" ] ; then
 	EGIT_REPO_URI="https://github.com/stoeckmann/${PN}.git"
 else
 	SRC_URI="https://github.com/stoeckmann/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 
 LICENSE="ISC"