[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/, x11-wm/xpra/files/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     db75ee79722700299a45b254c89007270d24689b
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 29 14:05:49 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 29 14:05:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db75ee79

x11-wm/xpra: Drop old 4.2

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 x11-wm/xpra/Manifest                        |   1 -
 x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch |  33 ------
 x11-wm/xpra/files/xpra-4.2-no-service.patch |  19 ----
 x11-wm/xpra/xpra-4.2.ebuild                 | 170 ----------------------------
 4 files changed, 223 deletions(-)

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 310851c94a31..1b68b101e872 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,4 +1,3 @@
-DIST xpra-4.2.tar.gz 4057304 BLAKE2B 17b6a95f7ce24a311c39d09291d9570285c30f25c2d935389cb380c2fce698acd984821e69acaabd66368e76b5beddd01803a68d6a16dd930dd2fa3289532f10 SHA512 261d46c04ce70686f41873c5c0c115e462e3b2501c58ab05fb2904f4700454c5fb8124d0faf86fe5e982872f19a4b90b941f8aff4790f7206602d6030c005353
 DIST xpra-4.3.1-tests.patch 51444 BLAKE2B c645aa52bb06c3872f6c1c7aace099c10a6fd46dd4c386ec1a13f6326e3fc8860a71767510ce9b44375cc8b30cef563e4405b2834670a9d2c555d3359d16e99f SHA512 0c70c33e24980db31e904c91f987a73693bd2349958ea8392138987e1dc1852ea42a4ee7e3b238f01c92adc57dbe196e57f4c4accf27aade6c4ea55c1ff9b40c
 DIST xpra-4.3.3.tar.gz 4180278 BLAKE2B 2fceab6c95efd0bd0390b7965aea588f39e43f86094c1f9921e1f75022f569808e27d7d85adcccfd64ac28889d0f6d2d6afdf4365f8c919bac8b1a14f3919f23 SHA512 c470e892b4b6379b6c9447731ab174e85c26de15fdc9541a199a2f49e45d07942ae8638f8ddf040a22c73422c6e6b262a9066cd8990f182b75163f7d449d91e2
 DIST xpra-4.3.4.tar.gz 4184031 BLAKE2B e01e338398f86c80a1092ea3155126ed26eb959ca97790add4cfcdb0ec8a1c6391937ff101c889ec78bb00bbf38ac0c42c5b85d60e72804ffccbbe5f446aaa3e SHA512 93855ff248f135c70a2144a0afbc66e4830b8d214c9c2017dff1d3e3c7902dac15b1cb03670cde8018b40d5c404bd7c243625faeaba712130f5d0082f562c60c

diff --git a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch b/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
deleted file mode 100644
index 8475d47b8b3c..000000000000
--- a/x11-wm/xpra/files/xpra-3.0.2-ldconfig.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ruN xpra-3.0.2.orig/xpra/x11/fakeXinerama.py xpra-3.0.2/xpra/x11/fakeXinerama.py
---- xpra-3.0.2.orig/xpra/x11/fakeXinerama.py	2019-09-24 15:54:02.000000000 +0200
-+++ xpra-3.0.2/xpra/x11/fakeXinerama.py	2020-01-16 12:20:22.620519078 +0100
-@@ -23,29 +23,6 @@
- 
- def find_libfakeXinerama():
-     libname = "fakeXinerama"
--    try:
--        from ctypes.util import find_library
--        flibname = find_library("fakeXinerama")
--        if flibname:
--            libname = flibname
--    except Exception:
--        pass
--    if POSIX:
--        for lib_dir in os.environ.get("LD_LIBRARY_PATH", "/usr/lib").split(os.pathsep):
--            lib_path = os.path.join(lib_dir, libname)
--            if not os.path.exists(lib_dir):
--                continue
--            if os.path.exists(lib_path) and os.path.isfile(lib_path):
--                return lib_path
--    if LINUX:
--        try:
--            libpath = find_lib_ldconfig("fakeXinerama")
--            if libpath:
--                return libpath
--        except Exception as e:
--            log("find_libfakeXinerama()", exc_info=True)
--            log.error("Error: cannot launch ldconfig -p to locate libfakeXinerama:")
--            log.error(" %s", e)
-     return find_lib(libname)
- 
- current_xinerama_config = None

diff --git a/x11-wm/xpra/files/xpra-4.2-no-service.patch b/x11-wm/xpra/files/xpra-4.2-no-service.patch
deleted file mode 100644
index dd85370968ba..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-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 1718b06a9..b24a5bd1e 100755
---- a/setup.py
-+++ b/setup.py
-@@ -139,8 +139,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 = server_ENABLED
--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.2.ebuild b/x11-wm/xpra/xpra-4.2.ebuild
deleted file mode 100644
index c42097bb561a..000000000000
--- a/x11-wm/xpra/xpra-4.2.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_SINGLE_IMPL=yes
-DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 tmpfiles prefix udev
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="https://xpra.org/"
-SRC_URI="https://xpra.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg ibus +lz4 lzo minimal opengl pillow pinentry pulseaudio server sound test vpx webcam webp"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( client server )
-	cups? ( dbus )
-	opengl? ( client )
-"
-
-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/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,x265] )
-	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}
-	$(python_gen_cond_dep '
-		dev-python/netifaces[${PYTHON_USEDEP}]
-		dev-python/rencode[${PYTHON_USEDEP}]
-		dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
-		cups? ( dev-python/pycups[${PYTHON_USEDEP}] )
-		dbus? ( dev-python/dbus-python[${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/xmodmap
-	ibus? ( app-i18n/ibus )
-	pinentry? ( app-crypt/pinentry )
-	server? (
-		x11-base/xorg-server[-minimal,xvfb]
-		x11-drivers/xf86-input-void
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
-	')
-	doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-3.0.2-ldconfig.patch
-	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
-	"${FILESDIR}"/${PN}-4.2-no-service.patch
-)
-
-python_prepare_all() {
-	hprefixify -w '/os.path/' setup.py
-	hprefixify tmpfiles.d/xpra.conf xpra/server/server_util.py \
-		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
-
-	sed -r -e "/\bdoc_dir =/s:/${PN}\":/${PF}/html\":" \
-		-i setup.py || die
-
-	if use minimal; then
-		sed -r -e 's/^(pam|scripts|xdg_open)_ENABLED.*/\1_ENABLED=False/' \
-			-i setup.py || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:DEFAULT_PULSEAUDIO:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--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)
-		$(use_with ffmpeg 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)
-		--with-strict
-		$(use_with vpx)
-		--with-warn
-		$(use_with webcam)
-		$(use_with webp)
-		--with-x11
-	)
-
-	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
-}
-
-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
-}
-
-pkg_postinst() {
-	tmpfiles_process xpra.conf
-	xdg_pkg_postinst
-}