gentoo resync : 22.05.2018

4 files changed, 2 insertions, 34 deletions

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"