commit: d5decb08518dc8bdca78208c37baca956c758e69 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sat Jun 17 12:45:57 2023 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sat Jun 17 12:45:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5decb08
x11-wm/xpra: Avoid udev directory move on usr-merge systems Closes: https://bugs.gentoo.org/908477 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-wm/xpra/xpra-4.4.5-r2.ebuild | 8 +++++--- x11-wm/xpra/xpra-9999.ebuild | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/x11-wm/xpra/xpra-4.4.5-r2.ebuild b/x11-wm/xpra/xpra-4.4.5-r2.ebuild index a774716c5872..2c08072e01a5 100644 --- a/x11-wm/xpra/xpra-4.4.5-r2.ebuild +++ b/x11-wm/xpra/xpra-4.4.5-r2.ebuild @@ -195,11 +195,13 @@ python_test() { python_install_all() { distutils-r1_python_prepare_all - # Move udev dir to the right place. + # Move udev dir to the right place if necessary. if use udev; then local dir=$(get_udevdir) - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + fi else rm -vr "${ED}"/usr/lib/udev || die rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index 8a065e465ed5..052a2654219b 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -196,11 +196,13 @@ python_test() { python_install_all() { distutils-r1_python_prepare_all - # Move udev dir to the right place. + # Move udev dir to the right place if necessary. if use udev; then local dir=$(get_udevdir) - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + if [[ ! ${ED}/usr/lib/udev -ef ${ED}${dir} ]]; then + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + fi else rm -vr "${ED}"/usr/lib/udev || die rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || die
