distutils-r1 migration, PIL fixes (bug 471564)

(Portage version: 2.2.0_alpha180/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

4 files changed, 114 insertions, 21 deletions

diff --git a/x11-misc/winswitch/ChangeLog b/x11-misc/winswitch/ChangeLog
index e1822f93de47..31bd66077104 100644
--- a/x11-misc/winswitch/ChangeLog
+++ b/x11-misc/winswitch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/winswitch
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/winswitch/ChangeLog,v 1.5 2013/01/05 13:35:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/winswitch/ChangeLog,v 1.6 2013/06/17 07:32:40 xmw Exp $
+
+*winswitch-0.12.18-r1 (17 Jun 2013)
+
+  17 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/winswitch-0.12.18-PIL.patch, +winswitch-0.12.18-r1.ebuild,
+  -winswitch-0.12.17.ebuild, metadata.xml:
+  distutils-r1 migration, PIL fixes (bug 471564)
 
 *winswitch-0.12.18 (05 Jan 2013)
 
@@ -29,4 +36,3 @@
   22 May 2012; Michael Weber <xmw@gentoo.org> +winswitch-0.12.13.ebuild,
   +metadata.xml:
   Initial import (bug 353662)
-
diff --git a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
new file mode 100644
index 000000000000..e3a30b37fcc4
--- /dev/null
+++ b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
@@ -0,0 +1,83 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471564
+
+--- winswitch-0.12.18/winswitch/virt/xpra_client_util.py
++++ winswitch-0.12.18/winswitch/virt/xpra_client_util.py
+@@ -95,8 +95,8 @@
+ 		widgets = []
+ 		has_pil = False
+ 		try:
+-			import Image
+-			has_pil = Image is not None
++			import PIL.Image
++			has_pil = PIL.Image is not None
+ 		except:
+ 			pass
+ 		jw = self.get_encoding_widget(server, server_command, options, change_cb, has_pil)
+--- winswitch-0.12.18/winswitch/ui/capture_util.py
++++ winswitch-0.12.18/winswitch/ui/capture_util.py
+@@ -125,16 +125,16 @@
+ 		#resize it
+ 		img_data = load_binary_file(self.filename)
+ 		import StringIO
+-		import Image
+-		image = Image.open(StringIO.StringIO(img_data))
++		import PIL.Image
++		image = PIL.Image.open(StringIO.StringIO(img_data))
+ 		self.save_resized(image)
+ 
+ 	def save_resized(self, image):
+ 		""" save a PIL.Image after resizing it to thumbnail size """
+-		import Image
++		import PIL.Image
+ 		(w,h) = image.size
+ 		w,h = self.get_thumbnail_dimensions(w, h)
+-		image.thumbnail((w,h), Image.ANTIALIAS)
++		image.thumbnail((w,h), PIL.Image.ANTIALIAS)
+ 		image.save(self.filename, "PNG")
+ 
+ 
+@@ -190,13 +190,13 @@
+ 
+ 	def	do_capture(self):
+ 		#force py2exe to include these:
+-		import Image
+-		import GifImagePlugin
+-		import JpegImagePlugin
+-		import PngImagePlugin
+-		import ImageGrab
+-		assert Image and GifImagePlugin and JpegImagePlugin and PngImagePlugin and ImageGrab		#avoid pydev warnings
+-		screenshot = ImageGrab.grab()
++		import PIL.Image
++		import PIL.GifImagePlugin
++		import PIL.JpegImagePlugin
++		import PIL.PngImagePlugin
++		import PIL.ImageGrab
++		assert PIL.Image and PIL.GifImagePlugin and PIL.JpegImagePlugin and PIL.PngImagePlugin and PIL.ImageGrab		#avoid pydev warnings
++		screenshot = PIL.ImageGrab.grab()
+ 		self.save_resized(screenshot)
+ 		self.finish()
+ 
+--- winswitch-0.12.18/winswitch/util/icon_util.py
++++ winswitch-0.12.18/winswitch/util/icon_util.py
+@@ -27,7 +27,7 @@
+ 	HAS_CAIRO_RSVG = False
+ 
+ try:
+-	import Image
++	import PIL.Image
+ 	has_PIL = True
+ except:
+ 	has_PIL = False
+@@ -58,10 +58,10 @@
+ 	return	scaled_data
+ 
+ def pil_load_scaled_pixmap(filename, size_limit):
+-	img = Image.open(filename)
++	img = PIL.Image.open(filename)
+ 	(w,h) = img.size
+ 	if w>size_limit or h>size_limit:
+-		img.thumbnail((size_limit,size_limit), Image.ANTIALIAS)
++		img.thumbnail((size_limit,size_limit), PIL.Image.ANTIALIAS)
+ 	assert img
+ 	return	pil_image_to_png_data(img)
+ 
diff --git a/x11-misc/winswitch/metadata.xml b/x11-misc/winswitch/metadata.xml
index 59acc2cc580e..475f302a1746 100644
--- a/x11-misc/winswitch/metadata.xml
+++ b/x11-misc/winswitch/metadata.xml
@@ -2,8 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
 </maintainer>
+<upstream>
+	<doc lang="en">http://winswitch.org/documentation/</doc>
+	<bugs-to>https://winswitch.org/trac/report</bugs-to>
+</upstream>
 </pkgmetadata>
 
diff --git a/x11-misc/winswitch/winswitch-0.12.17.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
index cbf8ca2b0f7c..b801fa2ec8a1 100644
--- a/x11-misc/winswitch/winswitch-0.12.17.ebuild
+++ b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/winswitch/winswitch-0.12.17.ebuild,v 1.2 2013/01/05 13:35:04 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild,v 1.1 2013/06/17 07:32:40 xmw Exp $
 
-EAPI=4
+EAPI=5
 
-SUPPORT_PYTHON_ABIS="1"
-PYTHON_DEPEND="2"
-RESTRICT_PYTHON_ABIS="2.4 3.*"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit python distutils
+inherit distutils-r1
 
 DESCRIPTION="client server tool to start and control virtual desktops"
 HOMEPAGE="http://winswitch.org"
@@ -19,24 +17,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/gst-python
-	dev-python/imaging
-	dev-python/netifaces
-	dev-python/notify-python
-	dev-python/pycrypto
-	dev-python/pygobject:3
-	dev-python/pygtk
+RDEPEND="dev-python/gst-python[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
 	dev-python/twisted
 	dev-python/twisted-conch
 	media-gfx/xloadimage
+	virtual/python-imaging[${PYTHON_USEDEP}]
 	x11-misc/devilspie"
 DEPEND=""
 
-src_prepare() {
+PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
+
+python_prepare_all() {
 	einfo "Remove bundled Vash"
-	rm -r skel/share/Vash || die
+	rm -rf skel/share/Vash || die
 
-	python_convert_shebangs -r 2 skel
+	distutils-r1_python_prepare_all
 }
 
 pkg_postinst() {