commit: 9c15a7239ec2589e1225b465f3688731c473d071
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 12 16:30:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 17:44:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c15a723
x11-wm/xpra: drop 4.3.4-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
x11-wm/xpra/Manifest | 2 -
.../xpra-3.0.2_ignore-gentoo-no-compile.patch | 13 --
x11-wm/xpra/files/xpra-4.3-no-service.patch | 19 --
x11-wm/xpra/xpra-4.3.4-r1.ebuild | 219 ---------------------
4 files changed, 253 deletions(-)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 9e1c819b017b..3e29e19a6741 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,3 +1 @@
-DIST xpra-4.3.1-tests.patch 51444 BLAKE2B
c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f
SHA512
0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
-DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B
e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e
SHA512
93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c
DIST xpra-4.4.5.tar.gz 4332287 BLAKE2B
64165a18d0f204247f984f616438252e82922447441376e6e46a15509486e67f699e852562cd632591fd2831a86592d5029c5905932fc9d267b16a7e6edd1b5a
SHA512
6fb28328efc020969fff17bf747a1e0bf5b21869c9532a8c482e12f979d1dec7989e10e5bf3a9ae7dbfaa9e48c670255b196fdb819200a74dfbdec3ba5ae744f
diff --git a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
deleted file mode 100644
index 5823ac8c167e..000000000000
--- a/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xpra-3.0.2/setup.py
-===================================================================
---- xpra-3.0.2.orig/setup.py
-+++ xpra-3.0.2/setup.py
-@@ -516,7 +516,7 @@ def cython_add(extension, min_version="0
- #python2.7 setup.py build -b build-2.7 install --no-compile \
- # --root=/var/tmp/portage/x11-wm/xpra-0.7.0/temp/images/2.7
- if "--no-compile" in sys.argv and not ("build" in sys.argv and "install"
in sys.argv):
-- return
-+ pass
- assert cython_ENABLED, "cython compilation is disabled"
- cython_version_check(min_version)
- from Cython.Distutils import build_ext
diff --git a/x11-wm/xpra/files/xpra-4.3-no-service.patch
b/x11-wm/xpra/files/xpra-4.3-no-service.patch
deleted file mode 100644
index b336db581953..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-no-service.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't install the service files. Auto-detection is used to determine what files
-to install, and where, which can be unpredictable on Gentoo. The init.d script
-is also not suitable for Gentoo.
-
-diff --git a/setup.py b/setup.py
-index fc67abb50..a11dc0d97 100755
---- a/setup.py
-+++ b/setup.py
-@@ -145,8 +145,8 @@ from xpra.platform.features import
LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
- server_ENABLED = (LOCAL_SERVERS_SUPPORTED or shadow_ENABLED) and DEFAULT
- rfb_ENABLED = DEFAULT
--service_ENABLED = LINUX and server_ENABLED
--sd_listen_ENABLED = POSIX and pkg_config_ok("--exists", "libsystemd")
-+service_ENABLED = False
-+sd_listen_ENABLED = False
- proxy_ENABLED = DEFAULT
- client_ENABLED = DEFAULT
- scripts_ENABLED = not WIN32
diff --git a/x11-wm/xpra/xpra-4.3.4-r1.ebuild b/x11-wm/xpra/xpra-4.3.4-r1.ebuild
deleted file mode 100644
index af4ceff68269..000000000000
--- a/x11-wm/xpra/xpra-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,219 +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
- SRC_URI+="
- https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
- "
- 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 opengl pillow pinentry pulseaudio +server sound systemd test
udev vpx webcam webp xdg xinerama"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
- || ( client server )
- cups? ( dbus )
- 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}] )
- opengl? (
- client? (
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 )
- udev? ( virtual/udev )
-"
-DEPEND+="
- test? ( ${TEST_DEPEND} )
-"
-BDEPEND="
- $(python_gen_cond_dep '
- >=dev-python/cython-0.16[${PYTHON_USEDEP}]
- ')
- virtual/pkgconfig
- doc? ( virtual/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
- "${FILESDIR}"/${PN}-4.3-no-service.patch
- "${DISTDIR}"/${PN}-4.3.1-tests.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
- $(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/bin/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
-}
