gentoo resync : 23.06.2018

26 files changed, 103 insertions, 126 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index ca7497eb1c98..9bd97eaac8fc 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index a661bb43477c..fcb35cb0ece2 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,6 +1,6 @@
 AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c9cbbe45b59bd88cef6290d119ba45f9a53f5a54bbc9240440807fffe6a5a3400e3cfc6042651a26de5ef11cc SHA512 50e236783df1d27f3968c182a32689ddc33c45cce5c9dad91e8a2d1e1515b2e03113d0f2b9c67b0d239625198f35918b46bebeb6454ae7c2649c58b5943d4481
 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27
-AUX dmenu-9999-gentoo.patch 564 BLAKE2B bd1d71e7e234c00a6d8b2f099b50e04fa6ba848ccd9f97e24adb69711b316a52b08632c8bdec94d60a1b4a5c38cda65287484a3880e57a3d5cbed06d28a36dfc SHA512 ecf1005f6d41244929de9e1f7a9486dc4359974bf763b522cab920cf13b65a26d8e12d3b1ddcf12b98e20d4007472c5fd6e240aa33892564e2c06b603c965b3a
+AUX dmenu-9999-gentoo.patch 561 BLAKE2B 6c0d69737040068fae1ed2286902d2afea9e4ce6be4f3a1682bae4de8477953e50f92b137a0b347434027ec9f31dc635a0980aa12ac2f59ca16862284eed56e9 SHA512 4896a7fa15630650c028073a45856d0680c8e84c14dcf6b5bb0fc02b2303f460d4ee91730ddfb7684ac6c46e24d1651a46539b080feb61d130944dc47fa14af4
 DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3
 DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c
 DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77
diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
index 75a1f89415ec..c22e9b78fe08 100644
--- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
+++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch
@@ -6,7 +6,7 @@
  # flags
 -CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
 -CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
--LDFLAGS  = -s $(LIBS)
+-LDFLAGS  = $(LIBS)
 +CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\"
 +CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
 +LDFLAGS  += $(LIBS)
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
deleted file mode 100644
index 4ad621142410..000000000000
--- a/x11-misc/e16keyedit/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST e16keyedit-0.7.tar.gz 88323 BLAKE2B dde8bcfb18f6c2f2c52357b7951cefd2f3e96b272320c0991ea4a665dbadcf5026e74ac59bacdd728b9534b818c73d778a804d3bbf598d82d5c64d30dd0ca75e SHA512 6178977bd9e1dfd337717660be8102f5c3f0a6d29d4b0b1ae67a7fa9a812ab46c4fee67e52282ca38d429d16697935e25e7c046f22d7f3bb06b7b3933e6d557b
-EBUILD e16keyedit-0.7.ebuild 459 BLAKE2B ab38100f74c663271be8c7588691ad20eef0bd10d566d87fe70438c619382b52a413b4f4d7c037902ae1d8bb6c4bea07ba187795317a56b521382969c0cd6cc4 SHA512 d4de07f9076f740c151d066120e1d47d7ffe255a31bbe627b362cc678eb2c75c2551e1f532c7b43d81c5b7b8090e7d5ce9997acd3b8e991b51a145dfc9724308
-MISC metadata.xml 355 BLAKE2B ee02369040e2c94e11922137b3f49c596f63c2ffe8a5ddf776b750f38800a6cfd18a6810403df276a6915e4e7ba19c1b4ea4d540265af3dcad163670481e02ad SHA512 734fc27afcce73c91e7bb00d3809a477b68d92b00a95a9b3dddb5f95ad5786799832b5932cd085ebf0b071879973bd4816eecaf31f869f794d50830eb82f7307
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
deleted file mode 100644
index 922f01990443..000000000000
--- a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Key binding editor for enlightenment 16"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="=x11-libs/gtk+-2*"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --enable-gtk2
-}
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
deleted file mode 100644
index bc4fe6836d29..000000000000
--- a/x11-misc/e16keyedit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-<longdescription>
-This is a standalone keybindings editor for enlightenment version 0.16.
-</longdescription>
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
deleted file mode 100644
index 7a38316f3405..000000000000
--- a/x11-misc/e16menuedit2/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX e16menuedit2-0.0.3-no-docs.patch 430 BLAKE2B 30674abf0e1fcea7803642717983e548c33ec95d8293ac57c6cc75b1a51a266e30d4c36f0d9cb30aa5505cb89a79ef65db2b86d55462e531c5f765ca01b2a551 SHA512 b356134b36a72ad60a856c7101a035ad456bee5d121b69cd8e8b8ceed50c234fd232066c374e08aa5b4afb2ec15f5543124389c74dea1ec1517f6fe2ab22e401
-DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
-EBUILD e16menuedit2-0.0.3.ebuild 671 BLAKE2B 4d19f8ae442b6c1a581f7dabda28d9d1d103171676412ef54afdbd462251015a7fedec8ea214903375fa4892e6c23541f5d5fff266c614338088129b06166624 SHA512 78795378c1775bdb0f063621f808dc3662e91162fb96cab45d1cff55b3ea5b1ca964dff15435d07dcd146e00da2b8d5a38dcff159ce6c5fb8156baca33982eff
-MISC metadata.xml 246 BLAKE2B 8e42a79334d5ae7cf62794aa2d53ec5b472d6bc28550d58d37b09b26e68b87e22749bdd2c23cd120da320a5af5f0346569dd93cc417c04e83c5913864557e066 SHA512 460d202301d84244b49bd0eac9611142f8800f9f79dd0f42872b35c39b439e1be231cad8c3cd5cfabc162f26198df38aabcd65fcd6c13e9fff0c58ae939dad7f
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
deleted file mode 100644
index 5fc26891b700..000000000000
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Menu editor for enlightenment DR16 written in GTK2"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc sh sparc x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-wm/enlightenment-0.16
-	>=gnome-base/libglade-2.4
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-docs.patch
-	sed -i '1i#include <glib/gstdio.h>' src/e16menuedit2.c
-	gnome2_src_prepare
-}
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
deleted file mode 100644
index 764ac8660336..000000000000
--- a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -220,14 +220,7 @@
- yelphelpdir = @yelphelpdir@
- SUBDIRS = src po pixmaps help
--e16menuedit2docdir = ${prefix}/${packagedocdir}
-+e16menuedit2docdir = ${prefix}
--e16menuedit2doc_DATA = \
--		README\
--		COPYING\
--		AUTHORS\
--		ChangeLog\
--		INSTALL\
--		NEWS\
--                TODO
-+e16menuedit2doc_DATA = 
- 
- GLADE_FILES = e16menuedit2.glade
- e16menuedit2datadir = ${prefix}/${packagedatadir}/glade
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
deleted file mode 100644
index 2031ab52a3ef..000000000000
--- a/x11-misc/e16menuedit2/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-needed -->
-<upstream>
-	<remote-id type="sourceforge">enlightenment</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/x11-misc/libinput-gestures/Manifest b/x11-misc/libinput-gestures/Manifest
index 15272b7ba810..8544aa902d94 100644
--- a/x11-misc/libinput-gestures/Manifest
+++ b/x11-misc/libinput-gestures/Manifest
@@ -1,6 +1,8 @@
 DIST libinput-gestures-2.31.tar.gz 15872 BLAKE2B 0fe671f50ee6e7b06362591d68d259587347794c80df27c73d833e459eb9499ae919bf3e4f12e1dfc2852fd9b70c3962963f3a291107bab8ea0a8f1576dddde4 SHA512 fc3c90025486c8da5b2419f99666737dca40dfc962a549bd1955ea792137a1377a9697c8cab908991503fa9dd6d72520a04ac2dbc9463bc228566569be43ca67
 DIST libinput-gestures-2.34.tar.gz 16321 BLAKE2B ae1fc850a075fd0b8e4aec6b94f0257f10f309a28a4893aad608eff59afede28b4126734a14f510ca569f64d79492461000dfca8c34e614a5e99839f3c5d952d SHA512 47ffa36b9abb01e62a046d1135cf3ec2773285f94ba68d66c03f877b6acf057491fb4a7645198d8c3bde39e38e12e039f3b10c6987d5765798d969d23359269f
+DIST libinput-gestures-2.36.tar.gz 16598 BLAKE2B 3c30408ce394cf8bbc5a68c5f37c9106bb481ad47c75f25bfbba7470da0cbfb330512fe0422588408f177085c23a5cf0379c13a49c9fce438e8d8b1179c91d50 SHA512 69f77d0681f37deee3f215e71e4410d5c45107d2d0a1addb897de14d7f83bcb3e2285ed9ba605f30db23441a9d7bc9a6960b2a49d53ad71a379d0b874d36d645
 EBUILD libinput-gestures-2.31.ebuild 1017 BLAKE2B 611b39ec192cc040fd79ef4d262fc15ee31515ebafa478d1a406f64b4da6d32679945d5e0554df832a73cc7ed19c1cc41e830205f3fbced34f40c54f44542a7e SHA512 26486d673e801c4af689661765eca932cc46bf1abc68f67038455ccdeef036bed0ec579bebf3bb6abe74f8daaf12df9772d9e938bc70de314fc3a23fd68ec9a7
 EBUILD libinput-gestures-2.34.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
+EBUILD libinput-gestures-2.36.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
 EBUILD libinput-gestures-9999.ebuild 1341 BLAKE2B a490dbe6d8a18577153c9448ca03c0a9ff61906759ab4182a71c13f1891e71f5055cc17612c38b47ffff9feb5fdeb5ff8abf53de97c0f302346da01c64d22563 SHA512 f0bc64a45e9100fba0404e3955aec6355ef065678b590a6d7e38c306b229eaa304f619c6dfd6216e8e79cce5053e17f8eb91adbec5ebd9fcf7eed74bcaaef822
 MISC metadata.xml 825 BLAKE2B 2c2b255745088a09c94810f34d5540b437428582a8b4e67fa31c47ae7257ded169b8047c2ebce98e090092063d9d3086f60cf6f04accc6c50a62313d1c14528b SHA512 9ed80c1c4113a9539366f66ddcc1a0169d42252e0cf347693085d89dee2259c9c120f4e864e35d42a1af9f86019ef944c27bd2ba71cba6ff6eba8509281807c5
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
new file mode 100644
index 000000000000..39fb049c736d
--- /dev/null
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.36.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Actions gestures on your touchpad using libinput"
+HOMEPAGE="https://github.com/bulletmark/libinput-gestures"
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bulletmark/${PN}.git"
+else
+	SRC_URI="https://github.com/bulletmark/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libinput-1.8.0
+	x11-misc/xdotool
+	x11-misc/wmctrl"
+DEPEND=">=dev-libs/libinput-1.8.0
+	dev-util/desktop-file-utils
+	test? ( dev-python/flake8[${PYTHON_USEDEP}] )"
+
+src_prepare() {
+	default
+
+	# Fix docdir installation path
+	sed '/^DOCDIR/s@$NAME@${PF}@' -i libinput-gestures-setup || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	elog "You must be in the input group to read the touchpad device."
+
+	if ! has_version x11-libs/gtk+:3 ; then
+		elog "${PN}-setup script supports Gnome 3 via x11-libs/gtk+:3."
+	fi
+	if ! has_version kde-plasma/kde-cli-tools:5 ; then
+		elog "${PN}-setup script supports Plasma 5 via kde-plasma/kde-cli-tools:5."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/polybar/Manifest b/x11-misc/polybar/Manifest
index 2ded8b194c09..535c974a14aa 100644
--- a/x11-misc/polybar/Manifest
+++ b/x11-misc/polybar/Manifest
@@ -1,6 +1,6 @@
 DIST i3ipcpp-0.7.1.tar.gz 191417 BLAKE2B 62b76a0921c78f374309d26856c01d1467b8bd181ce922fd47daec406afda9d76eea9a1f473b4899e22f99e2ef36fc70f72db1bb17eb1f3e71a8431c2634b915 SHA512 ef9f591bb4436916ad038bcb0c15ea3415d1978ff264fb276108ddac89c98515c464fbf252429f6a76589cb78e1434adba2efefb5a844dadad0e261f3806fb72
 DIST polybar-3.1.0.tar.gz 418298 BLAKE2B 1c7394a17ff1ec5b0dec519b7aa58e63cfcec0f104d4302051f6e12753b7074c3d85072a3d78e7ce135c53d4ddd4a6f68ea61ffb7b2ad04997bbf0c836115046 SHA512 6d8759d9f750c2abfa79fe735615b0ed3d1827e3a88561317712c6f02cb32a0a77726f97cb419f3a040ae9085a34a23cb1aad0aacf3f14e56c542977b89036b2
 DIST xpp-1.4.0.tar.gz 84095 BLAKE2B 2af4221953abe7f40473c55cd50c608b54ebc85a62be65af987ed5e6c5eaf56fbd92531788becf39ba5ad52099ac78f36e9b2a2515b473f4d86ed5fda3fa5065 SHA512 d34cbbe2391db36db7dffac0415d26b7487536e97c4d7efd472ab0aeffa4c8e757ee030b05e2aa1cfa8a591ee591bb96a6db7eb9fa5850027f958e92f078739c
-EBUILD polybar-3.1.0.ebuild 1691 BLAKE2B 4af6ba35fc69031427004e98db18444a3abfc070b68405a5191ef0a154da09c8862f98c0948bbc684225dc0f17b4c2fe4046c61088ad54214003cc9dba47209c SHA512 382c6cb1353be1b7c5975d63b12d42f39ffbf6e11b2b730cf49f8aa1b6759e4e36b5fb1ab61abcbf4d9b1558b3def3b036a9a13086ea2f9ae4f392d797f9671d
+EBUILD polybar-3.1.0.ebuild 1690 BLAKE2B 87332f0eced500b9ccd979d7625dc7976018a801979f7337ebc0a38a69c00c4256be93948774b2a93b618b6e7b4240141a8ee3ee217d72090020a0f74ca7807b SHA512 f31fad149bb6a58a30ff9ae2d0d15cd6fdb8396060a56d5627fc8d6e9b47ae456e3678c5c24965e0f8432f75cb9011876930c540abfde12d94d349f2ea399091
 EBUILD polybar-9999.ebuild 1182 BLAKE2B e457c43df7e40835a0ad863a3583d9389ae7871b61a89a9dd4530757c539c8843eccb08865d4cf169a1d452dcb3665766a577ae01bb165c24872d335fe279bee SHA512 99b4e170edd51117bbb326379b66a325da1c179980d68404d2e6d0ca18e6f11c8c692f44d548a94b3e6b04560cc34086cf7e5d3099278e235f9f06e00e84d1a0
 MISC metadata.xml 696 BLAKE2B 2b2762500174e5b8674161433cc5c862158dc1db4e057b4e92d3c7433e8c286a80111dd311bba04631f71d2a58817ed2c745f024da1a39b5622fafc57525e346 SHA512 a3fbaea3fa687472a671c7b209bcabaf8a3fcab86b53aa357aa776cc3b57a565eae933b50a6238dc73d46659ddd893ad1dbe9f312d828d05c26cf0945818d322
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index 1d10b8eee8b4..5897c55c919c 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 IUSE="alsa curl i3wm ipc mpd network"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index 11361a5c1c4d..644c42a0e9cc 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,6 +1,6 @@
 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 957 BLAKE2B 71bb80b2cd996ceef055b4fe437488c3053ec565205127b8405e38f96b58601355cdeb22fe06c2eefccdf846d067d7f0306f768d7a9acd227332c18d9032dbed SHA512 379a283a17d3ca7bdf8349df7ceada185e2c86549c14eec45ad05c85cbf912eacf2da7c559d500563170223f8630c878a9987671a5d9eea72785bddf77975585
+EBUILD revelation-0.4.14-r1.ebuild 958 BLAKE2B 405c6fd1723cf31a4b00763b8f102e88716e8130a2f5b146184bfd64fa5cbb700aa230ff1176f002b7ed16179cd7037da504c57ba0e7826e1abe65a4435c0b87 SHA512 31dc4c383c5992570206f779f9bec62c6ea2511d2997c19eb5e758ef2f422e00bdd4f8c8172583e983b573c97bd944cf2e4ef8f5e376ea64ed342f049d13841d
 EBUILD revelation-0.4.14-r2.ebuild 1051 BLAKE2B 626492e800adb5e7341afd7d647c9667fee7e8bc31764a0d9fc333bdc2ffc3ad1e40cb31d20e3b4353747a2c0a7e2f9670cd0081527aa35390a265eea6f9cbc1 SHA512 0548637f2932d677a9ec7c04fde0a53a470ed0612e74015df0e6a7254c8ee03436ea8f22df173d28ba7ef39c4185a2c6d60e3bd7f061d3caf2b197a20bc66aac
 MISC metadata.xml 221 BLAKE2B 62f515310d9bccb1e3747264848ac800fc9489f83567f3e23f1b3a2f6636f6a499652435e153728de911f47a8534279f3ade767815414523f15077584397a632 SHA512 9ca3dafa7e44ec0f210681f8f524549f103695d57d0f8463a9044ac9456e6bf99ad6c7448e62a672471b7e82535b76214b924e3b336f186bced032750e68754b
diff --git a/x11-misc/revelation/revelation-0.4.14-r1.ebuild b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
index 0a270428d9e1..fa6097d412eb 100644
--- a/x11-misc/revelation/revelation-0.4.14-r1.ebuild
+++ b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ GCONF_DEBUG="no"
 inherit python-single-r1 gnome2
 
 DESCRIPTION="A password manager for GNOME"
-HOMEPAGE="http://revelation.olasagasti.info/"
+HOMEPAGE="https://revelation.olasagasti.info/"
 SRC_URI="https://www.bitbucket.org/erikg/revelation/downloads/${P}.tar.xz"
 
 LICENSE="GPL-2"
diff --git a/x11-misc/sddm/Manifest b/x11-misc/sddm/Manifest
index 48b3e132911b..117cd78be37e 100644
--- a/x11-misc/sddm/Manifest
+++ b/x11-misc/sddm/Manifest
@@ -10,5 +10,5 @@ DIST sddm-0.15.0.tar.gz 3520188 BLAKE2B b29a994a0ea2fbbda3f5eaf16885fdfa513a759e
 DIST sddm-0.17.0.tar.gz 3527180 BLAKE2B b11ea779f772f4c0638e3c8712d03ecb12d26f432f34b2756c0a1a90b3db2136525ff0c4b2733b14e2605ba656b76d69c8fdb465864017bd19b58b14982d3492 SHA512 81d6fc8731a3f4a49018c5bde07d21e26647e0066382cfb8dc4570ac906844ee58bc79efc4b0b2753d6c831cb33e1fa8d512335d2f76a66c493527ea68c5a101
 EBUILD sddm-0.15.0.ebuild 1576 BLAKE2B bcdb6f67b661a3c87b7fe403918ac60cc6dba303e879c8a12e2a0708596c37c5152d406b092cc85a5bacca7c36ef46e942ed054969eb526382662c918bd394e1 SHA512 48839e26239bd57053717ca81a5b6b285677384ce081652fcb774e573a37bb3d56c42489732fdec5d8442550483f3cb2b4b1b936947e3554641bd1e00c17dd45
 EBUILD sddm-0.17.0-r3.ebuild 2311 BLAKE2B 39aca6a331d7b3946362cdc236681db3bc157a9383b5567927a5126ac2c4823e85a1b4cd590c33ffcb661f83915711e4dc395da9b8e817503248f3a89b320bcb SHA512 089e9d907cfec936b4f24f51c555b1b0811da2b83a79567b5a39b476e8dd2ef3a51c94f48a5e11fa34f6f56cd2de361a1ebdab7aacf23df990869571704c4dfc
-EBUILD sddm-0.17.0-r4.ebuild 2374 BLAKE2B 1c7f4137d94de2ded2f0137fc20384f0733bf1ae722b562bbfcca47a6472c60d616f833a6165979ab47b12e75812b10086755e8cf1dbd95b11b58c67c1ec7661 SHA512 b4ca829a4de85d7398b27a5090f7ba6e5b360ec05738ce7713063ea540c6cf05dfb269b97d35e8260886f17b440495c70de81259df4db59eb41f4311bc975709
+EBUILD sddm-0.17.0-r4.ebuild 2372 BLAKE2B b17f693274d6d62724fbc42fe06b84bb9b35ecf0104a55d3ed6b3d9731520a7a1c498ab4179d7fc57ae54350a310527531c86c5aa3d13325aadba6c3278d675f SHA512 1bdeea78d6c7af3353a5aef8f1785ff239bd11d1984fabbdbc6495900c1b8d80e12cc1f7b6d0a9dd8fd6630d7f43a91f3a0ed62af3a0e214e0ace34266c05b37
 MISC metadata.xml 943 BLAKE2B 6bfdf54b23210c7e0d781c2f96358036ac7281825e71e4a8e9cf5fc6d43faf5525cc0ac267c7be2f5eadb08ca830350cf102425d30e19e5e4f92a3a57fc5affa SHA512 8a6b888910d68d5209c070c17e0c2e9dc5d64cf9d70cbf5ce945cfae763f864787fb998eb5544f4e6710c36b0045530780fb27f01944b60d71f60f09e8ecb516
diff --git a/x11-misc/sddm/sddm-0.17.0-r4.ebuild b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
index 090a03ea4de0..ba166f9c67fe 100644
--- a/x11-misc/sddm/sddm-0.17.0-r4.ebuild
+++ b/x11-misc/sddm/sddm-0.17.0-r4.ebuild
@@ -9,7 +9,7 @@ inherit cmake-utils l10n systemd user
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
 SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
 SLOT="0"
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index a1b7a792014c..f71576378c6e 100644
--- a/x11-misc/xdg-utils/Manifest
+++ b/x11-misc/xdg-utils/Manifest
@@ -1,6 +1,7 @@
 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 2222 BLAKE2B 5074042cf9a2538fb9183366831424808342ee66d5211dd1fee1a52f366d119ad78d689d748dc9642feec470ae7352c75d084e5e1e4bf325dad9eafe4372cf8e SHA512 4bacdde96a5be5a1c4265c83ac17ad0342021fb14e7e4fd2ee9009614836891bff4b14571f497fa1f8c1b39e6d2476065a44e5dda337360aa092b91a0756764f
-EBUILD xdg-utils-1.1.3.ebuild 2223 BLAKE2B 9153c33784772b40796b5c35abe03dc93a7b025c812ff5fbb26636dfb70d3b227f448e8e672f187b18dd6651c7ffcf4abb7965fff576cce9f545e43f6afd0b5f SHA512 1aee4d905c11ea039569bf330d44a33889acf84e6a88688f24ac31d27e93c143b94dd5129f4cf6fe07db2c2f7c91cbfe8ec70e23131704b674462f8b161a087f
+EBUILD xdg-utils-1.1.1-r1.ebuild 2181 BLAKE2B 18d2104aec42d81ff47e5ec2fe6659304217af3b36e76c8ab8212282c2cf3e75f087cc3787eeb76d4050742b59d35d12e62c99a4aecad3c17ba9f9369dc04ff3 SHA512 c6681cc7404329d3206a20188380c923ab24fdee29f917e42c55bdb3aa31a06b6711103d599f817f4c05121844c262489b2de374421796e4ba06c509d6d8c619
+EBUILD xdg-utils-1.1.3-r1.ebuild 2131 BLAKE2B 8419a25ecf2c1f5f5890930e62d952d1d4de03f48fa76663d90e7f2eeb6c0fec408757024d957b80c191ba6e98934c3f4890d3ea86273a3794973749247f5252 SHA512 27553b55394d37f83101a4bcb681c4edce7f97d74d203d197cb78122bca5a96991475d478f6480dfeedf2d3757e3f5548b5b8cad8f82b131e15d2f80b8a738f0
 MISC metadata.xml 228 BLAKE2B 6b6559027915d8578c02e363cc855e812c338acf7716fe4108a8b85c09152a086cb578e7361f4613a44e8b550d7e205ff43aea39dd9488951fa18c6e15042278 SHA512 4f5e63f918a0f8790db49c5b12173c673f86935f00796a04acfed573f618379b73b05b1869941e11f881fe69d4958f5287ce815fd710eadb6ac9f2680894caae
diff --git a/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch b/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch
new file mode 100644
index 000000000000..1f6cc29ab059
--- /dev/null
+++ b/x11-misc/xdg-utils/files/xdg-utils-1.1.3-xdg-open-pcmanfm.patch
@@ -0,0 +1,21 @@
+From 31525d3855f876ddf2e29091b2e8d376f923e09e Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter@gmail.com>
+Date: Thu, 24 May 2018 14:40:53 -0500
+Subject: xdg-open: better pcmanfm check (BR106636,BR106161)
+
+diff --git a/scripts/xdg-open.in b/scripts/xdg-open.in
+index 630e63e..bf9da4c 100644
+--- a/scripts/xdg-open.in
++++ b/scripts/xdg-open.in
+@@ -451,7 +451,7 @@ open_lxde()
+ {
+ 
+     # pcmanfm only knows how to handle file:// urls and filepaths, it seems.
+-    if pcmanfm --help >/dev/null 2>&1 -a is_file_url_or_path "$1"; then
++    if pcmanfm --help >/dev/null 2>&1 && is_file_url_or_path "$1"; then
+         local file="$(file_url_to_path "$1")"
+ 
+         # handle relative paths
+-- 
+cgit v1.1
+
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
index c5e01113b9b4..af90774c45dd 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="doc +perl"
 
 RDEPEND="dev-util/desktop-file-utils
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
index af9be47a61ba..85055ff55ce5 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3.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 ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
@@ -34,6 +34,10 @@ DOCS=( README RELEASE_NOTES TODO ) # ChangeLog is bogus, see git instead
 
 RESTRICT="test" # Disabled because of sandbox violation(s)
 
+PATCHES=(
+	"${FILESDIR}"/xdg-utils-1.1.3-xdg-open-pcmanfm.patch
+)
+
 #S=${WORKDIR}/${MY_P}
 
 src_prepare() {
@@ -42,14 +46,9 @@ src_prepare() {
 	# to run `autoconf` in ./ and `make scripts-clean` in ./scripts/ to refresh
 	# all the files
 	if [[ -d "${WORKDIR}/patch" ]]; then
-		eapply patch
+		eapply "${WORKDIR}/patch"
 	fi
 	eautoreconf
-
-	if pushd scripts &>/dev/null ; then
-		make scripts-clean
-		popd &>/dev/null
-	fi
 }
 
 src_configure() {
diff --git a/x11-misc/xiccd/Manifest b/x11-misc/xiccd/Manifest
index 30ef34759e77..ffcbc58f7d51 100644
--- a/x11-misc/xiccd/Manifest
+++ b/x11-misc/xiccd/Manifest
@@ -1,3 +1,3 @@
 DIST xiccd-0.2.4.tar.gz 30981 BLAKE2B 079b743f88308b3fff5826bccef125c90636182cf1e6311166e91a337b24be824ac564696f1c65d112fccf737bfbff968ce3d96a2a31ba29cca1069377e16695 SHA512 40101467a38e9369b171b44d5d7fd4b07968dfcd74ace89e15f3dfad32131a3dc3b26249af2340e408908bd3df766785b46e885a3b68ff26b24ed2627a40cd2c
-EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B 1af3760f9e7de84bd58183a29e90c720f90e2040256e1d9e3b86d9abbf4b36ea4a42d84155342dd0073488d54ddcdf372bf40b9247009077bb9f9bdde660d0ac SHA512 ffd40914be02c49134a58f419e49423dbeb8bb612a56537331ff948b9c08e09cdea7bbf29a5eedf63586fa80e4e911717b8fa61c84cf1139585c8c3415a7aa7a
+EBUILD xiccd-0.2.4.ebuild 506 BLAKE2B db85d071ff8660d93c41c25c3c0fe250c971a172c0704a076310bf309f0694a70a250ebca714c0767fb2b0703e860a275d812631b2a99efd878c3602bc4d2bb1 SHA512 776fc5065dc15bb18fa735aec32d30bdff4c1d1c6f78ffea2774076fc05ada353ea5c9ef7db912f45f3ed7a9cb050c6b3405e23da0b5c3b41f3b66832841c6ec
 MISC metadata.xml 764 BLAKE2B 386c639b7452560295dc0b25e0dfafe126c868d4749711125faf5aa57c027d45ac69ce658d09f775504eea2a8ee9d1ef89cb821ccf695d17506fe14639d847f8 SHA512 91b048281b6c4ca83e6ba61e870e5f04b90bae2668727edf18946c1ee703284b48a4caf4a1f259c80106fcdcaba91c10048c9f4569a2a5b45110a8acd2e1b2db
diff --git a/x11-misc/xiccd/xiccd-0.2.4.ebuild b/x11-misc/xiccd/xiccd-0.2.4.ebuild
index 9bf0afa6a032..64aec3d35d7a 100644
--- a/x11-misc/xiccd/xiccd-0.2.4.ebuild
+++ b/x11-misc/xiccd/xiccd-0.2.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
diff --git a/x11-misc/xwallpaper/Manifest b/x11-misc/xwallpaper/Manifest
index 634be2810278..3df9f59886a6 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-9999.ebuild 989 BLAKE2B 99fb573839f4990f7a3ab6b0ece3e87f8389b66e4dac4a303fb5372d143c008b808fc06a0ca43636d612d6c976717cea5d7f8cd711136476a837bf7f3a26fbec SHA512 b338de596750da56107cf760420451b129ead2bd233b593012e921fd86bd5b19554b74e1304442a038c79a1542ad64a2e9016d9212f30a5d783020b95204da19
-MISC metadata.xml 915 BLAKE2B 8849ddadb92292a654650b0e4febcc3eb2dbd5137d38b2ef15fa6ac1726b014432908da049c8af6639477fa0697f604ce81b954653048c3a9e9e79c95c208f46 SHA512 9a6fab09b2e9dabc97b8bf4454ab70cb3a235570f01af16807c9420b6ed60d96ee63c4be186a2507b6773bcc9bf7e69718eee75391c46c4e127b26bcc344e537
+MISC metadata.xml 804 BLAKE2B db3ea33826679dd19ae2631256fb9570b190fed70efd5084059cd7b23d620f632e654658062ddb1d92ec1ac31a67285c2610282e2c5d0af0806e4c1b554dada2 SHA512 ecd6a763905744ab6a8aae1772027401810e0d18e806147a0bec305722a2a4dae39cc9fa5e400db6933b636ec9787b80fd0f1b0e2c0eaa4f5c87d2e3f4cb4991
diff --git a/x11-misc/xwallpaper/metadata.xml b/x11-misc/xwallpaper/metadata.xml
index 36a2d7518765..1c2d8ed0efac 100644
--- a/x11-misc/xwallpaper/metadata.xml
+++ b/x11-misc/xwallpaper/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ya@sysdump.net</email>
+		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		The xwallpaper utility allows you to set image files as your X wallpaper.
 		JPEG, PNG, and XPM file formats are supported, all of them being configurable and therefore no fixed dependencies.