gentoo resync : 15.12.2019

4 files changed, 3 insertions, 96 deletions

diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 014291fc2499..e2949a187f14 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,7 +1,3 @@
-DIST libxkbcommon-0.8.4.tar.xz 648592 BLAKE2B 6205ca08f1ccb6d85320428317e9d023e2f2a56dcaa77e34a9f9ea42bbf67c9ee27a3123dd8e880ead3fa92c4cd7718bde55a255c52f16fef8d33c395c2511a9 SHA512 dbd441d0d7d5ba4fb352d64d150d163d4cdcf8340059457c291dc1fc69d1606ff6589732cb41a7fcfe106af0192977b243d7d68c4d95b90ece7abb620df360e3
-DIST libxkbcommon-0.9.0.tar.xz 376160 BLAKE2B 9a349a7ce9dcd1e9475f4a3b2365c11e91dcf4833d53c99b7231c1a757a410b4e347f90c77013d2a3a2a724765c1f2187d8c1fe96ad4441d34772f62ec081620 SHA512 7e3b03f1fa5abca31574c02e8308be9d5a6e2bdd369e808faeaa62e63a3d3592158cc695df55828275fc10219d79e1915e4f7331f1967aed0c9c54025272e9c4
 DIST libxkbcommon-0.9.1.tar.xz 376164 BLAKE2B 16c95081136ea9ce742f494ae2192cce815f3fb4a3d33d3e525f8ad61f1f720fa6bfe74088a9ab88f3c6ef9cdf78c4d8d4dc87e7478fd84e4b09e03a337efbdf SHA512 8d4551a06e7dd4936633f544409401dc33f8f1900adb5daa6403615c71f321d17212db739f89a5b3e393d729b3f33167691404849a25d5526b403fd9ec3e8878
-EBUILD libxkbcommon-0.8.4.ebuild 871 BLAKE2B e1ecb34684b9999a0a68f1561ecd5e27870308abd51ad2713fb5ece66b2b99b222252d19ef0c01be3b8e8e27d32ce42a963912bae89dcc5c40f8dfe19ab5e27b SHA512 9af26d68f893e7fcf17415df441e3d86ffb7fee253b5092c7000f145d9ca5a5d0db1ac09399c3af4eef5719b6d2461e82d7d4d720891c434c2665ae7d0d33967
-EBUILD libxkbcommon-0.9.0.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
-EBUILD libxkbcommon-0.9.1.ebuild 1199 BLAKE2B 2b6283d7f1e7d9c07ede218fab1998b8b5fa8f13e49343210741ed3adcee02adaaf255c8297ab7411ac5488d09cfd340d276b77bdcf3417842937380229ae1c4 SHA512 577ee5974be646aaa8d5782122fa9432f1ed7b0770fb97311bc495a038e9de30efa9a496c5e5ff80be44033a8a3e475a8839138e1fdf86ec4f9bbe1838540ab9
+EBUILD libxkbcommon-0.9.1.ebuild 1216 BLAKE2B 82435dab35e380f00f48f0d1fb3a54e8c22e163913e72189859039f10fa83dc0498893cdb8ab0c7195164874cc51176735d78e16adc187e4665354d48a4e9a3c SHA512 2628f7a00dc614764708aad7a88830f6b68e4c2291866c9e29f4b5747ff55aa142091f647c4dc6dcfd62aaf4815d2eb050e65d95dda35fb4603bc2437bcbc900
 MISC metadata.xml 325 BLAKE2B db764fac0ca1f4359bcd129dc165f78592535dee40bc25b6f2d7c662bdce43e01cc66b362765607665a75fc5b1703de204cf90eecae4f8d285cfaefcebc614b8 SHA512 ca2a116a574783f7b3c6191759c902e2cb059ec135456cef989b81be07fecc48f9ff56e02845d18c2376c99be3dd9711f39ad91394e421fa36d8fd6453c0a121
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
deleted file mode 100644
index e92a52c52bd9..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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-3 ${GIT_ECLASS}
-
-DESCRIPTION="X.Org xkbcommon library"
-HOMEPAGE="https://xkbcommon.org/"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="X doc test"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-pkg_setup() {
-	XORG_CONFIGURE_OPTIONS=(
-		--with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(use X || use_enable X x11)
-		$(use_with doc doxygen)
-	)
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild
deleted file mode 100644
index be655c7b43b2..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
-	GIT_ECLASS="git-r3"
-	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
-else
-	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit meson multilib-minimal ${GIT_ECLASS}
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="X doc test"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		-Denable-wayland=false # Demo applications
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
index be655c7b43b2..3c8da7b78001 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.9.1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/xkbcommon/${PN}"
 else
 	SRC_URI="https://xkbcommon.org/download/${P}.tar.xz"
-	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"
 fi
 
 inherit meson multilib-minimal ${GIT_ECLASS}
@@ -17,6 +17,7 @@ DESCRIPTION="keymap handling library for toolkits and window systems"
 HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
 LICENSE="MIT"
 IUSE="X doc test"
+RESTRICT="!test? ( test )"
 SLOT="0"
 
 BDEPEND="