commit: cddcf9838acd192875f82ba04db3b06c22e300a2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> AuthorDate: Wed Jul 25 22:50:20 2018 +0000 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org> CommitDate: Wed Jul 25 22:52:38 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cddcf983
x11-misc/winswitch: remove last rited package Closes: https://bugs.gentoo.org/552526 Closes: https://bugs.gentoo.org/552528 Closes: https://bugs.gentoo.org/552532 Closes: https://bugs.gentoo.org/605116 Closes: https://bugs.gentoo.org/611650 x11-misc/winswitch/Manifest | 1 - .../winswitch/files/winswitch-0.12.18-PIL.patch | 84 ---------------------- x11-misc/winswitch/metadata.xml | 12 ---- x11-misc/winswitch/winswitch-0.12.18-r1.ebuild | 47 ------------ 4 files changed, 144 deletions(-) diff --git a/x11-misc/winswitch/Manifest b/x11-misc/winswitch/Manifest deleted file mode 100644 index 70cd25a1f45..00000000000 --- a/x11-misc/winswitch/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST winswitch-0.12.18.src.tar.bz2 1193952 BLAKE2B f9da52da90f10f1d623d66d6469f0a995316e45fa1fce3e21945579592b7da914a0dc2b86b80afb5f0a72d48a8d8897d06659d4ffffa3366ff0ebc0b03ecbb74 SHA512 841d269119ab3118acbbd7ad1c2d27203b45a72213fd9e8d75d937224d973e78110a05e5772a3856a3f3c9440633b200c7a0eab67a3d5b0125de22f33084819e diff --git a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch b/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch deleted file mode 100644 index be6484dd108..00000000000 --- a/x11-misc/winswitch/files/winswitch-0.12.18-PIL.patch +++ /dev/null @@ -1,84 +0,0 @@ -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 deleted file mode 100644 index 54d7be4f112..00000000000 --- a/x11-misc/winswitch/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="person"> - <email>[email protected]</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 deleted file mode 100644 index 290afbeebc9..00000000000 --- a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# 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" -}
