commit: 49b7c0c1ca3d0ab153bce1206008262424c29a00 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu May 26 22:06:56 2022 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu May 26 22:06:56 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b7c0c1
x11-wm/xpra: Add udev USE flag and call udev_reload when enabled Closes: https://bugs.gentoo.org/847037 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> x11-wm/xpra/xpra-4.3.3.ebuild | 19 +++++++++++++++---- x11-wm/xpra/xpra-9999.ebuild | 19 +++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild index a6855e815cf0..6edd3e2ee447 100644 --- a/x11-wm/xpra/xpra-4.3.3.ebuild +++ b/x11-wm/xpra/xpra-4.3.3.ebuild @@ -22,7 +22,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o HOMEPAGE="https://xpra.org/" LICENSE="GPL-2 BSD" SLOT="0" -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" +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" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( client server ) @@ -99,6 +99,7 @@ RDEPEND=" x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) + udev? ( virtual/udev ) " DEPEND+=" test? ( ${TDEPEND} ) @@ -193,12 +194,22 @@ python_install_all() { distutils-r1_python_prepare_all # Move udev dir to the right place. - local dir=$(get_udevdir) - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + if use udev; then + local dir=$(get_udevdir) + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + else + rm -vr "${ED}"/usr/lib/udev || die + fi } pkg_postinst() { tmpfiles_process xpra.conf xdg_pkg_postinst + use udev && udev_reload +} + +pkg_postrm() { + xdg_pkg_postinst + use udev && udev_reload } diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild index 59f1f56b88b3..a21d89139d37 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -21,7 +21,7 @@ DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based o HOMEPAGE="https://xpra.org/" LICENSE="GPL-2 BSD" SLOT="0" -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" +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" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( client server ) @@ -98,6 +98,7 @@ RDEPEND=" x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) + udev? ( virtual/udev ) " DEPEND+=" test? ( ${TDEPEND} ) @@ -191,12 +192,22 @@ python_install_all() { distutils-r1_python_prepare_all # Move udev dir to the right place. - local dir=$(get_udevdir) - dodir "${dir%/*}" - mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + if use udev; then + local dir=$(get_udevdir) + dodir "${dir%/*}" + mv -vnT "${ED}"/usr/lib/udev "${ED}${dir}" || die + else + rm -vr "${ED}"/usr/lib/udev || die + fi } pkg_postinst() { tmpfiles_process xpra.conf xdg_pkg_postinst + use udev && udev_reload +} + +pkg_postrm() { + xdg_pkg_postinst + use udev && udev_reload }