gentoo auto-resync : 01:05:2023 - 11:19:44

6 files changed, 2 insertions, 268 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index c5bcfea1c51b..06e7267b08b1 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 267e341f082e..bee4d5ff900f 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,12 +1,8 @@
 AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
-AUX xpra-4.2-suid-warning.patch 745 BLAKE2B 58153996d70476058b8daba30e61cbe02a84f10bc61ba79bafa045c1474d8436f4aa7c7e1bfa0ffc92450effca92810016d6afeaf1261cd568b5c9dd9b41f468 SHA512 82e994786967fb258cf273ea69d579207e503af5a53466821d4c155c5c61099468db26b7c31b4e91d343eff8e60cc06a66664e6a7a7e968e8ea7f1b8f862700d
-AUX xpra-4.3-cpp.patch 1273 BLAKE2B fc7b55d69242a4aaad4692959c67c4b2219b11d6e2cee32f7c6dd23d2efcf0727f7a3299d4f94032ad561876c4148a2c10ac260f9df208fab10766462b1738d7 SHA512 e4a11ef3518037695194e0b15e79dbe4bc2cc8c70780052c5660fd621d682936367fa17a998cc307a629eee5860a8e74cbb82cbfaa46cc2d0e6ec051058a43ec
 AUX xpra-4.3-no-service.patch 779 BLAKE2B 5232b103b47601b4340d6a863d2cd3cc6641a55d6c252702034902a4d5189c7df45b7d6280ae9bf2a3dbe8c96a73847f936032cc9b58c4bdd91025974fa84005 SHA512 d5045da20f4fdcb2b434f280c42b26ee1c8c280e4037a116c3edd0990a97acc5017bf428c4c222a1c38e23a6dd5709789ac80e62187144d334068deecc99d20e
 AUX xpra-9999-xdummy.patch 614 BLAKE2B 9b502fa836caea212f90730e0238adb16c74814a55a2a5b32e062880d29b1fa05247fc3c5e8edddf0acdd1d93620dafb507ec9a14996c3aea248d204510a0e2c SHA512 71efb726f50b85890bb3508bd3943b3bb9e34a8f5d3c92c6fa4f7c2ea6b8c51551243ea0d4d52802f17e5aaed7716b9ee0b462cde1941dae9273651dcc461a9a
 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
-EBUILD xpra-4.3.3.ebuild 5334 BLAKE2B 7421a2325b3fbc44ee454a63254a805849f3e083b3f5c759229fa2f0a6c990fbda3a09ebac0adea7d1e615b904f2a30176cb6e90318ff30bbacb49041888fc34 SHA512 cd5b41bb5326f6a2fec6c0303c0bb8e09082880b9351ee251fac8e6062ebf36c0f1a3bc1bb10e6c1d82a1d8acd7bcd9cbb06eaee650360bcf8ee9bcd47bfe51c
-EBUILD xpra-4.3.4.ebuild 5323 BLAKE2B a49a39a02472baa7fca0a53a87166690ab05f0de47fb6860e85eac3541881c275042b77ff190955c724692df0ae5dd55420c74d9aff4505b587a2ec446180983 SHA512 eda1413ffec13d0cd6cc497eebe64b2508d98175308a42153860d8dc035e25320e4102c75d1872b5f6e68a4fa8f21f4f0b5384e54c34f480be1c6c5af9eed36c
+EBUILD xpra-4.3.4.ebuild 5322 BLAKE2B f658b1301adcd6dec129281d1726d462e8a67293a9456d4bf1a87ebf94474db0ae228805e1181e9aecbc73c2e7dbdf2b0935ced91b89db9bc93913b3f8967532 SHA512 98486d33cc43b0bffa9ad52ea71653b92b4b405e91f2ebfd4db7854dace0e7bec41cd1d8503569a35c377def618fedcee78737cfde51d2b780e094ffc8be9756
 EBUILD xpra-9999.ebuild 5244 BLAKE2B 6a034de431da942de78d170fecfb84c492c35b86684ba5f2d171dd83002c600791fa559ed231ef82d7c39d5b90fb2835a4bcc7a9b9f8d4176ae7e893937f5b9e SHA512 6ff2e13ba7a414cf2b95a43fd1701162c77549b51dcebc406eb91a85b3e8ebce4a028f95f6b96d35521bab8b4027375a204db82bba5925369b9f747d1de5cf77
 MISC metadata.xml 1292 BLAKE2B 748b4713831cc4f2d6bbfb4f9c4d073b654772a64cbb3e0d5c52b9afcaaf9f1355d6ab7ab38f72a27cf7290f124e3d458320ad07847f9720568a60603b2abe4a SHA512 ecd2f89e7ae720dd11f3a36ebf90447ec2f4e326a5621618b7f4bf68189771823edc09fedcf197fe997af1aba48b5eaea62ac98d6fedf8bb6dac404da3aef85d
diff --git a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch b/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
deleted file mode 100644
index b1b2afb4e18b..000000000000
--- a/x11-wm/xpra/files/xpra-4.2-suid-warning.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --color -Naur a/xpra/scripts/config.py b/xpra/scripts/config.py
---- a/xpra/scripts/config.py	2021-05-19 16:18:30.475153200 +0100
-+++ b/xpra/scripts/config.py	2021-05-30 08:50:42.326953006 +0100
-@@ -159,7 +159,7 @@
-             if (xorg_stat.st_mode & stat.S_ISUID)!=0:
-                 if (xorg_stat.st_mode & stat.S_IROTH)==0:
-                     if warn_fn:
--                        warn_fn("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-+                        debug("%s is suid and not readable, Xdummy support unavailable" % xorg_bin)
-                     return get_Xvfb_command()
-                 debug("%s is suid and readable, using the xpra_Xdummy wrapper" % xorg_bin)
-                 use_wrapper = True
diff --git a/x11-wm/xpra/files/xpra-4.3-cpp.patch b/x11-wm/xpra/files/xpra-4.3-cpp.patch
deleted file mode 100644
index 41f1263e3465..000000000000
--- a/x11-wm/xpra/files/xpra-4.3-cpp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c80d18b41701082e60ce6bfa5bd6a274affaff96 Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Sun, 22 May 2022 12:00:01 +0100
-Subject: [PATCH] Most build systems respect the CPP env var instead of just
- calling cpp
-
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index f84d56c6d..7f0db3b69 100755
---- a/setup.py
-+++ b/setup.py
-@@ -149,6 +149,7 @@ ARM = ARCH.startswith("arm") or ARCH.startswith("aarch")
- print("ARCH=%s" % (ARCH,))
- 
- INCLUDE_DIRS = os.environ.get("INCLUDE_DIRS", os.path.join(sys.prefix, "include")).split(os.pathsep)
-+CPP = os.environ.get("CPP", "cpp")
- 
- from xpra.platform.features import LOCAL_SERVERS_SUPPORTED, SHADOW_SUPPORTED
- shadow_ENABLED = SHADOW_SUPPORTED and DEFAULT
-@@ -2423,7 +2424,7 @@ if v4l2_ENABLED:
-         ENABLE_DEVICE_CAPS = 0
-         if os.path.exists(videodev2_h):
-             try:
--                with subprocess.Popen("cpp -fpreprocessed %s | grep -q device_caps" % videodev2_h,
-+                with subprocess.Popen("%s -fpreprocessed %s | grep -q device_caps" % (CPP, videodev2_h),
-                                      shell=True) as proc:
-                     ENABLE_DEVICE_CAPS = proc.wait()==0
-             except OSError:
--- 
-2.35.1
-
diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
deleted file mode 100644
index 2bc1844bb041..000000000000
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ /dev/null
@@ -1,216 +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
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch"
-	KEYWORDS="amd64 x86"
-fi
-
-PYTHON_COMPAT=( python3_{9,10} )
-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 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 dbus html server sound xdg xinerama )
-"
-
-TDEPEND="
-	$(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,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}
-	${TDEPEND}
-	$(python_gen_cond_dep '
-		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? ( ${TDEPEND} )
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	doc? ( app-text/pandoc )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-4.2-suid-warning.patch
-	"${FILESDIR}"/${PN}-4.3-no-service.patch
-	"${FILESDIR}"/${PN}-4.3-cpp.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 's/^(pam|scripts|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)
-		$(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_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
-	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.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index 32a4a46aacb5..3583260ace2a 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -11,7 +11,7 @@ else
 	SRC_URI+="
 		https://dev.gentoo.org/~chewi/distfiles/${PN}-4.3.1-tests.patch
 	"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 PYTHON_COMPAT=( python3_{9..11} )