gentoo resync : 15.12.2019

7 files changed, 190 insertions, 6 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 775f83d7eff1..7ab08671f486 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,9 +1,12 @@
 AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbcd7834d487ca64018b43ef365478f18d8959f0602dd1f4a50f48332487aa413ad4b4f8a91946494ef223b1b2b2c887400e7f7077f429 SHA512 244d6aaa805ef0f99238a0f1ff592efc9fda9d7c3898c0e3ff8a40bfb2d27597737e941b90d1d86c794a50dc61ade8862a4be97ef4938005b0f918565dc7abe9
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
+AUX xpra-3.0.2_ignore-gentoo-no-compile.patch 610 BLAKE2B 963b3b61602f6a7ad7c8247109932d0da7eeef2762eaa8a987a8f10178a13cec3255000661bc7e3344319a555c9f0ed41b6383be7728af543cb5d2e004c377b2 SHA512 ff16637dca766ba2d36351e1aeeb87f2bab02e73e8da8fdb566051727b0c6fec6df1925318eee8d1c87580196ec78f0303da56d3439b4b4bace3105a914251e8
 DIST xpra-2.2.2.tar.xz 2195836 BLAKE2B 39d8354738df399d98248a0d455c3b7fa6124f374f0f6e0a476bae53b9728b9ab16c11bd759b6ff52a28295445809fb18b3379b7fc620f0916944f738a00b280 SHA512 5c09e29732c9ca7d03557e4e6070517b192484e67944532d5aeca53e518c8617f7d3a5919a2557050fbb9aa4123a0302a53720dd7036823db83588264dd3e6d2
 DIST xpra-2.2.6.tar.xz 2198720 BLAKE2B 41f238e98dbb60598cffcc3960375a525658c72db478acace0acb964fe3ee039acb5e352a76ffb5724b6c4acd63ea510505f6841f688c67d0ae2a3cbc2270642 SHA512 f47b7a8b08fc90bdf3cba91e4f7343785cdf6e24a0979f4564e9f6885b0f36c03ff5656e2d7ac5fd21895faca7b00e8839ebd66c82122a2c7cab2b40bd44e745
 DIST xpra-2.4.3.tar.xz 2434852 BLAKE2B 3d2dd4d8a64a20a88004a91f95d8e6165f45dac7a3d725f41c437d605f55bbd903284e7e829e02c1e94e33c3777ce660c55b469fb5b1f6c5025853b0cae1a6c3 SHA512 5174f7852571eaeb6c2fb629aa2686e19bff7251622ff08903af188989f132b73e4509c98edfac9cddd0f582e63d0ffae94442111a7bfcef8013b3fc87dffd54
-EBUILD xpra-2.2.2-r1.ebuild 4047 BLAKE2B 0188064f36f179c378a29c0eacb418177eac49ecbe9ea844cb7638ba1e8719b3b09dfa6d9afeaede8a82161b67051c152e9186994fadad421afbd3d6872cdeb7 SHA512 f075fca9a968d24c03136ccb90c059b7ba18ef84f9beb8916f65d5534c0ad804abffd648bf9549c4892a468b59d8277c2827e58b15664140497aa1617ea934c6
-EBUILD xpra-2.2.6-r2.ebuild 4095 BLAKE2B 0e1a4646024233f18422a27886d2da0816ddafccc625aa8a2aeea7aef9078e4e8c0abc4b680ecf1aff53f9bad88a2503709bf389fa43a53ff7b16c3c03708102 SHA512 ffa6e3a20e9f753cbe5f20af611b552f5eb605deda06d82b06642053b6fcffda1b806703763024e902be8007f8962773b39f9e9591ea1a9cb6e48592c2310f46
-EBUILD xpra-2.4.3.ebuild 4134 BLAKE2B c524d54cd55ef9f76e0c61046bd22b9225c7608b165fd3b9e8138ab9c5e37f9c5606b405a5d547810296e0ba52d3e3139c539fb3ae6d6750826be37d30324e17 SHA512 5f96ccad721365b11190b6a5a164b2590cc48134ef00440b6664cc6f83c58755c8573a5f7200080164410b2768469ccd83d43501bebf07dac4f5a53718635769
-MISC metadata.xml 979 BLAKE2B a73af09dd3e3c794df8214545c7fd32208cd567de64bc25d5f23ef950ca99931b37f21265a8d2ec1f2e919463e9af44e01ff2fd52e29734a96595540d28a384c SHA512 854b7708a2b1bcccb19f42bd850a8a7ea31b1dad69ba40961dccadb5ab3c8c82ec65b2491f2a353b59a6591a65f5f971154b9d680a525db2cd82442c7654a723
+DIST xpra-3.0.2.tar.xz 2749196 BLAKE2B 3c8745657a12637704fb88ac7b867ab387ef7ed2250396d9e534aecf81e40f85332a2c51ba49638834012f4a4d85c03bd7e49ee259bb2400aeb60fb06abf8b59 SHA512 115f606ff5886d99a906f318cb1a7a4a86e80ebf23e4336e67938267d92ef624de577cc8fc06c6ce541b7c44a0cef58d930b5928f32e24dfc67c72127c7b623c
+EBUILD xpra-2.2.2-r1.ebuild 4074 BLAKE2B 6e3faee346e422a113ba09c8cf355caa2ecc41c74c2ab1d720b32e6a3b051ba8b156785bc2c0a872ba186a18af2dd370b668dc512a4cfe3fdc6f421d9c16ae52 SHA512 24476f6100dd733d61316d695d644337b4c3bfcbd405cddc9429496fe64502a6605157a648c5417045db9b75c21343e072d87f12b239ed31c0289a87f96c06f3
+EBUILD xpra-2.2.6-r2.ebuild 4122 BLAKE2B 661931d507e047c6d78871adf14693b11a499eb05e96afadec6ac93678f890b715bcd884982fa9d76fb5ded069de09f5ee1df9a56d0d1668e25aa0b0d05eb82d SHA512 4a038cffd380329cb608d91ec5372df75fcb01724cf37dd24b10b222a91697d3a53e5042e631bdeb3c430f91c7ede8418aeaa31a9905624030947a55c7a608e4
+EBUILD xpra-2.4.3.ebuild 4161 BLAKE2B 29513d3a7d880f921bf474b5d2994315ba5b78ee38ea6d44ac1891ffd551571b42a5d6ffbdff24149c0df0a6898ae73f5585c3ade877f09475b2d7c2769cd116 SHA512 aa6a85ae73339fd65d7f971da9e77f7fee9803f5056e5273f07c7ae8a66fca40065546cf571fa9a2db8cdfe711f4f1ed86c893be8d0ff0490065f0e0d0ec9de5
+EBUILD xpra-3.0.2.ebuild 4283 BLAKE2B cc64121bc0b17e0304c456fe2bdeed4b87f78dc0604a54a402fc2453f695daf868166c4c0741721ea87da84f7c7648cc81f7601a73cfb633daea816bc2822e3a SHA512 4831ab12404ea3d0f0129c34403508d558126cebfb37cdfdf0339f0e4ce661aba6e143407bae356fba69e07c372ab9f5177f277f353f8b114d74e7a8d5ac2362
+MISC metadata.xml 1183 BLAKE2B 3401d4bc8847e1da6884abaa431cf0c64bc6cd2d1e118bde8b225f8a3670b561d9109cfa248652a71c397a9cdc8d50f6fd83a48ab41de569e03e22e63f5acd2b SHA512 5a48871a51cebe09db53997d61e49ed0828be430f34772b88fc06770bd90a935bec31e0dce7fb78756c337faf9cc1fa4896f5d6d709857fee9fde007ec0b0986
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
new file mode 100644
index 000000000000..5823ac8c167e
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-3.0.2_ignore-gentoo-no-compile.patch
@@ -0,0 +1,13 @@
+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/metadata.xml b/x11-wm/xpra/metadata.xml
index 9ac095e40d67..e1742788d2bf 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -5,6 +5,14 @@
 	<email>dilfridge@gentoo.org</email>
 	<name>Andreas K. Huettel</name>
 </maintainer>
+<maintainer type="person">
+	<email>heroxbd@gentoo.org</email>
+	<name>Benda Xu</name>
+</maintainer>
+<maintainer type="person">
+	<email>alexxy@gentoo.org</email>
+	<name>Alexey Shvetsov</name>
+</maintainer>
 <upstream>
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
diff --git a/x11-wm/xpra/xpra-2.2.2-r1.ebuild b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
index 5cb93348090d..31e44b5473b9 100644
--- a/x11-wm/xpra/xpra-2.2.2-r1.ebuild
+++ b/x11-wm/xpra/xpra-2.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-2.2.6-r2.ebuild b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
index 6602c5a6ba85..d8009b90ad39 100644
--- a/x11-wm/xpra/xpra-2.2.6-r2.ebuild
+++ b/x11-wm/xpra/xpra-2.2.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-2.4.3.ebuild b/x11-wm/xpra/xpra-2.4.3.ebuild
index 246fbbf2f766..f74fe5051c8e 100644
--- a/x11-wm/xpra/xpra-2.4.3.ebuild
+++ b/x11-wm/xpra/xpra-2.4.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	clipboard? ( || ( server client ) )
diff --git a/x11-wm/xpra/xpra-3.0.2.ebuild b/x11-wm/xpra/xpra-3.0.2.ebuild
new file mode 100644
index 000000000000..c57900d96ee6
--- /dev/null
+++ b/x11-wm/xpra/xpra-3.0.2.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3
+PYTHON_COMPAT=( python3_{6,7} )
+inherit xdg distutils-r1 eutils flag-o-matic user 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"
+
+LICENSE="GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	clipboard? ( || ( server client ) )
+	cups? ( dbus )
+	opengl? ( client )
+	|| ( client server )
+	client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxkbfile
+	csc? (
+		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	dec_avcodec2? (
+		!libav? ( >=media-video/ffmpeg-2:0=[x264,x265] )
+		libav? ( media-video/libav:0=[x264,x265] )
+	)
+	enc_ffmpeg? (
+		!libav? ( >=media-video/ffmpeg-3.2.2:0= )
+		libav? ( media-video/libav:0= )
+	)
+	enc_x264? ( media-libs/x264
+		!libav? ( >=media-video/ffmpeg-1.0.4:0=[x264] )
+		libav? ( media-video/libav:0=[x264] )
+	)
+	enc_x265? ( media-libs/x265
+		!libav? ( >=media-video/ffmpeg-2:0=[x264] )
+		libav? ( media-video/libav:0=[x264] ) )
+	jpeg? ( media-libs/libjpeg-turbo )
+	opengl? ( dev-python/pyopengl )
+	pulseaudio? ( media-sound/pulseaudio )
+	sound? ( media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		dev-python/gst-python:1.0 )
+	vpx? ( media-libs/libvpx virtual/ffmpeg )
+	webp? ( media-libs/libwebp )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rencode[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg?,${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/xmodmap
+	x11-libs/gtk+:3[introspection]
+	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]
+		x11-drivers/xf86-input-void
+	)
+	webcam? ( dev-python/numpy[${PYTHON_USEDEP}]
+		media-libs/opencv[python]
+		dev-python/pyinotify[${PYTHON_USEDEP}] )"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.2_ignore-gentoo-no-compile.patch
+	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+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
+
+	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 dec_avcodec2)
+		$(use_with enc_ffmpeg)
+		$(use_with enc_x264)
+		$(use_with enc_x265)
+		--without-gtk2
+		--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)
+		$(use_with sound)
+		--with-strict
+		$(use_with vpx)
+		--with-warn
+		$(use_with webcam)
+		$(use_with webp)
+		--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"
+}
+
+src_compile() {
+	# xpra calls `ldconfig -p` during compile to locate libraries.
+	addpredict /etc
+	distutils-r1_src_compile
+}