summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2024-02-13 13:52:44 -0500
committerMatt Turner <mattst88@gentoo.org>2024-02-13 14:37:57 -0500
commit898ac6d1b0d59abbc128d2da46d1fa7e8431859a (patch)
tree7ef4cb2926a48e1864af0deaeb31b8dadbfe75eb /x11-misc/xkeyboard-config
parentx11-misc/xkeyboard-config: Remove version requirement on pycountry (diff)
downloadgentoo-898ac6d1b0d59abbc128d2da46d1fa7e8431859a.tar.gz
gentoo-898ac6d1b0d59abbc128d2da46d1fa7e8431859a.tar.bz2
gentoo-898ac6d1b0d59abbc128d2da46d1fa7e8431859a.zip
x11-misc/xkeyboard-config: Version bump to 2.41
Closes: https://bugs.gentoo.org/920632 Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-misc/xkeyboard-config')
-rw-r--r--x11-misc/xkeyboard-config/Manifest1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild67
2 files changed, 68 insertions, 0 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 4b482d9df882..80405d3ec240 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1 +1,2 @@
DIST xkeyboard-config-2.40.tar.xz 893584 BLAKE2B 79dd20e588e72c9fe65ff0885889ae3e2ad0ffbb66b27cf90db36fecfd41f24667fcc0a0a7fc96f3bc5d01502532af3e6b560719413bc16529328dd02d353c92 SHA512 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878
+DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
new file mode 100644
index 000000000000..8dccf01c3ce0
--- /dev/null
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+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 ~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 )"
+
+# <dev-python/pycountry-23.12.7 bug #920278
+BDEPEND="
+ dev-lang/perl
+ dev-libs/libxslt
+ sys-devel/gettext
+ test? (
+ ${PYTHON_DEPS}
+ 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() {
+ use test && 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=(
+ -Dxkb-base="${EPREFIX}/usr/share/X11/xkb"
+ -Dcompat-rules=true
+ )
+ meson_src_configure
+}