reinit the tree, so we can have metadata

4 files changed, 149 insertions, 0 deletions

diff --git a/x11-misc/winswitch/Manifest b/x11-misc/winswitch/Manifest
new file mode 100644
index 000000000000..3c49412fa7ed
--- /dev/null
+++ b/x11-misc/winswitch/Manifest
@@ -0,0 +1,6 @@
+AUX winswitch-0.12.18-PIL.patch 2481 SHA256 c6f918b23ba8462b9837228f6bf6b9265043d2a5902ab867f7f7bcf9e2733fbf SHA512 fca8d822537da67b753142a2ede895b5e6a49f2c5625b8cc80de2637f355d43cdf0a9a9973adfa0ae83ae70b213a96317ae7e4ac21cdf9b6ccd2295c0dd519af WHIRLPOOL acd7cc1eb8009f77598cc59d836ab454ab978357248822fb9f54789d9711df4e5a8ade70653a17f2ca96b393bbe15fff8c8b073372a5163f4660bca25d5faf9b
+DIST winswitch-0.12.18.src.tar.bz2 1193952 SHA256 466a6906d98b47381f0528410e1d833354dc20ea2855a0c0424a10c90cbc7e08 SHA512 841d269119ab3118acbbd7ad1c2d27203b45a72213fd9e8d75d937224d973e78110a05e5772a3856a3f3c9440633b200c7a0eab67a3d5b0125de22f33084819e WHIRLPOOL 18d783e8589b687435a278e8acce83a31fb720b8ec29a58e78a2f61649687ac2e998d11e780863cba5b26d062872f314b07ab5a277f9d1a67b5a446647df0d25
+EBUILD winswitch-0.12.18-r1.ebuild 1287 SHA256 917e4f074a24e3e36fb899dffff454233a3c71bcde37fa80158ffb06aa0804f4 SHA512 270f0eb74495fa062f9a32e34bc882f0a9d3ec38d83f6689a84011a73e545b42dc2c116c3f7bb85388cd3205a562282a76218904d692fea2b20dfc4c7069e945 WHIRLPOOL a29e4f574cc3383c5083f730e3814efa52e8aa54e43e7733d2ef56b543d5cfdb7938b87c6d5facce0cfe19fe1654d5b474015adaccfe13d1f890fa3ca565123f
+MISC ChangeLog 2815 SHA256 d4ce95fc28d9afe0c28e4bf30dbd3a01026af2b1d62b8a6a56ca4602478bf96f SHA512 672e511f3ed7ee22f5892b33976ce60267e0755191f1992f6f43f9470ea10bbf2780d9d47bb49af5f9d3cbf1ce307e9bba4ef3a432ac4318959b0c1161548606 WHIRLPOOL b6a239a08866097fe3759d459d0118d869f4cfd6a5dc819bc5b28a1fc25c4fa4db38a03a70c3b64710ee564d439ecb126ed0b2478230fadd733b484a5a07f4b6
+MISC ChangeLog-2015 2042 SHA256 d55b318b4d9c14254ab08802a64efbde7ae3a049eaa2814d5f0f033e13e1c778 SHA512 4a3feef026a2400ec59023f8d0e8038a102485652edd97e7da5427c982bdb4647ee5e9fea7f8fc6e49a2a8e834d08c94d9d4db1a014ad951a7a5fe344b553530 WHIRLPOOL e67e7e83115a98814ab902c872f0d50a819513612948255c27a80cc7609ab7d7d2d1278cec2d1355f8d09db44be1fe662430d9bdc227bbdd86b2dde6829190a8
+MISC metadata.xml 374 SHA256 00e12ba837ab5ee99b168c666779e9a232c5e2354047ef885f33fea87d362869 SHA512 fb37c9db3fe38df1a05bd09ef5e86c0bcc5cd41a9081ec81ee33f6b827be6d19c6d4836650f19d893927cbb602d4b7c90de73d8a75a64ef64bcf86af38f68131 WHIRLPOOL f24e6f71dcfbda8986f3a234de06622c3033ba2b67abb3de383f13b3086c56d424e774f63c6d45a9ee6ebedfbe8d2a0fe2a9655d09e2a9b1251a115f2c091afa
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..be6484dd1084
--- /dev/null
+++ b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch
@@ -0,0 +1,84 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471564
+https://winswitch.org/trac/ticket/238
+
+--- 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
new file mode 100644
index 000000000000..54d7be4f1121
--- /dev/null
+++ b/x11-misc/winswitch/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<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.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
new file mode 100644
index 000000000000..290afbeebc97
--- /dev/null
+++ b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="client server tool to start and control virtual desktops"
+HOMEPAGE="http://winswitch.org"
+SRC_URI="http://winswitch.org/src/${P}.src.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/gst-python:0.10[${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-core
+	dev-python/twisted-conch
+	media-gfx/xloadimage
+	dev-python/pillow[${PYTHON_USEDEP}]
+	x11-misc/devilspie"
+DEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-PIL.patch )
+
+python_prepare_all() {
+	einfo "Remove bundled Vash"
+	rm -rf skel/share/Vash || die
+	export PREFIX="${EPREFIX}"
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "You might want to install following packages for additional protocol functionality"
+	elog "    net-misc/tigervnc[?server]"
+	elog "    x11-wm/xpra[?server]"
+	elog "    || ( net-misc/nxclient net-misc/nx ) "
+	elog "and net-dns/avahi[python] for automatic server discovery"
+}