x11-misc/xkeyboard-config: Drop old versions

Signed-off-by: Matt Turner <mattst88@gentoo.org>

x11-misc/xkeyboard-config/Manifest

@@ -1,2 +1 @@
-DIST xkeyboard-config-2.46.tar.xz 931044 BLAKE2B a24ffd179cdace04c0d51599e65a8eec87f492a6a3bbb5dc11e8a6ef5ff1be6472eb5c53103c8cdc6dd6373c1dbeea02656416856445fd265b10f2661212671a SHA512 c58ce438ec109e80ff601ad07aea13f0ccdd096720b574838673925ec2a745b9210df6ef2ecfab3911909b492b560fb9af1d4f6bce60bd329e575f1db16b6dfb
 DIST xkeyboard-config-2.47.tar.xz 930468 BLAKE2B ddfe6d3c8a088cd625c1a81c56ffe1f2ada5e003b3bf0628983a0058aa9e0ff9c26ab8cfcd0a6aded22e6a545d63533b2de05570b4e0c3a22879e195dcb96f61 SHA512 bd9b70ec5c8957e087f6c12272725044e6e124c15c7cbbfffb7f3c231944984d3302adda604da05464b7be6c91b5461e74fbec8544ac21b06e3bd8c748fd04e3

x11-misc/xkeyboard-config/files/xkeyboard-config-2.46-libxkbcommon-2.11-tests.patch

@@ -1,46 +0,0 @@
-https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/commit/1eaadd20d69d2dd3744371c853aa68f6571b7a77
-
-From 1eaadd20d69d2dd3744371c853aa68f6571b7a77 Mon Sep 17 00:00:00 2001
-From: Pierre Le Marre <dev@wismill.eu>
-Date: Sun, 5 Oct 2025 09:20:24 +0200
-Subject: [PATCH] =?UTF-8?q?test:=20Fix=20test=5Fcompat=20for=20libxkbcommo?=
- =?UTF-8?q?n=20=E2=89=A4=201.11?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Restore test support for libxkbcommon ≤ 1.11.
-
-Follow-up of 5c94ff232d60e1d7e253549b2d3722fc719f76f6, which introduced
-a fix for libxkbcommon-1.12 but mistakenly removed support for anterior
-versions.
-
-Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/857>
----
- tests/test_compat_rules.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test_compat_rules.py b/tests/test_compat_rules.py
-index ebcc8bd18..edb649f62 100644
---- a/tests/test_compat_rules.py
-+++ b/tests/test_compat_rules.py
-@@ -174,9 +174,16 @@ def test_compat_layout(xkb_base: Path, rules: str, mapping: tuple[Layout, Layout
- 
-         # [HACK] Fix keycodes aliases
-         if alias.layout == "de" and target.layout != "de":
-+            # libxkbcommon ≤ 1.11
-+            alias_string = alias_string.replace(
-+                "<LatZ>         = <AD06>", "<LatY>         = <AD06>"
-+            )
-+            alias_string = alias_string.replace(
-+                "<LatY>         = <AB01>", "<LatZ>         = <AB01>"
-+            )
-+            # libxkbcommon ≥ 1.12
-             alias_string = alias_string.replace("<LatZ> = <AD06>", "<LatZ> = <AB01>")
-             alias_string = alias_string.replace("<LatY> = <AB01>", "<LatY> = <AD06>")
--            pass
- 
-         # [HACK] Discard components names
-         alias_string = COMPONENT_NAME_PATTERN.sub(drop_component_name, alias_string)
--- 
-GitLab

x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild

@@ -1,84 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..14} )
-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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-lang/perl
-	dev-libs/libxslt
-	sys-devel/gettext
-	${PYTHON_DEPS}
-	test? (
-		x11-apps/xkbcomp
-		x11-libs/libxkbcommon
-		$(python_gen_any_dep '
-			dev-python/pycountry[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.46-libxkbcommon-2.11-tests.patch
-)
-
-python_check_deps() {
-	use test || return 0
-	python_has_version \
-		"dev-python/pycountry[${PYTHON_USEDEP}]" \
-		"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
-		"dev-python/pytest[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Remove pytest timeout
-	sed -i -e "/test('pytest'/,/)$/ { s/timeout: [0-9]*/timeout: 0/ }" meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcompat-rules=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Workaround for portage's collision checks, see pkg_preinst (bug #957712)
-	mv "${ED}"/usr/share/X11/xkb{,.workaround} || die
-}
-
-pkg_preinst() {
-	# Avoid touching EROOT if not needed, and use -f just-in-case anyway
-	if [[ -d ${EROOT}/usr/share/X11/xkb && ! -L ${EROOT}/usr/share/X11/xkb ]]; then
-		rm -rf "${EROOT}"/usr/share/X11/xkb || die
-	fi
-	mv "${ED}"/usr/share/X11/xkb{.workaround,} || die
-}