diff options
Diffstat (limited to 'x11-misc/xkeyboard-config')
| -rw-r--r-- | x11-misc/xkeyboard-config/Manifest | 8 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild (renamed from x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild) | 11 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild | 66 | ||||
| -rw-r--r-- | x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 11 |
4 files changed, 81 insertions, 15 deletions
diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index afd153502348..f17c63984198 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,4 +1,6 @@ -DIST xkeyboard-config-2.41.tar.xz 898404 BLAKE2B f608c30b31c26f2273907f45929a0fe9e44bb9513d45a791be1ff3fb8da5cd56d4fbb182540c47960f16841a30f89fdab0ad87cc41597c02bfd76643fff6857d SHA512 108c1d0a8344e15f5d92f876a1b008571f6dbe57aecf2797757accc1f3f031a07dfb4ba5028e06784620810dd835ddd5afadf68e2d73594ae96b7520b0bbde7a -EBUILD xkeyboard-config-2.41.ebuild 1636 BLAKE2B 4967819e4ce4d77947bda3195747beb826a21cd78ecc5bb05bfcf0669d0f020ff6a879a3881d03d8dee3758b8e8b68e7b5a4c319d931d34a5fe1c849abe79e21 SHA512 968ee58b66c757c7ae0e982f0969c61f54f34a18d66e7573a9a37f89d949b2d146a7780b1a8eda724ce7278276cffc83be1b67bb7691da699d3bf749cd97a923 -EBUILD xkeyboard-config-9999.ebuild 1644 BLAKE2B 5a10a4e5ac7c7d40ba7f83d084303fae1f21e1506005442f847b70fbd951e618b7a23b0106011ed82c1a7728c08920897a737da273ac04855d23b4ec3f184ee7 SHA512 579292ce8a3dba6c48ef8dc77aa53dba79d9861c560c25155de0edd98314e52f68e3948864f0ac617f0eb6f7b18451088f9db4f1d1fc362b9a91b6b435fc3aad +DIST xkeyboard-config-2.42.tar.xz 910192 BLAKE2B 1b49a9bdf9e6ad2c196b8c4cc93803a2b4ce804148a7eb55616672db5c4d3eb289e2de931ee8b08a2152dd542a9f2d1e00ba8cca7651d7f33b570ed4a5f4c57b SHA512 654436ae21b9deb3b193847403b652cc5c19aa665a9c9168598fc6ac7af83ac04d40684d9eb99dd4db97c21e5100cfeed06b25e2b041eb9fdf3c05ef95a891a9 +DIST xkeyboard-config-2.43.tar.xz 925424 BLAKE2B 89cf4872305ce3358185ed63f0ff2f0dc90205d50d51b4b881256e0762b12a74f30d0905a75e5feff2f0fef09d94bee778a8cbe83cdf6e048653e8eb42f53087 SHA512 6daf885bf8794cf03d5b447b90ca1666f87e9c609a344e02bb90edca360eb64b24f80a92ed570aa75b4ea62245b3998f6df3757f7e02c4015cdfecee5378a0d4 +EBUILD xkeyboard-config-2.42.ebuild 1574 BLAKE2B be170bb0067f1e8a19bce450e8227c671ecd02525c41930a10b951cb696d88ec8b12709bf7687ec3d8f7dab9b18569d6a1cb9dbfb3cfe9a990fe2d915791f56f SHA512 992a19559ca2254bb7e8f4ea0ceeefbd4918d75584f74b87ee45b2add5a19765b768ff27341a4a82576296411ad233e8e7189a37f0a5a6e07b4b2a96174b9424 +EBUILD xkeyboard-config-2.43.ebuild 1582 BLAKE2B beee2bce78e8c6616cc3d8eac2fe050dd1eb243e03a24d3f3102cc00e7b2732afe7da5b54d33c7a5f8eb79a4ad445b6e89e63b12eb2746ab9587b9ae9cc95745 SHA512 0ad649e9dfa09364a57bb8f93a0bad356d3d8ab6c0aa3adf7766c8aa18907e6d43e0ff9990dbfdf7d1e967e8f299d288ea7d1f7cf564fdb206a333a0b3ff7761 +EBUILD xkeyboard-config-9999.ebuild 1582 BLAKE2B beee2bce78e8c6616cc3d8eac2fe050dd1eb243e03a24d3f3102cc00e7b2732afe7da5b54d33c7a5f8eb79a4ad445b6e89e63b12eb2746ab9587b9ae9cc95745 SHA512 0ad649e9dfa09364a57bb8f93a0bad356d3d8ab6c0aa3adf7766c8aa18907e6d43e0ff9990dbfdf7d1e967e8f299d288ea7d1f7cf564fdb206a333a0b3ff7761 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.42.ebuild index fe824fdb32a2..e62a6b47fe03 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.41.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.42.ebuild @@ -3,18 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..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" +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" + KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" @@ -22,13 +22,12 @@ 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 + ${PYTHON_DEPS} test? ( - ${PYTHON_DEPS} x11-apps/xkbcomp x11-libs/libxkbcommon $(python_gen_any_dep ' @@ -48,7 +47,7 @@ python_check_deps() { } pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_prepare() { diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild new file mode 100644 index 000000000000..d4e67dee2a23 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.43.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..13} ) +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=( + -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 8dccf01c3ce0..d4e67dee2a23 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -3,18 +3,18 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..13} ) 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" +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" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" fi LICENSE="MIT" @@ -22,13 +22,12 @@ 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 + ${PYTHON_DEPS} test? ( - ${PYTHON_DEPS} x11-apps/xkbcomp x11-libs/libxkbcommon $(python_gen_any_dep ' @@ -48,7 +47,7 @@ python_check_deps() { } pkg_setup() { - use test && python-any-r1_pkg_setup + python-any-r1_pkg_setup } src_prepare() { |