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 2235A15807A for ; Tue, 10 Jun 2025 08:02:50 +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 0E3B83431C4 for ; Tue, 10 Jun 2025 08:02:50 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 078471102BE; Tue, 10 Jun 2025 08:02:49 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 0050A1102BE for ; Tue, 10 Jun 2025 08:02:48 +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 AE4813431B5 for ; Tue, 10 Jun 2025 08:02:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23410265C for ; Tue, 10 Jun 2025 08:02:47 +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: <1749542526.cea0e7e9372804723ecee46c4bb0c145c1128063.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-r1.ebuild 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: cea0e7e9372804723ecee46c4bb0c145c1128063 X-VCS-Branch: master Date: Tue, 10 Jun 2025 08:02:47 +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: b9c649c6-31df-4626-86fc-4edd121dc86c X-Archives-Hash: 82506dc799b2930502f840933e82c657 commit: cea0e7e9372804723ecee46c4bb0c145c1128063 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jun 10 06:47:29 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 10 08:02:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cea0e7e9 x11-misc/xkeyboard-config: fix collision workaround for binpkgs Was hoping to "do nothing at all" when not needed, but cannot test the current system in src_install for binpkgs. fwiw, we can still avoid touching ${EROOT} for nothing unless xkb is a directory (still with -f in case users did anything weird with permissions). Also revbump just in case binpkgs were made already either with or without the previous version of the workaround. Closes: https://bugs.gentoo.org/957712 Signed-off-by: Ionen Wolkens gentoo.org> ...yboard-config-2.45.ebuild => xkeyboard-config-2.45-r1.ebuild} | 9 ++++----- x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild similarity index 89% rename from x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild rename to x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild index 374525fd7ec8..f887a3b0e8ec 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.45.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild @@ -69,14 +69,13 @@ 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 + mv "${ED}"/usr/share/X11/xkb{,.workaround} || die } pkg_preinst() { - if [[ -L ${ED}/usr/share/X11/xkb.workaround ]]; then + # Avoid touching EROOT if not needed, and use -f just-in-case anyway + if [[ -d ${EROOT}/usr/share/X11/xkb ]]; then rm -rf "${EROOT}"/usr/share/X11/xkb || die - mv "${ED}"/usr/share/X11/xkb{.workaround,} || die fi + mv "${ED}"/usr/share/X11/xkb{.workaround,} || die } diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index 374525fd7ec8..f887a3b0e8ec 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -69,14 +69,13 @@ 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 + mv "${ED}"/usr/share/X11/xkb{,.workaround} || die } pkg_preinst() { - if [[ -L ${ED}/usr/share/X11/xkb.workaround ]]; then + # Avoid touching EROOT if not needed, and use -f just-in-case anyway + if [[ -d ${EROOT}/usr/share/X11/xkb ]]; then rm -rf "${EROOT}"/usr/share/X11/xkb || die - mv "${ED}"/usr/share/X11/xkb{.workaround,} || die fi + mv "${ED}"/usr/share/X11/xkb{.workaround,} || die }