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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B2B3A158176 for ; Mon, 06 Oct 2025 13:50:03 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 99236341E61 for ; Mon, 06 Oct 2025 13:50:03 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3F8D31103B8; Mon, 06 Oct 2025 13:49:58 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 36C211103B8 for ; Mon, 06 Oct 2025 13:49:58 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6F06340FB8 for ; Mon, 06 Oct 2025 13:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 245473AA7 for ; Mon, 06 Oct 2025 13:49:56 +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: <1759758591.c11a4ce52ee0b4906bf3bdd921161ffb89ef04ab.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.46.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: c11a4ce52ee0b4906bf3bdd921161ffb89ef04ab X-VCS-Branch: master Date: Mon, 06 Oct 2025 13:49:56 +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: 5990397d-760d-4870-a7c1-a3bd92e80126 X-Archives-Hash: 308b3d21b699513285c4f8f9323cd884 commit: c11a4ce52ee0b4906bf3bdd921161ffb89ef04ab Author: Matt Turner gentoo org> AuthorDate: Mon Oct 6 13:01:13 2025 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Oct 6 13:49:51 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c11a4ce5 x11-misc/xkeyboard-config: Version bump to 2.46 Signed-off-by: Matt Turner gentoo.org> x11-misc/xkeyboard-config/Manifest | 1 + .../xkeyboard-config/xkeyboard-config-2.46.ebuild | 80 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/x11-misc/xkeyboard-config/Manifest b/x11-misc/xkeyboard-config/Manifest index 08aa328ca48e..a65f040a1177 100644 --- a/x11-misc/xkeyboard-config/Manifest +++ b/x11-misc/xkeyboard-config/Manifest @@ -1 +1,2 @@ DIST xkeyboard-config-2.45.tar.xz 916148 BLAKE2B 5c322500878f17ac5e30464966d448c176c1420bd187c419b47121ba596ea47fe3b3950b39bd25683e76573edb49299c2b650a23d1e2345df3edbb018c730c18 SHA512 1b82ced3e2a6386d40f9bac3735a72986b9f7387c356a706373724858a920e33ae0a9bd777a388dfdee43efc4dd6c2aa172d4b923fa2ca32e9a619f410437a7c +DIST xkeyboard-config-2.46.tar.xz 931044 BLAKE2B a24ffd179cdace04c0d51599e65a8eec87f492a6a3bbb5dc11e8a6ef5ff1be6472eb5c53103c8cdc6dd6373c1dbeea02656416856445fd265b10f2661212671a SHA512 c58ce438ec109e80ff601ad07aea13f0ccdd096720b574838673925ec2a745b9210df6ef2ecfab3911909b492b560fb9af1d4f6bce60bd329e575f1db16b6dfb diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild new file mode 100644 index 000000000000..434760a2bd1c --- /dev/null +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.46.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{11..14} ) +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=( + -Dcompat-rules=true + ) + meson_src_configure +} + +src_install() { + meson_src_install + + # Workaround for portage's collision checks, see pkg_preinst (bug #957712) + mv "${ED}"/usr/share/X11/xkb{,.workaround} || die +} + +pkg_preinst() { + # Avoid touching EROOT if not needed, and use -f just-in-case anyway + if [[ -d ${EROOT}/usr/share/X11/xkb && ! -L ${EROOT}/usr/share/X11/xkb ]]; then + rm -rf "${EROOT}"/usr/share/X11/xkb || die + fi + mv "${ED}"/usr/share/X11/xkb{.workaround,} || die +}