summaryrefslogtreecommitdiff
path: root/x11-misc/xkeyboard-config
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-02-13 23:36:16 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-02-13 23:36:16 +0000
commit5ee866097f7722d669e9a3b4ca2906105852e6ec (patch)
tree890944c963175a5008b706f03c1fb949a657f9ef /x11-misc/xkeyboard-config
parent8234174b0455dd6d6656a24155014c4fba8fad49 (diff)
gentoo auto-resync : 13:02:2024 - 23:36:16
Diffstat (limited to 'x11-misc/xkeyboard-config')
-rw-r--r--x11-misc/xkeyboard-config/Manifest4
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild67
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild6
3 files changed, 73 insertions, 4 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest
index 273ad03d8d27..ba3255dbbb4d 100644
--- a/x11-misc/xkeyboard-config/Manifest
+++ b/x11-misc/xkeyboard-config/Manifest
@@ -1,4 +1,6 @@
DIST xkeyboard-config-2.40.tar.xz 893584 BLAKE2B 79dd20e588e72c9fe65ff0885889ae3e2ad0ffbb66b27cf90db36fecfd41f24667fcc0a0a7fc96f3bc5d01502532af3e6b560719413bc16529328dd02d353c92 SHA512 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878
+DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a
EBUILD xkeyboard-config-2.40-r1.ebuild 1654 BLAKE2B 0577791689f3b49662e933adfe0e73be02566746876a62e85b952c262229fd7f9cd6b0cda7f5a82185503ce6e44f2cf45076fd8b6028c139fb4968d952726d95 SHA512 5c6ad57c4ad3a93cbfb39b7c09dee2efcec99e7a0c72cb4297d1122371a02d4fb1466a4c3dd34750b70406de0fb45d25a407a16251d321b21996553c32a81365
-EBUILD xkeyboard-config-9999.ebuild 1662 BLAKE2B 778143ba8f56159c5cb6e0d18fdfa0f7204751312951a6d24fd6ae05fc7b12b610dded474a7efd2c571f823be4e3c5170b72b32f81ab2b66ac50b8ede1363ce5 SHA512 b239da0b7dcfdce69421b0a6e003daff439adcd50f5767fcdbfb159e6493e0529d030fe130cc78df298c7dadb5ff73483d1383d9177a1568514024f1943ff9c6
+EBUILD xkeyboard-config-2.41.ebuild 1644 BLAKE2B 5a10a4e5ac7c7d40ba7f83d084303fae1f21e1506005442f847b70fbd951e618b7a23b0106011ed82c1a7728c08920897a737da273ac04855d23b4ec3f184ee7 SHA512 579292ce8a3dba6c48ef8dc77aa53dba79d9861c560c25155de0edd98314e52f68e3948864f0ac617f0eb6f7b18451088f9db4f1d1fc362b9a91b6b435fc3aad
+EBUILD xkeyboard-config-9999.ebuild 1644 BLAKE2B 5a10a4e5ac7c7d40ba7f83d084303fae1f21e1506005442f847b70fbd951e618b7a23b0106011ed82c1a7728c08920897a737da273ac04855d23b4ec3f184ee7 SHA512 579292ce8a3dba6c48ef8dc77aa53dba79d9861c560c25155de0edd98314e52f68e3948864f0ac617f0eb6f7b18451088f9db4f1d1fc362b9a91b6b435fc3aad
MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986
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
+}
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
index 026837b87ed2..8dccf01c3ce0 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -32,7 +32,7 @@ BDEPEND="
x11-apps/xkbcomp
x11-libs/libxkbcommon
$(python_gen_any_dep '
- <dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]
+ dev-python/pycountry[${PYTHON_USEDEP}]
dev-python/pytest-xdist[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
')
@@ -42,7 +42,7 @@ BDEPEND="
python_check_deps() {
use test || return 0
python_has_version \
- "<dev-python/pycountry-23.12.7[${PYTHON_USEDEP}]" \
+ "dev-python/pycountry[${PYTHON_USEDEP}]" \
"dev-python/pytest-xdist[${PYTHON_USEDEP}]" \
"dev-python/pytest[${PYTHON_USEDEP}]"
}