gentoo resync : 22.05.2018

18 files changed, 8 insertions, 254 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index b22a4320e672..4462a71dea90 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index 771ee78d5b63..c28bf9f456b8 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,7 +1,3 @@
-DIST bdftopcf-1.0.4.tar.bz2 116380 BLAKE2B b6c8e691e556a34bd655cbbfac6ea3c9d8cdfed789554b658f45af46f9f33b667346ba641681811f2de268d86a45c5f91485be027b48a06191937901d7cb149a SHA512 af18bd3a68d4811ab70f69fa7e871ca87650a4a28e13567db5ed40cba6a0c8006928ad5828dcc16a624bc38917f53bcf7470f3b1b3b2fca0379ecf03114a3a52
-DIST bdftopcf-1.0.5.tar.bz2 123291 BLAKE2B acd4838278b090026f002e6f5fae7146fff718e13b9120f2e0e317d8f8062361b6ce121d937ac29d38ff423c13f6426fb68b044c4832a452294aa910b331fce5 SHA512 9c6a156c8932579ee37699efaee3b1421d04d55ca0a62ca850a69cc65c21c7d9366b5a090b6a40e927504df16fecfdb484606052adc1038ca25e797f7e8c86c3
 DIST bdftopcf-1.1.tar.bz2 150815 BLAKE2B 2251b6daf090d61b6418bb0b76666e9dba65230c7a568bca6d3211869466921d6cb411820afd18262fb42fbc8b9d7118b3fe61b465b5bb00f8c93a17a6779df4 SHA512 7b790e8d512ca2812ac889c156ef91c48798b4744a6857e5b17e0128764b5afa8c5426fe5de05a9819d64745116718db4221b3e657e3c2633465e87179c44bec
-EBUILD bdftopcf-1.0.4.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
-EBUILD bdftopcf-1.0.5.ebuild 441 BLAKE2B 1ad53f7ac677a55d815219c21b8b03d4158168c5685898557092afe35b07151f10c8f05e5f29143a36f8dd673cd474c08ba61d59135c11a393391c973f574b54 SHA512 82825e87f9f4defb60cf7892328860cde0977df9aaf410f3dbd101723809342cc2a45b690b188d0c338a272d6aba9c4ce972bbe6f6c4de85712a068d44144350
-EBUILD bdftopcf-1.1.ebuild 435 BLAKE2B 6b07dc0b186d0e327323fe319cb02de3a9ee50b2e8d3855ce7ed05355ac1258cc95437af38b969878e88ca5a1079228d3ddd8905b1059a823e3096a375f8c2a1 SHA512 082d1f020c023b012d099ae60fb25f76d5c00ab99a01928bbd2abc877a723ecda080c19ead0a17b698c2b0412dc445ca68ec474f9d64ded245b013b84ae2bf68
+EBUILD bdftopcf-1.1.ebuild 434 BLAKE2B f3b89af618068e987b4ba920d11064f52f16a84903e64311f6d2929cf020977b4ee0623fcdf9de1402d53d69015ef5dbfdd2fb806f208748894258116e6971c2 SHA512 4981d9142b98cfdc6de2babc4eeef8c7f581168b8cb04617c17ce70fa90b5f257d0ddfad7c66d896225e7d3b7dd8b58efc7cbec5f3b3a2d58c22a58e80045f16
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
deleted file mode 100644
index 9a15ad4479bc..000000000000
--- a/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org bdftopcf application"
-
-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="x11-libs/libXfont"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
deleted file mode 100644
index 9a15ad4479bc..000000000000
--- a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org bdftopcf application"
-
-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="x11-libs/libXfont"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
index 17bf9ad89698..357ddc564117 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
 
 DESCRIPTION="X.Org bdftopcf application"
 
-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=""
 DEPEND="
 	x11-base/xorg-proto"
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index fd8e71a5a430..2772ad3be0f9 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -4,13 +4,8 @@ AUX Xsession.desktop 229 BLAKE2B f1daf7f0ef98a3be220195fb64bc057180db20016ef991e
 AUX chooser.sh 1192 BLAKE2B d0afaaed792dae06c4716ea33924568aca5da3251b15067fc5ba92b2dd5651185ce64329a69ae588f5a4532b8e4b123f7f29bd2db7352df1b496a6e4e03191a8 SHA512 6149a5dc19104773d3500d2e89e8be5c9da49fad8b38148d511af237c6fef84c3223a94d4c0451296e7b27c86c513c5f4fd425a738d94c30d26f1ac888bbc255
 AUX startDM.sh 818 BLAKE2B b9ccb2e8dc8c711b6ca550a0e94b15af38df59bb3a508666e5768a9a070c5d4c742f7b88319d5d936956f14f543af5b7c6f0b2fdccebe57a82280fe87fbac5ca SHA512 f3b3aa841edfbd23810d2da7c56e23e3f1c1eb650b1196feea2fc8dc6092ad5d4c2fba70943a1bc86d716d838ab4ebc0d93e8a2c2ccdf69b171c1fdc4989942c
 AUX xinit-1.3.3-gentoo-customizations.patch 1494 BLAKE2B 1a67f486324e07aee07078648101a3f82b10d5953084c6afe6564530132fb92d299c44559e4d6d3ab74554139be02c285b2076b959413ec248b57cc2aafbc733 SHA512 810066a3af51fd31c177f1aa33d3020e63d1656bacc297fa2bb44e0f3745bfd27d466745ebb07343f7b95339a9f6c8821c6f117e0b2f99724e21a0869427228b
-AUX xinit-1.3.4-startx-current-vt.patch 808 BLAKE2B ffcda8d6abc7793afcfd15565de626be4dac60dd494e1bf6579e2eea3eb99fb3787ad2eb698b0594dab58ee1d01026e3ca8503774dea4bb2c75f153b7b00929f SHA512 48b16a9c521dfc83f215f25efbd4f7d433bd61e656608c20f69214ae5939f8f4a5e38d8985cc82bee871848827d53a0245940c76c7b75df4a4d907a1106ff4a9
 AUX xinit-1.4.0-startx-current-vt.patch 740 BLAKE2B f5ac87b96f76bd4c845cde4844f935afbb757908d0c94f6f5b9c7e6b8055841fcdf4de44af964fe3703d2599b9097fca300551bb4a3dce003e20c266d619eb49 SHA512 97e0ac72c49a9a5ac29a09f169076f0bcec48978f645be01f3b40b6c32b4af4d188f96662c0cf62bab0a6b356ae80c25e0614c0b87a368d7a01a11e603ecdd15
-AUX xserverrc 45 BLAKE2B 768b6cce44df53b656776acb0c386aade3897e1d117a6673986a18d0cefb22b3ba0dee3b5fa07d8f0e8603852ff66d422cb5dbb725bb44e437d323c25e6d8069 SHA512 f86d96d76bcb340021e7904925f0029f8662e4dfc32489198b3a8695dca069da496539e2287249c763fe9c4d8d5d591fd18fe49a0bee822cbbd0eb712efbb89b
 AUX xserverrc.1 132 BLAKE2B f914e41cf124fb4777cb6eef3cee5e7137336961ef5cc010288b5949fff59fcdab3d2f264c91fe05ae165b6bacd63ae8b13e58b51a149b637996db346790aca2 SHA512 3cc3b18cfc8076badcae62d098a0c3cc0b654ab691b9e7a64f456f5428f1afe1130c9c033b106cfa2e566de22cb75756d71368e3c0a7474b8a76f63c1f91a918
-DIST xinit-1.3.4.tar.bz2 165881 BLAKE2B 78e0b9e8fdb146e969014d726ac05e7f4cf14947aa6026642fbbe6a55eb9c5cb891f079281bb40b460f9b1373259e338dcc0615fbdda64da49b719980017b782 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
-EBUILD xinit-1.3.4-r3.ebuild 1913 BLAKE2B af34d5eb73f8e99ea509c577c7560d44f11f8151dafd2371d91172c395e564605bd326f8da5610a34e1b2edaad4f58f09f208a38d1d803610b641cbbc651592f SHA512 59712d0dd8ff2e7637bbd3b72a9bc067d860247eb9bb8be603211d265a3c209d59431759cffee408e4104a5d28f07fe18349e7aab1858b18944b5b6ca4467e05
-EBUILD xinit-1.3.4-r4.ebuild 1770 BLAKE2B aff5f95040e5b78e49670178dbf5ba32cf80b437aa91857acd0c6590eb60cf39f4dcc460b16519d86ea05c08e2e0fbd670e49ee4dcb5831ef79cf7cca12ada3d SHA512 bddc5e4776a5b27533fb179aa4102618f8f6a9e9afc1202f962734f5854bd4e60bddac6141fafa297060b544b633be269646a8cb3b4896f0003e2e707d2930b8
-EBUILD xinit-1.4.0.ebuild 1762 BLAKE2B 125af5b99a63b2e7a49bd3c815c3737eae97090d499c7f54cf8560f1fe780d4a5100754b021f7d89ea8f337d3df40c0189277ed979dff055471b9c82a8bb9f84 SHA512 ed09d694dfa29a45fd51bf3700564c7e5ce31bb8dcad6a3b63e7a0921060c0b314bf4c6881c940decc071f5058ca8a71ed2cf99a60dfd884f865eec9a9237245
+EBUILD xinit-1.4.0.ebuild 1761 BLAKE2B 2cbae077fd7323d05f5a812a0c273d4d856aa6d3099a55dfcf5cb0ff8300132694962a367ee4db1dc4efdc94f10e7b4ef59bfd6e702772ec9d9cda7535367da9 SHA512 e650c6724eed6b984cd4c1581325bdfd65fe5785cf33d2b6c10a7dbbd240a16ad1240b503d78842be66de1f7d3875be25aa5469cb9069689225da936aa8e59b9
 MISC metadata.xml 480 BLAKE2B 190a0b3a84e4d0d85e0928b964cb820599510c6c09a1a7c385b2f9b402a44478e08b48fce2d88216fe2fd52a3f35ec02d99cb7d738caf8a2d8dd6418e36f6125 SHA512 5dcfabd3eff26ffb33bd8ae8248cc3214c67a0fb10d5c214b2432fea7625b2555b29bb654d9712e8d55a081b25912da65ac367203fe529a860febc59fb91de55
diff --git a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
deleted file mode 100644
index 362b420cfc8f..000000000000
--- a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur a/startx.cpp b/startx.cpp
---- a/startx.cpp	2014-09-11 19:31:42.000000000 +0200
-+++ b/startx.cpp	2015-02-08 19:09:56.416428623 +0100
-@@ -188,17 +188,6 @@
- if [ x"$server" = x ]; then
-     server=$defaultserver
- 
--#ifdef __linux__
--    XCOMM When starting the defaultserver start X on the current tty to avoid
--    XCOMM the startx session being seen as inactive:
--    XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
--    tty=$(tty)
--    if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
--        tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
--        vtarg="vt$tty_num"
--    fi
--#endif
--
-     XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
-     if [ x"$serverargs" = x -a x"$display" = x ]; then
- 	if [ -f "$userserverrc" ]; then
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
deleted file mode 100644
index b4de2528749e..000000000000
--- a/x11-apps/xinit/files/xserverrc
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/X -nolisten tcp "$@"
diff --git a/x11-apps/xinit/xinit-1.3.4-r3.ebuild b/x11-apps/xinit/xinit-1.3.4-r3.ebuild
deleted file mode 100644
index 9cca45f03285..000000000000
--- a/x11-apps/xinit/xinit-1.3.4-r3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+minimal systemd"
-
-RDEPEND="
-	!<x11-base/xorg-server-1.8.0
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
-)
-
-src_prepare() {
-	# this patch breaks startx on non-systemd systems, bug #526802
-	if use !systemd; then
-		PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch )
-	fi
-	xorg-2_src_prepare
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
-	)
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession
-	exeinto /etc/X11/xinit
-	newexe "${FILESDIR}"/xserverrc.1 xserverrc
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/00-xhost
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/Xsession.desktop
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-}
diff --git a/x11-apps/xinit/xinit-1.3.4-r4.ebuild b/x11-apps/xinit/xinit-1.3.4-r4.ebuild
deleted file mode 100644
index ea3e115f959f..000000000000
--- a/x11-apps/xinit/xinit-1.3.4-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X Window System initializer"
-
-LICENSE="${LICENSE} GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+minimal"
-
-RDEPEND="
-	!<x11-base/xorg-server-1.8.0
-	x11-apps/xauth
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}"
-PDEPEND="x11-apps/xrdb
-	!minimal? (
-		x11-apps/xclock
-		x11-apps/xsm
-		x11-terms/xterm
-		x11-wm/twm
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
-	"${FILESDIR}/${PN}-1.3.4-startx-current-vt.patch"
-)
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xinitdir="${EPREFIX}"/etc/X11/xinit
-	)
-	xorg-2_src_configure
-}
-
-src_install() {
-	xorg-2_src_install
-
-	exeinto /etc/X11
-	doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/Xsession
-	exeinto /etc/X11/xinit
-	newexe "${FILESDIR}"/xserverrc.1 xserverrc
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/00-xhost
-
-	insinto /usr/share/xsessions
-	doins "${FILESDIR}"/Xsession.desktop
-}
-
-pkg_postinst() {
-	xorg-2_pkg_postinst
-	ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
-	ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
-	ewarn "any executable. When you run startx, it will run this as the login session."
-	ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
-	ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
-	ewarn "Here's an example of setting it for the whole system:"
-	ewarn "    echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
-	ewarn "    env-update && source /etc/profile"
-}
diff --git a/x11-apps/xinit/xinit-1.4.0.ebuild b/x11-apps/xinit/xinit-1.4.0.ebuild
index 980a062d1359..67abbac0edf9 100644
--- a/x11-apps/xinit/xinit-1.4.0.ebuild
+++ b/x11-apps/xinit/xinit-1.4.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
 DESCRIPTION="X Window System initializer"
 
 LICENSE="${LICENSE} GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+minimal"
 
 RDEPEND="
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index eeb0eb7df347..fe0e020d9c28 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,7 +1,3 @@
-DIST xkbcomp-1.3.1.tar.bz2 246963 BLAKE2B f3cd6e30b61341b2ae29731e97d9e3d833f9f2f12f751664fa0a919ddb06dd8fcce5559107c147b39522970885881512ca0221a5119b06b646456c2f6471fdee SHA512 03ee4cad3ef0295b57eda25eec2c301baf04beaea8936baff5ae87e3eb41ace3095ce3fc80a55cd1c4f58581ed23bc0acfbe38879fce27e2a6f6cd647ec6bae7
-DIST xkbcomp-1.4.0.tar.bz2 243774 BLAKE2B f6a226abfe555608a898a7db40fd83cac954bce6d688c1e68fa42e94675428f1399ee85764adece215456f9e3103882a83ae218a695bd60f28a0e0dd0e0b3261 SHA512 c96a63fc2d9a6ac17123297574966c45d0dcfd4ae3d4073ce863c7738d453f4c0a5f7a87c06efdec19f0b270207a7170fe1aa72a73ef1b50f95c7ca262f4882e
 DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
-EBUILD xkbcomp-1.3.1.ebuild 458 BLAKE2B c06aff2b862cf68af1950647fe3d8f60342cb17225516c1d31a6932371e49199551b290311d58cb57312cf8854e8975e84d5b0fe1a2ebd81b407fd520bb98363 SHA512 fbccde9c157ba47ae47ae3cdd52c3fe254dbb2fc4f395f0b5ad5e18f52f35022912646b42ba141b08ef1e644293ab59ab07fee437e4b4a8c5534083406dc3443
-EBUILD xkbcomp-1.4.0.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
-EBUILD xkbcomp-1.4.1.ebuild 459 BLAKE2B 5ad7a3b31d467692c80abfff18903399c2a5f43222e4081ab4a1ba768ed42712f74317622846cc3a1f2813a0254a2a09b30481f5fa82f62798841962dfe91579 SHA512 a430b31cae73f61b98c15ae3ae6735fbb465827894ef2ffe151e408b79beb87be71e342efd5c91f2a6add9bb173d696e6b0e433e63e12bc936c11a3fa64efada
+EBUILD xkbcomp-1.4.1.ebuild 458 BLAKE2B 494541c3f941fedd25b488a4094bc0f92598948b454eb1bf32c5abac18dbdae01af939d4e259928b450cc7976d9f93fb49cd207e239e99c6bb6999f37152586e SHA512 899bc4a357b2a9feca67fe97e9b3a2b7bdfef6d180331493cfe3b4dec67e1b669f5f956a7f244973acf8bb8c0d96d961d399644487279d07b55be63f4341de33
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
deleted file mode 100644
index dda097533d2f..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.3.1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="compile XKB keyboard description"
-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 ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
deleted file mode 100644
index be2694f8fedf..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.4.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="compile XKB keyboard description"
-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 ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
index 0f8d6920e19b..be2694f8fedf 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit xorg-2
 
 DESCRIPTION="compile XKB keyboard description"
-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 ~x86-macos ~sparc-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
index d011c1b99ab2..83752473841e 100644
--- a/x11-apps/xtrap/Manifest
+++ b/x11-apps/xtrap/Manifest
@@ -1,5 +1,3 @@
-DIST xtrap-1.0.2.tar.bz2 95471 BLAKE2B 430d6881b743094b1e9b6eb60479cef44d636108ace4d53db35ed0371c567b2623088c5997c1dedebf17143bdd81f2e531f7b7c728f3336fc2c419b1ff3c8b39 SHA512 5fe6e02dd36d2fb65e5b83cbdae81d89fcbf467c9fc3f943a013299c2fc03c76f125627294302acb808d8b53e3ec51a82ba288d793df6ba3e88e0c980c6b3f77
 DIST xtrap-1.0.3.tar.bz2 134065 BLAKE2B f0e67ff4436a2c7eafd2ed4e6fe5c1d41dbd397918cbffa81587c4b3276c206cc4b9e4e889d50588ffb2dd1b029f04304acf1f34c27b1dccc52c61342ed5be91 SHA512 cdb205859a96a64ede8ce1df119c318e5b6d35107425996c18be0ec56a6287a0564d768f93012f301cb91d517f67261de5c76441c0bfb796cc0190799aaf6c2f
-EBUILD xtrap-1.0.2-r1.ebuild 324 BLAKE2B d271e66251759aa367ee5f02a789e7147a63d484f2a5690d2cc9267025824bd6ee66f0cbcd6510c561a9ee9010fd7c5d6675380bdc9e3c7ccb38d71f8d6af440 SHA512 caf4835f82b3b582bb63b7b4cd1edfa7d9630d32f6cf88fff0810e245ccaba1b2164570290d8e0c6382981f67fa7c1c09b45d225d7f462157a01a3106a3e46be
-EBUILD xtrap-1.0.3.ebuild 345 BLAKE2B 55bec46bdbcd25804a166e8d71ca128a0cb853cfbb392dcae2853f728f75dcbcfbdadd8411e820614839f91c1bc9a665ac0a4e39ef4672d7064c0cab39cb0e26 SHA512 e9115511a798df284cdadd56d0b58311681c329ce6f99ad3d5964c6dbb9099080a46361c48a264f86b3528fb6561a83e2c182e4c4b9b1a29571d88c9c25657bc
+EBUILD xtrap-1.0.3.ebuild 344 BLAKE2B 49d1eece56d8b71026717e525a9c6da9911f7077ab71d6e2de5f714a5a11c57264f693f69cc613f53e48b13cd7a223799b78dc4795f178ed3c5fa33c2bdda7c1 SHA512 264dd4fe0efff3a02a9defe1dfa70b812957c93a2344aed4ee4f22a755e3f21939f693747a5580b4c16cf4d14146d89cebdf5a8c271fef7368a91ebac13ab9ae
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
deleted file mode 100644
index fbe79b1339ed..000000000000
--- a/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXTrap"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
diff --git a/x11-apps/xtrap/xtrap-1.0.3.ebuild b/x11-apps/xtrap/xtrap-1.0.3.ebuild
index bd3a6b9a5ca6..ddd13d4ff23e 100644
--- a/x11-apps/xtrap/xtrap-1.0.3.ebuild
+++ b/x11-apps/xtrap/xtrap-1.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 inherit xorg-2
 
 DESCRIPTION="X.Org xtrap application"
-KEYWORDS="amd64 arm ~hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt