14 files changed, 172 insertions, 16 deletions
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index cc80e4c6def0..d91f03a0a453 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/gxmessage/Manifest b/x11-misc/gxmessage/Manifest
index 68eb7dd9ee30..f84a7479b598 100644
--- a/x11-misc/gxmessage/Manifest
+++ b/x11-misc/gxmessage/Manifest
@@ -1,5 +1,5 @@
 DIST gxmessage-2.20.3.tar.gz 274110 BLAKE2B 9863e680b1d23ba3d69c35e2de826106f1078f585c0be36d1ad51946abbeef8637bc2f872f9fee20738c978146adebfbe47548de48be6b12b92c314ed93d9c32 SHA512 8f677d0ee899c88a40c912ba68b59ba9a21a0ae21db467c64756daea41fbf2a7fb566e26c74e72f89e6009b1e8029af9bd5748f92099f681346399fe7e9d8e27
 DIST gxmessage-3.4.3.tar.gz 275354 BLAKE2B 2801944c3a6542d250f91388a90736ba781013e5c370e42783db620387a07b315b176bac60e30af6e623d4f664291fdf567786e66a1f9e8c383dc772a64547e6 SHA512 4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a
 EBUILD gxmessage-2.20.3.ebuild 851 BLAKE2B d0b7315257ae7aa09db15c7da5625909b241e1f8556e4462483534e4f9da4ecfc56fbbab7da7f99545ab31cde696499804501dd37456cf9fa981555ea1b006c2 SHA512 2d51cc5dda9e95f29214e928197d5a15e7a7594eb4aad230671743731f5fc9df965c04da6d406c7d5f7e64c10224263e36b2addac54794d2ae7e07c6a3b9b903
-EBUILD gxmessage-3.4.3.ebuild 884 BLAKE2B 991db497194496e3d7328ccbf535dde609018ce4253c0a835c7e7572ace4fdd84325205ca89ae25b4c04ae456faf16e3e6980173bb390be68e890151bc2aa447 SHA512 a2fec46ee18b88277ace47f9d7ab1b5f2f597c8b4e0fbaf0b7c5c5554b2a4455191238288f6d1f0658ce40eb4561188cfd6253e8718f86e2b74a3766589fe899
+EBUILD gxmessage-3.4.3.ebuild 878 BLAKE2B dcfb0f94b7405893ad71c5beef5a74142615f0393e19ec99d91d38b7b8ae645cbc721299703321f7ae793f97c85dea58de731ce17c664f3a6d24abdddc5e534c SHA512 5048188f71c19770e5a4f0db6781556164517e938efbef47f5edd8d7c8ce318b6c52461052d64d5188f6d44638c4d617a7d5df39b6bf40a782843a87a59f2188
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index 89a45eeb2b16..aa81967dc82f 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/kronometer/Manifest b/x11-misc/kronometer/Manifest
index 253a24615584..3cfb62a6ec9b 100644
--- a/x11-misc/kronometer/Manifest
+++ b/x11-misc/kronometer/Manifest
@@ -1,3 +1,3 @@
-DIST kronometer-2.2.1.tar.xz 121952 BLAKE2B 02d7ae02e9fc53ccef4d8d247043c5a69a9096a5fec9c3f98491298f75b649762983acff41cfffe863935640d75ef703278accdac542e0110127ee9e86c4cf57 SHA512 d635b55c0513427e7c98c7317813fd62886b7fb6aab7cb238ac6ba058ff37c7e9302c46c48e2248fa13e50d32d90a39ddd8d4bb88663a4019cd981f54e46a42c
-EBUILD kronometer-2.2.1.ebuild 744 BLAKE2B 11128db7b1833cc68e5b89c470cefed0c42896b981c5d9591130eccfe169012d04ca05ab98b89945e29ac222be057fa6cc0cd1f2873c0c1c81e036bce3837ac6 SHA512 e65b3ae614fe924ac2eeb4a61e47d6ea2e0b4dc8ca8a4a0475de49436afda24db377c6864e14def3b98b51d78d0f55c954c8b2e41d380ca1ab0370c1af95967a
+DIST kronometer-2.2.2.tar.xz 123980 BLAKE2B 2652c2a48de5571de22a95aa0b42f4b6620fb538033c0ec7d2c63c8ae8729b6feeecd8b7acc9c7542fe6eb2be0fb145a9dab53e5e9f97ff0511e2a12f5017dbb SHA512 2c808d7b3fafdc2cf507b0bb64be1b36be166a43543b18569e430d86f75cc64505de9dafd9a06e5b8b9e7fde0c0e624f598da7539026885b12585e3628067f93
+EBUILD kronometer-2.2.2.ebuild 722 BLAKE2B cd9fc9acb635b73be2d07eac01d27d63e6e1eea6e2bfdc2c5e3835eb8b6e5e419561d14d9b67e22b42cefa062dcdb94022be07741be5205174add487034bfc34 SHA512 87c7afbb47a6d16cdb60caa7a440a063b2c25102fe2d4894e32ec60b29321153a57fca00cd76f8effbf08eae8bfbae16097d0f534bc38c0d44da391cf408cc3f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/x11-misc/kronometer/kronometer-2.2.1.ebuild b/x11-misc/kronometer/kronometer-2.2.2.ebuild
index 009aec994148..dff9d003d23c 100644
--- a/x11-misc/kronometer/kronometer-2.2.1.ebuild
+++ b/x11-misc/kronometer/kronometer-2.2.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="forceoptional"
-QT_MINIMAL="5.9.3"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 62966a26abcf..8a6470b68594 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -5,6 +5,8 @@ AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
 DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
+DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
 EBUILD lightdm-1.26.0-r1.ebuild 3852 BLAKE2B 01ead162fd8ef1318ead8c9ebf8042ab687861f812fa2f63d2b5d664dc7acc199372eb2c578cf759ba47ffdd0a15b371b19181c7510007d929a37a0527de3855 SHA512 d6a0eda1ae31f1954830ac24111273102adf7c366b1105a3f5104426af13b25809ee53223bc0d38e4676ce774054b58a962a10620aeb762028dd1c6f2598d60a
 EBUILD lightdm-1.28.0.ebuild 3886 BLAKE2B 2013d0787f3c0c0b3d4a68c9595d4df06ad4e0f040bdf89b814c5c12a6734e97c328265075e1de7271c0a1f64e8eefea6a27603e96ac16bdbd4bd2961b3291d7 SHA512 f6920480ce47f8364facb1e4b2b8e22b5d4065f9a6b5474cb6eb8656232863840d38438ba1283c3e006ef8331ce7f504122829c110d1288fb656dcc3983c04b7
-MISC metadata.xml 402 BLAKE2B 8a38da4573da6f8e60a2ada6b33040329a7ea2416237e5da51b4aababf116b0f83d95ba8c4ae62a8c2de5ef48e4f46217897f38eacf420248ebc75623507c84e SHA512 552c99167df3618a9d530d34e5391986543e06a8e030d44233f19d3c2f482c4747c701bb549864be9e8a2faa1ff2fc83d6b6bd68c868244c5cc2dcea0a86b28f
+EBUILD lightdm-1.30.0.ebuild 4226 BLAKE2B 0df0010ad4e31f14a65c46acfc51c314edbb3e5a75d8f4e76bf80bd49983d6ecefaace3797c82cdceba5402a6d98796c3e22f6a9aa45548041a22ba13b36a4f6 SHA512 de7c1f643a8e4267bec58d9fe92d82f2419b6ffd568b3e6120e6e0dfaf342f8a808a2e9a093dc670acef7135e1f0fed39f84c1dc6768bdb93100474c3585a953
+MISC metadata.xml 462 BLAKE2B 8360d85d185558b5d6c3b2d18d5210c532537d1cc93007b0f0b91d37b388d02c966dda14c298ff8c3b47bd39696b332f989fffa6e1a68001116ddd69141b21d6 SHA512 d76a144235e233e46103c3f10ee64d3b5306b82220366e006671851dc725027ddbf600ca8fab8370c7fca3b09182cd7c85b458d79e7ddca681f279909f4737ba
diff --git a/x11-misc/lightdm/lightdm-1.30.0.ebuild b/x11-misc/lightdm/lightdm-1.30.0.ebuild
new file mode 100644
index 000000000000..2dbffbe278b9
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.30.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd user vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+	mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gnome +gtk +introspection non_root qt5 vala"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.44.0:2
+	dev-libs/libxml2
+	virtual/pam
+	x11-libs/libX11
+	>=x11-libs/libxklavier-5
+	audit? ( sys-process/audit )
+	gnome? ( sys-apps/accountsservice )
+	introspection? ( >=dev-libs/gobject-introspection-1 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	>=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+	gnome? ( gnome-base/gnome-common )
+"
+BDEPEND="
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+pkg_setup() {
+	export LIGHTDM_USER=${LIGHTDM_USER:-lightdm}
+	if use non_root ; then
+		enewgroup ${LIGHTDM_USER}
+		enewgroup video # Just in case it hasn't been created yet
+		enewuser ${LIGHTDM_USER} -1 -1 /var/lib/${LIGHTDM_USER} ${LIGHTDM_USER},video
+		esethome ${LIGHTDM_USER} /var/lib/${LIGHTDM_USER}
+	fi
+}
+
+src_prepare() {
+	xdg_environment_reset
+
+	sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+	sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+	einfo "Fixing the session-wrapper variable in lightdm.conf"
+	sed -i -e \
+		"/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+		data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+	# use correct version of qmake. bug #566950
+	sed \
+		-e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+		-i configure.ac || die
+
+	default
+
+	# Remove bogus Makefile statement. This needs to go upstream
+	sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+	if has_version dev-libs/gobject-introspection; then
+		eautoreconf
+	else
+		AT_M4DIR=${WORKDIR} eautoreconf
+	fi
+
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	# Set default values if global vars unset
+	local _greeter _session _user
+	_greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+	_session=${LIGHTDM_SESSION:=gnome}
+	_user="$(usex non_root "${LIGHTDM_USER}" root)"
+	# Let user know how lightdm is configured
+	einfo "Gentoo configuration"
+	einfo "Default greeter: ${_greeter}"
+	einfo "Default session: ${_session}"
+	einfo "Greeter user: ${_user}"
+
+	use qt5 && append-cxxflags -std=c++11
+
+	# also disable tests because libsystem.c does not build. Tests are
+	# restricted so it does not matter anyway.
+	local myeconfargs=(
+		--localstatedir=/var
+		--disable-static
+		--disable-tests
+		$(use_enable audit libaudit)
+		$(use_enable introspection)
+		--disable-liblightdm-qt
+		$(use_enable qt5 liblightdm-qt5)
+		$(use_enable vala)
+		--with-user-session=${_session}
+		--with-greeter-session=${_greeter}
+		--with-greeter-user=${_user}
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Delete apparmor profiles because they only work with Ubuntu's
+	# apparmor package. Bug #494426
+	if [[ -d ${ED}/etc/apparmor.d ]]; then
+		rm -r "${ED}/etc/apparmor.d" || die \
+			"Failed to remove apparmor profiles"
+	fi
+
+	insinto /etc/${PN}
+	doins data/{${PN},keys}.conf
+	doins "${FILESDIR}"/Xsession
+	fperms +x /etc/${PN}/Xsession
+	# /var/lib/lightdm-data could be useful. Bug #522228
+	keepdir /var/lib/${PN}-data
+
+	find "${ED}" -type f \( -name '*.a' -o -name "*.la" \) -delete || die
+	rm -r "${ED}"/etc/init || die
+
+	# Remove existing pam file. We will build a new one. Bug #524792
+	rm -r "${ED}"/etc/pam.d/${PN}{,-greeter} || die
+	pamd_mimic system-local-login ${PN} auth account password session #372229
+	pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+	dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+	readme.gentoo_create_doc
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/lightdm/metadata.xml b/x11-misc/lightdm/metadata.xml
index 35133937b2af..65cd70df4916 100644
--- a/x11-misc/lightdm/metadata.xml
+++ b/x11-misc/lightdm/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="gtk">Pull in the gtk+ greeter</flag>
+		<flag name="non_root">Use non-root user by default</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">CanonicalLtd/lightdm</remote-id>
diff --git a/x11-misc/notification-daemon/Manifest b/x11-misc/notification-daemon/Manifest
index 0f6ef7227c36..fb0b19424c61 100644
--- a/x11-misc/notification-daemon/Manifest
+++ b/x11-misc/notification-daemon/Manifest
@@ -7,5 +7,5 @@ DIST notification-daemon-3.20.0.tar.xz 340752 BLAKE2B 9ded1efdb38de0097495ff570b
 EBUILD notification-daemon-0.5.0.ebuild 969 BLAKE2B 2a68f40ddd286ffe671223695c6787b72572a20e5e65f1ec613c06a56b2acdd23c4ea3729b2fc6d3a17778756e057be117819349ab8eed9145a364526997f35b SHA512 c280d0805d07355a65b7dfc6de6f028eb73d153968a31cf3e41139b0dde29820b7ae8fa69542b6ec81618044113e783f63990f380b55567508dff9a321bfda3b
 EBUILD notification-daemon-3.14.1.ebuild 988 BLAKE2B 0faddfdb82d045022ce71e84d2193827379161abed2ff5384ee2b3ecee6fb4989bbf3e29579ac4435cde59bd1b0ca4711514d6f720ac8670bd01f0af8b49e6a7 SHA512 60f13a07051b020b47ff323a63313a41d7dd475d9eedd923beddedc9e41cb8dc77ec4bbae4f2bd46fc9d5a7d1539a86be89c95854623eea287f0d2d36b13ce97
 EBUILD notification-daemon-3.18.2.ebuild 962 BLAKE2B 62221336f94d9898d4d7922e967a78ec56e27069e44e8650cfeac3e2232ef97bf8267fbbe52b319008660f6402392568cf6f772481b075a140111adfa6f2346c SHA512 73fcddbe382e142bdaa74e4976e2b2555c9a086112374ec2b337ffbcf222c67bcfe6c65d121feea91eea80ae811385e9f21c3ebdb4de500f5093d25c1f14cea1
-EBUILD notification-daemon-3.20.0.ebuild 958 BLAKE2B 2d70d6372c5a32cc15376e0e058e7be31a6c07e4b5da372350dc920737a18142ff96fa82436a3d24227c5241eca67b5bcae539300a8c7163882618e2d3edae0e SHA512 0fd75c5389ce28024e68c8dbf0bfa9d551a69270f9b921cd56e26fdeee2863c883ac84544be84c147d3fb00282faf63a5102cadba030a7a4e032e120bd59d311
+EBUILD notification-daemon-3.20.0.ebuild 957 BLAKE2B 00e2b6c8151114b81bcc22da52981d069673e09c368fa537d4413eddbb514a642c8aab804f749102dab52e5c88b18e62796143e411eae05350a66312e17e9028 SHA512 f2483c4f05b4eab83c1ac1b647e9a2a9d7878124bf5b56413c40d31cb320526e6dd41629c2de26e6c2070c59de434c6c13c500be0946aa8b11879a51233efcdb
 MISC metadata.xml 270 BLAKE2B 9c2dafa0390cfc7b94b5c44505d72021bf57cf8ffb35be7a3327f4316c3e4b2dbbfa0325d97243a8ea933440a5678cc5d35c639f5aa210b1d5ceb8ab65eb5d90 SHA512 92c366ec57074ced42e6f9960f97d1cd1a022dba7450b51f3617a6a5e00c755496dfa84aa4ac259f4b00c676366b1eaa3ec30eeb9bcb0bf41253d1910005db2f
diff --git a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 93b3ba18d43c..07a5e708c20e 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/notification-daemon/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/x11-misc/xdg-utils/Manifest b/x11-misc/xdg-utils/Manifest
index 30ab70c9fce1..c0425681b57d 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 2193 BLAKE2B 0807a3c8c674f9c6a26fc6bf78a9448c3d65c6c092394cebd35a29cc3fc824af7a42747593b4ec7c38183021335708b8c1d88a6d18eb5898ff665588be9d3fea SHA512 53f1736f62c34e4baeaaad6451ce3476a52cfb2ddc82ccf5b71fcd2e96c0b87ede082cd30bf6c0e42aefb66af2f297fb8be93eea90ce29f531c8336d3cf33684
-EBUILD xdg-utils-1.1.3-r1.ebuild 2150 BLAKE2B c8ba1b1862a4caf91425fff76c879fd7178a00923b9bcecd57207b424a6b4ca62552276e3c81dab402d89d12baa01b8608bba5e21d14d6b55e3f9acfa6069749 SHA512 725485e88dfba73e17e7ba6f43828ae4943aa6606056e71442c538968d06d5e73baeb8902e6ae58d4e77658a4c7163f048876ddbaec38ff3b34fc2098d72d1e5
+EBUILD xdg-utils-1.1.3-r1.ebuild 2149 BLAKE2B ea2adcac7e76d3d0e3af22cdf2b7729b0f3646bee19094b9062cc369b2db646e781e22f76508eb5963ccd48c9d2bd605124e53abe4660cc30e24d6c36ae50aab SHA512 62cb50a86432dab383e110c78e46bf9523360d9ae40e53df905fed7cc747fbe48174bd215aa9805146e4208ac3b3d2b4e71a1a4094b4f75e7763454664272704
 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 4e46bf29f1ae..c34ecf7d6812 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://portland.freedesktop.org/download/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~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/xdotool/Manifest b/x11-misc/xdotool/Manifest
index a00fb0d58d02..604ad3938254 100644
--- a/x11-misc/xdotool/Manifest
+++ b/x11-misc/xdotool/Manifest
@@ -1,5 +1,5 @@
 DIST xdotool-3.20150503.1.tar.gz 102125 BLAKE2B 3b34b69ab7843d49a5cc76129dca96664b8e548abd01acda03399d06b1a146169c78dff302932000fe72c578be60bc774e3e503980b408cab4bf17d71630151c SHA512 d8eb411490d2f4936d63cd459e3319f76faf6dd415a3c2c68446b5a98d24290794dbffd22fbccfef5acc7d8aec6ce92b2135ecb3e1178607fc7d5b1e1767ede1
 DIST xdotool-3.20160805.1.tar.gz 105388 BLAKE2B b836bd9c408bc4f7de562a1dd1fe18142155dc486b01912462b6d1cebc5f3f4094a407556c9f50cafb4ca3a17149e6f69303706730aabdaf94abc6d4b817d351 SHA512 e27b1029ee954ea17643ed489a00a1856e5687b03772c0f10a8e50cde3c3c957b57a3ba9890005474a744a228ef4827a83770d6890479c37a1f98f4fd7b1ff6c
 EBUILD xdotool-3.20150503.1-r1.ebuild 1296 BLAKE2B 2254e8e361b00d268b515fc5c9bb0b964cf800109d9b642d7fa892f37f18e4cde8cc962757a2fb5032240c7b18ea4f6281891b08e22064cb38ea5f684adf7cb9 SHA512 b6adda51b715bb0a1171b9c1ba515c03a960e2cd46522625c4d701b318e35efbcad9927e0a9aa0653e51635b4f41d84bfc4f7e3f0f6fafc0d25d37e3e65cc0ed
-EBUILD xdotool-3.20160805.1.ebuild 1352 BLAKE2B 7aed50517d84f99f9c25b1ab9196fff81ea614d0ab80a6cb7ad59d3764499e9f599720dd81f03ee0b1e5233e114d01be517044f6a6fb51f5c0d0cb7b9d14a5f2 SHA512 0ceb0e3bf1186ac6217d2713468f9df16448ddf93386cc05eb624e43654f1c755349d600c67cd4acc296f2980b96ba0b980d18de728140453cc01d88aebb2148
+EBUILD xdotool-3.20160805.1.ebuild 1351 BLAKE2B 00fd7f6f259827339c43949557726bf7bc4acdd4171201d0f64f4e22a2d3fd6ec033d20c8ae48af37c6e05cdd34b005eafcc7ada5268a45eef14d316261ba4f0 SHA512 d27b83b5a93be4f1952c75927de0775304bf474b2e491eff781339b000297c7f01f345353849336f03405df3a173916b59becdc63927995ff734b24a9da9582f
 MISC metadata.xml 583 BLAKE2B 72181c8dfd9d575229c2e86ad0041311325f9103715be568d45915c3a69bc44ef30919146fcae3f74ea2dbf844cd62d94dc7fe5e0ef1969b84a764b4ccd30cc1 SHA512 7c09064d2334d1f6b4d488bd9aaf091e0b27a7e674f151c62bea6e988d58c71996cf20f5d63587e14903a80b5f93e77305d493b94fe03a68ab24fbf1a438df76
diff --git a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
index ba53a8cc47eb..8dc6d7406c21 100644
--- a/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20160805.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jordansissel/xdotool/releases/download/v${PV}/${P}.t
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
 IUSE="examples"
 
 RDEPEND="