From 1fca4db26fb13c520980473abebd51f620d34531 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 17 Nov 2023 16:57:03 +0000 Subject: gentoo auto-resync : 17:11:2023 - 16:57:03 --- x11-misc/xkeyboard-config/Manifest | 3 +- .../xkeyboard-config-2.40-r1.ebuild | 65 ++++++++++++++++++++++ .../xkeyboard-config/xkeyboard-config-9999.ebuild | 22 +++++++- 3 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild (limited to 'x11-misc/xkeyboard-config') diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 5662536fc556..604f53fc2090 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1,6 +1,7 @@ DIST xkeyboard-config-2.39.tar.xz 896112 BLAKE2B d1ef598a0c1993518b01e73c319147ea1f3e55e1c8040762b9e95636c89d9b719322f3f2a1a87bffc545928b2912ead37f336182ba69d692893521322f170e21 SHA512 4690a0291c1f8c2c53b84984221a60a935c9b7cfc8ae20a8740403571f3704dedf06e5755b45775a15a5df21ebd2acac3ff785ff19f54d792ae359c4c6d60756 DIST xkeyboard-config-2.40.tar.xz 893584 BLAKE2B 79dd20e588e72c9fe65ff0885889ae3e2ad0ffbb66b27cf90db36fecfd41f24667fcc0a0a7fc96f3bc5d01502532af3e6b560719413bc16529328dd02d353c92 SHA512 00c965e747169194d9a8d1ed0dfd544988c70df6a69888c50a06b4e266ce7047a8696ce408b9a7ba91e7e6b9679ab6e5f014308dbbf0a9c6be0e948d7646f878 EBUILD xkeyboard-config-2.39.ebuild 1003 BLAKE2B eec1fec962f65eaef104088b3a21cbaf7af9fc7156411c63ff103718103663f16d9752701be551d98d5bee8f6307f9fdf9a77845316a24c91399470c483e1479 SHA512 efbfca4459134833abc2b6d24f5e4853684cfdcff1ab720071519432da307b92f169e01ae1751ee9fa283733c3aab51c402054b6069c84c0d14ef10894f9b6e2 +EBUILD xkeyboard-config-2.40-r1.ebuild 1608 BLAKE2B 5f53e50461c81360e7be4e95e91461ed729c9c30a42109b5c447e899a0bd2e5760880f5865cfeb1c39dba483f09365833f34ec1fbde8ec91588a1c59fb6f228a SHA512 c644501a4af103f2ffe7c3be283dad4ca5c97bac8336581806741e27a587426c2ab188bb7d8ebcaf2c46c92be59b3ac69470275704d8a3b9d35788717da17204 EBUILD xkeyboard-config-2.40.ebuild 1103 BLAKE2B 70444a87db9f7bdb25216001b8d0c2ecca1138c505b238309376d88ea310065112bbd0a0334c1e5fd74e1ed0457d50ca892a6ebce49c53c42114d64e6b858d73 SHA512 316304f739b1efb96789d4c511183e5272e77e2f40ab623a7ad90e566a0c0696feeabafff46cdddc1b820a55ece68f6cbbdc31ee8e0c1f492d5ef6d04d98c64d -EBUILD xkeyboard-config-9999.ebuild 1110 BLAKE2B c41a77bd6e82a3c86beb54da8b64ff2ae253043b19a386beedc22fd264b95bec00d3dc4e89346fe1c105d9f6c2b6cceacac07d578923057e58f05545041b4e22 SHA512 cb7bf0f3cc410d567310d26af4bf1849699b0ce39ac8c2320746ca48ec46186bb5c5d7cc47ba9939ac04a72fd852c569c8ad5a3e967d905d516070aefc848845 +EBUILD xkeyboard-config-9999.ebuild 1628 BLAKE2B ecf03552c65f211c2c9bb44d2f912332887f7c35cdbfb3022e6df57376fdca19da3b2f707400cde4ec6ca286a83488762198f2629137216067aa65607da378a4 SHA512 fcc574f7ca2b96564e4e9f110d6d2d560789de253f4a7f867ade4c49574873c6d5cfaea943008182e9883b423962f5c2dd25e575f0fbe93604ae13fb9551489b MISC metadata.xml 442 BLAKE2B 3e7e6564b3aa17ef958ae6aed94b6d28156d743ad2782b0c2c08429adff128a7a7ea549e2f5fcece91cdc0f498d341790d0694b193dae16b60a63966bbb581b8 SHA512 0c32c580abc07b3141fa3b9137eba130654e0701b4c9e49be10a801c5c068d67881a74dc0e5d45dc34e8964364e0516bbc5e1b854ae0d7d8ff12bf1ec1ec2986 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild new file mode 100644 index 000000000000..1f95c24a7bf1 --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.40-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2023 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 ~m68k ~mips ~ppc ~riscv ~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 + 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}]" + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + python_has_version "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 4fcf0d647513..4456bf37dfdd 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -23,19 +23,37 @@ IUSE="test" RESTRICT="!test? ( test )" BDEPEND=" - ${PYTHON_DEPS} 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}]" + python_has_version "dev-python/pytest-xdist[${PYTHON_USEDEP}]" + python_has_version "dev-python/pytest[${PYTHON_USEDEP}]" +} + pkg_setup() { - python-any-r1_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() { -- cgit v1.2.3