gentoo resync : 22.05.2018

5 files changed, 3 insertions, 126 deletions

diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 2c56c04585b9..5fd27cc4369a 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,9 +1,3 @@
-DIST libxkbcommon-0.6.0.tar.xz 608700 BLAKE2B c82ce8dd9971e53161630d044b48fc5d11011d828ac20f5918a985a3c38c05e85ee3864610238d77a78b7295d7f95a074cec829767e31d1629d23cc8811ea539 SHA512 b70ff4b3b85f03cc2875622ccfa60ba6f1b86a07be90df8be73b867771dd08a85740df95fe8dfef2bacf4356a6dfc9c51523ec6ce60d197184860577b39586c4
-DIST libxkbcommon-0.7.1.tar.xz 622384 BLAKE2B f45c0a8f882504210e1fd7d4535643cb4245b3fdfedc03a73fd1c149ee32149431d1ae3f0a54a27a28dc05a70c6701c314f07f252da9363e5b8124f1b9f1c18d SHA512 9f209214d5d7f9334cabb2cd7e0d9b9b0392c1fae06b60e92a03398875399fe48754b543389f78b8b06dd28a86dfd440720e534bae309ca8ef882eb874dce4e1
-DIST libxkbcommon-0.7.2.tar.xz 630276 BLAKE2B df4f29be0583f40008b48077dc5d4c0de7bdf66fc5df6e6df723f59623cbc681578f40fa5240fbef62ea785aed049805b65bfce82eb6497a4eaa27660103a10e SHA512 4a06f9d719393a34689fdd74b0cce80af20e26cc5bd6e1b34fff4093a4f8f103704bdc54f0245b62903cdd7529cd8d59864924b9f4ddab314d152804da4da649
 DIST libxkbcommon-0.8.0.tar.xz 643456 BLAKE2B 37f8e8ccff63354dc37ec26091a7da28f5a1f05ca0656b03716cdcdbf3172344d600b3b2b646da309ea3e4f04bde1b1279c96b07c493266ec6489935177efbbc SHA512 ad64baa03685b72e1047f9fdfc95661acf5bace59280a95d3defaca73c91fb77c31ecde00b430726e3521ff90cf8dd93ecbc816c18be0971cb616e00b81cf163
-EBUILD libxkbcommon-0.6.0.ebuild 951 BLAKE2B 37edc93a4af4e6f76d0e94e478cee9633ff0c945f7ad8dd5d15ff8d41231f9d6b820e4e001cdd9fd2f2cc0da444281b9637fd0778e6971b5907351f63ffeadcc SHA512 de65aee937a33286f600d70aa94d75b312c3ef54f1234054b26414db5699927108d20ed1b43fd1f4a4e6bb1fa165ca0d568da18b1aee840c40d1a19b25f548ca
-EBUILD libxkbcommon-0.7.1.ebuild 986 BLAKE2B b5fbcb23d89770c2c138623d3e8b57bdc57bfad1de2b63c547fea5b8bf1e43f2759d5d8fcec336873321d87321eb1f5e30bd2ac525ea74b8b04db8c80609f9b5 SHA512 cd5d6383fd37932afc59a79c8018da07e81e706906f384f79bf5bf0603a1c921073add913433fd216c046bacbb7cf4be90991f322d5408aa2513aa59f5564506
-EBUILD libxkbcommon-0.7.2.ebuild 995 BLAKE2B 277162985edb0258a290a6cdc0f3efb7a70f3ab7933cf414ccac08eed25c7b1863502405a5ddf1f55b1a0c37caffbb75d86d5b3cb5e984ae240a5c324c819b89 SHA512 b6fcbfe5723191ebf1390b63b21c49142f952b138e703c5715f693670a8eb8039f5808135ef7ee57d7b84f038d6d12be4c47d758f4aa91e079b37abd56c6f543
-EBUILD libxkbcommon-0.8.0.ebuild 1006 BLAKE2B c5d3d2d0bc924011083a281bfed1e14e26200c0676d79b4e3c619a0c17db7d339ef2e70dc51b433cf89ccd2c337aea75e7e3a5eb66bf65fa1ef3484ba82c9472 SHA512 6348410e210f78c7757566a6ba5d5be7aa7637c22e2fe93c578664c4b6352d091d36a20f719868c352251c3386a784a7d12f96b9df3bb86f35740c8d33e275e2
+EBUILD libxkbcommon-0.8.0.ebuild 927 BLAKE2B b61005d7c7bf19d47222572da239a90d15ba4d5e1ed3bed32891ed4bcfb5da66a102190630d3f004d33da0ac81aaacc0b1cccfd5d506c312883df275e1beffb3 SHA512 583c890dda84aa07a0ad9a42afde72e57c6ec8a6bcd808dceca9a82aea1e2ce5d8b633eedf8a9539f647eeb108ad8135d0a357efd770c711dd465524abb3a91d
 MISC metadata.xml 234 BLAKE2B b45f6795dbd73dfcee2a68f93ec5460509b15a69401467bc8f4af9505eeb04a2aa35a2b144eb88781df4abd4e15d2b88fc728daf033c6d646762170ffb00b1a7 SHA512 fabcd59aeede4ac93d66552746edacc44fd565551aafaca67185aff7f8e6a4c0fa21f3d54e4fccd7def948ec57b90489631bd779fb992cd9322132b0a3aa503b
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
deleted file mode 100644
index 69ff6c0b4422..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.6.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_EAUTORECONF="yes"
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
-	>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-	>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
-	doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
deleted file mode 100644
index ab4a07d9ac54..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? (
-		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-		>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
deleted file mode 100644
index 0a4987e6ce5a..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.7.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-XORG_MULTILIB="yes"
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EXPERIMENTAL="true"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	XORG_BASE_INDIVIDUAL_URI=""
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-fi
-
-inherit xorg-2 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X doc test"
-
-DEPEND="sys-devel/bison
-	X? (
-		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-		>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
-	)
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-	xorg-2_pkg_setup
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
index 8cb418863fbb..1957a763a86b 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.8.0.ebuild
@@ -17,14 +17,13 @@ inherit xorg-2 ${GIT_ECLASS}
 
 DESCRIPTION="X.Org xkbcommon library"
 HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 IUSE="X doc test"
 
 DEPEND="sys-devel/bison
 	X? (
+		x11-base/xorg-proto
 		>=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
-		>=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
 	)
 	doc? ( app-doc/doxygen )"
 RDEPEND="X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )"