summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2023-06-17 13:45:57 +0100
committerJames Le Cuirot <chewi@gentoo.org>2023-06-17 13:45:57 +0100
commitd5decb08518dc8bdca78208c37baca956c758e69 (patch)
tree8758ed7ee86761590e629d045f2aaf0e9cc7b6aa /x11-wm/xpra
parentsec-keys/openpgp-keys-jiatan: Stabilize 20230505 hppa, #908619 (diff)
downloadgentoo-d5decb08518dc8bdca78208c37baca956c758e69.tar.gz
gentoo-d5decb08518dc8bdca78208c37baca956c758e69.tar.bz2
gentoo-d5decb08518dc8bdca78208c37baca956c758e69.zip
x11-wm/xpra: Avoid udev directory move on usr-merge systems
Closes: https://bugs.gentoo.org/908477 Signed-off-by: James Le Cuirot <chewi@gentoo.org>
Diffstat (limited to 'x11-wm/xpra')
-rw-r--r--x11-wm/xpra/xpra-4.4.5-r2.ebuild8
-rw-r--r--x11-wm/xpra/xpra-9999.ebuild8
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