gentoo resync : 29.12.2022

3 files changed, 4 insertions, 67 deletions

diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index cc39230be1ae..540d975a7c04 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1,5 +1,3 @@
-DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
-DIST libxkbcommon-1.4.0.tar.xz 471948 BLAKE2B 5b0a155a3a47adb7302db01f3daa0ef81993a9754b032b01f1cdbd53af74d15df95dc6c9334860211a28272b246f66978ad6e409db74a242afb13c17dc25b76e SHA512 7dd86952c036a6a78455b1ba05b53fcff9d6f133bb01c83fa860b4eaec3fc26bb0b5535948bcc2dafbd27204c3c91d01404ca9fc52896cc36af509384797d4f1
-EBUILD libxkbcommon-1.3.1.ebuild 1474 BLAKE2B 6fad57ab223145b1f966714970d6e21bc16841405a569e68a505587c7ac2fedaab111be7b58d0d99bc700c4dc8c6e3723e49b1594e2d6033519a640530908515 SHA512 1e78ed395916ed6e9c2691ae7113ba90cdb0123e9ca2d675ff3ea6d22da9dfbe91771131a6ef8a7a1ac6fcbee6238ff88761180ee3ea7e60da066d549b9aab21
-EBUILD libxkbcommon-1.4.0.ebuild 1549 BLAKE2B 8e1f8c89bb116b7d571957128e7fd16affaa92714ce32f163255d07e23dceb083f4d13e881ac124f8b44da6c435fe1e4c6ad647ca5a7ee6fe8d0947c7052cadb SHA512 74bf0d2980af0dc1189ae051bd8d30b9146df6e375b6cd86ce92c760977b16767ed4d2f4fb84f9740c97eb54226d049a0a79c18f91fba37e2444b48d8d919062
+DIST libxkbcommon-1.4.1.tar.xz 471824 BLAKE2B a784f3612bb52abb79bf1a2ddd3e7709fa52eddce5cabcf8520ed7df8ec8ea557e51205e1e9d116a0b31eb27b1f3bca33144318c5f01be7312cbb3e48f687fbe SHA512 757b340aeab6d187917807a88015b5113475ab2172aaaa8e530b40ea60619b3fbdfa668fd62707d66ed8fb763e68fee19394fcbd519af7c01d8975c59fdf0d89
+EBUILD libxkbcommon-1.4.1.ebuild 1545 BLAKE2B 7b0af3e3b664290fc834f621ccc0c740bdfb31c4e342380fc9847857f8172c4d68b486822547fcee5bf37cc13d4faaf460a9a9930a546d33f4c54266bea5dcba SHA512 ffc63c15e96bcef0ba4c7a28b12ffff1e7a72888f467a9b6f3ee5466330dd7bc98473fedbf0e271b1dd0da48fe829177ec56a3a4b5314ed20bdb3fef5e3f3a4c
 MISC metadata.xml 392 BLAKE2B 387cc216299e7c312552b0fa7abdd744203daff7bc5a51ef5b7d2bcfd39b83904308c8bb2b66f2459f77f593e18fc8ade017491fa45e698e8e6bfce03a819df8 SHA512 0ab9850b467605c1050d70ca526d2a4c2957e3ec9f56113fcabeb9d4a79cb8636ab077f66e17c7e05b79aad6948a7e89a83e5d8c48197ab016a7f5b2f2886f42
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
deleted file mode 100644
index 513cfd69b0c3..000000000000
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 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 ~riscv ~s390 sparc x86"
-fi
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
-
-DESCRIPTION="keymap handling library for toolkits and window systems"
-HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
-LICENSE="MIT"
-IUSE="doc static-libs test wayland X"
-RESTRICT="!test? ( test )"
-SLOT="0"
-
-BDEPEND="
-	sys-devel/bison
-	doc? ( app-doc/doxygen )
-	test? ( ${PYTHON_DEPS} )
-	wayland? ( dev-util/wayland-scanner )
-"
-RDEPEND="
-	X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
-	wayland? ( >=dev-libs/wayland-1.2.0 )
-	dev-libs/libxml2[${MULTILIB_USEDEP}]
-	x11-misc/compose-tables
-"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )
-	wayland? ( >=dev-libs/wayland-protocols-1.12 )
-"
-
-pkg_setup() {
-	if use test; then
-		python-any-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library="$(usex static-libs both shared)"
-		-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
-		$(meson_use wayland enable-wayland)
-		$(meson_use X enable-x11)
-		$(meson_use doc enable-docs)
-	)
-	meson_src_configure
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
index 1928a5e2d281..f3622c3dac8a 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.4.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.4.1.ebuild
@@ -8,10 +8,10 @@ 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx