commit: 61165c54af803d45d05e611bc95cfa1149352872 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Jun 10 08:11:19 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Jun 10 08:12:26 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61165c54
x11-misc/xkeyboard-config: check -L as well Thought had added this already. Bug: https://bugs.gentoo.org/957712 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild | 2 +- x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild index f887a3b0e8ec..f0f55eafa674 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.45-r1.ebuild @@ -74,7 +74,7 @@ src_install() { pkg_preinst() { # Avoid touching EROOT if not needed, and use -f just-in-case anyway - if [[ -d ${EROOT}/usr/share/X11/xkb ]]; then + 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 diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild index f887a3b0e8ec..f0f55eafa674 100644 --- a/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild +++ b/x11-misc/xkeyboard-config/xkeyboard-config-9999.ebuild @@ -74,7 +74,7 @@ src_install() { pkg_preinst() { # Avoid touching EROOT if not needed, and use -f just-in-case anyway - if [[ -d ${EROOT}/usr/share/X11/xkb ]]; then + 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
