Fix PIL imports (bug 471566, thanks Arfrever)

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

5 files changed, 216 insertions, 19 deletions

diff --git a/x11-wm/xpra/ChangeLog b/x11-wm/xpra/ChangeLog
index d5bdb565c0ac..b0e402b9e154 100644
--- a/x11-wm/xpra/ChangeLog
+++ b/x11-wm/xpra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/xpra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.67 2013/06/09 19:20:49 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/ChangeLog,v 1.68 2013/06/09 21:17:51 xmw Exp $
+
+*xpra-0.9.4-r1 (09 Jun 2013)
+*xpra-0.9.5-r1 (09 Jun 2013)
+
+  09 Jun 2013; Michael Weber <xmw@gentoo.org> +files/xpra-0.9.5-PIL.patch,
+  +xpra-0.9.4-r1.ebuild, +xpra-0.9.5-r1.ebuild, -xpra-0.9.3.ebuild:
+  Fix PIL imports (bug 471566, thanks Arfrever)
 
   09 Jun 2013; Mike Gilbert <floppym@gentoo.org> xpra-0.9.5.ebuild:
   Revert PIL virtual change; see bug 471566.
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 573291d2ef29..fa6d3a215fe7 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -4,22 +4,23 @@ Hash: SHA256
 AUX xpra-0.7.1-ignore-gentoo-no-compile.patch 482 SHA256 32c4a3819b0035ecdeeab72a15b183a894226c300bc5159a419251440f070195 SHA512 e22bfbcf6402e179d86fa4128b96d47e2ad4373ea2aa22a877ca3a3573ed56fbbf20ce66c2e94713a1d2d7b53dfa3339fd2f481f57e14770e09e1c0435bbc693 WHIRLPOOL 152c1c9ff623afd1d29dd7678f5ba44524e60b1cdbafd7f5779f1f8e53ea33015afa2476926aa91ef587131e0b1a6504cf9ffa149c3b72fd2fa62e7838152201
 AUX xpra-0.7.4-prefix.patch 478 SHA256 3a3e1914a82c71050891a31aad14360666c73bbc620a5d2da5d24391064bbca4 SHA512 b738ef53d05e2daf101eb2ea68f754db88f16c68e23177bcd87e96a2ce3336c40526bc1bafb25917c349484ac6bb92ff228b686fc6fff4fc281b0b5797b479e4 WHIRLPOOL ffae9d84515ba6784921ae1983c95520384f7dad7795ca1bbdbb4c8f99459633bd6f49b9c4babb2ce5ca7bde553ffb3ee7c64e559867cdb1a8b1e739d3fc5a09
 AUX xpra-0.8.0-prefix.patch 463 SHA256 5c05c47154751e68ea91a3988d17baa06a027370bddaf857f269cc2a0cabde77 SHA512 a18b61923f2ffc34a1a17de20705bee587804e3ed597c6092495f513e061255b0c412873b3c01a849c1fc19ca82a2b4aa95dc9add4e971a9e922074f6abcf0a2 WHIRLPOOL 64471baa063b0a1355b7c110be5f9febe9beaa8416377c98f418e2cf0ad14ecaf37267d3bf1175b0197ee38ecd15dec1da7953415d9818bc2d86fee99334ea56
+AUX xpra-0.9.5-PIL.patch 4033 SHA256 cb46783967532c5689da368ae5f0770a123dff1f65716723d833ad9f1f3c4a9d SHA512 8427686a10179317d254c3a80edbc5947aa2f1c6747de4c1363cb61c9b96dd5aa8bff67a36cf75ba1e597e04f6bebaffb5c5367efeee33268bcdbc6c95c5dbf9 WHIRLPOOL f7d10791add68e6111aaa4b8f24fa96d47d0169d50016a20edfa4af414d899fef20b8b12fecf5eb99c3254471b83eece672f3fc0adab999e44153f80abb7269e
 DIST xpra-0.7.8.tar.bz2 471147 SHA256 27f5d0bc2a369a93076ef90fad46a6354e0327033b9139b659d602e9e32c17cb SHA512 d14fdd75c7fd494f4aaae8740ce1a5a7880ae70109ffa7989d346d1b5add56a8117a5851132140f2e8a3aad0f7f3f4a9fe6e2b2f3e9666e469f35fc179fd0af2 WHIRLPOOL c0ed83f90ade9b3a7b0ab728ab090d73277fecb56edc4943295fa19f211b3e41c12dcad6eec9b01932c0a2bb1a6402f8f88deaf25c7f88be01fcf986778c4fd0
 DIST xpra-0.8.8.tar.bz2 581029 SHA256 248bac50c78eccfbc7f728667f9d0ef26b101b288193fa286881cda452e63683 SHA512 b3d2121c13e293cca466997af1b49069ced0012c6692cfac375e9990d62efc916b44f2641a4e9c5e04e425d19c14e85e1521ae1832aa3ea02fcc46ac29672a63 WHIRLPOOL b1f654542e8e89ce89ffb6fac9ee3a42f0c88e6d9ce0fdc1573b28c0b117e970f7e96484eadf7552c35e6dd3064f37495a4eb2cdb1c51c2dc0a8ded8877ba321
-DIST xpra-0.9.3.tar.bz2 606313 SHA256 0e757c6372312a7d33350e440c83c2590120e505f5d7f8b8da7a85d33c701201 SHA512 d0d28bda936b395718e1fdc5e6bfcb43f0ea5d9fbb42aa1c2748db1e155192efbe066c9005acda60ed027c5b34e23c660526c0f59ed7d1015da760655110ed05 WHIRLPOOL b823d7bc5d607b390dc964d0e234cd0716e4e8339b14a659cff9c8afa93e08bc5d83c0ffcac0a5b2a1c3ceb81fcbe27d3362cc1971bf22b67836b82b0f8a9997
 DIST xpra-0.9.4.tar.bz2 606748 SHA256 572d2d37113d300c439aba2280b2468db60573048cdf104e51fd937ec5e23061 SHA512 bb926c65484166e8cbf8b13ef99b462d169e587ef8dac7b825b0ebbc9879c0afca830520f5b32feaacb496191f783f5194e9b8ae157af89278965e17f7bc8f17 WHIRLPOOL 263e317685ddf128fd363b945e8aac16366b5b8c9f64c3dbf1740133fdcaf60d1aec55005d046ff2fa2000028a3b733eb14077cfdca6118a07a3ce2742ad112d
 DIST xpra-0.9.5.tar.bz2 606452 SHA256 3c56a9bb766c08d287f02f9c2ee75ab0fbd96488130b9e61d25e4deb6a7f29e3 SHA512 c056b978083d088008289261a15e3b4baaf8ff7f93771bc55b120924359a6da3d47295b4d778bf772f158cc86d0318e33d37e9f7d7ad76badc9ea7c6f7a70979 WHIRLPOOL 30435735f9e02848fc85fc0788ecf1733bd0aeded58ac2961718009d40be95838bc5a28253e36e14003b77373d8c191ad8cc177646fa5275b2b22885ce8c6a47
 EBUILD xpra-0.7.8.ebuild 2520 SHA256 be7b5830ac406d6021ae56feee6549bf1e78f3623109c55d95b55b284bd2fbf3 SHA512 9a94a50c0e4f111e333b4545dbcbfd7b54e24e132e40bf57ab9aab881ea2e45127df71f84341fa5eed8e0aef1a6395861759881e537c97586ff9783c664f9838 WHIRLPOOL 1d00d061266bbd8935d37403a470a863af628127fe23b96ab258ab5595c0e9ad28bc7d7f3f011583b211c3758e320ce6c3c9f2f81e3a7424a753620f841769f5
 EBUILD xpra-0.8.8.ebuild 2256 SHA256 a3dd42fd2649a57eae026f027c0b0e9769c85af5f45af537edab0ecb80acc240 SHA512 e8ec733fa29a7c1ede09362122ef46167046e0aa89b27690ee3931661168f33b25b56dd8860ac110de88a84e8f3a2ab7037a48f8dd4ec6b9b236fab6a768ffdc WHIRLPOOL a6c0038b983d6bef22fe7632a609942cdea71255489d10f9f768dbe31eadbd0b4ec4214b432f80ed360177e5b0d19d457b318ddc1f21f6a8073bb3e7a25f99b3
-EBUILD xpra-0.9.3.ebuild 2334 SHA256 6b3fbb5e50d7acca95bb6e515f64f72174dd685b6ad2274232a0ba04e451172d SHA512 13b8a162d67b24e4db355a71d95e548f7c214bed5556dad2dd6edea4e7825a821a4b38172a460279e7114bb914cb4cb9d6b915827beff4f7fec4431f2e06fbb8 WHIRLPOOL 72544e23e20fb1969fa4cf00ce4a959664c146f5fa231d0648eaf13a4c3c6133d6f683b869f0cca051c42ad713d3ad513533a8667f2fa1b076fa05f0145c20ef
+EBUILD xpra-0.9.4-r1.ebuild 2476 SHA256 172f8899ca3f852e3408de61146b1215026fbb8be7f832daf47129ae852bb8b4 SHA512 1e8365a13b23cca95b3812de62066df5c5dc20ac255da06787c7806d2c9abdea4a5ec997c40a2533b36868299049fad3c494da6c9428eaa63f4b5b225aa9ad67 WHIRLPOOL dd2c7a1c43b551e9698a1d82c1790bd65c763c7061a7f14f0bcf90820395f008ba3d86c41069b43523d72074e8d3463f329c0b68424a828f661475e09e372780
 EBUILD xpra-0.9.4.ebuild 2429 SHA256 bd3a9341a531df50a12d985a43b06181285fcb06e029a2118a8980c2b6e98807 SHA512 8d4406e352c00b5709cc7646c02e67727e3d800e40278ff0e4be3ffb94064ac18e368b72943c20454b4336a8e975ca9c3f38401309dc41c760bcceef490e73b7 WHIRLPOOL e7eacfc3f035c1e15b4076cd9f812b8f065adc4b3e265027a2edcb5a40ef7b5d376b37b24fe3be063da2d6bca620bdf761a37e7a3b455db98719e7bf9a831f8e
+EBUILD xpra-0.9.5-r1.ebuild 2476 SHA256 435a0d03537a5066c421ac1b2e74796485ad8555daba9e9fd9efca84627b0277 SHA512 2d456caaa0d6f73d81ef7e06cafc467c2d148f4e545089d91d6605d2ba9c258594e841694b2ea2413e76fc733d4c2a6038adffb4f1ea45093dc5482ba4938249 WHIRLPOOL 46c4ca53ef13594c7b55857ea87052248ecb0c8fcb5b46bd02db825ea9764a49ee42d0c312d957b25cc262e77b6579c353cc5c4f7ae60f6ac170bb1322b308a1
 EBUILD xpra-0.9.5.ebuild 2433 SHA256 6afa4356455d3e08a4076fdc07dc86bc849ec1b0739b61f53aa48571c2f290e9 SHA512 bad55494f2fa42eed1f5bbad5d4d6df10c79b6093cca7fe5f73dec42125448bc15f821fc3ba7a6c9c3a56b07d2dd57fab774d8b826fa717473903cbcb802a46a WHIRLPOOL 58dcbafe2fc6c0f7b1492cb0efde933bf540fd70f5bb161707a43fc867ca41ecbbf26f89c8866a6c61de1ef70f474e573937903ec53ea3444c45c0d1a248a79b
-MISC ChangeLog 9463 SHA256 b57f4dedbc7eb005d0bc7575b3473cae32dd1c841c2f7a0b90b81e553a19b863 SHA512 ebeacd4b401cfe34c5c8a021d6a470cc5ea190892c73e68f230698eb51bc1b1930f912937b5570a82472350457095497e1e59a57bb5dbe4a8cf746f1aec85b49 WHIRLPOOL 17feaa53a047db6a0dda821d0e7e370153c2e2c7948385d5d2a2f02ddd261e90d4c9fe1d6ab8fea804d965701eaa9f74af1519d4f7bbd77b8b3494c0e177d8ba
+MISC ChangeLog 9710 SHA256 fb946f8df06118ca9d796221dc1270eb95d08395e89228ac263eea6921b79d66 SHA512 86851a144c898d9d54c2e20c6e7b47c9320aa97d70359bcfcc395fb93f19e04ea74cc6bad08015bb84b19e4c765b85288fb0b78c19d240741da2317a5b9908d9 WHIRLPOOL eef5ec3a6c45a608fe70dc41fc92552147565ba3e04bc6266d19b3bdf161b3f00de9a44a85738b5852231c0764a90c3fec54b632cf45b7be27bd2da40621288a
 MISC metadata.xml 868 SHA256 1174a95588a9a35fbe124a155d47938d663d18321b4bccfae7565361cfb42d5c SHA512 d7fb4e373049c4819bfa7549efd4e635ad74044e06e64d9189f0974cf72375ef8ae1c4b674fcfcf6d630bd0047ff70475e584f8aee14e7b3d062dbe6d486fb6b WHIRLPOOL 130d3d78c7ab990221b23a7f2081e3e1ecd1d85b9353b53977f5c8acec757170d91ad84a692c0f6f0e4a629a83007afdc48c9e8fbfbfcbccdc3eff6c457efe66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlG01ZIACgkQC77qH+pIQ6RwugEArlsPzhPXGNQmoLE9JFyCdVcE
-nXgzMSBZRjzxeGX75AYBAL5ZhIO8Y0jHg9KIjFdWM4O0cTg8qPjJrzcQFO0y+RjT
-=0gK/
+iF4EAREIAAYFAlG08U8ACgkQknrdDGLu8JDx3gEAgW1aNjMqUQg4ojKWMkRhmibi
+L2XZ0jp1bTwj4kYgdQkA/2/Ry/WazrP8UWBmwxIjUBvRmhCqXD2OePJRCMURmOnk
+=4Q0+
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/xpra/files/xpra-0.9.5-PIL.patch b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
new file mode 100644
index 000000000000..1e17af291348
--- /dev/null
+++ b/x11-wm/xpra/files/xpra-0.9.5-PIL.patch
@@ -0,0 +1,103 @@
+--- xpra-0.9.5/xpra/server.py
++++ xpra-0.9.5/xpra/server.py
+@@ -610,11 +610,11 @@
+         width = maxx-minx
+         height = maxy-miny
+         log("screenshot: %sx%s, min x=%s y=%s", width, height, minx, miny)
+-        import Image
+-        image = Image.new("RGBA", (width, height))
++        import PIL.Image
++        image = PIL.Image.new("RGBA", (width, height))
+         for wid, x, y, w, h, pixmap in reversed(all_regions):
+             _, _, wid, _, _, w, h, _, raw_data, rowstride, _, _ = get_rgb_rawdata(0, 0, wid, pixmap, 0, 0, w, h, "rgb24", -1, None, logger=log.debug)
+-            window_image = Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride)
++            window_image = PIL.Image.fromstring("RGB", (w, h), raw_data, "raw", "RGB", rowstride)
+             tx = x-minx
+             ty = y-miny
+             image.paste(window_image, (tx, ty))
+--- xpra-0.9.5/xpra/window_source.py
++++ xpra-0.9.5/xpra/window_source.py
+@@ -1024,8 +1024,8 @@
+ 
+     def PIL_encode(self, w, h, coding, data, rowstride, options):
+         assert coding in ENCODINGS
+-        import Image
+-        im = Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride)
++        import PIL.Image
++        im = PIL.Image.fromstring("RGB", (w, h), data, "raw", "RGB", rowstride)
+         buf = StringIO()
+         client_options = {}
+         if coding=="jpeg":
+--- xpra-0.9.5/xpra/window_backing.py
++++ xpra-0.9.5/xpra/window_backing.py
+@@ -32,7 +32,7 @@
+ #have/use PIL?
+ has_PIL = False
+ try:
+-    import Image
++    import PIL.Image
+     has_PIL = True
+ except:
+     pass
+@@ -91,7 +91,7 @@
+ 
+     def jpegimage(self, img_data, width, height):
+         buf = IOClass(img_data)
+-        return Image.open(buf)
++        return PIL.Image.open(buf)
+ 
+     def rgb24image(self, img_data, width, height, rowstride):
+         assert has_PIL
+@@ -99,7 +99,7 @@
+             assert len(img_data) == rowstride * height
+         else:
+             assert len(img_data) == width * 3 * height
+-        return Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1)
++        return PIL.Image.fromstring("RGB", (width, height), img_data, 'raw', 'RGB', rowstride, 1)
+ 
+     def process_delta(self, raw_data, width, height, rowstride, options):
+         """
+@@ -395,7 +395,7 @@
+         if use_PIL:
+             #try PIL first since it doesn't need the UI thread until the actual do_paint_rgb24 call
+             buf = IOClass(img_data)
+-            img = Image.open(buf)
++            img = PIL.Image.open(buf)
+             if img.mode=="RGB":
+                 raw_data = img.tostring("raw", "RGB")
+                 #PIL flattens the data to a continuous straightforward RGB format:
+--- xpra-0.9.5/xpra/scripts/config.py
++++ xpra-0.9.5/xpra/scripts/config.py
+@@ -18,8 +18,8 @@
+ from wimpiggy.gobject_compat import import_gobject, is_gtk3
+ gobject = import_gobject()
+ try:
+-    import Image
+-    assert Image
++    import PIL.Image
++    assert PIL.Image
+     _has_PIL = True
+ except:
+     _has_PIL = False
+--- xpra-0.9.5/xpra/server_source.py
++++ xpra-0.9.5/xpra/server_source.py
+@@ -696,8 +696,8 @@
+     def make_window_icon(self, pixel_data, pixel_format, stride, w, h):
+         log("found new window icon: %sx%s, sending as png=%s", w, h, self.png_window_icons)
+         if self.png_window_icons:
+-            import Image
+-            img = Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1)
++            import PIL.Image
++            img = PIL.Image.frombuffer("RGBA", (w,h), pixel_data, "raw", "BGRA", 0, 1)
+             MAX_SIZE = 64
+             if w>MAX_SIZE or h>MAX_SIZE:
+                 #scale icon down
+@@ -708,7 +708,7 @@
+                     w = int(w*MAX_SIZE/h)
+                     h = MAX_SIZE
+                 log("scaling window icon down to %sx%s", w, h)
+-                img = img.resize((w,h), Image.ANTIALIAS)
++                img = img.resize((w,h), PIL.Image.ANTIALIAS)
+             output = StringIO()
+             img.save(output, 'PNG')
+             raw_data = output.getvalue()
diff --git a/x11-wm/xpra/xpra-0.9.3.ebuild b/x11-wm/xpra/xpra-0.9.4-r1.ebuild
index 362e913e4491..e28ea4b445ff 100644
--- a/x11-wm/xpra/xpra-0.9.3.ebuild
+++ b/x11-wm/xpra/xpra-0.9.4-r1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.9.3.ebuild,v 1.1 2013/05/24 06:05:54 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.9.4-r1.ebuild,v 1.1 2013/06/09 21:17:51 xmw Exp $
 
 EAPI=5
 
-#dev-python/pygobject and dev-python/pygtk do not support python3
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 inherit distutils-r1 eutils
 
 DESCRIPTION="X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on wimpiggy"
@@ -17,9 +16,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+clipboard pulseaudio +rencode server vpx webp x264"
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 # x264/old-libav.path situation see bug 459218
-COMMON_DEPEND="dev-python/pygobject:2
-	dev-python/pygtk:2
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
@@ -34,9 +36,9 @@ COMMON_DEPEND="dev-python/pygobject:2
 		virtual/ffmpeg )"
 
 RDEPEND="${COMMON_DEPEND}
-	dev-python/dbus-python
-	dev-python/imaging
-	dev-python/ipython
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
 	virtual/ssh
 	x11-apps/setxkbmap
 	x11-apps/xmodmap
@@ -46,11 +48,13 @@ RDEPEND="${COMMON_DEPEND}
 	)"
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	>=dev-python/cython-0.16"
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
-	epatch "${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch
-	epatch "${FILESDIR}"/${PN}-0.8.0-prefix.patch
+	epatch \
+		"${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.8.0-prefix.patch \
+		"${FILESDIR}"/${PN}-0.9.5-PIL.patch
 
 	#assuming ffmpeg and libav mutual exclusive installs
 	if has_version "media-video/libav" ; then
diff --git a/x11-wm/xpra/xpra-0.9.5-r1.ebuild b/x11-wm/xpra/xpra-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..b194429884f7
--- /dev/null
+++ b/x11-wm/xpra/xpra-0.9.5-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpra/xpra-0.9.5-r1.ebuild,v 1.1 2013/06/09 21:17:51 xmw Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit distutils-r1 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 BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+clipboard pulseaudio +rencode server vpx webp x264"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# x264/old-libav.path situation see bug 459218
+COMMON_DEPEND=""${PYTHON_DEPS}"
+	dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	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
+		|| ( >=media-video/ffmpeg-1.0.4 media-video/libav )
+		virtual/ffmpeg )"
+
+RDEPEND="${COMMON_DEPEND}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	virtual/ssh
+	x11-apps/setxkbmap
+	x11-apps/xmodmap
+	server? ( x11-base/xorg-server[-minimal,xvfb]
+		x11-drivers/xf86-input-void
+		x11-drivers/xf86-video-dummy
+	)"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=dev-python/cython-0.16[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.7.1-ignore-gentoo-no-compile.patch \
+		"${FILESDIR}"/${PN}-0.8.0-prefix.patch \
+		"${FILESDIR}"/${PN}-0.9.5-PIL.patch
+
+	#assuming ffmpeg and libav mutual exclusive installs
+	if has_version "media-video/libav" ; then
+		if ! has_version ">=media-video/libav-9" ; then
+			epatch patches/old-libav.patch
+		fi
+	fi
+
+	use clipboard  || epatch patches/disable-clipboard.patch
+	use pulseaudio || epatch patches/disable-pulseaudio.patch
+	use rencode    || epatch patches/disable-rencode.patch
+	use server     || epatch patches/disable-posix-server.patch
+	use vpx        || epatch patches/disable-vpx.patch
+	use webp       || epatch patches/disable-webp.patch
+	use x264       || epatch patches/disable-x264.patch
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	rm -vf "${ED}"usr/share/parti/{parti.,}README \
+		"${ED}"usr/share/xpra/{webm/LICENSE,xpra.README} \
+		"${ED}"usr/share/wimpiggy/wimpiggy.README || die
+	dodoc {parti.,wimpiggy.,xpra.,}README
+}