3 files changed, 2 insertions, 20 deletions
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index 05d597a82ab7..1a10c206e12f 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,4 +1,3 @@
 DIST xkbutils-1.0.4.tar.bz2 131269 BLAKE2B 20e51a33b280bf4eaf6dfb3b2986ffdb09d1bb4fe3dd3689de5256204cc0e90808367b0afc054e2b5a6746b3b125bc0d20337761e1714c069f3c300a65fddb06 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d
-EBUILD xkbutils-1.0.4-r1.ebuild 357 BLAKE2B 353a7729087263f2065ec40751fc63b716ae999cd0ba2e1e28bd614fe5dbe2dee18f216189d95e9eb69c88f04ad9a320000d4a2046847ee399b93a528e08c804 SHA512 78764cdcdb942f992624057b9f77719a3acb34ccd04155735fd8d01f66bde384b5adfe09e1605e0c32805a4066613ae80256474d234d458aa8e9f5b2df86509c
-EBUILD xkbutils-1.0.4.ebuild 359 BLAKE2B a8f3c870330fb536a45fd8bbd19ccef2b13bdd39a1f11f0ebce2d247d80aaa6b20e2a0806c47b39100a63198ed94e6feeca5b7fb8cbd5756554e60eac9f65938 SHA512 f6b17791a4b3df16e1bbf47fed78f2572a42351faf82fc8087412c53c6b250d3eb5e6a92fef1cfcc9124d5173ec9ba69695fc9b8a59ffeee9af3b42a9d22756e
+EBUILD xkbutils-1.0.4-r1.ebuild 351 BLAKE2B 5e91ddc2656f3640553fc9855f1f53423647c007d4abe5698ef8a2a891cb829d2fbf7656a78d18724550196513e32f8fab4ca1a16c6c1194d8575bddd0726653 SHA512 840013cf2f507057107efb57b291cc21897f4ef32fc7260319e3aa12b369b9b61f4faa31806727e74ea89a5d157e250bc1e691a0e9655bb2d0cf36def0a5a254
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
index f407430b8807..65a60558ad4a 100644
--- a/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
+++ b/x11-apps/xkbutils/xkbutils-1.0.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
 
 DESCRIPTION="X.Org xkbutils application"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
deleted file mode 100644
index ead2202df2a2..000000000000
--- a/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="X.Org xkbutils application"
-
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"