Version bump, add setxkbmap dep (thanks redneb, bug 437614), add keywords to 0.6 series, drop old.

Package-Manager: portage-2.1.11.26/cvs/Linux x86_64

8 files changed, 96 insertions, 149 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index 571e929a388c..eccad355ca72 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.28 2012/10/06 09:24:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.29 2012/10/14 21:40:38 xmw Exp $
+
+*xpra-0.7.0 (14 Oct 2012)
+
+  14 Oct 2012; Michael Weber <xmw@gentoo.org> -xpra-0.5.3.ebuild,
+  -xpra-0.6.0.ebuild, xpra-0.6.4.ebuild, +xpra-0.7.0.ebuild,
+  +files/xpra-0.7.0-ignore-gentoo-no-compile.patch, metadata.xml:
+  Version bump, add setxkbmap dep (thanks redneb, bug 437614), add keywords to
+  0.6 series, drop old.
 
 *xpra-0.6.4 (06 Oct 2012)
 *xpra-0.5.6 (06 Oct 2012)
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index f7035a90977c..e515a3184352 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -1,22 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX xpra-0.7.0-ignore-gentoo-no-compile.patch 331 SHA256 0bf2a4da548574d69ee75ba46a9db40b152875e7a89e926fd85f1c93bc701565 SHA512 63008ccdbab3dc18b4bf350ff68cc1307f8b38cd91bdb64592264e1bf3ae25bfed2ef68069a0349c2035159df3d4368a195e23f39f557b1830018ef1923400f3 WHIRLPOOL df1bc9fcb2e55b0a6b5ea36c22264b18df3cf2a3c51b8d1f974387acf677a65c944da3aa085c3af504d166ceddaa119a25884724c3958be6220e0da97f83e440
 DIST xpra-0.4.2.tar.bz2 1129229 SHA256 c0f537855d22897832edbe771fe91eb5327d35db07d4389e906658c677d7aa02 SHA512 58ed09b87a571aba48d1068a4ab3e727eaf5511af5160f490207a1fd5af851a2844be42c15d92e084e56be676668e49eeb243d44bd7d6bccc63e101383813f3a WHIRLPOOL c150052896c97fef5515af429a9c960d4c31522bae094b8fd82257ccf181adecf8d5d395de6a1ad2364d7d8510e3da4441b7ee52de0a2e3f2da79abfb2a9b6e0
-DIST xpra-0.5.3.tar.bz2 451985 SHA256 2f0601ed350a787b7e813ad85390de61043c7cfbd072043bdda224592248270b SHA512 73f29fb4d40e465b1242b75368103b85673e6b86bf65fd03d50c1f17a1ec7986f3a0a2a1e7a939594713345889a312511b5d34fa3c940e8706e9e7448e73d1dc WHIRLPOOL 166d6f5b7c50b52183cdaa223eb7a9d37aeb846f01812e7df13a1045b845273d971ca72b330be7415622205b5ca25a45910046b0857d05f3accc72201cff8f2e
 DIST xpra-0.5.6.tar.bz2 453318 SHA256 a456fec93d4fc1e3746432a42d62e177cf27595b17f8cb1c5f6e6d139014f0c9 SHA512 5360a4205b5fcaeac1c47d4794e0faa33fb0c7002d1ecd40db0b848d208516580c1f02fcfc8e3d7c86c24266072d7891b1f416260bce9d7031a641d9776177e3 WHIRLPOOL 6055cd14771cc9e7637a61d314e1a3491b347ccbcd3ffc2ae00ac09c62c6acc53908b06ab1a925ac80a2521d6b63a1de8e584e0ab9672fddc1bfefbba5bb0f50
-DIST xpra-0.6.0.tar.bz2 453087 SHA256 ce3d697dfb860178d3480a95dbf3295e369d06d1f308d67c9b6896fee9a9db1e SHA512 1c30be7377de0d3759478753d013df297e744d3fdb689be1168d84257986da9901720e49e6b354b67e9adc418599e0599f3066cbcaac04e94c136a2e07eb97fd WHIRLPOOL 9378df5db026290c55d8595f4c8c0cace85e27b8ce8525e9c092202269976b9a1c612529a06aba1a2b286fbd0ba4b25dfc9518f155fd8dcd80caf88dd686fd6e
 DIST xpra-0.6.4.tar.bz2 456613 SHA256 3c47e16555325417e8be19dfcfd0c9c9f07d7a6e2e203d0bad46f68ac059f5d6 SHA512 841b7857c58af8943dbe970ce237cb479221acac529397cb32d4ee114551e8437eef3864ea7bed85f5a3b8c53434ace8e86e02cae8a159df59f0e7ba15dd3298 WHIRLPOOL 6abec3fdb6448652b049a88f991785dad764bee821f21e36fd7e24d5be6effc0d4ec31346ea36c499b9a9905ed5c3c2650956ad7fd0d11f02b3ea43ea3fb4f4c
+DIST xpra-0.7.0.tar.bz2 475193 SHA256 d31e4d960985730c683a204fc24511261a2d689cf5ddeed845b9ac859f3154a6 SHA512 cb8188e5d91136433bdbcfa452c084912905bc2d839c043a68280b8ca1f618f978dae1896b5041730edea5da226d5b975163f705dc4bf23e2c55b9ffce29fa58 WHIRLPOOL a8ff905162744ecf570a09658b3d9dffd635b43ec4e54db911ded363849eaf1b403c91a000ea59bfa8d4c2b2a26e8abfde2c02acf9179545a53cfb369157b459
 EBUILD xpra-0.4.2.ebuild 1828 SHA256 c0c09c7a6d1a743483967d4192abb170bbba401c54690a60083a2d093d2a9ac1 SHA512 c27f8a04ee4691965f25550de4a7259d0989b0a1acc0932ae657c14058b950131ccf399ba2d70cf189634c63f3214f41f92b0a672573ace4d54eba2370be1ba0 WHIRLPOOL 2a564e02cade0bf9c927609f8891ee6f4b510f6e56083273d45aa138eb5452ca2e73186373728be6647673ec5197177bb408a08a6c2756391d9a3d9db6326893
-EBUILD xpra-0.5.3.ebuild 1828 SHA256 a42db24d9d14e59a184029efbad06fd99a26c0042186efd3e6d78c141af09647 SHA512 9c243c223eda7ab7652032f6037d1fd41300d28a97234a7bacd4e11dbe6b0ae2cfa75f53185b799cc60849572d3b149bb31d859d828c6b917d0a2110dde78b02 WHIRLPOOL 7554431e1fcc051993d29c2711cab93c334542747fda7eddc7b040f13213c3397b848b9a771a4d3e13b449d039c7a2de010fb810ccf3065d02ead3ec77c19a5d
 EBUILD xpra-0.5.6.ebuild 1828 SHA256 292708e70121ed60d33cc7a701556cc8faae1c7d12b460cc71fd090580f3ad9a SHA512 b159ba30224ff658e9b49e2e72d8b788f008d5876a525c5795225e9e88fc64d0efb86d4478735588704fb87c980989b443b767a0eaebe24166a3c6b6e55bb898 WHIRLPOOL 796ddbcbbaca1a80f18e781e048db43512d351c6bd4560baf02691ab46ea5e2ddde66eefa6ca6e2e3578f436e5dbd875782cb43438e9b0a39a0b7dece65205b3
-EBUILD xpra-0.6.0.ebuild 1907 SHA256 455054c85f35d7084d59cc169b24f29dc9597f1da648619257d63d232adb1934 SHA512 ef5874929d7f6f059ef616cdd4f932a8ef677c60822e922d7b4fe2d717a310ab960b23b8182345e9778da19388ad818aeacf81f7153bb5fa983ace1ce9c18813 WHIRLPOOL 8842c5f41612a6bd79605b9dc001872b85f3436e5324d2fa8c55753cb15a27c82f5361b0962d8afe86bb7f4317f1b270143de9c02e106aa55015624983d7e5f8
-EBUILD xpra-0.6.4.ebuild 1907 SHA256 6d77f192503189178dc44998ec8ef4a1e584b0b40ece1ab538049e81d5a604fd SHA512 bb4a6a21bf4eeceedaff8b7535746525eaf5487b51080800d7d9ceb2b0d32da447be4230b12b506eeb197d187e9f3897cb135182fb377715bc5feb9b4679a3e0 WHIRLPOOL 953891af92843d169a54757870cba12c97a04a21205676c9aa574bd05792110d829f4585081ade7f580be6ff75b711033d0482210cd7c59be056496a1168721b
-MISC ChangeLog 3911 SHA256 f02f917b6929ea0aba1a7cf2d7fe016471a7cde1bb8efd7e000c7e34044ce998 SHA512 61a4a6886b88883c13a5e11640e31966c3e5ece3ed2e58d3c5976d1664f0b6da90a38ec77333b3872fd6f17e420a1be92457dea6da19bf4dcfc4bc0f17457c9d WHIRLPOOL 20d9ca855da38dc11d670fd8017b8f30f5e72a1ac728b8b53b77a485ba305121c77b7788a870b045990a9a9efae29c6772e71a91aaafc69f09d9e12920e08e6e
-MISC metadata.xml 542 SHA256 c7813bff556108ea474fcf7b73e8f26c2f872f668873e1d78fd9f8eb6c1602ce SHA512 2d90ecb1d99270d8006b5ae092e27d8934ee03c62fb4970c452b660184533d0e795bf178d0122ed8a1c699956c4f0b9c53a9243772836b58e0fdec5e7c3bd268 WHIRLPOOL 86838144cf7fd9cc099b4601be11da49d82b3b2a7329ab4761017975af4e35601243f9f148cb1486919008d0829bc84dd7b1ade18e5323a968f7bf8103e4378c
+EBUILD xpra-0.6.4.ebuild 1962 SHA256 311b5e55b824642a51dc46efe9ede3d75190086e14381870507f04bd34284882 SHA512 de2d8ad1a4ba6a737c45ffbbe2a5ce1f361ada8aec3f0b81478cd2bd3687ee8833ed51d2f1f63612054a82ce7c08bf95c088f7d4e6258214828bedbc0279d70c WHIRLPOOL 2a4245636a015b94e786ffb1ced2d23fd4c216effdfc7e62a07c9e2347253bd3693e20dc040009e95e58deb5c4fd21885f8e14066d0e136d1e35ead2e41d90bd
+EBUILD xpra-0.7.0.ebuild 1652 SHA256 1b1f8e53eb365e90336398ba31f8fa6606b4a35e31f5dbc2fc067cee63df827e SHA512 bc5b2c52734481c30e9bc63f00ad0d7fdb964440a913e95977509d10e339e2996bbb21628fc0873eabfad2fe2d918bdbfbf84d351743f3559ffa713fb4f88774 WHIRLPOOL 69b996bd1660384937c062cacf9b4427b0676d1575eeaa9cf708373623a03e44951289e13a6035d85e987c0278e583eb7574e93cf635e5fb3c411c69c9344af2
+MISC ChangeLog 4235 SHA256 40a5c4261168f5bd949cfd8ae458b2dbf9445db657d947a32b9a18cbffac13f6 SHA512 768026669a973391fda5c939bc44550c8018040f277eccf907e1aab276bce2c2254fdb12b17b6ceeb7043193d9d05251fca741983d8640e166f4402743db4cd9 WHIRLPOOL 8fac14afffcc1cf232bea5d90e8322781fd40aea21fd145f3f155fbeb0179907dc1e3af65ad9c52bb78be7f375363bb2e9829aadc71fd78e57c1ed2ae12d1ed6
+MISC metadata.xml 658 SHA256 6aef86c970695b5c01220804072b2eccf90d1b9338d8a44e22ca2a72b067bc0a SHA512 71abc8d4880b0ff4e793c7f402090bc3e77e785c596ca6ebba76f4054628fb679aecb015971718f164ad095a081ed4d279d87e5a4660d3978c17ac232a532365 WHIRLPOOL b0ccd330fef2d9ca77bd617f3e11dc6d08481181481abf6941969a62e837331d3b06e82cf89504cc928b5df3abaee05f9f3b2d0c7aadd6ca67cebdd4275b28a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlBv+PYACgkQknrdDGLu8JD+pgD/QxHKf9W3S57vmc2z+10OQNym
-jD6Upaf/xA5BmYviF8UBAI5zQFAh1ZOcOvttXsgGbSRjihjF6/ThGbrtBBejQAsQ
-=dTHo
+iF4EAREIAAYFAlB7MX8ACgkQknrdDGLu8JD/JAD/TjazYfJ3ENAAkSKpUuZslzVG
+U/TV3L08LNtyoNHxKIoBAJURFP+8nm0PAK5q4/K4PYa/81ZFZlHxm5mw338gscRC
+=KviL
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.7.0-ignore-gentoo-no-compile.patch b/x11-wm/xpra/files/xpra-0.7.0-ignore-gentoo-no-compile.patch
new file mode 100644
index 000000000000..f2d3a930daea
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.7.0-ignore-gentoo-no-compile.patch
@@ -0,0 +1,12 @@
+keep installing .so files
+--- xpra-0.7.0/setup.py
++++ xpra-0.7.0/setup.py
+@@ -132,7 +132,7 @@
+ 
+ def cython_add(extension, min_version=(0, 14, 0)):
+     if "--no-compile" in sys.argv:
+-        return
++        pass
+     global ext_modules, cmdclass
+     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 b5be2b825935..84b58d19654e 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -11,5 +11,7 @@
 	<flag name='ssh'>Runtime support for secure shell communication</flag>
 	<flag name='clipboard'>Enable clipboard support</flag>
 	<flag name='rencode'>Enable rencode support</flag>
+	<flag name='vpx'>Enable vpx image format support</flag>
+	<flag name='webp'>Enable webp image format support</flag>
 </use>
 </pkgmetadata>
diff --git a/x11-wm/xpra/xpra-0.5.3.ebuild b/x11-wm/xpra/xpra-0.5.3.ebuild
deleted file mode 100644
index ed996bd30dcb..000000000000
--- a/x11-wm/xpra/xpra-0.5.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.5.3.ebuild,v 1.1 2012/09/05 10:27:15 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-SUPPORT_PYTHON_ABIS="1"
-inherit distutils eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/"
-SRC_URI="http://xpra.org/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="ffmpeg jpeg libnotify parti png server ssh x264"
-
-COMMON_DEPEND="dev-python/pygtk:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	ffmpeg? (
-		virtual/ffmpeg
-		x264? ( media-libs/x264 )
-	)
-	server? ( x11-libs/libXtst )
-	!x11-wm/parti"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmodmap
-	parti? ( dev-python/ipython
-		 dev-python/dbus-python )
-	libnotify? ( dev-python/dbus-python )
-	jpeg? ( dev-python/imaging )
-	png? ( dev-python/imaging )
-	ssh? ( virtual/ssh )
-	server? ( x11-base/xorg-server[xvfb,-minimal] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16"
-
-src_prepare() {
-	use server || epatch disable-posix-server.patch
-	if use ffmpeg ; then
-		use x264 || epatch disable-x264.patch
-	else
-		epatch disable-vpx.patch disable-x264.patch
-	fi
-
-	$(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die
-
-	#python_copy_sources
-	#
-	#patching() {
-	#    [[ "${PYTHON_ABI}" == 2.* ]] && return
-	#	2to3 --no-diffs -x all -f except -w -n .
-	#}
-	#python_execute_function --action-message 'Applying patches with $(python_get_implementation) $(python_get_version)' -s patching
-}
-
-src_install() {
-	distutils_src_install
-	rm -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
-}
diff --git a/x11-wm/xpra/xpra-0.6.0.ebuild b/x11-wm/xpra/xpra-0.6.0.ebuild
deleted file mode 100644
index 23336fb63fdc..000000000000
--- a/x11-wm/xpra/xpra-0.6.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.6.0.ebuild,v 1.2 2012/09/05 10:27:15 xmw Exp $
-
-EAPI=3
-
-PYTHON_DEPEND="*"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-SUPPORT_PYTHON_ABIS="1"
-inherit distutils eutils
-
-DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
-HOMEPAGE="http://xpra.org/"
-SRC_URI="http://xpra.org/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clipboard ffmpeg jpeg libnotify parti png +rencode server ssh x264"
-
-COMMON_DEPEND="dev-python/pygtk:2
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	ffmpeg? (
-		virtual/ffmpeg
-		x264? ( media-libs/x264 )
-	)
-	server? ( x11-libs/libXtst )
-	!x11-wm/parti"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmodmap
-	parti? ( dev-python/ipython
-		 dev-python/dbus-python )
-	libnotify? ( dev-python/dbus-python )
-	jpeg? ( dev-python/imaging )
-	png? ( dev-python/imaging )
-	ssh? ( virtual/ssh )
-	server? ( x11-base/xorg-server[xvfb,-minimal] )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-python/cython-0.16"
-
-src_prepare() {
-	use server || epatch disable-posix-server.patch
-	if use ffmpeg ; then
-		use x264 || epatch disable-x264.patch
-	else
-		epatch disable-vpx.patch disable-x264.patch
-	fi
-	use clipboard || epatch disable-clipboard.patch
-	use rencode || epatch disable-rencode.patch
-
-	$(PYTHON -2) make_constants_pxi.py wimpiggy/lowlevel/constants.txt wimpiggy/lowlevel/constants.pxi || die
-
-	#python_copy_sources
-	#
-	#patching() {
-	#    [[ "${PYTHON_ABI}" == 2.* ]] && return
-	#	2to3 --no-diffs -x all -f except -w -n .
-	#}
-	#python_execute_function --action-message 'Applying patches with $(python_get_implementation) $(python_get_version)' -s patching
-}
-
-src_install() {
-	distutils_src_install
-	rm -vf "${ED}"usr/share/{parti,wimpiggy,xpra}/{README*,COPYING} || die
-}
diff --git a/x11-wm/xpra/xpra-0.6.4.ebuild b/x11-wm/xpra/xpra-0.6.4.ebuild
index ad1f9448fe14..da492eccd9ed 100644
--- a/x11-wm/xpra/xpra-0.6.4.ebuild
+++ b/x11-wm/xpra/xpra-0.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.6.4.ebuild,v 1.1 2012/10/06 09:24:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.6.4.ebuild,v 1.2 2012/10/14 21:40:38 xmw Exp $
 
 EAPI=3
 
@@ -15,7 +15,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~amd64-linux ~x86 ~x86-linux"
 IUSE="+clipboard ffmpeg jpeg libnotify parti png +rencode server ssh x264"
 
 COMMON_DEPEND="dev-python/pygtk:2
@@ -30,6 +30,7 @@ COMMON_DEPEND="dev-python/pygtk:2
 	!x11-wm/parti"
 
 RDEPEND="${COMMON_DEPEND}
+	x11-apps/setxkbmap
 	x11-apps/xmodmap
 	parti? ( dev-python/ipython
 		 dev-python/dbus-python )
diff --git a/x11-wm/xpra/xpra-0.7.0.ebuild b/x11-wm/xpra/xpra-0.7.0.ebuild
new file mode 100644
index 000000000000..685a1a2fcb3c
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.7.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.7.0.ebuild,v 1.1 2012/10/14 21:40:38 xmw Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="*"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+SUPPORT_PYTHON_ABIS="1"
+inherit distutils eutils
+
+DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
+HOMEPAGE="http://xpra.org/"
+SRC_URI="http://xpra.org/src/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+clipboard +rencode vpx webp x264"
+
+COMMON_DEPEND="dev-python/pygobject:2
+	dev-python/pygtk:2
+	x11-drivers/xf86-input-void
+	x11-drivers/xf86-video-dummy
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	vpx? ( media-libs/libvpx
+		virtual/ffmpeg )
+	webp? ( media-libs/libwebp )
+	x264? ( media-libs/x264
+		virtual/ffmpeg )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python
+	dev-python/imaging
+	dev-python/ipython
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	x11-base/xorg-server[xvfb,-minimal]"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ignore-gentoo-no-compile.patch
+	sed -e "s:libwebp.so.2:libwebp.so.4:" \
+		-i "xpra/webm/__init__.py" || die
+
+	use clipboard || epatch patches/disable-clipboard.patch
+	use rencode   || epatch patches/disable-rencode.patch
+	use vpx       || epatch patches/disable-vpx.patch
+	use webp      || epatch patches/disable-webp.patch
+	use x264      || epatch patches/disable-x264.patch
+
+	distutils_src_prepare
+}