gentoo resync : 30.09.2018

4 files changed, 2 insertions, 18 deletions

diff --git a/x11-apps/Manifest.gz b/x11-apps/Manifest.gz
index 6111e8e4bd78..fa6129232eae 100644
--- a/x11-apps/Manifest.gz
+++ b/x11-apps/Manifest.gz
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index 2e653915f1ac..8fc7a9634d9b 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,5 +1,3 @@
-DIST xkbcomp-1.4.1.tar.bz2 251069 BLAKE2B dd485d2a5c985bace74fb5cc8da64d6b33dc9450c2e98f42e7e82f989faaa724da068799c40d2703da7172d758e67ece633ca47d2fc97342ec7a9aaedd71d201 SHA512 443397e112f67e2ebc5150ec0dbf0f4a072ea39585d964d2c7cbd0569b7e0ce7d8bed0bc2c2d886343fdb060c941e65b42aac16adf189c66e90849029e278f23
 DIST xkbcomp-1.4.2.tar.bz2 248399 BLAKE2B dcc09823fdf8a62451a1daf8dc56adbd1713b56ac7343b9edb8b3aef8b527ab8443a056ae6b4f8c21051ce5aa4764c9b198c9a5cd0e929f52e9a3e191b950334 SHA512 b00d1eb08c19be86044418c8ea3bfc3c3973406c481878270138a70ed9dab348acb8e4d0af8678879598ffbd7df1c640a63d0abad3d7481758be99af8dd7734e
-EBUILD xkbcomp-1.4.1.ebuild 446 BLAKE2B 079a752e517ac8989881f11e069aab9105fe1c701e7fa6d4a722ae49365cb4c209663aa308ee7794c976171fd27cdc12d9986904b0218925977f4775dcc93815 SHA512 282a652e0293ba772c40526907b3b73573ecdf4bce430ae26f36d3eba5b14f6636111f59569833d2cd6eb35d6d3a1db0462d3d6635ed213d45c49ea7a122d60f
-EBUILD xkbcomp-1.4.2.ebuild 450 BLAKE2B 9fa92ac4b5f001ea90ea1840f1da07800dfcdb054db93fb6a6705fd06cf25373595490f14765e5d3b6193b0a54e2bf07331ead2811411342162f4a4ed5b04ac2 SHA512 38a33d72b605835092c6a3ef24f5f0fc19e212d7b5f885e83623619d40bf674981425e526b69d94612be9aebc23835c056fa7a50a57d1ef9886f04c0e640ebcb
+EBUILD xkbcomp-1.4.2.ebuild 447 BLAKE2B faae055663b315dd8c4647a5448d80f6a384155a23fe119363b502a6f56f7b2ee57805191dee8604b9519bcc1c0e617f3ba7bd3bb22a0116c3161f406156c2cc SHA512 c96f63b303aa495842119df7893c45aea534dadc44ac7bf6a41144e796ed2f5ca118923b7bfaf462e8de2fc92b6ecb78c952465bc4697b7f6d51bb3f00adefa7
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.1.ebuild
deleted file mode 100644
index 71ce633f34c7..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.4.1.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 ~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.2.ebuild b/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
index d6587f9b2357..e3605f2fc588 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.4.2.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.4.2.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 ~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 ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"