gentoo resync : 20.03.2022

4 files changed, 52 insertions, 7 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 932d300e452c..e6ed2d579c11 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
 DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
-EBUILD xkeyboard-config-2.34.ebuild 1017 BLAKE2B e45aca3db6e84be92531a6e96f791426ec9f59f6d9db8c2e392727b73c2029a31abef1383f0141a6f96638780cd964b8aa89dbfb9c1ebe165a2440b8477e1a09 SHA512 940af9cedae8b63310b74c0cdda8ea6437fe9d10060e9db9b0f08b6d3b8fdbc2ed5ee9b1b34812c8fbdf40502a9f48b8d190089a3dfbb655377e32bd43c2a73c
-EBUILD xkeyboard-config-9999.ebuild 1019 BLAKE2B 15e28c63f89ae1238f0f8c5c6c56b5cdffb8d66ca0d70124867012f3b4e8fbc9ba73c9c93af74c7185909a6811f5a4dea2fe6ac77b6bb3c9e3b37c84c877d884 SHA512 57d5933cfa0f30d80dfeae2b9c12594929c1e60f72cd18beda86e0846ba46311d4ef4d8d199687942ecd4f35239e7e06967cf95c1b38358276e47cb99973615a
+DIST xkeyboard-config-2.35.1.tar.xz 873196 BLAKE2B 22a57cf8858f85dedb78c6fb8d29914e3ba07fc1bafacce40ea1aca485d5db510140af3a5df286ccf3247e8e2715820ea6b6ef412d808b448236f04325eefb8f SHA512 0c62246aa45c9cb883979cc32ba01a6ebf1c3e40673603ddd304a46f1583b997b17ade708849102285f01fe0caafb35abf9c7686ef8be49f4f2b521e03418f94
+EBUILD xkeyboard-config-2.34.ebuild 1032 BLAKE2B 41a3ecfdaf5cf06466f10357f308fe12fd78054558b71763b5c2e720f7e47816d1f71e19d153865e52aa95039d96236af5c424dd88dea42b58218e7a4ff6f20c SHA512 680e6caf58081372230c19aacdca0e5b4e06d309ecfc6d0c791532519cf04a04630d391a353c694ed7b2db389929a8556f9ab18b8a09a4d70a34d457b8d2a802
+EBUILD xkeyboard-config-2.35.1.ebuild 1031 BLAKE2B 713d47fffc8c63c274a03f34bd41c3c239e187e0894e17b44af54cdec37e3710338b296e2b8eacf3731983341916f6a797f2cceb19c23c7359020c2fb77ddec3 SHA512 9f913ba35d9685c2e772443fc5b4f94b0567469c343643fb385a7c2e67715dd84ab3f53f1e8737f62c5254f6c6cc8d790a8a7d036327c51b74844062a45b4448
+EBUILD xkeyboard-config-9999.ebuild 1031 BLAKE2B 713d47fffc8c63c274a03f34bd41c3c239e187e0894e17b44af54cdec37e3710338b296e2b8eacf3731983341916f6a797f2cceb19c23c7359020c2fb77ddec3 SHA512 9f913ba35d9685c2e772443fc5b4f94b0567469c343643fb385a7c2e67715dd84ab3f53f1e8737f62c5254f6c6cc8d790a8a7d036327c51b74844062a45b4448
 MISC metadata.xml 338 BLAKE2B 0abfc9e29fc629961ecbcc525a18185afd4b08cee4b68d35d1e2f863b898b1881b68e53f26079d1dfacbcd1f6961433dddf316435f421ec9f8b7a2e669c89eab SHA512 d1df4e20e9260892555393fddfeac0c9190c13cbf2a654ece211faab0c180ecdf592939992d5abf20a432a68a1ac0400e9e65241a9d3c7a04093c11b13123d75
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
index 37b2a739543a..d4fd5d0d6e36 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
@@ -25,6 +25,7 @@ DEPEND=""
 RDEPEND=""
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
 "
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
new file mode 100644
index 000000000000..5a1d4ab607f5
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit meson python-any-r1
+
+DESCRIPTION="X keyboard configuration database"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/XKeyboardConfig https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND=""
+RDEPEND=""
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/perl
+	dev-libs/libxslt
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+		-Dcompat-rules=true
+	)
+	meson_src_configure
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 9e1a13130f32..5a1d4ab607f5 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
@@ -13,18 +13,18 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config.git"
 	inherit git-r3
 else
-	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
 DEPEND=""
 RDEPEND=""
 BDEPEND="
 	${PYTHON_DEPS}
+	dev-lang/perl
 	dev-libs/libxslt
 	sys-devel/gettext
 "