gentoo resync : 23.12.2017

7 files changed, 160 insertions, 8 deletions

diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 9012400bcaa2..dfe05de99dd7 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index 0fc6de02d75c..ac22cda95850 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -6,5 +6,5 @@ EBUILD marco-1.12.1-r1.ebuild 1565 BLAKE2B 52aa8d582b335fa717f24f6eea05a6b9b4c64
 EBUILD marco-1.12.1.ebuild 1523 BLAKE2B 5309f6ea4d04f2d1d89cd93bcc5bc71e732ed302a4c8b725c568d4ca4733576011e85335ab149451134b6a12bf9b7fb40355ebb85cb283f7ce9ba9e750c46d12 SHA512 a032aa7dd3eaaef4b6a5dd38330ddebabd61b1f6dd6ebc9569e036368cc5b23e66dbde8f89886fa0a27115c4ba128767b479828bf52a9216d3d06095a9dcbe4d
 EBUILD marco-1.14.2-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
 EBUILD marco-1.16.0-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
-EBUILD marco-1.18.1.ebuild 1473 BLAKE2B 6b3e1556cfeb03141e10fdad815e000851c6503f3d7128616c8a577a5fa1108029b4e64985641db21a8ffd211270bab5eff6fe2695c4fc82f86c045cc8771bcb SHA512 82e6fe23b37f377d2153f1e9c4c2c6b07b1a970a92e0460224b51a33adcd492340d8b08b7ecc6da15187f27014b350a6fefbd8d0c0267ad517adce8b4f03736b
+EBUILD marco-1.18.1.ebuild 1480 BLAKE2B 8e9c8a30b52686f628db419f22e4fdab76959f1a03c9b6083d9be265c477505febd88a2c469af064d161f1eeb37c3edcbd278a8935c68dfadc4a37fb47e46639 SHA512 242ca3e45e8f4c7ceebd32234e5ab6a749bd464d4714a86c21607b8cc6e9651d367f56fdee18083caa832625828d650a4527d602089e76c1de544cf0b3abe80e
 MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
diff --git a/x11-wm/marco/marco-1.18.1.ebuild b/x11-wm/marco/marco-1.18.1.ebuild
index c662c1eca330..3ee2fa3540d1 100644
--- a/x11-wm/marco/marco-1.18.1.ebuild
+++ b/x11-wm/marco/marco-1.18.1.ebuild
@@ -8,7 +8,7 @@ MATE2_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="MATE default window manager"
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 5729b456e0bd..02ab9fdcda51 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -6,8 +6,10 @@ DIST xpra-1.0.6.tar.xz 1892736 BLAKE2B 5eefd99b0900d24717c24da92ed9daf47046080fe
 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 3956 BLAKE2B f3c4fc7120eb83058dac9f538204a241f37b241a44b2534d7257c3b89c93fc5725c53677c20b8e69e83a8f884fa3ad15405615679f6247145174ee2f60462914 SHA512 063e353fd1964b82dd3f2f462993a1d2fd27b696068b3c90cbf8b84f7841f3b9318c4388202283d0eaba715b4775105ceea0998019442b83e3d4d0eddfbf9a9d
+EBUILD xpra-1.0.9.ebuild 3978 BLAKE2B e5804682d43b89132eb8d563f02ce337369eb47bcbe8bdb3e603886bea09e56bd09a739226c5c2b3a745e0b17a11a53b0c1d74af9adcede4650d8d483dcaa939 SHA512 981a2483d631b46cd42ffa125d4b6889e9d6407b8d553613e4975487d7ffce4e667c9229db7e75b9009c44347dfc5e6b9d8570c10fb33c412336524b41c4aa33
 EBUILD xpra-2.0.2.ebuild 3940 BLAKE2B b3cf94307d0b79fbf4f932d1992e185a4a4fd709af02090b10655fdafe0212ed774b7223f5a037f207b5d4b372ddb853e521b466910738cda475a2fc9f607fab SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7
-EBUILD xpra-2.1.3.ebuild 3889 BLAKE2B 0e7e2ba8ea9e9bf899564549fd7152679b4a4c132153916bd34397f345eaba210c8548fec54bf569ecfe78133ecaa55415a73f82059715b4a1bfeac47bd74fb4 SHA512 04f5b8970fa310de05c6df23236108c4b0bb967b52152962a4e722f0f38ef32ec20fde590a72c9c81604739d0d7182340c8c6213a1d76a2ed0b037999cf93e26
+EBUILD xpra-2.1.3.ebuild 3911 BLAKE2B 1bce77e2ca8e54af2d8238e1a98cfa5740c3dbf9ac217c18c91a2c508d6ec8e56c9c9f236b0fa8aa907f97b778d5a6891cea6f6d74fdfe834f6038abd279d181 SHA512 d425e3321a3e5cab6fca8f0604fd7e779a9707538e09eb9b3ec30b028de73514b1aea1c3e5f5ca44454883dc3cbc72f8aa8ef3de3210eb837d5c8cf49b85d40d
+EBUILD xpra-2.2.1.ebuild 3966 BLAKE2B 5838f6f85d385dcaf9581a1120afd877b894dd3f4d7425ca03a6d5a04ed2ab2c70cdb6cfe8a1d9b55fab8947abb0d661bde00402161034703757adc9403a0c33 SHA512 570d920ad621117e8da3c618b52456c0502937fc2458fc6b68653619b89ac83e2f0578a284be62bb70b9ff54ab151153ad28912564f10a95b61552a6d2729b2d
 MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
diff --git a/x11-wm/xpra/xpra-1.0.9.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
index 2aa260c03d6b..e1fbabaa5fd3 100644
--- a/x11-wm/xpra/xpra-1.0.9.ebuild
+++ b/x11-wm/xpra/xpra-1.0.9.ebuild
@@ -5,7 +5,7 @@ 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
+inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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}
@@ -92,6 +92,8 @@ PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
 pkg_postinst() {
 	enewgroup ${PN}
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
 }
 
 python_prepare_all() {
diff --git a/x11-wm/xpra/xpra-2.1.3.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
index 4c0c8a994be7..2f9cea7ce6aa 100644
--- a/x11-wm/xpra/xpra-2.1.3.ebuild
+++ b/x11-wm/xpra/xpra-2.1.3.ebuild
@@ -5,7 +5,7 @@ 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
+inherit distutils-r1 eutils flag-o-matic user tmpfiles xdg
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
 HOMEPAGE="http://xpra.org/ http://xpra.org/src/"
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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}
@@ -90,6 +90,8 @@ PATCHES=( "${FILESDIR}"/${PN}-0.13.1-ignore-gentoo-no-compile.patch
 pkg_postinst() {
 	enewgroup ${PN}
 	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
 }
 
 python_prepare_all() {
diff --git a/x11-wm/xpra/xpra-2.2.1.ebuild b/x11-wm/xpra/xpra-2.2.1.ebuild
new file mode 100644
index 000000000000..977f0a206128
--- /dev/null
+++ b/x11-wm/xpra/xpra-2.2.1.ebuild
@@ -0,0 +1,146 @@
+# 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 xdg
+
+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 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= ) )
+	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 )
+	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}-2.0-suid-warning.patch )
+
+pkg_postinst() {
+	enewgroup ${PN}
+	tmpfiles_process /usr/lib/tmpfiles.d/xpra.conf
+
+	xdg_pkg_postinst
+}
+
+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)
+		$(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"
+}