gentoo resync : 29.12.2022

4 files changed, 6 insertions, 51 deletions

diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index d9dc884619ea..4112886389ee 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,6 +1,4 @@
-DIST xkeyboard-config-2.34.tar.bz2 1763558 BLAKE2B 4417ab66f476de9914113296437b6a1b558c57561169353f533695bbe95831e73045c87bb3a072d1e3c103d2f69aedc3a73e5290c90ecaa8a131419d0d8ca3aa SHA512 cf3bdb658349b2db9db44ea1a0f7060b890b95520319101d83ba5aefeb0b1e2fd578b6f72a90758438f04bffbe7536cf112b76297fd47c95e02029fd203c51fb
-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 1034 BLAKE2B 4392fe7ebfb849a6e841619ff626e2276aff9e8b42ba8b632dd551df3013622c29a6930ed51a44eae9a677003155a556272397bff92b1c029078fa092be90ada SHA512 19e1322d4b47f0b11cbc08bd2342a5de06ff747d1d3eb6ee98eb2020259e42d8e6984d227a0137a1bdadc7c5bf17ef39d9f522ab733f2070d95450db6de0d102
-EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B bfbfcf9d6007d88400383cd60939d3e5cff03f69dd6979174ea2476688ac8a28b6ddeccdd5b2573194da1c95ebfbfd6fe5b06ebf352685b7037a3a1fda835dc0 SHA512 d291d500994eb2a0d95e4c1bccd9e5714dc83e8327f3addc181b83f940cadd9a2fd000f027912215957bf62cf282b4c4f7edf7933704f9447a47a372c1f00168
+DIST xkeyboard-config-2.36.tar.xz 880776 BLAKE2B 3ce6d9e5a1e763beb15614cd1b559ff6d56c2f6438b1c0680755a029ac90e48de4a939b1bcc0054a510cc0e08f6ffa6db98fecd4bf11e01510b151aa664425c3 SHA512 a81054ff6b7928a445a913b80fad995056559feff7bc1f4926657f171a102108b6e22958dc6c814ae2a25445f65c94485f13399628016f1358cf3840e235e3de
+EBUILD xkeyboard-config-2.36.ebuild 1030 BLAKE2B a0bcd6d3b409bfeeb9b987d57e7edd9dbc131ff7cd78cd2741def7c6a70581ea5fbafca2954d85779ece93731573e00dd259d46332b6b8def5f58d424696a6a5 SHA512 77b303d931dca500ae748271ebef479a793392d85da59c9fd5b565d74ce59a2d798ddf1a16d5ecd0e3c6678604b1b1760f91dd1c82a9f1b4ea5fcc57c4e65945
+EBUILD xkeyboard-config-9999.ebuild 1038 BLAKE2B 8ddae88b4c7009cb60dec8707cbe239054a49bd713079aaf28b1c10b31f8458b9dea63415dcf197008f3827a203ca9489117d474c9dc7e48061584ae0f2415b7 SHA512 38ff78bfc51cd3f8bfe2a0cfb6262f2f46a12f17868ac5b3cb6fb0cabe44e6b0ac562ea7cb39a208f743f24f5a7da67f43b98fb822020eb6371c0682e2373eaa
 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
deleted file mode 100644
index d4fd5d0d6e36..000000000000
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.34.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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.bz2"
-	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
-"
-
-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-2.35.1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
index 61ee79dadc75..fa640550337b 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.35.1.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.36.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.x.org/releases/individual/data/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 5220bb275be6..007071e3699d 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit meson python-any-r1
 
 DESCRIPTION="X keyboard configuration database"