gentoo resync : 21.07.2018

32 files changed, 199 insertions, 176 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 22e984d2ddcd..6eb5367a866f 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 0ac65871b273..5fd04fc88425 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -3,7 +3,9 @@ AUX bumblebee.envd 127 BLAKE2B 2a993cd77706c2da4f90a3a77b4a6d0014b1322c584ae8970
 AUX bumblebee.initd 485 BLAKE2B 7583befe5a3e3b699bf895f1e4ac445dbe1bbbb172ef0c9e4d38a6c347699e80aca7a450f95cde9d8fe0f033d5d5a80716c9f17155f7d5ebdfa286b533fc4ab5 SHA512 12c4d28bb0dfa17239c7bf488408f3ca5e672a2167664b7d9f5501fcb878fe679c351bbe037f31b762e8e9a911088d08d66814cd8cc6b257fd973cc6c54ee10f
 DIST bumblebee-3.2.1.tar.gz 143110 BLAKE2B 537fe96e061f229c4c1e7748aef89e4eec040536d7a3161b449a34752c19078d3b4da6703f1c11268b4bb0e6590f94168bab5917fceac0eb73825b3c233548f0 SHA512 6f016f75d199577215ff00c059e196829e9d3efeb0fb6eebe6c3fad6176e330332e1ef25875a22ac9892895683d95899ea44f1ec1f85d31300ad83cb1fe0310a
 DIST bumblebee-3.2.1_p20170123.tar.gz 63376 BLAKE2B 986cc1ff39d937547268b07c98f8881810586c58a40f454cb3839aea4e5f116b27b8947acc7b1e05f3cca7a3f717f963ae3ad9f379473b40b898e6fcfedff5e6 SHA512 398101927211a8d09f19d519fd0537c94b942bd7fc11d10d394a3a520f2afa6abe174db78b60bb134caf78ffda4cdd50d0ef424134acd07ff4ce93998881e31b
+DIST bumblebee-3.2.1_p20170130.tar.gz 63428 BLAKE2B 33a2fbbd6e6cbc6cd026b87714d06e54d8803cc75e997cc1bd1aa1d1263c3fe9602f822b92c67fa7e76632bb19daaae11e591b88d087889a970d374f6316e847 SHA512 b457e8ce197782bd1b1fabd3c0c67e4ec26cdb90a3715bbe7a8e1550cdde19134151567cfa0c73d800c30e5d303b30bc1261d5f3cbceaa64d559416e4d541070
 EBUILD bumblebee-3.2.1.ebuild 2005 BLAKE2B 3201a0ec6fc11d8b66090654b57cf79fbc504079819db90a303fb476bf99c5a7ca74183547b69b948c83a4285093c3ae8aa708d73440f2d0c23647d0d9b001d8 SHA512 02a045d7d3ed89c39b4b354d81e988cf015c873ece37ce4733405fc699e94e14935e8b395ab6a1fee32b3dfc7e186f908546766146a2f19f5702b83a201560aa
 EBUILD bumblebee-3.2.1_p20170123.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
+EBUILD bumblebee-3.2.1_p20170130.ebuild 2215 BLAKE2B 70dc2ee2c016d518854a50e62d1cef3cb8ebff39d06c7f55d865e599feca81ae75e29b56f108b6c5cdc961feab4093e050a0c3d5727c7c434bd03b87c866a52c SHA512 881ecd2dea9d2a1234b354651e236edde1059db8c91f0b91d52c7e3cb6bbb16c543f9485ba83b69bf6371a1c2e28f694eaf39f33117f0a074f43e57b68fd61ee
 EBUILD bumblebee-9999.ebuild 2215 BLAKE2B f9f61a4183cc43c2c1442101b433fec6a3477d6062da340d8421e0e63398927c5767177ea4d3c98ef87bd261de39b821d003d7a67e209de21b47c57c5e7aed21 SHA512 7da89e2bf3ee757b29fde2757dba5e63c157ff0b15b59d244df8ec43ce9a25adcd00b6f149b694488a916eb7d293b6a59d48e40c18eb94b4be1e9fa35c26a69d
 MISC metadata.xml 1006 BLAKE2B d62003b7a5d0c4a67eb4bc568d967c5cb0419db57013b4344e02e7290f578ae29851349b5bd780077ab84b2537268e499be8260fca6a9939fd10ca62be4e9d90 SHA512 71a8b920e4bac5a76bddeb54e8c0a2062f555ded301d5b3128f56fe2d65ec8da10e3323a6557a36f51eb2879b50fbb3a122f6c87a9201c62a5707a109fa8596b
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
new file mode 100644
index 000000000000..cb8c3ee88762
--- /dev/null
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20170130.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib readme.gentoo-r1 systemd user
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Bumblebee-Project/Bumblebee.git"
+	EGIT_BRANCH="develop"
+	KEYWORDS=""
+else
+	COMMIT="d469a32fc0dfef5b3725c7a5331be2d04b870594"
+	SRC_URI="https://github.com/Bumblebee-Project/Bumblebee/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+
+	S="${WORKDIR}/Bumblebee-${COMMIT}"
+fi
+
+DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets"
+HOMEPAGE="https://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee"
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="+bbswitch video_cards_nouveau video_cards_nvidia"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libbsd
+	sys-apps/kmod
+	x11-libs/libX11
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/opengl
+	x11-base/xorg-drivers[video_cards_nvidia?,video_cards_nouveau?]
+	bbswitch? ( sys-power/bbswitch )
+"
+
+DEPEND="${COMMON_DEPEND}
+	sys-apps/help2man
+	virtual/pkgconfig
+"
+
+PDEPEND="
+	|| (
+		x11-misc/primus
+		x11-misc/virtualgl
+	)
+"
+
+REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
+
+pkg_setup() {
+	enewgroup bumblebee
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	if use video_cards_nvidia ; then
+		# Get paths to GL libs for all ABIs
+		local i nvlib=""
+		for i in  $(get_all_libdirs) ; do
+			nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib"
+		done
+
+		local nvpref="/usr/$(get_libdir)/opengl/nvidia"
+		local xorgpref="/usr/$(get_libdir)/xorg/modules"
+		ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \
+			CONF_LDPATH_NVIDIA=${nvlib#:} \
+			CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}"
+	fi
+
+	econf \
+		${ECONF_PARAMS}
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newenvd "${FILESDIR}"/${PN}.envd 99${PN}
+	systemd_dounit scripts/systemd/bumblebeed.service
+
+	local DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group.
+		You may need to setup your /etc/bumblebee/bumblebee.conf"
+	readme.gentoo_create_doc
+}
diff --git a/x11-misc/fpm2/Manifest b/x11-misc/fpm2/Manifest
index 16b084c5c4a8..02446eb0ae9f 100644
--- a/x11-misc/fpm2/Manifest
+++ b/x11-misc/fpm2/Manifest
@@ -1,3 +1,3 @@
 DIST fpm2-0.79.tar.bz2 230189 BLAKE2B 6e444dbed72a139fd7cecaa3669c0da042d17dc1adc72ff0350b4b094f990e9d19a953328319ade692088536673ca04df50624919c3a2d087486f09c8dff7fa4 SHA512 2310f69df323c172954932f9a3454fab95d1389854110c1d18bfbb0dff59f0da937cbc2641abe98c7be85b7c5a65234a925acd9f82b5643079864ce529dc92b2
 EBUILD fpm2-0.79-r1.ebuild 640 BLAKE2B e29a5546c5be65d8b968569906f8751a6ffe254c9041349432d0e446cf237149aa9a8599f1f4088e9023d1e0f6c5e59a04d27053256f628dcd811333651d52b3 SHA512 9444a0b070b72547acf245393d6241dec70d756b5d114aa2469441feede6c51304a238002003031bbcf01f359aff3bfb4cb3fd5baa9c7f813dabd90651fa1b5e
-MISC metadata.xml 244 BLAKE2B c4578615fd9f129ba63401a677b05631e811fc780e4c1f3e95ad1da14adb53c59705683a04a0ad1e54ec8ae3730b412d77ecd844b664272ff22c27dd00aafe53 SHA512 c0661c87a34d45258dc8236baf4e1fd4fcb3f418f4a6bb13670ae91141c7474ea8d423cb7df3c8f45cc4441e22783e6ceb807a84ccb8a75c574ea079f8a02117
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml
index 2028cee3c389..15fd2f3a22be 100644
--- a/x11-misc/fpm2/metadata.xml
+++ b/x11-misc/fpm2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/googsystray/Manifest b/x11-misc/googsystray/Manifest
index 7b4faf35986f..f154abd66997 100644
--- a/x11-misc/googsystray/Manifest
+++ b/x11-misc/googsystray/Manifest
@@ -1,3 +1,3 @@
 DIST googsystray-1.3.1.tar.gz 1000034 BLAKE2B d5410fa1b8fcad0713e2ced85472703a22bd4a93658762f2d5af00bd395fd7ced6486f2c061d46ef949144b423788d8e09104c2d46765abe090c2eabca618b47 SHA512 607bfe5f062ef35356429ad69b44020947fa31cf95bb9e4ef985176b83bdc75a40da470f146c0a5ed1835bbd08241d242966372032ce64d322a48a5413fa8568
 EBUILD googsystray-1.3.1-r1.ebuild 482 BLAKE2B 07ac613e4034b136fffa32a6f95882b2a3118454e3c17045fd97556caef76bea944d4577ad28e8c23b4ad235cc894a1aaab7c3f24149d331bc629e0223c6ee1e SHA512 b73cf355611fa4b723d3f8c7772bb7b01f33e74867de32f30eb772ef48b66006a528a4b65a4673d2615a5f638f2729e6ae498140e4041d10ba3ddd04adad1de8
-MISC metadata.xml 331 BLAKE2B c8090974104392324e4e70a0562bc43b3f843c34f469f63f0808f19be10cd2e8921660c0bda7b2f0ca9b8cad08a4c88bbe761249137d872b080714fbab664715 SHA512 29a747660370f7b31fdba7b08898a12c8e85ca2dd039a158c442a4452dc84bf7e9815d166b4d0b5e43ae00fe3abd5cd76788a98dbddf40951d85a5106b366b85
+MISC metadata.xml 248 BLAKE2B cfae9580ed433c7566b5e1bdd5b8d6712b4f0185acd62f9c94a0739dc3fa683b4ed3ff2b9978de00e03feeaf59544d3c1a6b90ec0fe63d19cbc8a4eb6d928e87 SHA512 38396ec3bb90c02ef96e57b5a5e826d0ec890d7301308efe37288113a7906485e156ca5776459708ce2e28709ba8ff93841d8201a9f4810377888a533193c741
diff --git a/x11-misc/googsystray/metadata.xml b/x11-misc/googsystray/metadata.xml
index c233f5704bb2..105a6c46eacd 100644
--- a/x11-misc/googsystray/metadata.xml
+++ b/x11-misc/googsystray/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">googsystray</remote-id>
 	</upstream>
diff --git a/x11-misc/i3status/Manifest b/x11-misc/i3status/Manifest
index a33c66af7f59..dec784ffe6c7 100644
--- a/x11-misc/i3status/Manifest
+++ b/x11-misc/i3status/Manifest
@@ -1,6 +1,4 @@
 AUX i3status-2.11-pulseaudio.patch 1085 BLAKE2B cbef3ee6b008773aff92f629468bf543bc0b574069902d085aab0787b1c50472145a7071aaf476b0b7098a4897f7cd6154bbbf03aade2b4a52de82ec59a9831b SHA512 d08f22209598567af425aea2e387dfaec0312e47a4ae9882818097e84d3ff59f671132242f6f8d6620c3d63b3b0e1c9054d26f416804608fe657872dea1c9678
-DIST i3status-2.11.tar.bz2 54970 BLAKE2B bbf60250b3f86fafdbd40ad33d1a07783e461e2193392acaa51ebd435ad7cb85d1bb8f4819d61018f65ad99fc52e93b474484f80b24f3d96df067d8b39dfd934 SHA512 37d2549649178122fab7411a3c714ae041d9c726c140002ec6ccd1a4f2e28af618ca28af9aa3bc45d0cafda0b25dd438c9ed4c3739ddcc0511e19305657730f0
 DIST i3status-2.12.tar.bz2 57162 BLAKE2B d3225581b628640bfb6084b390a135562c2ce052078cf014a63e106c83beb14b38270eee28d01898d478a9593ce542684252e420ffe37d07f392509ac9b2a749 SHA512 687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3
-EBUILD i3status-2.11.ebuild 1034 BLAKE2B f1850568cfa5b59dccd170280995af09c92a053164a5a223d47d4099b8ae4cedd436ef8c5d582aef4ecd12d374db4cc8c844f9e8218e2e14200706e087ee8c72 SHA512 68196c29876594a1749a8caa2d443ce0bba0c3637704bb1d0dae00a98a3fe710165b69571c7e6c7345e33619b0e8a33fa331d1659e9c2bf551f809b5ce339ba3
-EBUILD i3status-2.12.ebuild 1047 BLAKE2B df289865197722316fb4d1148196fe51e947004b9791c099c73f3f4afb65e812d74d6d1eb079c043884986cee8f1144bb52766201f31afcd1ce488565d61bb8a SHA512 46cd0b4cce5dc7bcca347c687144112d28297508e672e357fc6e27e2c4dd382c4c01681cbae8856a77c616705bc53bae65e4cd24e537900a4c633c77a05a4afb
+EBUILD i3status-2.12.ebuild 1045 BLAKE2B a7f9599f1d904046477a35cec6a6d51fafaa8980d1a94c7a914fe5deff90dfb7bfe529096e19434316bf0e81cf1ff17a87674b705b77db5453160d7fb037d416 SHA512 dcfc73c0f40c229966beb2df99ea306f402e895e809d248f0eb4ecc7ffa8bc001912624098db023e4ea35351c0c0175e221028050cb40032b7b4cdb94898966a
 MISC metadata.xml 923 BLAKE2B 9c815212a4cf22f000c66829c287ce86f55f9271b7e74ab55231eace1cb435092ef4539946ae598d741c34a1032f67ae23f29667499707a051fca604683c0b5a SHA512 767566a72041c13afd546301ad688053e7855fa90c036d381eb03ba4d53caa573809b9ba7433c4484004f3aed800a0b9232c6861e347a1b75ed04f56cb37240b
diff --git a/x11-misc/i3status/i3status-2.11.ebuild b/x11-misc/i3status/i3status-2.11.ebuild
deleted file mode 100644
index e549829427fa..000000000000
--- a/x11-misc/i3status/i3status-2.11.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs fcaps
-
-DESCRIPTION="generates a status bar for dzen2, xmobar or similar"
-HOMEPAGE="https://i3wm.org/i3status/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="pulseaudio"
-
-RDEPEND="dev-libs/confuse:=
-	dev-libs/libnl:3
-	>=dev-libs/yajl-2.0.2
-	media-libs/alsa-lib
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pulseaudio.patch
-	sed -e "/@echo/d" -e "s:@\$(:\$(:g" -e "/setcap/d" \
-		-e '/CFLAGS+=-g/d' -i Makefile || die
-	eapply_user
-}
-
-src_compile() {
-	emake V=1 CC="$(tc-getCC)" PULSE=$(usex pulseaudio 1 0)
-}
-
-pkg_postinst() {
-	fcaps cap_net_admin usr/bin/${PN}
-	einfo "${PN} can be used with any of the following programs:"
-	einfo "   i3bar (x11-wm/i3)"
-	einfo "   x11-misc/xmobar"
-	einfo "   x11-misc/dzen"
-	einfo "Please refer to manual: man ${PN}"
-}
diff --git a/x11-misc/i3status/i3status-2.12.ebuild b/x11-misc/i3status/i3status-2.12.ebuild
index f50925e34309..81f9ba7f6c6f 100644
--- a/x11-misc/i3status/i3status-2.12.ebuild
+++ b/x11-misc/i3status/i3status-2.12.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="pulseaudio"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 6f66c52d4502..d6caaa746f59 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -7,4 +7,4 @@ DIST lightdm-gtk-greeter-2.0.5.tar.gz 571189 BLAKE2B 583e75b1d621ffef4ade7e65fb3
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1794 BLAKE2B b2d0c60a37398e03020c45919f8f0d759500226b048ef9d95832e61ec6623ed6dccec7a5debbe735ae36d60a7ede626b82d6db3c8890e59752d223457a9525c8 SHA512 00b4731815c52b6051ccdaf9246bd618747f33ba7c6f648596c0c53d61c5dfdabb84fdc4b0ad11782f7423965de9fa4a04ad543c45cf7c8e2c9d14faf35c7d01
 EBUILD lightdm-gtk-greeter-2.0.4-r1.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
 EBUILD lightdm-gtk-greeter-2.0.5-r1.ebuild 2092 BLAKE2B 0e8ec3cbf51a55d14bff6b2a2b5a86745ea3c1906c73fe856429b8fbfb03a7e9af1b508edf0411955487f54579a5324b77662cf2f44f11daea44c479c4340135 SHA512 5b7bbe6a61ad4b689397d1cbbeca0fec6dc4ba5b9092b0863b83df0b7c48d12274fc3f7a302d0a2beeb9d51935d0b0878791e7874775674d4064dc585b11639c
-MISC metadata.xml 337 BLAKE2B 3c65fc50a54a761aacd4a8fa45fac5867cfc1831f596d6cacb9b84f649ef3b4827647c8f57590a16a5075ebfccad378b552fc2dbb07190ad8fb7c23ae8c84e34 SHA512 7819a26eb1d16acc0eaeb89c43ae27520ed527e4bc3166e3f5e582cb3c693cba07270e0864e2c57dfc005b4f27cae2b9bfad3f83be24990b6ecb1d0049c5efe6
+MISC metadata.xml 338 BLAKE2B d67c21b3faacdf75178e2dd79f1365b5d8891431f2388a959c986f9e21f1da21a5138ba6d1831c4d28f6102a6964850ce3ebe8971d955e68be0d9d97fbfa2fa4 SHA512 2b2065cbe74e2166fc4fe4970fcc01e20dc34c92842e163bcc799d162da39e2cce09f1491e6fc853d5fadd9cb40cc975f0f1e4d57462fbce2442a99441ed7403
diff --git a/x11-misc/lightdm-gtk-greeter/metadata.xml b/x11-misc/lightdm-gtk-greeter/metadata.xml
index e25f7247d61c..f10733f1b734 100644
--- a/x11-misc/lightdm-gtk-greeter/metadata.xml
+++ b/x11-misc/lightdm-gtk-greeter/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">lightdm-gtk-greeter</remote-id>
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 36049f2ed062..622c608925c6 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -11,4 +11,4 @@ EBUILD lightdm-1.18.3-r1.ebuild 3804 BLAKE2B 0a9e0ac82b6b671ebef81433faa82e0b98c
 EBUILD lightdm-1.24.0-r1.ebuild 3769 BLAKE2B cf78459133c836c6702d362a3977f3149d88d7c31aa950799a6cb3cac2480c592f6a953cc3a437939ab0aedfe06ddb0db60493f3b38a2d3ec3bdffc51325a796 SHA512 68d690c0e7a48b0d5e3db8977f2f48f8041cf298beec1d6d65d3f591676bf960cc54d140a65b9a7874f52d00d8954574258ea5d37d103fb724468d1809b2c650
 EBUILD lightdm-1.26.0-r1.ebuild 3870 BLAKE2B 869f000cf85d211b0c0e5125d196928c2e2fc1eaca43dd8a8be6a5e503f26aff779b4a58f3ef0108999225538ad0e3cbbd9213cb6cdfeb8fa75a7e9b98b6109f SHA512 13c2c39e9c7e5e8923bd24150f47047084a26912dcff8ce96df9bd1002b533ada62827a971fb4f4fa73c67e256cb67c4feb787ef8fbb3daa6b0f549138faeb67
 EBUILD lightdm-1.26.0.ebuild 3780 BLAKE2B bf14b85e4a808d3f0743135c325b5c91289ff80097ac22d968942e520551c8a6176e02a4444032ab4cd917d6c2a264901ba517918baa2d78d24e48c72bbba390 SHA512 6fdeac35cfab56c7df81cbd393b1eca4b39114087593731dcd340c9bb30781404c2365d448002c30f863a9441d3709d0984adaa638740bf1b2facce440cb789e
-MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
+MISC metadata.xml 392 BLAKE2B b3c495f83a30fe7dfee0e7f244c8d2d2df1a30fa8e50a071e0d63dbefa15189058d54ea3e881ab953c1cd9cd8dca74c37b0013da56f795422c0d0e9c2a0297bb SHA512 f44fb165a56a51fea1f3c1afddaab69971d9d56249b74eb7bf1263c120581d2e0b699f1f7fa94a9d3da57421b5d6070f03cb10643e3b3713c771f8c992457fa3
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index ed6a529b3f5c..1ee43b1b0b95 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
 	</maintainer>
 	<use>
 		<flag name="gtk">Pull in the gtk+ greeter</flag>
diff --git a/x11-misc/obconf/Manifest b/x11-misc/obconf/Manifest
index 518ac6ad6f87..cfb111098a38 100644
--- a/x11-misc/obconf/Manifest
+++ b/x11-misc/obconf/Manifest
@@ -1,4 +1,4 @@
 DIST obconf-2.0.4.tar.gz 456523 BLAKE2B ef3b3e4664ccd1095f5e1cd468fa3d021cd469a641930309a41c7b1cf418b9d87b2d8f4420342363dc4781d8e3aca3e8ffc0b9aac0151a2399579c5ff0997cc8 SHA512 b8cf6f363fa8c2f1d21142a3f79687a72f683f564285b05751c822ddf7a421b09c3440cbc5b08eb09d151601c6ada835ff5cc940bf5abeec2210cca26b552294
 EBUILD obconf-2.0.4.ebuild 823 BLAKE2B 42cf4f162fa30e763eee0caa69e706da8196d0901202a1352712bb7848b5a413c72032fcdd9c31c4b23b6f8c73618ab9485dcb006232e0ced73289310c8d3493 SHA512 98ae0d0fc16d2388a659445288da556088de4ea692ea38abeb3efea876aeb466be310eb2fdc61d42645095e434de774ae4afd84f72da4d5bbc0a366756bc3cec
 EBUILD obconf-9999.ebuild 767 BLAKE2B 83d6d4c188108b33926b8afa8f1115a00dff7fb0ac2d3f4ccd94f0930567305ca2bd626f5159ed5e0683a6b2619e9bf6b0c6f563268a7db6be2bb218a861a364 SHA512 cc71a7f24edc705f8155ddc52e368027beef8bce3f5abc063ff1a7a6f71e8baa0bdddbcd66d95a79be6a64b682d27b8aa607771bd6ce90abbefaf667072cf71c
-MISC metadata.xml 250 BLAKE2B 923ba29298f48b552a4e9659a0a7aaed2ad5e95749b4f5043f8c7a6fca5b973762577072789007eb6f047717189be9e6aa5b6b5964a6bf13d52da6f85399b042 SHA512 c1832990e49282daac7d60cef0249c7b287d4957dc820079efacf988ffee53463ec5a63fc0dd5551793808793fe14c5e5cfd4cd75701eb07dacae7c414a4a2c3
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/x11-misc/obconf/metadata.xml b/x11-misc/obconf/metadata.xml
index 18e140956483..15fd2f3a22be 100644
--- a/x11-misc/obconf/metadata.xml
+++ b/x11-misc/obconf/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>hwoarang@gentoo.org</email>
-		<name>Markos Chandras</name>
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index b44b2951b8ba..1d21a42f25e5 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -4,4 +4,4 @@ DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac
 EBUILD pcmanfm-1.2.3.ebuild 1525 BLAKE2B 91dd715d6cad05ca36b3e867d9a206e74f92f20ae2e7077e4af5773634019e0f7200f480bb211cbb0737c594258d8ae73c940fbef97385750113023fb8fe73fa SHA512 b226940a0ddc5968ff2db4ef462e745c9110a6b775d12cc299e3af88353272b8736712b8151c4a2532eefe2d0190d289677bfb0fc85bba6722147d7de9c01c00
 EBUILD pcmanfm-1.2.5.ebuild 1627 BLAKE2B d7092670f43bbe87a423bb5f1492676a09938dd695b0bc48b3adf30d39d309a851f462fb5231f0820ab27cf056df23e07bb72e067f43ab25ebb74b151863e139 SHA512 4bb01a683c3820e1a0d6c8d330e4f02d0ac588f0ad69cb3e96257906aecc4dd87eadf50b75b9c716bd0ab12778eafd64d3efcae379587102c0a385b3b06fca48
 EBUILD pcmanfm-9999.ebuild 1764 BLAKE2B 7886b9c70db89b2d86b2f18b0981fc7fc90e1e4feb23c9551b2a81bf6be0d0bff74026d04174bf507d43e5eacc7df16616bf63d17e8cf194823ccdd560e107c3 SHA512 010cf7f72a855c3cfd8486eb5a7f3f56c90856f204ded84dfc30c5d95972a952e2027469880e39435f0fa08851aae3dfe45ce38e46849d810db238ae9f52d8a0
-MISC metadata.xml 455 BLAKE2B 72f1a00dad24e78531309d59b0717ba16e183c7868f4e18843703f5e556adab1418f40d7d8cfcc26c5625b016271e67027eb6a98869067067c4e06389a7fde58 SHA512 41bcf6db377068ea7a0b678fb765cc33433e5d749e563f2bbe55edd02377cde79a5c15339f81ebb1609f1f14b50186a5d03d23ab100064cbc7841e26efee723d
+MISC metadata.xml 338 BLAKE2B 67489af9d290abeb2c77c1f87dd427ad7bed67ddbc6fd6f60d051ef6d76f6b156a01749c6a3a7c50c5c388f46e1e4fb796d27b4814eec44c23d6c72c79ac7fb4 SHA512 545f77be5c130d6853004c6a263611b821b6f79a937625475670eefbcf7de83aa15bcd0ec26fa6084bf1cf5e19c81c580f9f8258b63967877f6a2600df679140
diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml
index 1c94949f8700..340c29b9b7ed 100644
--- a/x11-misc/pcmanfm/metadata.xml
+++ b/x11-misc/pcmanfm/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
   <maintainer type="project">
     <email>lxde@gentoo.org</email>
     <name>Gentoo LXDE Project</name>
diff --git a/x11-misc/redshift/Manifest b/x11-misc/redshift/Manifest
index ddbed4f462cb..dd3d24074adb 100644
--- a/x11-misc/redshift/Manifest
+++ b/x11-misc/redshift/Manifest
@@ -1,5 +1,3 @@
-DIST redshift-1.11.tar.gz 543804 BLAKE2B 9921ed703555fda60c06df9425bf4423ce3891db60f41a1c4c4b4897e2506b8ad79e44f765e49b08db5549406008e12c412c6ecb2a07316cdec4b123fd11ef11 SHA512 bcdb4c120efec3955f4f91f1290db0679e987e25d6610bd90ee8540a96bb11338e36b10680736490ea0b7e9eca5bc195b51767a5badf0b80495dc3da44c4ed8c
 DIST redshift-1.12.tar.gz 659019 BLAKE2B 09339a57fee192e3428ba4387cbea498f2f9f97eb75a418588cdda3289cfa7b7fada4cb299e983e9e6d2ffe3822c8235082e67bdfa542716b6dee9fc853a8dc1 SHA512 6763f6964b577fc146191af1c67a283a60df5bbdd3a74bfc94f66d5f9f3bef8835a479c6ec8a648b650b83a0e245928884a0f628606ace8c3f58d8319d35036f
-EBUILD redshift-1.11-r1.ebuild 1929 BLAKE2B deb30ec58329ba856afbd6176126da5002a49ff62187156788bad54d72f2ec08e410b066992e56be7e86ab6eb3ec704c46fefc0cd9285246bfac050cf68345d8 SHA512 bb1431c1b5fdb038024b9e99f83b49e3336161b6f6a26875f2c1fdd43dde30607fbdbbefbcd56b1eb614080268af8fbccb156a1ae303683f39d620e809a0c6ca
-EBUILD redshift-1.12.ebuild 1932 BLAKE2B 52f33b9630f4d82963c5399a3b3ec4f8d0b978731e2b30df3bebff41c521a490a12b0c41b8c0defc9f6180e70231286a8eeb1c76e448f8543b891e5cda5dd10d SHA512 a6882157a309e4f06917b0c2ecfa80bf810dd1312e06b9c08ab746e7041e257700a94b51b94d3f9b4dafc8e3a45a52585b87ce6322628543ec9751b0f6272060
+EBUILD redshift-1.12.ebuild 1930 BLAKE2B 0e03e5e7ab1fc0824597fee61d33221796920c2f8a41bf7714f7fc916e9efdb4828a72010062de7d41f4f6e71782eb195e54602e34431167e3170b8f15222b15 SHA512 4e5dacc4c9b84fa6f4103f0e37bb8fbe0607859b3216ba6fc3b858ca9eeedcd92d7a4f650bc68f4fcd953d06d4b72b723ae11d73f7570e86ac16e46bdc0e446d
 MISC metadata.xml 545 BLAKE2B db060df8f3a667a05c9517ed4181b722e4c2f987d7f5aa0085e3d8adf8a0d652fee0ca6901fcab4e75344f3337df4eb1ea15c7555fa2034709c185049155cd06 SHA512 5eb06d120a80deb3d70b3007a4bc8983b276cfb87a5471ca062675770e1e575e29e5b28562e53521976c9ba7c4cd6c95aee7fffb56aa2b1faaed098de42a2bc3
diff --git a/x11-misc/redshift/redshift-1.11-r1.ebuild b/x11-misc/redshift/redshift-1.11-r1.ebuild
deleted file mode 100644
index 02ab5175ab2d..000000000000
--- a/x11-misc/redshift/redshift-1.11-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit systemd autotools eutils gnome2-utils python-r1
-
-DESCRIPTION="A screen color temperature adjusting software"
-HOMEPAGE="http://jonls.dk/redshift/"
-SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ayatana geoclue gtk nls"
-
-COMMON_DEPEND=">=x11-libs/libX11-1.4
-	x11-libs/libXxf86vm
-	x11-libs/libxcb
-	x11-libs/libdrm
-	geoclue? ( app-misc/geoclue:2.0 dev-libs/glib:2 )
-	gtk? ( ${PYTHON_DEPS} )"
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( dev-python/pygobject[${PYTHON_USEDEP}]
-		x11-libs/gtk+:3[introspection]
-		dev-python/pyxdg[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	nls? ( sys-devel/gettext )
-	ayatana? ( dev-libs/libappindicator:3 )
-"
-REQUIRED_USE="gtk? ( ${PYTHON_REQUIRED_USE} )"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	use gtk && python_setup
-
-	econf \
-		--disable-silent-rules \
-		$(use_enable nls) \
-		--enable-drm \
-		--enable-randr \
-		--enable-vidmode \
-		--disable-wingdi \
-		\
-		--disable-corelocation \
-		--disable-geoclue \
-		$(use_enable geoclue geoclue2) \
-		\
-		$(use_enable gtk gui) \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)" \
-		--disable-quartz \
-		--disable-ubuntu
-}
-
-_impl_specific_src_install() {
-	emake DESTDIR="${D}" pythondir="$(python_get_sitedir)" \
-			-C src/redshift-gtk install
-}
-
-src_install() {
-	emake DESTDIR="${D}" UPDATE_ICON_CACHE=/bin/true install
-
-	if use gtk; then
-		python_foreach_impl _impl_specific_src_install
-		python_replicate_script "${D}"/usr/bin/redshift-gtk
-		dosym redshift-gtk /usr/bin/gtk-redshift
-	fi
-}
-
-pkg_preinst() {
-	use gtk && gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	use gtk && gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	use gtk && gnome2_icon_cache_update
-}
diff --git a/x11-misc/redshift/redshift-1.12.ebuild b/x11-misc/redshift/redshift-1.12.ebuild
index e7b003af9f8a..a57c7586c9bc 100644
--- a/x11-misc/redshift/redshift-1.12.ebuild
+++ b/x11-misc/redshift/redshift-1.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jonls/redshift/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="ayatana geoclue gtk nls"
 
 COMMON_DEPEND=">=x11-libs/libX11-1.4
diff --git a/x11-misc/shutter/Manifest b/x11-misc/shutter/Manifest
index 43e1b896e945..1c474f618abd 100644
--- a/x11-misc/shutter/Manifest
+++ b/x11-misc/shutter/Manifest
@@ -3,4 +3,4 @@ AUX shutter-0.90-webphoto.patch 640 BLAKE2B ed41f01bf59e60f04abc5f8dc98cb32731ee
 AUX shutter-0.93.1-insecure_use_of_system.patch 887 BLAKE2B c4ee5de1448dcb2babef9eabbddf93499ed4dcf9a295ed3c25c0997233216fc00cb8a866d8b1b6ad218110b6f6d881c51086da6606d88c6f8ab890eabf691891 SHA512 0a4f1f50dba2b25899484d56205349b42d4a5c3f01fe30c90c4cfca67d2d0936e70489ef220ab820439b57ebf3e72820b01efa57d30dde3931f197e81727681a
 DIST shutter-0.93.1.tar.gz 3432204 BLAKE2B 7c61942c1ddc288b912e8addd31111309b2b7305582f0d684f364552e4695ad45a54b2ef39b456f4410ee1434f20422c1abf0fffd7c15525e25810fd58a28008 SHA512 50a635fdf73454b15351a7e2c4507bf0f9fd816273affbed412f42b1032087304ecf1fb4a4b655bc056820f267b98214ff5104f4fcd9e843f78e70ac4a7a4a04
 EBUILD shutter-0.93.1-r3.ebuild 2676 BLAKE2B fc4767f3cbce96fe38aad85358aa7ea20572bfc13c7464a4431c84f42fea07052e884b330fe82fa2d7da6b1a53e493733fb5c3988e7f5b997effddb42e576968 SHA512 7ad986250d29414ba93b93e8afc0f1920eac8847fb2ada6eab7bfdef6c0cc337a0f487ab6c7b52b54f72e587d1ae5eeb94d5b08cb28301f30769102a728ca075
-MISC metadata.xml 423 BLAKE2B 9935beb1fa984a4bf9f32c4336b096d6c08b73af2c40394a93ce5cbbc1a01e65ee51e043e0777b46293e90b6b6e3c37c8d7a8aa9d644aeb30721bb2f1fc45d14 SHA512 f73d7c5164611e4f899ca2196863517583aed64ef2dfa26854b8c264ab9e89fee583bddff232e95a7f0c27d79b6c7d3901f1cea84edc36d6b91e3981ffffa425
+MISC metadata.xml 318 BLAKE2B 3e11d3fc694ec5a14878e69c1eccbcf1e4152ac240a266ece373ce2522af05ec7ee4409c1afa209ab464d5fa6985aee388014cd435d42dc1d28ea8ec339bd1ee SHA512 46572230d719235fa4ed51361dafe34de6e8cc3057503b957f422516651e6b9ac99a131abf8e6a5b677f4d76163628ef5940d76c466a2d4ab1f9d60f8d64fef1
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index 82b7d46a1d34..cfdc0bb6b2d7 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>hwoarang@gentoo.org</email>
-<name>Markos Chandras</name>
-</maintainer>
 <maintainer type="project">
 	<email>graphics@gentoo.org</email>
 	<name>Gentoo Graphics Project</name>
diff --git a/x11-misc/xdg-user-dirs/Manifest b/x11-misc/xdg-user-dirs/Manifest
index 13e4b0e08470..0e5c41edcd37 100644
--- a/x11-misc/xdg-user-dirs/Manifest
+++ b/x11-misc/xdg-user-dirs/Manifest
@@ -2,5 +2,5 @@ AUX xdg-user-dirs-0.15-libiconv.patch 298 BLAKE2B 5028bfcafccc0310c192894cbeee12
 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 967 BLAKE2B cec83d601a974c7a89a837d5462270f3bf0fa7d926db956045f936c28ce6f85640d0ab779f7951bb5bbe26f2ac604c7538617479cea017127334b8d442223077 SHA512 88539c0c075b9f1434e2922ca4f347b3740eb73acbe8aa416696a7121c56083c8f4c8e3fd59817ae1f0b6c12292c53d17d1e8b72d3670d79eb7867595a893cec
+EBUILD xdg-user-dirs-0.17.ebuild 961 BLAKE2B baa93c93a02bdfc6096588aa48ef2b18bde35322118e10f87b0c7d49ef68fc9fe95d52dc1241f47af03b6cf8c0aaf2ee39cff8935fea475356613399469b4f1c SHA512 062e1da4f6e06e9b8377b98f158602cc408732b3796368110f02a7225fe65304212639ed2e0bd458cbcd61ac52319191b847e46c50b7f478c92fb500f6bd9e18
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
index 4930c2e21787..9dc4570f7d8a 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://user-dirs.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="gtk"
 
 RDEPEND=""
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index a6cb9b9615a6..f6b5c4657c81 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 2138 BLAKE2B a77fb76f06dd8a901352b485239625a3a0f670060386f570320046564959dfb4a0bb39409c1cef1f80c8baf7bf75c90912f21c9e4d2687a44be5b8f2a4a1f489 SHA512 44966a6c22d502049b3d2a4bba96dcaec7fa755ae6c9286ae8e536e94bd16110715bb9ae561297556c7565b885140e9f3d4d8e77e4e8af12376871de159abc1a
+EBUILD xdg-utils-1.1.3-r1.ebuild 2144 BLAKE2B c736780358d4e0f0a9f90188384fba8223f92627c0389a433092ceeb7a9e03e66abc30d32fc12f073c901ad9dbb2ae9192205af71acb44a2e4a5179e363b6c32 SHA512 eff2759b73c7dee50e9893ed148f5fa651d805e410482b14e89121e52cebcf589aa545fe84f07707a542390ba55373e8b5deff128b991c6f084892cb9290ef80
 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 25f5098f93ea..a60ae64e93e1 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 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
 IUSE="doc"
 
 RDEPEND="
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 4233714fa08d..62bcbe4f705e 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,4 +1,6 @@
-AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1747 BLAKE2B 0b638c7884cac5684e85070342e24ffc310645372290b50c3e7c92b536db1c64d2cc2642e353ca88dbd2ebee86898c7f2e6586cf6ea2233c452cfacc37161491 SHA512 119f56f8afb4f8eaa2f739ef06aff06747fedd9036da9a70a57f8e13410d540532378841e9b7c54de1d7e6941cc254ad6927d0f4b83f330623a088866cbd6b5a
+AUX xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch 1733 BLAKE2B 7f0425ff2e5725197a5daef832d3d802daadd8fce4453447d5c6200e2334e0077d324c7e59952be540d1ba442ccea376c3c6959473cb8a0139c7e87c727b86a1 SHA512 e10baef321890342a949ed0cd4ec24bb6794f8b2ade2cb135a85491fe23287fe395da4056d36f4c7ff70218dfafd4db74e6c0bae457568e05f3095608b3ccc2a
 DIST xfe-1.42.tar.gz 2727833 BLAKE2B fbca14c77b04cb367173907dd4ae9c210cd88768276e5b7391338b29dc988288f866419f57d1189db6235941e4e2f91608835351000a42d46ed3e7c4c236c69f SHA512 858dd761e45ff09d32d2a230304be0817eab4b6a772376b08d778bb8e1eef681228e5d88e53c441f9b8722d8b7eeae96980e30f8c5e8bb603d4d9a3b3d267351
+DIST xfe-1.43.tar.gz 2775098 BLAKE2B 41a9d36da0bd2c58de8c928daf5714c90cd24952934ba22550651a7e6829b4f3386fd7ef89c93907eb2b28f2c7086ced1c8b5282b00beaa3ad79c9443f12e5b2 SHA512 e1b8e2d1509de913ceb76d05c7480842ae7c5389df2f02d39c1f80bd7387ce6ff77e82a95f0f1853a976e27ceb5380024337e261621ea3233996d2dec48f82a3
 EBUILD xfe-1.42.ebuild 1602 BLAKE2B 9b2e59f05bf959868b6be3fbc4d819095b153baf87a9bc57fac2bedf2c80ebafe5704f815bdc4a692ad941f96ba67070be42b28c80438814527a8d896f2a21df SHA512 a87c6c76316e9e7f49799b29bb1562c2fc7dafb6688d5e87dbee28de19af542fae385e80eaed4b9d16d842eab93ff797c76a5dc7e5f717603bfa58352416441c
+EBUILD xfe-1.43.ebuild 1379 BLAKE2B cc7625f7fd20519107d080ea9b14c7ec29151d233c1a391a1866d6a1aaf484b59a97b3dbb455d0717031dfa0a7365adf506ada625ea9d7690ea6de609c2596cf SHA512 39721bbce302592b417d35efd969398e1d4120d950cb95d6a3ab67209cd377cbae4517b585d376c31bedfd969b7b37430b7d3c726423cd66728584460d92157b
 MISC metadata.xml 349 BLAKE2B 1f855ee2a581396591ea01b3b1d00fe0dba88e564d38186f738d797eb50554593c2d2bf396f8a616329855ebe829b1da5461705965e252b2994545353e26f475 SHA512 08958aec505d6e35611988ed33f184112fecea69197b2f2e5d784d2db216a0b643d27c6ac24ca265fd89d612b67586925d6b768bdf86aa0060919c96ecda48cb
diff --git a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
index 1394f59abc2c..615f7b01bbeb 100644
--- a/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
+++ b/x11-misc/xfe/files/xfe-1.42-use_pkgconfig_for_freetype_and_xft.patch
@@ -1,5 +1,5 @@
---- xfe-1.42/configure.ac
-+++ xfe-1.42/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -29,6 +29,7 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
diff --git a/x11-misc/xfe/xfe-1.43.ebuild b/x11-misc/xfe/xfe-1.43.ebuild
new file mode 100644
index 000000000000..46f9ac9b1d80
--- /dev/null
+++ b/x11-misc/xfe/xfe-1.43.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="
+	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
+	zh_CN zh_TW
+"
+inherit l10n
+
+DESCRIPTION="MS-Explorer-like minimalist file manager for X"
+HOMEPAGE="http://roland65.free.fr/xfe"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug nls startup-notification"
+
+RDEPEND="
+	media-libs/libpng:0
+	x11-libs/fox:1.6[png,truetype]
+	x11-libs/libX11
+	x11-libs/libXft
+	startup-notification? ( x11-libs/startup-notification )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+src_prepare() {
+	default
+
+	cat >po/POTFILES.skip <<-EOF
+	src/icons.cpp
+	xfe.desktop.in.in
+	xfi.desktop.in.in
+	xfp.desktop.in.in
+	xfv.desktop.in.in
+	xfw.desktop.in.in
+	EOF
+
+	# malformed LINGUAS file
+	# recent intltool expects newline for every linguas
+	sed -i \
+		-e '/^#/!s:\s\s*:\n:g' \
+		po/LINGUAS || die
+
+	# remove not selected locales
+	rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
+	l10n_for_each_disabled_locale_do rm_locale
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable nls) \
+		$(use_enable startup-notification sn) \
+		--enable-minimalflags
+}
diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
index 4f624d94b93f..346449237099 100644
--- a/x11-misc/xorg-cf-files/Manifest
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -1,4 +1,4 @@
 DIST xorg-cf-files-1.0.2-solaris-prefix.patch.bz2 4423 BLAKE2B f30d628d65db851f2cad14e2806ce4fb9114b0ddac6f21d589ad592936c5fe633f19e7ccbe027ec079f2811e549e1fcd5606c573acedb5034d3bb18e1f6c7daf SHA512 61ba3dea5ce33c1bbcb7a7a9b53f1558ad71b818eaafb1bdbc38da8ff9ff231a824d4b6cbc59e6ddd422a2a74e88eec201471c8e630b9b447fba519973ddfdf6
 DIST xorg-cf-files-1.0.6.tar.bz2 337859 BLAKE2B aab1495a699e6236095585c94151b3bc2edbff9e2b1f414fc916e09eca8d5dd4a5492ee9c69f8b21bf7d6c6ef1ab0639ba0d96be02b6736968b13b9d4d6f4a26 SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa
-EBUILD xorg-cf-files-1.0.6.ebuild 1812 BLAKE2B 1dca6edb8006a8185d0784b50568d3a71c7d855df5e80336bebb7be0fceeae6dd35c94ae2d746e5221a84fe6d22dc55116bda5a939f4f88bfe80e096e6ed0874 SHA512 9cb0a2b2ff02111cd5537e13d92e035f7e58b96ff43a5158090ff3ac02a84b6e39d4da6952e01a155e1d9fb8ad3f4373bf6fc11af95b1447948e52b0f9d560ab
+EBUILD xorg-cf-files-1.0.6.ebuild 1811 BLAKE2B 0e2c01b59de28939f673cbec97fdec31fe6cc08a7282514c37b0ec8afc5a69a0e1f5dab52cb0660f16d06ff8789cca5bf60ffdc2761c943b246ac0e7ff5a347b SHA512 fddd89a739952d67d7318bcb38af5d0cdab137cb71704661edca19cb90a1558f4c2615d133d9948dfbb61ef19cc4570cb1e6e48edf981000510565dca1b002c9
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index d01b7a6fd293..2c4b306c33d3 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.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=5
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="Old Imake-related build files"
 SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-1.0.2-solaris-prefix.patch.bz2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""