From a693a49d235bea057923bcbc2ee6a40cce4bb060 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 7 Jun 2023 15:42:35 +0100 Subject: gentoo auto-resync : 07:06:2023 - 15:42:35 --- x11-wm/xpra/Manifest | 4 +- x11-wm/xpra/xpra-4.4.5-r1.ebuild | 218 +++++++++++++++++++++++++++++++++++++++ x11-wm/xpra/xpra-4.4.5.ebuild | 217 -------------------------------------- x11-wm/xpra/xpra-9999.ebuild | 3 +- 4 files changed, 222 insertions(+), 220 deletions(-) create mode 100644 x11-wm/xpra/xpra-4.4.5-r1.ebuild delete mode 100644 x11-wm/xpra/xpra-4.4.5.ebuild (limited to 'x11-wm/xpra') diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest index eaa0d0e8974e..73d06788d59d 100644 --- a/x11-wm/xpra/Manifest +++ b/x11-wm/xpra/Manifest @@ -7,6 +7,6 @@ DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd4 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B 64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a SHA512 6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f EBUILD xpra-4.3.4-r1.ebuild 5390 BLAKE2B 3dfe1a1b3eb8d3c9ece31e0c555b8ab6aa597d1b81850cac88e005dcfa146faa6c72bab4a219d0251ee9690948bfcfc618d2c396e25fd7642b1fcfe7467beb8a SHA512 89346bc7b8d08e36b206db561b650074fb67e7312dcefdc6ba5a784d4b48abaef45890c09cf964ca2947cb05c88d9ac767361c1f95f17a5761dbc1cae4253b25 -EBUILD xpra-4.4.5.ebuild 5373 BLAKE2B 9d40cfd8be2e0ff4aa4e0de168d817e70ce197585f1dc5861ca22116095f501c6e512e7f59314ee960594081d055240825abf8fb0b31647f47e796ff1a4a3711 SHA512 14fb248cea6571355362c6fdc7591f02a51dcd0d1e1b3fa47f309c22a67f6d403862acae828e5b9cc67844e5a18919a8df0082ef9418f1742fc937cbdcec5cb9 -EBUILD xpra-9999.ebuild 5418 BLAKE2B 85c3c74484d9f68ce0aaf918b869d94cbf609672a58fe521c0f7dbd47a7a543c9f4de0372cf9c460c3ce60a4643cdb15330544d3bc7cfa8f4c3f52f2d98a157a SHA512 337e6609b21543b8ca6d84158bbe889b4becc5fbb4630ffc8743681f45b858666d162d4a217a6513d8057f82549b07d155de41cc47935516cfe44648d9813eb6 +EBUILD xpra-4.4.5-r1.ebuild 5395 BLAKE2B 8600db0fe0e630356bc333aacedbd1704626af43c1fe625106bb69551bc2169e447ab1ef3890f188e2323091f2b0c4758c0e33b0254817f52ce1d75ad86bc57e SHA512 065eff6f59e9d532b934e0ca808bf1da7eb6c175150f3b55a383040de4f5d9093a7f8d16a29516beb6da0184a2ae8d1e1fcd533b00cb58647071f74bfcec359d +EBUILD xpra-9999.ebuild 5440 BLAKE2B 77232c03417a2a6d79893395ef88e7197eb8e3828f0fd2be33c223173a3bcd87386d3cdd73c0ceb44b2f4739b7297acb5dd31daa80e53f2dcfa583d6bad34e4c SHA512 4e3941ad23e6f968ff2c52f07a4859f79cda204dac391f47c6f6949fac7eaf3d707db526e6ac2462a35a40a5df935e6ec630044eded5a1835b4180c7aed93575 MISC metadata.xml 1416 BLAKE2B e9e738735a5cf651f59f6e690d1b30609f9a116aafe30951d971e82bef175ec53232141d323e7bf5a10d9c6c87cd41ef0b02fe9916af8d26c61ec19ff5629660 SHA512 55468ae3a5747693c8d9c96ea85086ab5bcccc01201a02a6afb6635ba4f39ba5d5258059b5f9cb083aff4aeef52fd08218a40e047b479280ffe95168c4994473 diff --git a/x11-wm/xpra/xpra-4.4.5-r1.ebuild b/x11-wm/xpra/xpra-4.4.5-r1.ebuild new file mode 100644 index 000000000000..edf3498864ce --- /dev/null +++ b/x11-wm/xpra/xpra-4.4.5-r1.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" + inherit git-r3 +else + inherit pypi + KEYWORDS="~amd64 ~x86" +fi + +PYTHON_COMPAT=( python3_{9..11} ) +DISTUTILS_SINGLE_IMPL=yes +DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_EXT=1 + +inherit xdg xdg-utils distutils-r1 tmpfiles udev + +DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" +HOMEPAGE="https://xpra.org/" +LICENSE="GPL-2 BSD" +SLOT="0" +IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + || ( client server ) + cups? ( dbus ) + oauth? ( server ) + opengl? ( client ) + test? ( client clipboard crypt dbus html server sound xdg xinerama ) +" + +TEST_DEPEND=" + $(python_gen_cond_dep ' + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/pillow[jpeg?,${PYTHON_USEDEP}] + dev-python/rencode[${PYTHON_USEDEP}] + dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) + xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) + ') + html? ( www-apps/xpra-html5 ) + server? ( + x11-base/xorg-server[-minimal,xvfb] + x11-drivers/xf86-input-void + ) + xinerama? ( x11-libs/libfakeXinerama ) +" +DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/pygobject:3[${PYTHON_USEDEP},cairo] + opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) + sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) + ') + x11-libs/gtk+:3[introspection] + x11-libs/libX11 + x11-libs/libXcomposite + x11-libs/libXdamage + x11-libs/libXfixes + x11-libs/libXrandr + x11-libs/libXres + x11-libs/libXtst + x11-libs/libxkbfile + brotli? ( app-arch/brotli ) + csc? ( >=media-video/ffmpeg-1.2.2:0= ) + ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) + jpeg? ( media-libs/libjpeg-turbo ) + pulseaudio? ( + media-sound/pulseaudio + media-plugins/gst-plugins-pulse:1.0 + ) + sound? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + vpx? ( media-libs/libvpx media-video/ffmpeg ) + webp? ( media-libs/libwebp ) +" +RDEPEND=" + ${DEPEND} + ${TEST_DEPEND} + $(python_gen_cond_dep ' + crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) + cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) + lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) + lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) + oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) + opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) + webcam? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pyinotify[${PYTHON_USEDEP}] + media-libs/opencv[${PYTHON_USEDEP},python] + ) + ') + acct-group/xpra + virtual/ssh + x11-apps/xauth + x11-apps/xmodmap + ibus? ( app-i18n/ibus ) + pinentry? ( app-crypt/pinentry ) + trayicon? ( dev-libs/libayatana-appindicator ) + udev? ( virtual/udev ) +" +DEPEND+=" + test? ( ${TEST_DEPEND} ) +" +BDEPEND=" + $(python_gen_cond_dep ' + >=dev-python/cython-0.16[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + doc? ( app-text/pandoc ) +" + +RESTRICT="!test? ( test )" + +PATCHES=( + "${FILESDIR}"/${PN}-4.4-xdummy.patch +) + +python_prepare_all() { + distutils-r1_python_prepare_all + + # FIXME: There are hardcoded paths all over the place but the following + # double-prefixes some files under /etc. Looks tricky to fix. :( + #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) + + sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ + -i setup.py || die + + if use minimal; then + sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ + -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ + -i setup.py || die + fi +} + +python_configure_all() { + sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ + -i setup.py || die + + DISTUTILS_ARGS=( + --without-PIC + --without-Xdummy + $(use_with client) + $(use_with clipboard) + $(use_with csc csc_swscale) + --without-csc_libyuv + --without-cuda_rebuild + --without-cuda_kernels + $(use_with cups printing) + --without-debug + $(use_with dbus) + $(use_with doc docs) + $(use_with ffmpeg dec_avcodec2) + $(use_with ffmpeg enc_ffmpeg) + $(use_with ffmpeg enc_x264) + --without-enc_x265 + --with-gtk3 + $(use_with jpeg jpeg_encoder) + $(use_with jpeg jpeg_decoder) + --without-mdns + --without-sd_listen + --without-service + $(use_with opengl) + $(use_with server shadow) + $(use_with server) + $(use_with sound) + --without-strict + $(use_with vpx) + --with-warn + $(use_with webcam) + $(use_with webp) + --with-x11 + ) + + export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" +} + +python_test() { + export XAUTHORITY=${HOME}/.Xauthority + touch "${XAUTHORITY}" || die + + distutils_install_for_testing + xdg_environment_reset + + env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ + PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ + XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ + "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die +} + +python_install_all() { + distutils-r1_python_prepare_all + + # Move udev dir to the right place. + 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 + rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || 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-4.4.5.ebuild b/x11-wm/xpra/xpra-4.4.5.ebuild deleted file mode 100644 index 199c4d9d268c..000000000000 --- a/x11-wm/xpra/xpra-4.4.5.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/Xpra-org/xpra.git" - inherit git-r3 -else - inherit pypi - KEYWORDS="~amd64 ~x86" -fi - -PYTHON_COMPAT=( python3_{9..11} ) -DISTUTILS_SINGLE_IMPL=yes -DISTUTILS_USE_SETUPTOOLS=no - -inherit xdg xdg-utils distutils-r1 tmpfiles udev - -DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy" -HOMEPAGE="https://xpra.org/" -LICENSE="GPL-2 BSD" -SLOT="0" -IUSE="brotli +client +clipboard crypt csc cups dbus doc ffmpeg jpeg html ibus +lz4 lzo minimal oauth opengl pillow pinentry pulseaudio +server sound systemd test +trayicon udev vpx webcam webp xdg xinerama" - -REQUIRED_USE="${PYTHON_REQUIRED_USE} - || ( client server ) - cups? ( dbus ) - oauth? ( server ) - opengl? ( client ) - test? ( client clipboard crypt dbus html server sound xdg xinerama ) -" - -TEST_DEPEND=" - $(python_gen_cond_dep ' - dev-python/netifaces[${PYTHON_USEDEP}] - dev-python/pillow[jpeg?,${PYTHON_USEDEP}] - dev-python/rencode[${PYTHON_USEDEP}] - dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] ) - xdg? ( dev-python/pyxdg[${PYTHON_USEDEP}] ) - ') - html? ( www-apps/xpra-html5 ) - server? ( - x11-base/xorg-server[-minimal,xvfb] - x11-drivers/xf86-input-void - ) - xinerama? ( x11-libs/libfakeXinerama ) -" -DEPEND=" - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - dev-python/pygobject:3[${PYTHON_USEDEP},cairo] - opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] ) - sound? ( dev-python/gst-python:1.0[${PYTHON_USEDEP}] ) - ') - x11-libs/gtk+:3[introspection] - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXfixes - x11-libs/libXrandr - x11-libs/libXres - x11-libs/libXtst - x11-libs/libxkbfile - brotli? ( app-arch/brotli ) - csc? ( >=media-video/ffmpeg-1.2.2:0= ) - ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264] ) - jpeg? ( media-libs/libjpeg-turbo ) - pulseaudio? ( - media-sound/pulseaudio - media-plugins/gst-plugins-pulse:1.0 - ) - sound? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - vpx? ( media-libs/libvpx media-video/ffmpeg ) - webp? ( media-libs/libwebp ) -" -RDEPEND=" - ${DEPEND} - ${TEST_DEPEND} - $(python_gen_cond_dep ' - crypt? ( dev-python/cryptography[${PYTHON_USEDEP}] ) - cups? ( dev-python/pycups[${PYTHON_USEDEP}] ) - lz4? ( dev-python/lz4[${PYTHON_USEDEP}] ) - lzo? ( >=dev-python/python-lzo-0.7.0[${PYTHON_USEDEP}] ) - oauth? ( dev-python/oauthlib[${PYTHON_USEDEP}] ) - opengl? ( dev-python/pyopengl_accelerate[${PYTHON_USEDEP}] ) - webcam? ( - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pyinotify[${PYTHON_USEDEP}] - media-libs/opencv[${PYTHON_USEDEP},python] - ) - ') - acct-group/xpra - virtual/ssh - x11-apps/xauth - x11-apps/xmodmap - ibus? ( app-i18n/ibus ) - pinentry? ( app-crypt/pinentry ) - trayicon? ( dev-libs/libappindicator:3 ) - udev? ( virtual/udev ) -" -DEPEND+=" - test? ( ${TEST_DEPEND} ) -" -BDEPEND=" - $(python_gen_cond_dep ' - >=dev-python/cython-0.16[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - doc? ( app-text/pandoc ) -" - -RESTRICT="!test? ( test )" - -PATCHES=( - "${FILESDIR}"/${PN}-4.4-xdummy.patch -) - -python_prepare_all() { - distutils-r1_python_prepare_all - - # FIXME: There are hardcoded paths all over the place but the following - # double-prefixes some files under /etc. Looks tricky to fix. :( - #hprefixify $(find -type f \( -name "*.py" -o -name "*.conf" \)) - - sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \ - -i setup.py || die - - if use minimal; then - sed -r -e '/pam_ENABLED/s/DEFAULT/False/' \ - -e 's/^(xdg_open)_ENABLED = .*/\1_ENABLED = False/' \ - -i setup.py || die - fi -} - -python_configure_all() { - sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \ - -i setup.py || die - - DISTUTILS_ARGS=( - --without-PIC - --without-Xdummy - $(use_with client) - $(use_with clipboard) - $(use_with csc csc_swscale) - --without-csc_libyuv - --without-cuda_rebuild - --without-cuda_kernels - $(use_with cups printing) - --without-debug - $(use_with dbus) - $(use_with doc docs) - $(use_with ffmpeg dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) - $(use_with ffmpeg enc_x264) - --without-enc_x265 - --with-gtk3 - $(use_with jpeg jpeg_encoder) - $(use_with jpeg jpeg_decoder) - --without-mdns - --without-sd_listen - --without-service - $(use_with opengl) - $(use_with server shadow) - $(use_with server) - $(use_with sound) - --without-strict - $(use_with vpx) - --with-warn - $(use_with webcam) - $(use_with webp) - --with-x11 - ) - - export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra" -} - -python_test() { - export XAUTHORITY=${HOME}/.Xauthority - touch "${XAUTHORITY}" || die - - distutils_install_for_testing - xdg_environment_reset - - env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \ - PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \ - XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \ - "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die -} - -python_install_all() { - distutils-r1_python_prepare_all - - # Move udev dir to the right place. - 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 - rm -v "${ED}"/usr/libexec/xpra/xpra_udev_product_version || 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 f24fa2443658..00b773011b00 100644 --- a/x11-wm/xpra/xpra-9999.ebuild +++ b/x11-wm/xpra/xpra-9999.ebuild @@ -14,6 +14,7 @@ fi PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_SINGLE_IMPL=yes DISTUTILS_USE_SETUPTOOLS=no +DISTUTILS_EXT=1 inherit xdg xdg-utils distutils-r1 tmpfiles udev @@ -99,7 +100,7 @@ RDEPEND=" x11-apps/xmodmap ibus? ( app-i18n/ibus ) pinentry? ( app-crypt/pinentry ) - trayicon? ( dev-libs/libappindicator:3 ) + trayicon? ( dev-libs/libayatana-appindicator ) udev? ( virtual/udev ) " DEPEND+=" -- cgit v1.2.3