gentoo resync : 02.03.2018

20 files changed, 125 insertions, 112 deletions

diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 93b91d820118..413bfeea7164 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index 02c2691e804f..b7f69d55bae6 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -2,6 +2,6 @@ AUX bbppp-0.2.5-gcc3-multiline.patch 2749 BLAKE2B 78e2a36cd3fd05fcc4b1804037f73f
 AUX bbppp-0.2.5-overflows.patch 453 BLAKE2B 45dcee17e6d725b3ba2e2197a75139d5b8dd86ae7b706f88069eda2ef1cf29236fc878a8de363904e88d4269302f9f9c6c49bf0ac2de607df3feeb53656a5420 SHA512 044755d73415d171ec2e0c61fe0affea912ab40dedd567f3e4f29938ca97825c1ab36be9bea50dc7c40227a06e5e2ea2541d0cdf71e5dc8013fef38a6db920eb
 AUX bbppp-asneeded.patch 1054 BLAKE2B b12c871818b5a26cd8f710ee7ee682fb652d8e7c138f4c9e9574f3beff30c2627d573aff393e473057179f006570005cded6ed4ea6d51c7b1a8ce1c0fabb8845 SHA512 96d243ce1b372d718649a8c4d1e14b3210f8e679aa1c6a5dfeb373aced866676bfb0622e639d65c8cfedf8e2ae072e01253a1013c9dbfb682957936b97547347
 DIST bbppp-0.2.5.tar.gz 83421 BLAKE2B 3fe18ce71617b792f9430b2bbe123af78b498be9a663fc782246550ed936b81278d27f06b9b454bc47ff6db193fa2a949e97f0fd970532399c3f0b0f335beda1 SHA512 55d1e4d1a2c97ac5a5d34a48cd877891d8d6acf32083d7bfa90e4941cfbc18a91d056a0ec6b7a96182f72be440f6609caf3bc82c9071c6d0bcfbe95577f04930
-EBUILD bbppp-0.2.5-r1.ebuild 1026 BLAKE2B 9421a5f35dfce1d8a243218ae6010fe8fb0e1d2f4f42e7b5c2b3a723043ba1d31450627cd68ad8bff4d851ebecf7a1d0d076792fc48d427a7b617e26bb8ceb4d SHA512 9957da80ae3dcb55cc1178e7765e3105d025eb4e907b677998c4b538a5955f714bd4ef413dc291661fa407c5d7969ecc7a5fd96621f3d648f6fb35a2bd394c50
+EBUILD bbppp-0.2.5-r1.ebuild 1025 BLAKE2B 945754287d890748d39dbeb52b10c4b45d6ddd15577bd03cac16cb80171242451a77e642626327fb307694d0c4e4ababa487c7abd9144d66511978ebb00ac270 SHA512 9f20397d5504678004fc5bfefdfe5cc7169486b8a8032bf122572a2fbdd6646c0d1ee9202080a1ce68b6723fbb017cc3febe8ce7a60c60e1a7be2cb1d1aa5e82
 EBUILD bbppp-0.2.5.ebuild 966 BLAKE2B 14c98a9ba67367870a486ff21b6d0d708207f06731b6861fe384ebb5ddb8df7473b5f641a4ad823bba456b1a8d587ba661ed3e62759eafa386316b4db9cb8725 SHA512 d9a9d54a88cdd6d89d8f12cb7a1ea0a39dde0c263423705831066e5e219855c645cea05002f32d4dc205f9cda73074fb35706ec5dc65095032c8facbae8d5fb4
 MISC metadata.xml 329 BLAKE2B 314294a4fe076008891426b44fdcd92a5fd0b8f04aeb0240fda6f52f7e4a09300b2d46efa23f7f910559089611139d2262c60e588354081b2af97a7aceae2b32 SHA512 1b2b0c0055b4f8f44734697036fe3b470d8a60bba3de1972e7a8e6e21083a9a36356d9afa1e661ccbbbb686b5db6d3c8a57dd4dbba11217eee28010af18b82cc
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index 9845508cd8a5..2664e9b7ae80 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="x11-libs/libX11"
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 4f1a8c4f71ba..5646ae54d89f 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -2,10 +2,9 @@ AUX lightdm-gtk-greeter-2.0.1-gcc6.patch 512 BLAKE2B d694ae119437b12ad13f94fcdbe
 AUX lightdm-gtk-greeter-2.0.1-lightdm-1.19.2.patch 2129 BLAKE2B 5f6d70a42a986c7da34c563487583a2b520bf6f56208a4fac9e5aa0122a89135a5eb007f160464a6e0f7f94ab33e308e16e3004d95f34e0b07d88d06269336ee SHA512 70bbed98680f6cb6746b4d4cb2ce113d6900373fe701c72a95e70e890e700b337b2ef6f7283bceeb22cecc3098f2cd94cd917bc0c21d034bf2e19be0688f62a4
 DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
 DIST lightdm-gtk-greeter-2.0.1.tar.gz 467375 BLAKE2B 9b6e4c597b0dcace770609f7bbe55dac627445b609619b7965566e964f1584bb75ed3ff7d45567dbdded5fb777578043990b9f8ba6f17d27951adf222740cee8 SHA512 fd41cae828f7feafb462143519500d0d98a8b6729eb5ffd9be4247d47fa0074fa00ac9892c8cbdda9d7656e9d6949ae65e69911ae911269e99e80e4fefb19a08
-DIST lightdm-gtk-greeter-2.0.2.tar.gz 487825 BLAKE2B e17b7528365154d9d5b80664c93deac3d6af2ed5c4be6829fff0f9500ad0e0dd8d57504052d34dbfcee8db2a1b14887d8002d42f185573f8fac01a43e618c4d3 SHA512 6a9b62d3eb94a223df30c0e7ef577645482e63f9ac9cce6466518bb7eabfca3915dba8dbe66dee7456a1f11f81869dc8685b98828b11ae0dd67aa021a9a1d6db
 DIST lightdm-gtk-greeter-2.0.3.tar.gz 490512 BLAKE2B 93aa086d520ed04bef5eda8f5c8afdf8f4d15f2b2b130fb889adc0a4270916d9a0151e20963f7dc8ec1f09c9f00a5966b49c3bd03ead048c63291a42486ede8e SHA512 bd5b18890cf0190faab0e6a2bffab67be359e99f45fda0be7eecded146d2518a4efc0fd4fd29970076246bb989f626dd750cb14b22ddf6188b2be5f113bff3b0
+DIST lightdm-gtk-greeter-2.0.4.tar.gz 566819 BLAKE2B 21b11a12e2af82e5548a72617da5b592a067a5fb883aa68e8076f3ec3793691a0e957da22ff49664334f67b3d7b20dda90bd02dce4bc4feadc18248e48125efc SHA512 d4dbcb7117ffd288b8a3a516423362ead837dfe83ea48cdf24056926d440900fefd22522868c39da2831dca861731b1a53f33a9db0d86c5e334e673a5dac3254
 EBUILD lightdm-gtk-greeter-2.0.1-r1.ebuild 1794 BLAKE2B b2d0c60a37398e03020c45919f8f0d759500226b048ef9d95832e61ec6623ed6dccec7a5debbe735ae36d60a7ede626b82d6db3c8890e59752d223457a9525c8 SHA512 00b4731815c52b6051ccdaf9246bd618747f33ba7c6f648596c0c53d61c5dfdabb84fdc4b0ad11782f7423965de9fa4a04ad543c45cf7c8e2c9d14faf35c7d01
-EBUILD lightdm-gtk-greeter-2.0.2-r1.ebuild 1734 BLAKE2B 98b9a8151f75a7c935a2167a0892f0de4319bf68e7033288facab9a62580e5f935df51257ea961bce0ebe0640a5ad545389228ae62e9dd702c1b337718c88705 SHA512 4230a5da75b6fa37e3334c78408aba7b8523a25db699f1e45984d2ba560f61c47a271a98ecc1f21453f539782e3bd98640c85c0b1df924ea09881640bde27499
 EBUILD lightdm-gtk-greeter-2.0.3-r1.ebuild 1879 BLAKE2B 12cd32f3d79a41ae0380bb34ac56a267861cef2784a78f5f54cd9b637993d5701ac812387a441e976b75df730ecc65050f9284c34219685046e59f995f51fd31 SHA512 30773b18eb0bdd788a9a6e4047f0d8c143a0b0143a9ae245c88b54b46908367bd7d6905439fb5b9568126981a843327b99a6debaabfe57774e26273c10cce884
-EBUILD lightdm-gtk-greeter-2.0.3.ebuild 1776 BLAKE2B 5344d2c7ac1339f09367f44eecd96b96146e88e04740d0bdd4a03effa4fe82d53fe4022511dac6c80f7511f9e080f451f209a06f47ef3dcee3b94a7ee09c9a22 SHA512 cb37c0f282e59e11cfc9adeaaf9c44b2be622f558341515de6b1b678c5b9960cc385968d636d92fbda0d7b3715362fcafd315077c5eb96b293c65e7852e38bce
+EBUILD lightdm-gtk-greeter-2.0.4-r1.ebuild 1996 BLAKE2B 636c4b4ff35b636c65558a9c6c0396f1141e1d452077f1661f217c551efa8f1dcb6c654b79060bb9f1d1a116f90e0f90e03c981c5df896fe4a265ffc8ef5464a SHA512 442bd92e1e239182357831e2581f9063edbbaf1e674b8d72979dd6ea8106078ee2ac17a8c13d32142525051eb992d44118f8fea06549b27f0d7fbd9f484f7910
 MISC metadata.xml 337 BLAKE2B 3c65fc50a54a761aacd4a8fa45fac5867cfc1831f596d6cacb9b84f649ef3b4827647c8f57590a16a5075ebfccad378b552fc2dbb07190ad8fb7c23ae8c84e34 SHA512 7819a26eb1d16acc0eaeb89c43ae27520ed527e4bc3166e3f5e582cb3c693cba07270e0864e2c57dfc005b4f27cae2b9bfad3f83be24990b6ecb1d0049c5efe6
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild
deleted file mode 100644
index cbde50c7fa49..000000000000
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz
-	branding? ( https://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch-2.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3
-	branding? ( CC-BY-3.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="ayatana branding"
-
-COMMON_DEPEND="ayatana? ( dev-libs/libindicator:3 )
-	x11-libs/gtk+:3
-	>=x11-misc/lightdm-1.2.2"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	xfce-base/exo"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-themes/gnome-themes-standard
-	>=x11-themes/adwaita-icon-theme-3.14.1"
-
-GENTOO_BG="gentoo-bg_65.jpg"
-
-src_prepare() {
-	# Ok, this has to be fixed in the tarball but I am too lazy to do it.
-	# I will fix this once I decide to update the tarball with a new gentoo
-	# background
-	# Bug #404467
-	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
-	fi
-	default
-}
-
-src_configure() {
-	econf --enable-kill-on-sigterm \
-		--enable-at-spi-command="${EPREFIX}/usr/libexec/at-spi-bus-launcher --launch-immediately" \
-		$(use_enable ayatana libindicator)
-}
-
-src_install() {
-	default
-
-	if use branding; then
-		insinto /etc/lightdm/
-		doins "${WORKDIR}"/${PN}.conf
-		insinto /usr/share/lightdm/backgrounds/
-		doins "${WORKDIR}"/${GENTOO_BG}
-		sed -i -e \
-			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
-		newdoc "${WORKDIR}"/README.txt README-background.txt
-	fi
-}
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
index 913dc8689930..248aa5ef01e4 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.3.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit versionator
+inherit versionator gnome2-utils
 
 DESCRIPTION="LightDM GTK+ Greeter"
 HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
@@ -37,8 +37,13 @@ src_prepare() {
 	# background
 	# Bug #404467
 	if use branding; then
-		sed -i -e "/xft-hintstyle/s:slight:hintslight:" \
-			"${WORKDIR}"/${PN}.conf || die
+		sed \
+			-e "/xft-hintstyle/s:slight:hintslight:" \
+			-e "/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
+			-i "${WORKDIR}"/${PN}.conf || die
+		# Add back the reboot/shutdown buttons
+		echo 'indicators=~host;~spacer;~clock;~spacer;~session;~language;~a11y;~power;~' \
+			>> "${WORKDIR}"/${PN}.conf || die
 	fi
 	default
 }
@@ -60,9 +65,14 @@ src_install() {
 		doins "${WORKDIR}"/${PN}.conf
 		insinto /usr/share/lightdm/backgrounds/
 		doins "${WORKDIR}"/${GENTOO_BG}
-		sed -i -e \
-			"/background/s:=.*:=/usr/share/lightdm/backgrounds/${GENTOO_BG}:" \
-			"${D}"/etc/lightdm/${PN}.conf || die
 		newdoc "${WORKDIR}"/README.txt README-background.txt
 	fi
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index 90bfe188bb63..de6803b4a2c0 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -6,6 +6,6 @@ AUX lightdm.service 279 BLAKE2B 92a9602d1d1c10fedfabd58b0794a68a278939d905f4d790
 DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
 DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
 DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
-EBUILD lightdm-1.18.3-r1.ebuild 3843 BLAKE2B df02964e4d7dda106cda753c5e818f693439451fecffd80d90ae528ca50eeb9a1f631183492c3b94b790efcc475a09230a1d826af7d5b356009a50b36817428f SHA512 a27e900a20d647a314bca9bf0c43ceac843906319d82ad54b471d37ebf6b83286551ff2b38285d8211606ddaff136955b487e39cbf8436c41bdca2056629af5f
-EBUILD lightdm-1.24.0-r1.ebuild 3808 BLAKE2B 3bfcf409671d5100ccb2f69d041685775884ea616204e55a0b8a1be605d0a055354b70ef65daf33945e193025dd7358c3ef33686c2e3b20a4dec497ea24149a2 SHA512 a35fddc94af5527d74839969034264c388c0204b204b9448adb700fb60dd93bbbcec2b1a8de32c7fe59fe69127ec85ff99b877b6a29c38ad22a482b8c69b60c0
+EBUILD lightdm-1.18.3-r1.ebuild 3897 BLAKE2B 05e97d3e9c2c8513d43e7f06c30737d066d9360f3177144bff79eee134d7b8a4b77af929c087c027cbd38b5cf68d34d8a149b6bbfe1c8804472730e4738ce812 SHA512 531f3724cb706a17b7dfc309f7413e1df5ed0e7e9f7da37d3427a5c189a8007cfd598eb370b1a57673033077b1a060cbd083f5088160eb78f788cfb9aebe2897
+EBUILD lightdm-1.24.0-r1.ebuild 3862 BLAKE2B ce4df61efd5edfd3f55507993d5d8d5330ec68466478e7603f881a7ac92168a7cdca1ac4c355000f093adac96baa14167f79da6cb4c1cfd951aaa4c25bb3ef4d SHA512 bb54b9ef6f2405c7fd5fe450ef9f0fde38f1fb0b5183cf37fddb8013019b0c5d30d2f13be64b41cd3a652a4a7c65ef100b327c2abc8ff5fc8884a72bd77ec946
 MISC metadata.xml 391 BLAKE2B c6a14fded4791158cfe9c26a70c9c4de8638ab6e9ad1f683cbf94a522f456f36f0aaf2db26d88ac9dab5bf7818d18d4dbf793ef7a6970e91f16e9642d8cbc91b SHA512 c3856bf443309731ef7ea0d849f76219f69552475a88e5c5fb54ca73f30f223da44d2f4eb6d37cfc5f305757c6654573f3d639fa87818318f7afa4dc57dce466
diff --git a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
index cd5bfce7b439..0592df3577ea 100644
--- a/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.3-r1.ebuild
@@ -127,3 +127,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild b/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
index 3a6907106062..ae3715bded41 100644
--- a/x11-misc/lightdm/lightdm-1.24.0-r1.ebuild
+++ b/x11-misc/lightdm/lightdm-1.24.0-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
@@ -128,3 +128,7 @@ src_install() {
 
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
+
+pkg_postinst() {
+	systemd_reenable "${PN}.service"
+}
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 63715912ffbc..9a6d085d0231 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -2,6 +2,6 @@ AUX pcmanfm-1.2.5-CVE-2017-8934.patch 1451 BLAKE2B 77c6fa0dea7f2a82e3aa4ecf91050
 DIST pcmanfm-1.2.3.tar.xz 406756 BLAKE2B e8f4c166559266b4628f5fda4b7595ea8a28e37aa71cc3ec957ff04af8c919a248da5b189eb52040f2d049f633313cf9386c77b331b8e491ed4b3a69615c5010 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
 DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
 EBUILD pcmanfm-1.2.3.ebuild 1536 BLAKE2B 9178611586b4f75c979b780197e15ec6606c824d865fdb23b091f81b8baba1547624242d7aa4f461c89d49636ec5b84cf8c554befc551de6c546c6ac08a6263a SHA512 9f7ae35619fabcfe21a50054dc98c5f0de11fbd920ff630661a369491cf34cacbde83e59fcee176f83353d174b82560342836309d1bba6db75a73edfe5ce4ca2
-EBUILD pcmanfm-1.2.5.ebuild 1639 BLAKE2B f14f5aa13b73b2640fcd180e35e044bf5e38febedfb2100495a2be8a372945a89c2c209c51e5235f4d7e918c78a95c185e943c29c6095f44a2d20f2dd348cc11 SHA512 81cee62abbdbfdb1f873ca8d4f4fdd84d2ffc29d5dc2d98046f3792730f22cfc6a18d1292206cf6eda35fffbc0e9a74a3b0da032ce3af9f411b3b9363c578cb7
+EBUILD pcmanfm-1.2.5.ebuild 1638 BLAKE2B 4d344630fd56ca206f43b64265eca613a59cec97bc5ab606aeaf77d94cc3fc99034e5e415aed666d941e3ad8ba5bb8575e50ef03ae29984e746a1be143b6e1b6 SHA512 2ca3bd0394b2cf81e0f4b8515ff0bea170b00e47e307a6312cc011fe2641869990a2ee03b7f803f5f4a71b1a28b4dcad7fb392dc1ed759221fbd0925cdf04968
 EBUILD pcmanfm-9999.ebuild 1775 BLAKE2B 409b92d95dbb8af1bfef8c2495bf156133d3e2bdd608eb3d5b82d0df0818c312e6ab6d92c8d2cf20f14ae43d0e3945b683cc448f53d68f357448a27a6892255d SHA512 26f93d3282f02f9616e3c49cb5105956130bbbeba6b9c12feb5c5caaea6883b8d180ff11b491c6b914063550d0153ee89ef1be58528b0b4615bd315a8d37ff2a
 MISC metadata.xml 455 BLAKE2B 72f1a00dad24e78531309d59b0717ba16e183c7868f4e18843703f5e556adab1418f40d7d8cfcc26c5625b016271e67027eb6a98869067067c4e06389a7fde58 SHA512 41bcf6db377068ea7a0b678fb765cc33433e5d749e563f2bbe55edd02377cde79a5c15339f81ebb1609f1f14b50186a5d03d23ab100064cbc7841e26efee723d
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
index cf755e442347..cbe9327aa04b 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.5.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
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ~ppc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
 IUSE="debug"
 
 RDEPEND=">=dev-libs/glib-2.18:2
diff --git a/x11-misc/xbatt/Manifest b/x11-misc/xbatt/Manifest
index 4abb3328a2a1..121a5970acef 100644
--- a/x11-misc/xbatt/Manifest
+++ b/x11-misc/xbatt/Manifest
@@ -1,6 +1,6 @@
-AUX xbatt-1.2.1-implicits.patch 297 BLAKE2B 95027e7cef8998bdb7e56e1bea86106d95fe46cc65afab2c54037a7b734752ae505c766e9014f9662514a2a15e69799ade3ed732b0d11254d45b47350162eac7 SHA512 a05010e7e51d2d9ca3d25344c3ed8b3d6c1761660140b7759827e30043ec0af75a444330eeee264df79fa89874886e120469d2f47ef2672471dbc6aed2e0cda4
+AUX xbatt-1.2.1-implicits.patch 301 BLAKE2B 9e7a8b0f2a88ed56857a9f2836f4ac2b916323625e748f6d980d334dd958e6c0c8b442103af5312b1176d386c802d524c1e1b5f0012a18acfc73eb163c247e7f SHA512 defdd56e8a52147afc3f924a1e462bdce4c6200a7300f442a46cc1a4eaaa7ffdc0e52c70683f23774e20e6480c91e094db4f834073c71b1c30a3f4d24c145353
 DIST xbatt-1.2.1.tar.gz 12779 BLAKE2B d93d13125d482ebd5b2979033f09ba74526ae8f11d5f4bc88a3ccb0129e3e0ca61e8ca4389c45d789e440389de59939319dd1ef3e03e8e9ca78a61d25b3fc83d SHA512 db96f89e3abecd23532305069806ac094d5a31797f6f730d0f0d5345ac3f339286a5e3bcfc73d42a44a666bcbc768c955b9c3d8ca2fd28bd8239dfa109fe7020
 DIST xbatt-1.3pr1.tar.gz 14412 BLAKE2B 7dc44305ac966c41cee8e62a8bcaa0ea991b13b3f126d09c5e80e60bfd4d2becbf57a657d41ee0db36c8a5d9a0366e255c5c893895fd253eb39dcd60a9227b51 SHA512 f6022a2d464e22a31c8246f20c4dcab2be381ec63a02fb9ac1d3e28dc9bdf26a949735b2eba800941f5dfde371913ea7a560413191197c44a0c156a58a60d41d
 EBUILD xbatt-1.2.1-r1.ebuild 813 BLAKE2B 3d7d54e9bf03f9e541180657b20c46131079cab8c1b89aa9f9c223274c83b7818c31c4366de71c09a4820e85863a23cbd772debd5e8ad67d6c987c67bd9e41d2 SHA512 8e624ad0a2c1ab2d04b04aea873e43e0de259d4ed78c7b70cc85a10f2378e2c98c7a38437709a102f087f410dbd814efdd10bf72635e93a3ddee6abe9ae014f5
-EBUILD xbatt-1.3_rc1.ebuild 920 BLAKE2B 4dffe50f021af3f9ca736bf9a3b86dc029d4dd9242b0315ede5fb372723c9d4e161eb6584ed1f334f3d53e4f3ee672b3749f442022ab4cb1807881577cfa0b61 SHA512 2fe26d597ee3bd90ee45b000eb487182f662b925dc106a868292ef5ee33bdf9ecbbbda9cf25554d283dc95547ab46b5daa06b198bce7c884164802ae54ddda60
+EBUILD xbatt-1.3_rc1.ebuild 886 BLAKE2B 6afda908181c801810ef0e2d12b4722090dc337d84caf2d43db84115c78171651a1ffd88ba238830824bfc4cfee0885d7ee0e25fe77111d65eab49005391afe4 SHA512 b87b1609eea09b05e0c8f6f6e979a4416dca070001213dff38adde546932f9b332f7f9bd0c8cd01974022809f0db63017b0d365ddc8967f2d3820de7e739363d
 MISC metadata.xml 318 BLAKE2B e2fde4c35c72439790ea9e4c0e403f1a0666a7ebc8e9f350b29138d01c171765fac8cd6adee54667bbc19921e6fc976a427c3429464769a02d9e8dc8c83a8925 SHA512 7d56445a5c7fffdc1104633cdd30eafa17588079b8a1f4cb226984b1aad4e41fe84320608681143dc01c5f1ac5f104cf0717e8183164031644220f9c61086a3b
diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
index d86e42ef3fc8..5e135d5c313a 100644
--- a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
+++ b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch
@@ -1,7 +1,7 @@
 Fix implicit functions declarations
 
---- xbatt.c
-+++ xbatt.c
+--- a/xbatt.c
++++ b/xbatt.c
 @@ -47,6 +47,9 @@
  #include <time.h>
  #include <sys/file.h>
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index a3d3a1f562f4..f291714e25c9 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-
-inherit versionator eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs versionator
 
 MY_PV=${PV/_rc/pr}
 DESCRIPTION="Notebook battery indicator for X"
@@ -13,32 +12,35 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz"
 LICENSE="xbatt"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
+RDEPEND="
+	x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXaw
 	x11-libs/libXext
 	x11-libs/libxkbfile
-	x11-libs/libXpm"
-DEPEND="${RDEPEND}
+	x11-libs/libXpm
+"
+DEPEND="
+	${RDEPEND}
 	x11-proto/xextproto
-	x11-misc/imake"
-
+	x11-misc/imake
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-implicits.patch
+)
 S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2)
 
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-1.2.1-implicits.patch
-}
-
 src_compile() {
 	xmkmf || die
-	emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \
-		EXTRA_LDOPTIONS="${LDFLAGS}" || die
+	emake \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
+		EXTRA_LDOPTIONS="${LDFLAGS}" \
+		xbatt
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README* || die
+	emake DESTDIR="${D}" install
+	dodoc README*
 }
diff --git a/x11-misc/xprintidle/Manifest b/x11-misc/xprintidle/Manifest
index 2e90ae0526e5..93e74b28c0e4 100644
--- a/x11-misc/xprintidle/Manifest
+++ b/x11-misc/xprintidle/Manifest
@@ -1,5 +1,5 @@
 DIST xprintidle-2.0.tar.gz 87308 BLAKE2B b2ef3cd82f7208b2c2a2a2cf3fcff028c318e682b7b1e5de4982a50bb757b263044cf54edcd5452fea7fd93f435b86da3da6d0ef38dbacee761bc77399f43665 SHA512 cc2f62b33ef387366246ee9a195be4cde68b2d13a49a4d1299640da2d42f7042152bfdf6932e7904a7f4211b0dc22486bbd62b47fdaf9d5d3db895e296b5f2f9
 DIST xprintidle-2.1.tar.gz 92360 BLAKE2B 9bfc08151a18200eb83b6569c2e9d79cbeb6326c39f0e8b9f5e400d0d3e28baa889ada32e3e0452197af77f90bae50d1094bae6972aeb0c3dbe81732246b6f1f SHA512 12393e10a6e53491f3e803fb2e946cc5e20d9fb6198c95d53512b3418034d0f262fddafe9fa10e1aa3f335940134365dcdecb0ac00216e32a2bc4cc5be1c8ec5
 EBUILD xprintidle-2.0.ebuild 653 BLAKE2B 8f17fd7c476ec814022435caba734d1cbe0cb21dc8d9c522d52a267304efd1ab0b96f73166e6ca0efdc63d793fff03f674bd094857fb36108c5e35c9788f3e18 SHA512 94c94b601d05b720c99c080074af43276a74415f3ecd670a517298945f96c5efdfa393483028edbb35ef7f4a6fe4a80ccf35b44cdb0466205f1b540c081a343a
-EBUILD xprintidle-2.1.ebuild 509 BLAKE2B 65a28dffed956eddfc9c550608ef5074697b293aef5ed3bbeac1d26bbecef6482d8febbefcc6e0c1f40901098d4c663fdcb8f8c7f0574b629ca05b7ea39ce848 SHA512 9d3b0afd5ed483b4779fc7b6e8a82840e7d5db97e23c5b62f3e2a5ff8e7d157c4e6b22d832282c1670cfa565fa8ba7d8caa7d7a261f0b683e0664162425db899
+EBUILD xprintidle-2.1.ebuild 508 BLAKE2B b7bf36e9923156b0bc80ad2394934db771d865646f6cb5d1c85aa24ca35778b71c349070e06a0c1c8eb1d53b3a513b2c8ba91a04fc8a168bc50d36cb6e47b61b SHA512 995eece01c19c9eb1b5001e6fb1ccb753f41b8fb57135828d5802bbed91d412f7335f931d9c35d4691dbdde7816036900951929dcbe2b12b183cf4645e87a58b
 MISC metadata.xml 304 BLAKE2B fe9f1bed50a82bcefcf1ecdd2196e57f2176ec406b13d707a4bc6013930127a61b515e66ba382a2f6a9bb01a59f6cc4b6d757a0ea1ec988c0315eb5bedb5ffba SHA512 3f2adb57b1759967aefe91475feac1723efe2e29c86f1111635f9f1c1d909ab518a80e60666cb500247b6a66772067901a3513d1b01a39ad42cbe3044c96e875
diff --git a/x11-misc/xprintidle/xprintidle-2.1.ebuild b/x11-misc/xprintidle/xprintidle-2.1.ebuild
index 4b37635dfb0a..276895f91bf9 100644
--- a/x11-misc/xprintidle/xprintidle-2.1.ebuild
+++ b/x11-misc/xprintidle/xprintidle-2.1.ebuild
@@ -24,4 +24,3 @@ DOCS=(
 	ChangeLog
 	NEWS
 )
-
diff --git a/x11-misc/xscreensaver/Manifest b/x11-misc/xscreensaver/Manifest
index f461999d39d8..c7a898fec4f1 100644
--- a/x11-misc/xscreensaver/Manifest
+++ b/x11-misc/xscreensaver/Manifest
@@ -11,5 +11,5 @@ DIST xscreensaver-5.37.tar.gz 10598833 BLAKE2B 44462bdf735c0eeb460e400b260340a61
 DIST xscreensaver-5.38.tar.gz 10712548 BLAKE2B 02630aa7daa3faf8aa7ff453218bed5e3db287b7c4d9b564a6d8822db8b2e1ae6be7843342d585f2d2900d2bd0e7fd2a12d49748d81bf10818fa5bc4254f6ef8 SHA512 9014571505afd3a116f541334ea37737659f63f4cbb267a56be451e2c353d9e57218119670a44297d36d140672ea423d0682433401b17749138ab6baf6507561
 EBUILD xscreensaver-5.36.ebuild 3521 BLAKE2B 6dcb3156b850b3f9ab210ab0d5c030c355c6ef6f90639c23316f71d20602cda04176bdb598af4b90f41edb3e5e51ce8195803974752ad128b85b395fb9d88d12 SHA512 085ce103e700f04014a8b769ab9e625763b62fda74d38f474c576eda8dce3b1143769a0662252997c9d4f652d2c0bda483af327b15f9798674eb62812dd2c438
 EBUILD xscreensaver-5.37.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
-EBUILD xscreensaver-5.38.ebuild 3530 BLAKE2B 08cf24c2252e4965a07ab3f8bc5728a40a82f287bb1343db2bede836de1d77c6b138478dace70bf54d703ce3d4b209d0bd6b018cf62532890ed6d05cf3b10a63 SHA512 fe2fc361b059b944e94f06013a3c99854f9f4b33fd25f7f75e07e249a88f13899f3c74982e7e0dfde43523474b7b48c610ff63dfcdb08f28f6b9164eee3af68e
+EBUILD xscreensaver-5.38.ebuild 3527 BLAKE2B 628c395a1813187dd11b90ff9bce39373bad14896166845eac95b4a60225895b8b754f6ed36497a0a105d50255f330e0065734c6dc936a8277688e7e85111578 SHA512 e38ae5c2500f42162d758c4e40f63776f4201e6e0ac9596a973c781878d76e2a432cc126ee804c22838770704b3e90f37000f0657530b5a5b501216edd86bb87
 MISC metadata.xml 660 BLAKE2B f720a7df804148568927cc909ec46013c8de0087f2ab5751bd3852cf310161c328d43f29db22105e46b4c142db3e84fa5a2c943bae63779156bfe569726bf12b SHA512 ecc2b0423bd77d7713db654875f5d112c90c278653248298c877a84104db40430fcdaffaac2cbb972bb6ae6ce970b498d4d086278ba85c519dedeb3586bcd41b
diff --git a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild b/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
index 6c8fa54ec6f2..baf1fe48e230 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.38.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.38.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
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="gdm jpeg new-login offensive opengl pam +perl selinux suid xinerama"
 
 COMMON_DEPEND="
diff --git a/x11-misc/xvkbd/Manifest b/x11-misc/xvkbd/Manifest
index 563d8f049adc..36be2b66ffae 100644
--- a/x11-misc/xvkbd/Manifest
+++ b/x11-misc/xvkbd/Manifest
@@ -1,6 +1,8 @@
 AUX xvkbd-3.6-last_altgr_mask.patch 202 BLAKE2B d980f06b4975bf5dadd6e6e656fd3471fbfc651cfee7f4c118010b1c38d41f7597f7bd6d7e07e6c261f7fed0b07efefdfd4f09fcee38029f0047ed5fc2a1317f SHA512 d3d58b1ba3a7dc71a0240ba3240fd06cc1719ac35ab8f1b119f7d79823fddcdbe1605a457722ec75d4b74804f0a68ec221c5ec3d6c15bd2c4130ce96c01f771e
 DIST xvkbd-3.7.tar.gz 81645 BLAKE2B 9133b3b8e176034f2c39deb3ad9b334f553c834ba3285aaed59ab2a6f531c0184879c7bfe8c702313c9b0d4089883603c2f8430160f3c2af243705e5328b4ed0 SHA512 19ac5e78c34889d80571bb9feea65582fa413cdce0ba2f949840a08e70c900d720ca789d90d1118aa9667d32183b0f1edb33b7b0029ef5abb1d6faf058134385
 DIST xvkbd-3.8.tar.gz 88508 BLAKE2B bdaa3b31322ef2393298cb6987e4980536f3a6707df4016acc698a6713f25bff3e92cdecfcbf0c513af5cb8290e9b434fc61108095138c15cbbba9765ba856a1 SHA512 8a1ff96d90d1021bfd60ac6c251e62d68a65e86a1f1ee1fbdbf67344bdd07d7e1929a646e7e80f1da5f3e12e50c655e2be180c9ae4129fa7912f32aa5f40f5f5
+DIST xvkbd-3.9.tar.gz 88440 BLAKE2B d024e97c3e134fd4270db07b1eb54c45380b74bdbffb3fbcf7778e839b51ad8a74a7a236e440215eaea38062ae321db866c5344ecb7eaf2ed9ce15d663cbde9a SHA512 f85d94f9b8012023eb4e901c1962ea39a491df2af67b617efb0817023eb93c460446ab9414fb20dcaee02e270cb9cb7b058a83ae96ffae73291b799f15a04b98
 EBUILD xvkbd-3.7.ebuild 1079 BLAKE2B 95d3b4c8fe766b590e65afba5546df9ceef6575acf8038e7de2615cd4c35382e15b459d09d64c8ae8fa5b1ca14cfdbd9768a86289d99f6f125bba1f9201d42b2 SHA512 620dc18b9769695fd17f6f86b21e7370557fd5dd168cc4e8e46a7789f2f4551b439e18ed3e7ba3cbbdcbbe711311be381124bb7eab8cddf3e28b87ffabc9e493
 EBUILD xvkbd-3.8.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
+EBUILD xvkbd-3.9.ebuild 1047 BLAKE2B 18dfa77c061d685dd57e4fc4125fcd027750b621f08b390063ebe3ff6d357bdc88a6560bf24363fe81026c7a2c1d9808ecc14dbcae6b1bccd6d5080bcab1575e SHA512 27af2ff87194e37174f5c59aea7d0806b052d8a3ca23a5a0694dede46d4ea8eb9c085465c70a34c19385b4e8450c04f870f27123b7c2eab6f3ae0ede2c4aff78
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/x11-misc/xvkbd/xvkbd-3.9.ebuild b/x11-misc/xvkbd/xvkbd-3.9.ebuild
new file mode 100644
index 000000000000..04a518b10850
--- /dev/null
+++ b/x11-misc/xvkbd/xvkbd-3.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib toolchain-funcs
+
+DESCRIPTION="virtual keyboard for X window system"
+HOMEPAGE="http://t-sato.in.coocan.jp/xvkbd/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXaw
+	x11-libs/libXaw3d
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	app-text/rman
+	x11-misc/gccmakedep
+	x11-misc/imake
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xproto
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6-last_altgr_mask.patch
+)
+
+src_configure() {
+	xmkmf -a || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) LD=$(tc-getCC) \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		LOCAL_LDFLAGS="${LDFLAGS}" \
+		CDEBUGFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake \
+		XAPPLOADDIR="/usr/share/X11/app-defaults" \
+		DESTDIR="${D}" \
+		install
+
+	rm -r "${D}"/usr/$(get_libdir) "${D}"/etc || die
+
+	dodoc README
+	newman ${PN}.man ${PN}.1
+}