commit: c11a4ce52ee0b4906bf3bdd921161ffb89ef04ab
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 13:01:13 2025 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 13:49:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11a4ce5
x11-misc/xkeyboard-config: Version bump to 2.46
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-misc/xkeyboard-config/Manifest | 1 +
.../xkeyboard-config/xkeyboard-config-2.46.ebuild | 80 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/x11-misc/xkeyboard-config/Manifest
b/x11-misc/xkeyboard-config/Manifest
index 08aa328ca48e..a65f040a1177 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1 +1,2 @@
DIST xkeyboard-config-2.45.tar.xz 916148 BLAKE2B
5c322500878f17ac5e30464966d448c176c1420bd187c419b47121ba596ea47fe3b3950b39bd25683e76573edb49299c2b650a23d1e2345df3edbb018c730c18
SHA512
1b82ced3e2a6386d40f9bac3735a72986b9f7387c356a706373724858a920e33ae0a9bd777a388dfdee43efc4dd6c2aa172d4b923fa2ca32e9a619f410437a7c
+DIST xkeyboard-config-2.46.tar.xz 931044 BLAKE2B
a24ffd179cdace04c0d51599e65a8eec87f492a6a3bbb5dc11e8a6ef5ff1be6472eb5c53103c8cdc6dd6373c1dbeea02656416856445fd265b10f2661212671a
SHA512
c58ce438ec109e80ff601ad07aea13f0ccdd096720b574838673925ec2a745b9210df6ef2ecfab3911909b492b560fb9af1d4f6bce60bd329e575f1db16b6dfb
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
new file mode 100644
index 000000000000..434760a2bd1c
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild
@@ -0,0 +1,80 @@
+# 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 ~amd64-linux ~x86-linux ~ppc-macos"
+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}]
+ ')
+ )
+"
+
+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() {
+ eapply_user
+
+ # 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
+}
