gentoo resync : 14.07.2019

12 files changed, 161 insertions, 17 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index f92a18230ac3..bca727cf2f8a 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/igt-gpu-tools/Manifest b/x11-apps/igt-gpu-tools/Manifest
index ee2f13c1ba0a..93825d18efd4 100644
--- a/x11-apps/igt-gpu-tools/Manifest
+++ b/x11-apps/igt-gpu-tools/Manifest
@@ -1,5 +1,7 @@
 DIST igt-gpu-tools-1.23.tar.xz 1045716 BLAKE2B f5e55ce9b682f2a9f2c6ab73c1e8e933ebea09b343f3af02df50b5bdce3e2ac313b1f92709c6de0d9fc7ffe2e2c9dfa95d2918ae9bd561cc285cff30fe59c6fd SHA512 8697265a978359e28983f483bf95819844597fc2080923d15d0587f6d648081af27e8ea318873e20103bbf8446b9f1005c6bc90a6276d3169837abd181f96839
+DIST igt-gpu-tools-1.24.tar.xz 1207436 BLAKE2B 0b04033be0195a4fee5611aeae2f47334ce1de5df65c652ebc0b36d1185286268bb426f472e3c1311ff576e8184e7a4efb95ef3181006ed8c448ea76452940d7 SHA512 22c25e27ead64f561fe8f46b132d6c7562a90d7bff09dc2618a532b16d7b8fdf54ed94d986a45655657b54219d350ce1b1e6c89da2b6073024e9bbe0973fa190
 EBUILD igt-gpu-tools-1.23-r1.ebuild 2543 BLAKE2B 53e126ad1ff997fc352d502542caf53b186addba0794db766669e199b884a8102fa7252c59eb723c31c002105a5fd1b2c4c0090683b6d45d91e2252b9bb81161 SHA512 42a7178f56cd09440d2d535a0f9bfff6a30c1bc4562224c0d62bb1269a9dfaa787c1b791851cf7c630caa45c6debae6a926cd0cd9e1052406c4f7f96d4ad869d
 EBUILD igt-gpu-tools-1.23.ebuild 1480 BLAKE2B 96daf039d3e8d00c898c34fccfbf55254b954273dded0106b4585510d9a0f724553b40d4c3f6649cb008b80bcaad1975af6121e2198742e7c0cca0ead61a4e80 SHA512 b636e28baa9ae33bc971273c3cb165da041f36aff7eb2cd329d6e62d8b24938d749282674e072fb7a32e2220db068dea89258ae9b2554669bfd02968b79a8b87
+EBUILD igt-gpu-tools-1.24.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
 EBUILD igt-gpu-tools-9999.ebuild 2509 BLAKE2B e5d7344a2cc59a3fe6f6e72abe3433fdb88344faa20b00ab11e7499b5911e734a983ea6cf64637f3e3e56df57c8a9fd766eb0832854ad2f30fc34ccf873e46e0 SHA512 2d50a2db3f8dd94138b0c7479b7a6dc5839efe4ac4c5e1cf5956db79cbb721f789d660f4f6620c8c201687e25cc6309b112d9ff2b28bde69c7fe1b964ad161ff
 MISC metadata.xml 814 BLAKE2B 361429b06051651da503aaffc4dfd632f1eebc24a1968d7945b86e1a7410a78eb4ef50458dd8d42041b2ad2a18dda4a1b9c767a57c44fc3296717f27a2a64a9b SHA512 094b5cdc37051da14c48bae7a714a29b15a40488c10c0d997c168ee3da16a911186555130fcbd4592c9fb4b948af06a3a00afc2d36b7af9f194c7c801d80e2d0
diff --git a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
new file mode 100644
index 000000000000..8662c0102ba5
--- /dev/null
+++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.24.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGIT_REPO_URI="https://gitlab.freedesktop.org/drm/${PN}.git"
+if [[ ${PV} = *9999* ]]; then
+	GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+fi
+LICENSE="MIT"
+SLOT="0"
+IUSE="chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv"
+REQUIRED_USE="
+	|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau )
+	overlay? (
+		video_cards_intel
+		|| ( X xv )
+	)
+"
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/elfutils
+	dev-libs/glib:2
+	sys-apps/kmod:=
+	sys-libs/libunwind:=
+	sys-libs/zlib:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	x11-libs/pixman
+	chamelium? (
+		dev-libs/xmlrpc-c[curl]
+		sci-libs/gsl
+		media-libs/alsa-lib:=
+	)
+	overlay? (
+		>=x11-libs/libXrandr-1.3
+		xv? (
+			x11-libs/libX11
+			x11-libs/libXext
+			x11-libs/libXv
+		)
+	)
+	runner? ( dev-libs/json-c:= )
+	unwind? ( sys-libs/libunwind )
+	valgrind? ( dev-util/valgrind )
+	"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	man? ( dev-python/docutils )
+	overlay? (
+		>=dev-util/peg-0.1.18
+		x11-base/xorg-proto
+	)
+	video_cards_intel? (
+		sys-devel/bison
+		sys-devel/flex
+	)
+"
+
+src_prepare() {
+	sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build
+	default_src_prepare
+}
+
+src_configure() {
+	local gpus=""
+	use video_cards_amdgpu  && gpus+="amdgpu,"
+	use video_cards_intel   && gpus+="intel,"
+	use video_cards_nouveau && gpus+="nouveau,"
+
+	local overlay_backends=""
+	use overlay && use xv && overlay_backends+="xv,"
+	use overlay && use X && overlay_backends+="x,"
+
+	local emesonargs=(
+		$(meson_feature chamelium build_chamelium)
+		$(meson_feature doc build_docs)
+		$(meson_feature man build_man)
+		$(meson_feature overlay build_overlay)
+		$(meson_feature runner build_runner)
+		$(meson_feature doc build_tests) # Test build is required for docs
+		$(meson_feature valgrind with_valgrind)
+		$(meson_feature unwind with_libunwind)
+		-Doverlay_backends=${overlay_backends%?}
+		-Dwith_libdrm=${gpus%?}
+	)
+	meson_src_configure
+}
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 1eda68c5bcfb..b0dd19426e10 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,5 +1,5 @@
 DIST sessreg-1.1.1.tar.bz2 136044 BLAKE2B 63cb285b82b1e47878b8e5165083efa320d8e13b2e8ca2e722df4d095fccc306d748966983d23833e2c4e9b31c0bcae62f10b5ed7da55eb5e32d46bab31061bf SHA512 92a21d31c5698212fa3d04360f4e931e018156ffed70ba03bee3f1ecd8540d5d54f07a0c7661e1077b73255eee4cc1afd1dda6907df109d3556626495ec08193
 DIST sessreg-1.1.2.tar.bz2 137612 BLAKE2B 0fe6484b83255bc2b917645ea841ad43b927131a8ef3fa9a47e7864984259140579c462c8d03645928ffd4667e7c46f36c5eb1aa35ce916ab65126c55f6bdde1 SHA512 7e3c2bdcadb7133aace463b58d8c6108d315ec95d2a42509073eeddc7f02644092a4b3168bd3b426c041736a016291092e0bf8368acd620dbeff96d53d12f98c
 EBUILD sessreg-1.1.1.ebuild 355 BLAKE2B 259b1f9aaa92ebcfdbac654479ddd708bc5ac57cc4743985f3957ce7db0aa2bbb85fad7a01c373b8c516a628c320969164ac0c333330e038046721bcdad80536 SHA512 cb25d5f1b75d86e6938292efca47201a59d7dec37889d647391e858a1b7e7e83452363f72a0b0e118a478ec4f1f5c6e7629e39c9bcbcc39a00243354fca93d23
-EBUILD sessreg-1.1.2.ebuild 360 BLAKE2B 1be967218effa9095265e728efe44b056fb144c1c6f3390001c681c36fb327375de1d704802ed0d38784e106e4b5484f685b8544e6681628f2d1615adf38d6e7 SHA512 83c4fa7eefdbf376f694756a195deafb26a5cd5d5a8ab4e860a95e89832ab39fc39b62a74f115e04f34bebe3cb0929f441b5053a1b8c0e7fbfbec770ffd81566
+EBUILD sessreg-1.1.2.ebuild 359 BLAKE2B 9bcb7e54a93a3c38258ab546c1baa275c543563ea90cca4e4e7cf3bf3d1e06b01d77134c02e74f58add094a8de9a49ccd93c3d1e678601be02d52b51e43b138e SHA512 a05b5b175e47b827c9f4eeffa3f6b8437838f5b7468ad91221dd8267f0b3cdf067a9a5f1101ac721f560104b41963f5874b4cb917909b3b7330e7ca7b4d3a077
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/sessreg/sessreg-1.1.2.ebuild b/x11-apps/sessreg/sessreg-1.1.2.ebuild
index d7aaffa2cc1a..f8fc65ac2b42 100644
--- a/x11-apps/sessreg/sessreg-1.1.2.ebuild
+++ b/x11-apps/sessreg/sessreg-1.1.2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="manage utmp/wtmp entries for non-init clients"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=""
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 7f19696ea884..f53246c1221a 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,4 +1,6 @@
 DIST xauth-1.0.10.tar.bz2 162176 BLAKE2B 0a3a70360357f0f1a36a72e54b404526e62ddabbdc8b2e6ed992ceb56847fa983b9cec1ba23aab92f4b2fe0712f097a8721d7c50a4b4ead217a5704cda76ea82 SHA512 1ddcd80848c4efffc6d0a576177f92a3ce47eb871a6c7e2097d96491aec027404d437e0bd792714ef423989153a9644f5ff179bde4dfeb4b340636d642d5849f
+DIST xauth-1.1.tar.bz2 163510 BLAKE2B 0b55ee9ec35ca436c36effe2ba4eee55f76a311a5482d1d72e80e5afea30c682de3f686b2956d17278721e190dd9bec4d93db6507853841a633c931312df745d SHA512 b6ecd59a853a491ef45bf8cfbff63bed36645f81cb79ae9d18458b57f7502bccf92f0d979d3337578518646f680ad379e67b1dac15a927cbb11372733e7a3a0c
 EBUILD xauth-1.0.10.ebuild 663 BLAKE2B 6776d89fede43d9b6d57328444c4a1ba9d261f4170cf1007c6b79af501b5c67cb46a361682a6046b23ccfed496a27f34f637f60a126fe4aad545abaf89b5d97c SHA512 0fd029a3cfe03e4a08da9147e1b856bedf8407c21299339fbd151038c5de3920c1ec305dc58ff720575e5c0e3de484fd169f3c3bf811d62c4d7ea34217e8b6f7
-EBUILD xauth-9999.ebuild 545 BLAKE2B 4b97293aa97ef5d05644508ab8bd6c055fb65d5c484981fa1cb786e5012e45e378d393b39c76d0744680e1385c36bc2da55a35192fdea22ff2e4b4ed18b23412 SHA512 99b1c10111900c48a7debdef3020905899018844fcc9b52b72e304e6a7f9702145565e2363bc8a7908cb7feb13e2bba0a62fd9afe64616ad14400e8e9c3c4c81
+EBUILD xauth-1.1.ebuild 659 BLAKE2B 2aff9ff901ca6c2cff8e73acad3a4112873774b430d4c6bad930154a07fd5b8d57f2d2b2dc28e80bd12cf8a45fb8ae82b5a6480fc0fe5f5564e9a4e52f41263e SHA512 2a2a9107b480b777bacae80da61a3c5035846f681c627547f492fc9c1117c31efa0eef99b10f32d3fd8add3d06e6965af6e6a0648234d11d6d7dd45b3c693c1f
+EBUILD xauth-9999.ebuild 659 BLAKE2B 2aff9ff901ca6c2cff8e73acad3a4112873774b430d4c6bad930154a07fd5b8d57f2d2b2dc28e80bd12cf8a45fb8ae82b5a6480fc0fe5f5564e9a4e52f41263e SHA512 2a2a9107b480b777bacae80da61a3c5035846f681c627547f492fc9c1117c31efa0eef99b10f32d3fd8add3d06e6965af6e6a0648234d11d6d7dd45b3c693c1f
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-apps/xauth/xauth-1.1.ebuild b/x11-apps/xauth/xauth-1.1.ebuild
new file mode 100644
index 000000000000..057d3ed2a71e
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xorg-3
+
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="X authority file utility"
+IUSE="ipv6 test"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="test? ( dev-util/cmdtest )"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ipv6)
+	)
+}
+
+src_test() {
+	addwrite /proc/self/comm
+	emake check
+}
diff --git a/x11-apps/xauth/xauth-9999.ebuild b/x11-apps/xauth/xauth-9999.ebuild
index aa5cc700c661..057d3ed2a71e 100644
--- a/x11-apps/xauth/xauth-9999.ebuild
+++ b/x11-apps/xauth/xauth-9999.ebuild
@@ -1,13 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools-utils xorg-2
+inherit xorg-3
 
-DESCRIPTION="X authority file utility"
+if [[ ${PV} == 9999* ]]; then
+	SRC_URI=""
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
 
-KEYWORDS=""
+DESCRIPTION="X authority file utility"
 IUSE="ipv6 test"
 
 RDEPEND="x11-libs/libX11
@@ -15,17 +19,16 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}
-	test? ( dev-util/cmdtest )"
+	x11-base/xorg-proto"
+BDEPEND="test? ( dev-util/cmdtest )"
 
-src_configure() {
+pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable ipv6)
 	)
-	xorg-2_src_configure
 }
 
 src_test() {
-	# Address sandbox failure, bug #527574
 	addwrite /proc/self/comm
-	autotools-utils_src_test
+	emake check
 }
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index a71bc0bef7ef..262e10ca12cd 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,5 +1,5 @@
 DIST xcalc-1.0.7.tar.bz2 145644 BLAKE2B 54bf53e652a535db5d116f8a5193b4b165fd500d3943b83fc294ccb3df44b39b4774ab0d9f44c37ff1a915948879d815738bb9e4caf8e1ad18830cd4addc05e5 SHA512 890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388
 DIST xcalc-1.1.0.tar.bz2 148193 BLAKE2B 8643544d7871eca1e242b643f1e80fc76b7b2f64612a75ca2ec2537194df84862d9b86be515acea5114a8f2dc6cfad7c95cf40e396a0aeb26a6951198827755d SHA512 877aab7bb08f409a21c26b841f4d91eb6993914ed0d26512e47d6b3d2b3e0b231158901415a106cfb45de43f03f253bf2a8733f986538d4ee810afe0e54f98d5
 EBUILD xcalc-1.0.7.ebuild 385 BLAKE2B b98e169e049a828af4a8b518acfce338d80131d0dc58671906abf9dccc742ee2a0575fe796f6bed43849d3273442d7e9bc8a4c332087318b9b617817b7f12f93 SHA512 eb3f726c638685bcf5a223a5acf880f1e8ffca74e360eca7cb44c4ab2ef723f711253259ef63f88278d82614fbce78c89699884850adce1ad2b24a3a7792f3ed
-EBUILD xcalc-1.1.0.ebuild 411 BLAKE2B 898844ff43e02bcdf0b63cc6b805956c93728776d9247a1a6ad97664b5763c68c6afadadbebc4c479d5d04ae3b6e6f69d03d6387d6f252857517e3efa0e06e29 SHA512 5a157eda8fb461c038a50b640c2c621ecf39bc185703f618895ff46340cc698405f119b8b9d20da322c76a8d35db949a87753d65ab8b35c20afe964b446eebd5
+EBUILD xcalc-1.1.0.ebuild 410 BLAKE2B d5814590365997db081a504424e37db171b5857a074124fbe414d9219874df0199469aa59759a87a9aa73ab537dac9580a8967553cde7e2b26a6ef601ae5dfee SHA512 717a5809eaa3f594f2df9da1d2f7f1afa131b8cb29b3666ac6e874ec9b181a29ab60fc65491344357d831db30db91dac5de3b818216aa6ad399474bb0dfb9154
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xcalc/xcalc-1.1.0.ebuild b/x11-apps/xcalc/xcalc-1.1.0.ebuild
index 970d5315e500..5d9604cd1fca 100644
--- a/x11-apps/xcalc/xcalc-1.1.0.ebuild
+++ b/x11-apps/xcalc/xcalc-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="scientific calculator for X"
 
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/libXaw
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 9376ec4fca9c..8704948f8e23 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -11,5 +11,5 @@ AUX xserverrc.2 143 BLAKE2B b33fac4b5ba731c79167d21a07840c46abfbb33e8fbb80aa1c3f
 DIST xinit-1.4.0.tar.bz2 174491 BLAKE2B 5a613a244a22f3bb4de43ae23b8f590b41a6af2c3adb282d2a089f4b94117220d86654c16cbb20ad0a50b6aab1be65512a7a42850e9047cfca96f25af964d081 SHA512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e
 DIST xinit-1.4.1.tar.bz2 176206 BLAKE2B 1c20f34db344eb967ac230a0cd61ad07d0089668aea32973e9b8b9749e5260ad5d93a7f6642a4f2c8d6b01870696e4e1e422790c2954320039aa85e6dba8870a SHA512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
 EBUILD xinit-1.4.0-r1.ebuild 1831 BLAKE2B dbd073e60166dfe8a4be89dd1ac3fb9521b4f26b441f8dae835127e45533c93c5fac61673b49991612c0b4f8ab8ab96b50020b154db515976b7d7a20a3a3a067 SHA512 25639916b11982c789d061a4ea9a47ff92724c8412a8fb0290fa50ffbc9d17a4252843b8fc94abaa90adda8df6e400e933788e1c3e3508ceaf7cc61ddebbadde
-EBUILD xinit-1.4.1.ebuild 2262 BLAKE2B 5a1f4e45c831c3af66885c06074b6cd20d8fb62a8bbe864d34cacd72052ac8af39776020c97c88ea5fb39bb07482992f97d7fce69847d7621b1997929a406429 SHA512 5ad6a7036eecd5d27a5a099f73cd032c83525124ab90eb5ce74886977b88cedec4a1943aa1bd21dcafe1d49e17969d986499c8c553ee15fb18dc731c13ebf76b
+EBUILD xinit-1.4.1.ebuild 2261 BLAKE2B 1606c20c543744041a956b759b601d24a24d3aa003798f5ca005b7382aa0363c36a3a0d6ef297f5b0f4096ae69c3facb816dbc05f2a76a1c28111f840c7e85e6 SHA512 0d055b154ab2ddb40197eeabc887afa4de208bb33540585b543a4c3c602e882f0e06ff4ffd311c3216b7b1ed7786509c59737c6d0512b7747d9d8cdb1c2a75ad
 MISC metadata.xml 628 BLAKE2B 15035295f88d4214959761156b63c4ec3997b06306c5e1cf61e33cd976c857564185abdc0cf7ead35688cbffa620e7d8da69c019281bd5efedccece6b42e3e05 SHA512 505e7ab74b57b8e137347a7a204f49548d4316e1c238f5c916ebc4d8d87666f854b188819259c6529bdedf1113c113c9088591e16abe4fe22f62d7d0a329054d
diff --git a/x11-apps/xinit/xinit-1.4.1.ebuild b/x11-apps/xinit/xinit-1.4.1.ebuild
index ff00135c3fbe..9023090213c6 100644
--- a/x11-apps/xinit/xinit-1.4.1.ebuild
+++ b/x11-apps/xinit/xinit-1.4.1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
 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="twm"
 
 RDEPEND="