gentoo resync : 09.12.2017

4 files changed, 4 insertions, 149 deletions

diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index b28f7579f7b2..4f16e6225897 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -3,13 +3,11 @@ AUX xpra-0.17.4-deprecated-avcodec.patch 552 BLAKE2B 3e29cbc526490b65c232756d505
 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 SHA256 2ba9212333ee5dc437955ce95d15eb8a9713cf4881914b1d2fe30b1fce188c2d SHA512 d99cceca56c226f8d52d3992e790337fa9e785671c6e2ae00f119492df402c350218bb7c60e1ecd8ccd02e379d59e99bb5601bd35d433095d4a04024ec0f99b4 WHIRLPOOL 6380e2748db3aeaf532e30b70e1956036823f505540c4339a62e0576f8ff108cd5e8f33631dedfdcd5b6d01695e9f2bd11c6287485ecb1c8f0c659073002bfbb
-DIST xpra-1.0.7.tar.xz 1895052 SHA256 179653f29deccf943c55dfe2f04375bdd747258d72fdc7a44f643ec588ce429f SHA512 a02f4afea4dae845f8ab3456270773361d6ab4bfd76c1a8b3cbda42e2df2eaffd5cadd2a1ef7871f0efc485f294eb1c000553531a3fe2f2f87f09623a628814e WHIRLPOOL 1f3e1fb71e32ff2f49caf290e5bed2901b5eeb0ebf7f90ee87dcbdacf3cf0f94da31d1e6d183c7ebfacea697f80ffcd3d3c1f7c4cef7be7fa8f08549e0b7c350
+DIST xpra-1.0.9.tar.xz 1899744 BLAKE2B a8577712c29ff637e69f0faf8224c3318397d104364376415c78099d236746c519ead198fd7436ca6ddccfa0888c394ea0ac81165a5d7d27ded0dbed66f27754 SHA512 99422ac58ebba4e1ba1ce47cf819c119249298ea4f9803d3fb9c4a3939ffd6baf3f34f6f6b3f1645fc17bd00b80410ff11f1fe30c5f79f797acf25b0ce2dd9ec
 DIST xpra-2.0.2.tar.xz 1926876 SHA256 4341bb6652d6e7784dddc02c63a634019c782332e9af1c08f4b8ec24f57a1f26 SHA512 4b36cf9cf96f094011412214368bc452ed597f1927f6488d6856ad80b575d7f37273cf49b8682fdbc137cf581d5a88b17a9241d508278e45e48f9451ba628b68 WHIRLPOOL d8919e8b9d40539a1c59dba2b1455924f276e5233e3674fd756e833c6bf2a132a5a27c9686cabdff2f4dc05b616245cdf0d06ce215ceb615c7c4c04861cfc41a
-DIST xpra-2.0.3.tar.xz 1928296 SHA256 caa97630b40de8e144328e80d002f3521acbc252ab17dc0bdcd1512ddf9a55b8 SHA512 25d8c5956462bd286c96a70b8f8fa8e9e75cfa27ec65438d72c0f6846b6ba7e5b61c3079ed6c663153d4abab0dddff906d6c22b40f97b77cc81728441798891e WHIRLPOOL 0017ab8f8f6db944bbc9ef8900c51ac5a78f4e935de36b4f1cc1a3cc7fd1871bbebe79bc713eb647fb4dc7811a8dd0a2243795438d1984b8f19922e41f1e3043
-DIST xpra-2.1.1.tar.xz 2065280 SHA256 0777e8b4bb7efc2cf5dae1424f6c8383dc5ea377de415b3895d776a7606bed39 SHA512 913c6952b12bdc01ef8cbbb62b05cfc9bd564b6d425f7edd2448bc3bfbdd9dc0bf9a890b1c85d3e39c387468b9738de7de4336e80b4e715856746197e1e93b20 WHIRLPOOL 72bf5405deb2fed5612d5126f7717d54273a64bdbd3f6c1e99737a9aee023c8d606508976f872a16ee91c4065a90f7aec6ed187110084e4a332a7dac512aaa45
+DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
 EBUILD xpra-1.0.6.ebuild 3954 BLAKE2B 374018a2ec481759522c31243937e4d81b8b58fa0334414bac81e0affc26869290af8842245cdca25a642a2e1c1c112421d4e099b28f98618b237c98d8196155 SHA512 adfc00b39fa458b1a178d723ff589f151a488c97ed4a35dd834d6beb3d8334150dce2cf59c189a6d6fe75d0117ea34d641560c14f0ca75c41b8c42396dc45ccc
-EBUILD xpra-1.0.7.ebuild 3956 BLAKE2B f3c4fc7120eb83058dac9f538204a241f37b241a44b2534d7257c3b89c93fc5725c53677c20b8e69e83a8f884fa3ad15405615679f6247145174ee2f60462914 SHA512 063e353fd1964b82dd3f2f462993a1d2fd27b696068b3c90cbf8b84f7841f3b9318c4388202283d0eaba715b4775105ceea0998019442b83e3d4d0eddfbf9a9d
+EBUILD xpra-1.0.9.ebuild 3956 BLAKE2B f3c4fc7120eb83058dac9f538204a241f37b241a44b2534d7257c3b89c93fc5725c53677c20b8e69e83a8f884fa3ad15405615679f6247145174ee2f60462914 SHA512 063e353fd1964b82dd3f2f462993a1d2fd27b696068b3c90cbf8b84f7841f3b9318c4388202283d0eaba715b4775105ceea0998019442b83e3d4d0eddfbf9a9d
 EBUILD xpra-2.0.2.ebuild 3940 BLAKE2B b3cf94307d0b79fbf4f932d1992e185a4a4fd709af02090b10655fdafe0212ed774b7223f5a037f207b5d4b372ddb853e521b466910738cda475a2fc9f607fab SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7
-EBUILD xpra-2.0.3.ebuild 3942 BLAKE2B b58acec335b44cd5374fe3f1779eab2ac37fcfe0fbe648a65ef8e9293ba7b0a6077d7689d3c9d8383c12736dab45daecf02cf7064191e07fa340c90e160474f3 SHA512 a76f95359f16f0960b3d90d15761ccfe9981d339558f482bafdc696e1f6af5a5c7c601dc9a931c3f47092d5683c240084255fee324ef2dfb5e47cf4fb805c68c
-EBUILD xpra-2.1.1.ebuild 3889 BLAKE2B 0e7e2ba8ea9e9bf899564549fd7152679b4a4c132153916bd34397f345eaba210c8548fec54bf569ecfe78133ecaa55415a73f82059715b4a1bfeac47bd74fb4 SHA512 04f5b8970fa310de05c6df23236108c4b0bb967b52152962a4e722f0f38ef32ec20fde590a72c9c81604739d0d7182340c8c6213a1d76a2ed0b037999cf93e26
+EBUILD xpra-2.1.3.ebuild 3889 BLAKE2B 0e7e2ba8ea9e9bf899564549fd7152679b4a4c132153916bd34397f345eaba210c8548fec54bf569ecfe78133ecaa55415a73f82059715b4a1bfeac47bd74fb4 SHA512 04f5b8970fa310de05c6df23236108c4b0bb967b52152962a4e722f0f38ef32ec20fde590a72c9c81604739d0d7182340c8c6213a1d76a2ed0b037999cf93e26
 MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
diff --git a/x11-wm/xpra/xpra-1.0.7.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
index 2aa260c03d6b..2aa260c03d6b 100644
--- a/x11-wm/xpra/xpra-1.0.7.ebuild
+++ b/x11-wm/xpra/xpra-1.0.9.ebuild
diff --git a/x11-wm/xpra/xpra-2.0.3.ebuild b/x11-wm/xpra/xpra-2.0.3.ebuild
deleted file mode 100644
index 011698e250a3..000000000000
--- a/x11-wm/xpra/xpra-2.0.3.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.1.1.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
index 4c0c8a994be7..4c0c8a994be7 100644
--- a/x11-wm/xpra/xpra-2.1.1.ebuild
+++ b/x11-wm/xpra/xpra-2.1.3.ebuild