| 1 |
commit: 49b7c0c1ca3d0ab153bce1206008262424c29a00 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 26 22:06:56 2022 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 26 22:06:56 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b7c0c1 |
| 7 |
|
| 8 |
x11-wm/xpra: Add udev USE flag and call udev_reload when enabled |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/847037 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
x11-wm/xpra/xpra-4.3.3.ebuild | 19 +++++++++++++++---- |
| 14 |
x11-wm/xpra/xpra-9999.ebuild | 19 +++++++++++++++---- |
| 15 |
2 files changed, 30 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild |
| 18 |
index a6855e815cf0..6edd3e2ee447 100644 |
| 19 |
--- a/x11-wm/xpra/xpra-4.3.3.ebuild |
| 20 |
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild |
| 21 |
@@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o |
| 22 |
HOMEPAGE="https://xpra.org/" |
| 23 |
LICENSE="GPL-2 BSD" |
| 24 |
SLOT="0" |
| 25 |
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama" |
| 26 |
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama" |
| 27 |
|
| 28 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 29 |
|| ( client server ) |
| 30 |
@@ -99,6 +99,7 @@ RDEPEND=" |
| 31 |
x11-apps/xmodmap |
| 32 |
ibus? ( app-i18n/ibus ) |
| 33 |
pinentry? ( app-crypt/pinentry ) |
| 34 |
+ udev? ( virtual/udev ) |
| 35 |
" |
| 36 |
DEPEND+=" |
| 37 |
test? ( ${TDEPEND} ) |
| 38 |
@@ -193,12 +194,22 @@ python_install_all() { |
| 39 |
distutils-r1_python_prepare_all |
| 40 |
|
| 41 |
# Move udev dir to the right place. |
| 42 |
- local dir=$(get_udevdir) |
| 43 |
- dodir "${dir%/*}" |
| 44 |
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 45 |
+ if use udev; then |
| 46 |
+ local dir=$(get_udevdir) |
| 47 |
+ dodir "${dir%/*}" |
| 48 |
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 49 |
+ else |
| 50 |
+ rm -vr "${ED}"/usr/lib/udev || die |
| 51 |
+ fi |
| 52 |
} |
| 53 |
|
| 54 |
pkg_postinst() { |
| 55 |
tmpfiles_process xpra.conf |
| 56 |
xdg_pkg_postinst |
| 57 |
+ use udev && udev_reload |
| 58 |
+} |
| 59 |
+ |
| 60 |
+pkg_postrm() { |
| 61 |
+ xdg_pkg_postinst |
| 62 |
+ use udev && udev_reload |
| 63 |
} |
| 64 |
|
| 65 |
diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild |
| 66 |
index 59f1f56b88b3..a21d89139d37 100644 |
| 67 |
--- a/x11-wm/xpra/xpra-9999.ebuild |
| 68 |
+++ b/x11-wm/xpra/xpra-9999.ebuild |
| 69 |
@@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o |
| 70 |
HOMEPAGE="https://xpra.org/" |
| 71 |
LICENSE="GPL-2 BSD" |
| 72 |
SLOT="0" |
| 73 |
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test vpx webcam webp xdg xinerama" |
| 74 |
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio +server sound systemd test udev vpx webcam webp xdg xinerama" |
| 75 |
|
| 76 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 77 |
|| ( client server ) |
| 78 |
@@ -98,6 +98,7 @@ RDEPEND=" |
| 79 |
x11-apps/xmodmap |
| 80 |
ibus? ( app-i18n/ibus ) |
| 81 |
pinentry? ( app-crypt/pinentry ) |
| 82 |
+ udev? ( virtual/udev ) |
| 83 |
" |
| 84 |
DEPEND+=" |
| 85 |
test? ( ${TDEPEND} ) |
| 86 |
@@ -191,12 +192,22 @@ python_install_all() { |
| 87 |
distutils-r1_python_prepare_all |
| 88 |
|
| 89 |
# Move udev dir to the right place. |
| 90 |
- local dir=$(get_udevdir) |
| 91 |
- dodir "${dir%/*}" |
| 92 |
- mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 93 |
+ if use udev; then |
| 94 |
+ local dir=$(get_udevdir) |
| 95 |
+ dodir "${dir%/*}" |
| 96 |
+ mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die |
| 97 |
+ else |
| 98 |
+ rm -vr "${ED}"/usr/lib/udev || die |
| 99 |
+ fi |
| 100 |
} |
| 101 |
|
| 102 |
pkg_postinst() { |
| 103 |
tmpfiles_process xpra.conf |
| 104 |
xdg_pkg_postinst |
| 105 |
+ use udev && udev_reload |
| 106 |
+} |
| 107 |
+ |
| 108 |
+pkg_postrm() { |
| 109 |
+ xdg_pkg_postinst |
| 110 |
+ use udev && udev_reload |
| 111 |
} |
Archives