gentoo resync : 03.03.2021

2 files changed, 51 insertions, 36 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index ed76b5d89f6c..9680cba484dc 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -4,9 +4,9 @@ AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c824
 AUX xpra-4.0.3-suid-warning.patch 731 BLAKE2B 6e576c088bc59ee7a52e15a8fbceb9117a47e4bf818b6777ffe977b5db1f9e72077ffeea07570312603f160d5556d2980914887f56d9733b1b6bf49ae385d0e4 SHA512 d3a3c2a2510159e83d6d6bda11f37b5500ce80d4bac059d3bcee8293caa93652a132d074f46a728204b012c61707994ebb87e0e02afd0c4efeab7a705ba5ea69
 AUX xpra-4.0.6-r28363.patch 10454 BLAKE2B 8385dc347edf9e3464784cf0d9bb8450696b66bb66af3b14e3a3440fb2b6ffea9f1d7c640f1973e8d37084eced58daad451162ac2b6798a7b5e7fb8f6f89b430 SHA512 a75534371a391fe1fbf6cd327e0df9eeb1fc7b65376de734f523984ea124ad95c7782af380735b95500cc63002e065c9684bb92095c5850f2cf42e7b15d661f8
 DIST xpra-3.0.5.tar.xz 2752016 BLAKE2B a36d6a4ebb0b14665014da92d510c0d5f978c96db653709ddc09a1015426d6ac6f71f9a221db68ee1114c95eeaca6600f9e49102ce9f936d9b0ee298ac432647 SHA512 3dbc122ebc8c4aa67154acfe92668ac364d8469022b03e28946d763e4d396f8c707690b2a4dbf07b55545259a53b46c9dd94e6e40131289ccc3dce6a88107681
-DIST xpra-4.0.5.tar.xz 2795828 BLAKE2B fed6514d75dbb08f386325e30e375fd2077db1dad91602e575e3955a622a52ade2fc8e0c6c823d8a495684afb3a2f55f27e28abdf8734d0eca25275a3d358193 SHA512 d2aa2b70b6ec702bca5b0c2b06378107d45c4cad79f83ee2a1ed27fd5f66474e2d8e1d28d5111e60417ed089f91bab0b1566b0c9b3dcf6f0cb5e204ff5c42c92
 DIST xpra-4.0.6.tar.xz 2797752 BLAKE2B 3f2d4108fec1f1b5c0cd38a26f1a2c41af253fd234427e8e54104ff3742b9f7ae3e1863db837addd76acc6856b6f3cfcbde97edc2bc75314b215d4ca46a816f8 SHA512 e3dc66040898ed40ef12b8cdb89e5f42c2f36edc071afb435334389e727f376ddc116dbee47018468bff24f2cdd7be35750b58bc108ba73c5558bd9eccbd04ea
+DIST xpra-4.1.tar.xz 2680552 BLAKE2B 7b23ac9cc226cea7aaf076c7c747189a76e95b520ac629e5649b627cd78211aba34e31c2c09477d55d50694659921a0553eec8c8ad3e1d7c98299dec8e75b236 SHA512 b2ce7875aaa5cef52195aa16b5914a2f9fa3ff279d39d7c7a72ea3da11afefeb5536d46987525d5bc948c28e3fea01d5cc975d2b32edc2a541b3fb0130560224
 EBUILD xpra-3.0.5-r2.ebuild 3841 BLAKE2B 387b36e4114eb489815bc6c09cd2ec7f9cb560d9c37e50aaadb567d5a8b9917c68f7b6db086a01d9efe719b955791c6ac70b8b913e5c86d25bff4d6da3d8679f SHA512 6fd77a9190d67a7c77b329d929890716d6b5814470383eea1dbf816fe190b8570997833bde5741d766745e54bd7e5e4f6f746609a69d0cc69c23f0f27907959c
-EBUILD xpra-4.0.5.ebuild 3795 BLAKE2B 559f5dd85d9f9736521dc793ecaeb331d7a9fe78e88e66349811f0b109bfff4a113932fe947ef17ade052d0683b90e10d27cf9bb5244f7e6dd098422991170cb SHA512 7f24aeea7b6eaf74f94df410cb660fc97ef00802a6a9cc428e71b58cf3f12a537fa85b291d85508f9c1657b737d7ab5e38b7722722c9327bc8adc7896288cf55
 EBUILD xpra-4.0.6_p28363.ebuild 3903 BLAKE2B 21eed5f246a785f88fc1a00f77fa707c522de1f2c8a52fb5e9343aecfdff2c2fe726ad5f778dcb79dc1c6237ec3e2fa35ad0647a2b034bb6434d8a10dc15ccd2 SHA512 6d1ff46e3625937d9b71f7ea8f15f41c84e66f9014712f622bd259cb9026fe314e57b454aabdc8df3ec0cea78606f05e54d5f9883d49ff3d793ec62182b16962
+EBUILD xpra-4.1.ebuild 3905 BLAKE2B 7eb6ec4ef2ead2166f938dc90f1ab1720da1b4e21f2b91e8775f8113ff3acc773a06c1d60d0e1391e3360dc658a9691506255ca11abbcbe05d68c10f21910eb0 SHA512 6ffba9a2cfbdee776711f44a688c2aebe0167aad65932d1644147bb4c62422e4486b0076145a06cbb065e9a4994201bb75eea41ca254421e22d514dc6f12d26f
 MISC metadata.xml 1090 BLAKE2B 51b66f86c4858f3c6081e03ee5444b0fd84de0db0355e7538a507ae6290b82f09407acef6e335ac7c5d7dfa2801da5e6b0f0b904daea6fd5c34f19d17492007a SHA512 99dde78c6a33dbbb890b071165c9e0ca57ea3d7a6866abfccda2d976006dcf17b531b2dd464a2c0e312c181d1a3561ba61316a8c5c9c27976281965673aca55d
diff --git a/x11-wm/xpra/xpra-4.0.5.ebuild b/x11-wm/xpra/xpra-4.1.ebuild
index 7e464f4eb4d0..65e293302714 100644
--- a/x11-wm/xpra/xpra-4.0.5.ebuild
+++ b/x11-wm/xpra/xpra-4.1.ebuild
@@ -1,20 +1,21 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=yes
 DISTUTILS_USE_SETUPTOOLS=no
-inherit xdg distutils-r1 eutils flag-o-matic tmpfiles prefix
+inherit xdg distutils-r1 tmpfiles prefix
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
-SRC_URI="http://xpra.org/src/${P}.tar.xz"
+HOMEPAGE="https://xpra.org/"
+SRC_URI="https://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="brotli +client +clipboard csc cups dbus ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
+IUSE="brotli +client +clipboard csc cups dbus doc ffmpeg jpeg +lz4 lzo minimal opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( client server )
@@ -22,8 +23,13 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	opengl? ( client )
 "
 
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+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
@@ -36,40 +42,51 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	csc? ( >=media-video/ffmpeg-1.2.2:0= )
 	ffmpeg? ( >=media-video/ffmpeg-3.2.2:0=[x264,x265] )
 	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pyopengl )
 	pulseaudio? (
 		media-sound/pulseaudio
 		media-plugins/gst-plugins-pulse:1.0
 	)
-	sound? ( media-libs/gstreamer:1.0
+	sound? (
+		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		dev-python/gst-python:1.0 )
+	)
 	vpx? ( media-libs/libvpx media-video/ffmpeg )
 	webp? ( media-libs/libwebp )
 "
-RDEPEND="${COMMON_DEPEND}
+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
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${PYTHON_USEDEP}]
-	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/xmodmap
-	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}] )
-	)
-	server? ( x11-base/xorg-server[-minimal,xvfb]
+	server? (
+		x11-base/xorg-server[-minimal,xvfb]
 		x11-drivers/xf86-input-void
 	)
-	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
-		media-libs/opencv[python]
-		dev-python/pyinotify[${PYTHON_USEDEP}] )"
-DEPEND="${COMMON_DEPEND}
+"
+BDEPEND="
 	virtual/pkgconfig
-	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		>=dev-python/cython-0.16[${PYTHON_USEDEP}]
+	')
+	doc? ( app-text/pandoc )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -90,6 +107,9 @@ python_prepare_all() {
 	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
@@ -114,16 +134,15 @@ python_configure_all() {
 		$(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
-		--without-html5
 		$(use_with jpeg jpeg_encoder)
 		$(use_with jpeg jpeg_decoder)
 		--without-mdns
-		--without-minify
 		$(use_with opengl)
 		$(use_with server shadow)
 		$(use_with server)
@@ -136,9 +155,5 @@ python_configure_all() {
 		--with-x11
 	)
 
-	# see https://www.xpra.org/trac/ticket/1080
-	# and http://trac.cython.org/ticket/395
-	append-cflags -fno-strict-aliasing
-
 	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }