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 8008415807A for ; Tue, 10 Jun 2025 06:18:21 +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) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 657C53430A3 for ; Tue, 10 Jun 2025 06:18:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 553811102BE; Tue, 10 Jun 2025 06:18:20 +0000 (UTC) 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 bobolink.gentoo.org (Postfix) with ESMTPS id 4CB781102BE for ; Tue, 10 Jun 2025 06:18:20 +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 F11B43430A3 for ; Tue, 10 Jun 2025 06:18:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6414B2530 for ; Tue, 10 Jun 2025 06:18:18 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1749535994.d4239fb331007a732aa1bf77b8dfdf8c9030e525.ionen@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/xkeyboard-config-2.45.ebuild x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild X-VCS-Directories: x11-misc/xkeyboard-config/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: d4239fb331007a732aa1bf77b8dfdf8c9030e525 X-VCS-Branch: master Date: Tue, 10 Jun 2025 06:18:18 +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: a0b8043b-0056-4111-acfb-d16769d0c744 X-Archives-Hash: 67a8b20a6acae63b5d5dfb0251aee0a4 commit: d4239fb331007a732aa1bf77b8dfdf8c9030e525 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jun 10 06:00:18 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 10 06:13:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4239fb3 x11-misc/xkeyboard-config: workaround portage collision issue Don't really like this, but unless portage either relax its checks or improve merging process there's probably(?) not a better option (would still need workaround for old portage anyway). Can probably drop this sometime in 2+ years after 2.45 is old enough, or if the symlink is ever removed. Unsure if maintainer would rather the workaround done a bit differently but that can be changed later (just do not want to leave this broken for longer). Closes: https://bugs.gentoo.org/957712 Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild | 16 ++++++++++++++++ x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 18 +++++++++++++++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild index 4ebef64ae30a..374525fd7ec8 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild @@ -64,3 +64,19 @@ src_configure() { ) meson_src_configure } + +src_install() { + meson_src_install + + # Workaround for portage's collision checks, see pkg_preinst (bug #957712) + if has_version "<${CATEGORY}/${PN}-2.45"; then + mv "${ED}"/usr/share/X11/xkb{,.workaround} || die + fi +} + +pkg_preinst() { + if [[ -L ${ED}/usr/share/X11/xkb.workaround ]]; then + rm -rf "${EROOT}"/usr/share/X11/xkb || die + mv "${ED}"/usr/share/X11/xkb{.workaround,} || die + fi +} diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index d4e67dee2a23..374525fd7ec8 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-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -64,3 +64,19 @@ src_configure() { ) meson_src_configure } + +src_install() { + meson_src_install + + # Workaround for portage's collision checks, see pkg_preinst (bug #957712) + if has_version "<${CATEGORY}/${PN}-2.45"; then + mv "${ED}"/usr/share/X11/xkb{,.workaround} || die + fi +} + +pkg_preinst() { + if [[ -L ${ED}/usr/share/X11/xkb.workaround ]]; then + rm -rf "${EROOT}"/usr/share/X11/xkb || die + mv "${ED}"/usr/share/X11/xkb{.workaround,} || die + fi +}