From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 697CA15807A for ; Mon, 09 Jun 2025 15:28:19 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 438A53431A8 for ; Mon, 09 Jun 2025 15:28:19 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BDFBE11047E; Mon, 09 Jun 2025 15:28:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B53D711047E for ; Mon, 09 Jun 2025 15:28:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6E11034316E for ; Mon, 09 Jun 2025 15:28:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F1DF529A3 for ; Mon, 09 Jun 2025 15:28:07 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1749482881.03eeb9e60aedebaffc0a8336cef700f4b4e5a46d.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeyboard-config/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xkeyboard-config/Manifest x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 03eeb9e60aedebaffc0a8336cef700f4b4e5a46d X-VCS-Branch: master Date: Mon, 09 Jun 2025 15:28:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 98dd53ad-9277-4108-b953-bcb829898572 X-Archives-Hash: dc98733c3ff2e80dfa1d4f6ae7f3a32b commit: 03eeb9e60aedebaffc0a8336cef700f4b4e5a46d Author: Matt Turner gentoo org> AuthorDate: Mon Jun 9 15:24:01 2025 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jun 9 15:28:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03eeb9e6 x11-misc/xkeyboard-config: Version bump to 2.45 Signed-off-by: Matt Turner gentoo.org> x11-misc/xkeyboard-config/Manifest | 1 + .../xkeyboard-config/xkeyboard-config-2.45.ebuild | 66 ++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 4e6c10ea7fd2..a9e0b3cdbdbd 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1,2 @@ DIST xkeyboard-config-2.44.tar.xz 906060 BLAKE2B 6abb485ef5c9cb1292afaed22ac72026dc22c0a08c3bf04ca29f8dd61d68cbf06e511fe095628a0ab6dec7766374318c4b5bddeb2c4da8a8a692bbbbf4b4e83b SHA512 1bd6c594c132d262863e9911cfe4e70936c82a87c118b302d032cc900767653abd6db3ee5bc8220dafa8cf65aba15e3ceae9cbd88c318dd404d3c432c8ed9c00 +DIST xkeyboard-config-2.45.tar.xz 916148 BLAKE2B 5c322500878f17ac5e30464966d448c176c1420bd187c419b47121ba596ea47fe3b3950b39bd25683e76573edb49299c2b650a23d1e2345df3edbb018c730c18 SHA512 1b82ced3e2a6386d40f9bac3735a72986b9f7387c356a706373724858a920e33ae0a9bd777a388dfdee43efc4dd6c2aa172d4b923fa2ca32e9a619f410437a7c diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild new file mode 100644 index 000000000000..4ebef64ae30a --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2025 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 +}