gentoo resync : 19.01.2018

4 files changed, 7 insertions, 296 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 4f227de7f530..c244aa235340 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -2,14 +2,10 @@ AUX xpra-0.13.1-ignore-gentoo-no-compile.patch 485 BLAKE2B 2c4a9c0d0fd6e9542abbc
 AUX xpra-0.17.4-deprecated-avcodec.patch 552 BLAKE2B 3e29cbc526490b65c232756d505625b8725bb46b161676bfb19e4f34a2a404a10f2a3ceb268d9f46b8f42d482f925f646585e26665e74328e38d1cff502d5bda SHA512 9b703001634916516a82cf1a72ec9bdcb626269a5b17daa93964cb204d351986184c6597c6fc0801061bf8856f8811a68eddfe9fed331dd108d9d692f5e153fe
 AUX xpra-1.0.4-suid-warning.patch 653 BLAKE2B eff19bbea48564ca02cea70e56171e57070f42ab22b27619f66eb64991d6d9823b9dca0329af7d4e5ea935befef658b1aec953de9dd1ae8c75bb9a192b41c726 SHA512 1b12b309eba08914af59017b6f3a76f743a27cea13bee9d17d2c73334d8c762fc1c8459f32783275eed1d0de83f571a4104cf0bfc3a334d4ff09ee873458ec9c
 AUX xpra-2.0-suid-warning.patch 617 BLAKE2B dc7f1ba0ec9e30e260601f1151edb43855619a1c34bc29c05536c4dea30c8131179ea17ca30ce3ae2c87d7b374f7a02a5afcde89b6bf29921fc0a9de457e3d54 SHA512 f0d69a6e57435d6c9ef1ecb10e9fa6916b2a8b11f5979b7dffcc37c0a8ec387306b651d50ca3fe10a489cb28f6c2384fbe578510bd7f9bc7a51249e66c4d17ab
-DIST xpra-1.0.6.tar.xz 1892736 BLAKE2B 5eefd99b0900d24717c24da92ed9daf47046080fe5676cc19f41eed3ea728242925702b2ca6312b29aae04876d2bdc68d15cec40d1dc067108c6c881eb225c50 SHA512 d99cceca56c226f8d52d3992e790337fa9e785671c6e2ae00f119492df402c350218bb7c60e1ecd8ccd02e379d59e99bb5601bd35d433095d4a04024ec0f99b4
 DIST xpra-1.0.9.tar.xz 1899744 BLAKE2B a8577712c29ff637e69f0faf8224c3318397d104364376415c78099d236746c519ead198fd7436ca6ddccfa0888c394ea0ac81165a5d7d27ded0dbed66f27754 SHA512 99422ac58ebba4e1ba1ce47cf819c119249298ea4f9803d3fb9c4a3939ffd6baf3f34f6f6b3f1645fc17bd00b80410ff11f1fe30c5f79f797acf25b0ce2dd9ec
-DIST xpra-2.0.2.tar.xz 1926876 BLAKE2B 2bd681ebbe6a7041975033c9a30e5b5fdf69352e82d1c56142aac9bb2b620c0ce3242232160cc32b33c74136ae9961c0ab3cb8ae7ec0acf372aebee0583a9318 SHA512 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68
 DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
 DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6
-EBUILD xpra-1.0.6.ebuild 3954 BLAKE2B 374018a2ec481759522c31243937e4d81b8b58fa0334414bac81e0affc26869290af8842245cdca25a642a2e1c1c112421d4e099b28f98618b237c98d8196155 SHA512 adfc00b39fa458b1a178d723ff589f151a488c97ed4a35dd834d6beb3d8334150dce2cf59c189a6d6fe75d0117ea34d641560c14f0ca75c41b8c42396dc45ccc
 EBUILD xpra-1.0.9.ebuild 3977 BLAKE2B 947784a1b008925f090e4d914eff598f23629f391f56ba9fac2bb7dfb3a912f9189cd9a13ece1eb7ae929ad5d718e530a0e8738ea5218135020624fa28d2ecce SHA512 82b11382f3f4226871d1127c916da7c317bf1e0b4c68bf4d304fb468ea46a1e27b04f18c1682882201053269455752dafff6c18332c8a7bfc078f6289d97ca78
-EBUILD xpra-2.0.2.ebuild 3940 BLAKE2B b3cf94307d0b79fbf4f932d1992e185a4a4fd709af02090b10655fdafe0212ed774b7223f5a037f207b5d4b372ddb853e521b466910738cda475a2fc9f607fab SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7
 EBUILD xpra-2.1.3.ebuild 3910 BLAKE2B 42d4229ec8a11ede29899809dabd5c87420a0ac866dafde20ddecfb821be1ff4d3fa40153f2c4c11d77f183340101b02913ed73d86dc8eeff5a5f2b22b2a22a6 SHA512 d7494e2ac2120d4f865e6167842f87301ca9813f8702268dabec8578db66611c3a0675f06f9d613de3973880f4b44bc45b2ad97a73d3935bb0442f6f6d5e0eec
-EBUILD xpra-2.2.1.ebuild 3966 BLAKE2B 5838f6f85d385dcaf9581a1120afd877b894dd3f4d7425ca03a6d5a04ed2ab2c70cdb6cfe8a1d9b55fab8947abb0d661bde00402161034703757adc9403a0c33 SHA512 570d920ad621117e8da3c618b52456c0502937fc2458fc6b68653619b89ac83e2f0578a284be62bb70b9ff54ab151153ad28912564f10a95b61552a6d2729b2d
+EBUILD xpra-2.2.1.ebuild 4069 BLAKE2B db19dbef2f975d4c7f302e4c3c7a71f0ae7c4ee81474f7db4b943dae4b7d911cbe33840d36d64d19e13defa470c657ac95de372dbf94595367862c5b75331a59 SHA512 3df61e647d6f319ba7a67d04280d085b283c305a19ed5ad6736b6851d3bdaee0363172065b7ae0c7c4505e24fa271661d4335258c9a5f189e045fd0a6f6b809b
 MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
diff --git a/x11-wm/xpra/xpra-1.0.6.ebuild b/x11-wm/xpra/xpra-1.0.6.ebuild
deleted file mode 100644
index 39eccb30ba88..000000000000
--- a/x11-wm/xpra/xpra-1.0.6.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# PyCObject_Check and PyCObject_AsVoidPtr vanished with python 3.3, and setup.py not python3.2 compat
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles
-
-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 ~amd64-linux ~x86-linux"
-IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 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:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	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= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	opengl? ( dev-python/pygtkglext )
-	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/ipython[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${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}] )
-	)
-	pillow? ( dev-python/pillow[${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}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
-	"${FILESDIR}"/${PN}-1.0.4-suid-warning.patch )
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-}
-
-python_prepare_all() {
-	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-		-i tmpfiles.d/xpra.conf
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	sed -e "/'pulseaudio'/s:not OSX and not WIN32:$(usex pulseaudio True False):" \
-		-i setup.py || die
-
-	mydistutilsargs=(
-		--without-PIC
-		--without-Xdummy
-		$(use_with client)
-		$(use_with clipboard)
-		$(use_with csc csc_swscale)
-		$(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)
-		--with-gtk2
-		--without-gtk3
-		--without-html5
-		--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="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.0.2.ebuild b/x11-wm/xpra/xpra-2.0.2.ebuild
deleted file mode 100644
index 5ab67f9e277e..000000000000
--- a/x11-wm/xpra/xpra-2.0.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles
-
-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 ~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"
-
-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:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	csc? (
-		!libav? ( >=media-video/ffmpeg-1.2.2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	dec_avcodec2? (
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= )
-	)
-	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= )
-		libav? ( media-video/libav:0= )
-	)
-	enc_x265? ( media-libs/x265
-		!libav? ( >=media-video/ffmpeg-2:0= )
-		libav? ( media-video/libav:0= ) )
-	jpeg? ( media-libs/libjpeg-turbo )
-	opengl? ( dev-python/pygtkglext )
-	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 )"
-
-RDEPEND="${COMMON_DEPEND}
-	dev-python/ipython[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rencode[${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}] )
-	)
-	pillow? ( dev-python/pillow[${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}]"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
-	"${FILESDIR}"/${PN}-0.17.4-deprecated-avcodec.patch
-	"${FILESDIR}"/${PN}-2.0-suid-warning.patch )
-
-pkg_postinst() {
-	enewgroup ${PN}
-	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
-}
-
-python_prepare_all() {
-	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-		-i tmpfiles.d/xpra.conf
-
-	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
-		$(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)
-		--with-gtk2
-		--without-gtk3
-		--without-html5
-		$(use_with jpeg)
-		--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)
-		--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="${EROOT}run/xpra"
-}
diff --git a/x11-wm/xpra/xpra-2.2.1.ebuild b/x11-wm/xpra/xpra-2.2.1.ebuild
index 977f0a206128..bfe8a1026336 100644
--- a/x11-wm/xpra/xpra-2.2.1.ebuild
+++ b/x11-wm/xpra/xpra-2.2.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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=( python2_7 )
-inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
+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/"
@@ -96,8 +96,9 @@ pkg_postinst() {
 }
 
 python_prepare_all() {
-	sed -e "s:/var/run/xpra:${EROOT}run/xpra:" \
-		-i tmpfiles.d/xpra.conf
+	hprefixify -w '/os.path/' setup.py
+	hprefixify tmpfiles.d/xpra.conf xpra/server/{server,socket}_util.py \
+		xpra/platform{/xposix,}/paths.py xpra/scripts/server.py
 
 	distutils-r1_python_prepare_all
 }
@@ -142,5 +143,5 @@ python_configure_all() {
 	# and http://trac.cython.org/ticket/395
 	append-cflags -fno-strict-aliasing
 
-	export XPRA_SOCKET_DIRS="${EROOT}run/xpra"
+	export XPRA_SOCKET_DIRS="${EPREFIX}/run/xpra"
 }