Fix PIL imports, bug 471520.

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 39 insertions, 9 deletions

diff --git a/kde-misc/ksplasher/ChangeLog b/kde-misc/ksplasher/ChangeLog
index f017d1ed4481..f1f6b49bd76e 100644
--- a/kde-misc/ksplasher/ChangeLog
+++ b/kde-misc/ksplasher/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/ksplasher
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ChangeLog,v 1.3 2011/02/13 20:07:58 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ChangeLog,v 1.4 2013/09/09 04:20:15 floppym Exp $
+
+*ksplasher-2.0_beta2-r2 (09 Sep 2013)
+
+  09 Sep 2013; Mike Gilbert <floppym@gentoo.org> +files/ksplasher-pillow.patch,
+  +ksplasher-2.0_beta2-r2.ebuild, -ksplasher-2.0_beta2-r1.ebuild:
+  Fix PIL imports, bug 471520.
 
   13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   -ksplasher-2.0_beta2.ebuild:
@@ -17,4 +23,3 @@
   11 Nov 2009; Samuli Suominen <ssuominen@gentoo.org>
   +ksplasher-2.0_beta2.ebuild:
   Initial commit wrt #233801, thanks to Matija Suklje for reporting.
-
diff --git a/kde-misc/ksplasher/Manifest b/kde-misc/ksplasher/Manifest
index cdfa6ed39e19..8919c0cef84c 100644
--- a/kde-misc/ksplasher/Manifest
+++ b/kde-misc/ksplasher/Manifest
@@ -1,4 +1,15 @@
-DIST ksplasherx2.0beta2.tar.gz 278173 RMD160 972a6e5651136f511616fd64c5a131bac128fa57 SHA1 f0fa5935880a20efea8c9cb3b604f78492a10306 SHA256 218ba4268218d1c08ce7662ca682886511f75cc067c5958eb8a11610d7864682
-EBUILD ksplasher-2.0_beta2-r1.ebuild 997 RMD160 c974194c06aa0fabb160902663c33a089f3bd2fd SHA1 64384bab27602cfc0c0cf108d6e9efbb1f30e67e SHA256 db2f9f82bc27d2cacda42559dd17b90a9624816b32ced40476f8d960b0490ee0
-MISC ChangeLog 684 RMD160 c39b4ab5965478154c272feaca7a30d4a1bd5d2f SHA1 5285401ae19b5b026b312ce46a39eb74c37734eb SHA256 85fd82a1e8bdb34439e590f05d051a2e6ddc714076d1259be8f16e2ced959dd6
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX ksplasher-pillow.patch 322 SHA256 c8da9d27427857c6f818bf240da3d73dcf654568f34dbebc013bea97bb401fa5 SHA512 83abbe60def9ed7ae23daef972f67897e63eed5b28ce55bca57456125d83f41414a70a829da14ecd6996298ca18f0d62b8c30392f128eb6dd4bdf253b5e82a5c WHIRLPOOL 7f76443f0d2f03a2712ceb9d5be927a7997928a10962b024b37c886e146f97579256e759fac648f11da425882c56c3e9c3c539d9cfede41b6801fef9b2111c17
+DIST ksplasherx2.0beta2.tar.gz 278173 SHA256 218ba4268218d1c08ce7662ca682886511f75cc067c5958eb8a11610d7864682 SHA512 cb1f284039a5542a2cb578c9bd32fc7e16d8415bdf777ac330b1fd4c4c774f982236e264268bd364bc1c9cbe4d274612a243437fbc308f8fa00a25b4e27fa649 WHIRLPOOL f3cff409d0aefb74213aaea3d7a802ab9ebdf479f9520be2923de67324387a443dd5c5e91e4cfd6653a91796a3986f2a29873f5ebbcbc1d7f5b8817395e2fa9f
+EBUILD ksplasher-2.0_beta2-r2.ebuild 1036 SHA256 3b15f6d8bda4c0d44fd970f2ab5023f0a9ad4ba5a232f27a121f94b287f4965b SHA512 c409e4529f527ff7497bb14290dff084d9126828c5aca74a409d8d8cacae9d46a81bfedba96160e28addc0342aadf7e55cfd23782e96348b8e40a0a39647a50c WHIRLPOOL c262b858bc69fac18f35f2e6095d4a3f8ec917e54b8703e3769ed5f06439615719a9d0c9968e2b9117286222ae89653129bcf2bf381098c15d53d31847bfe30a
+MISC ChangeLog 898 SHA256 28cde8af154cf5183d4ddbd0a4b6ea7d716f4dc1939bda6fca8f4a1627482c27 SHA512 d4c89d099d41e6a7170aad2f4ff397ba6a36e32bca77912b336c486f186a1b23c5c0cf45cd3568de359398c2b8f2ef5fa6ab4e99cdf89abead0b7fe2fd19c9b1 WHIRLPOOL cc5111508bdab5a501063a670698880d79a7c5695ffa0eaa02f24c582721cc4f4f8c6e9f346ad74bf21b769e403bc467a5a376366cfd9c151b859f1bc6dec244
+MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.21 (GNU/Linux)
+
+iF4EAREIAAYFAlItTIAACgkQC77qH+pIQ6RxqAD/Wmzo/AXfqbrwaorCVGfkcES5
+ReXXj7Y0IAW+gi+CPTkBAIZfKhzmvUQvw7w3ra5jE3QS2mRi88psvTT2xtZiAOKq
+=bqho
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/ksplasher/files/ksplasher-pillow.patch b/kde-misc/ksplasher/files/ksplasher-pillow.patch
new file mode 100644
index 000000000000..467c60c4e991
--- /dev/null
+++ b/kde-misc/ksplasher/files/ksplasher-pillow.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/show_bug.cgi?id=471520
+--- a/src/modules/filters.py
++++ b/src/modules/filters.py
+@@ -9,7 +9,8 @@
+ #
+ 
+ from __future__ import division
+-import sys, os, getopt, Image, ImageFile, ImageEnhance
++import sys, os, getopt
++from PIL import Image, ImageFile, ImageEnhance
+ 
+ 
+ def blink(srcfile1,destfile):
diff --git a/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild b/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild
index ce703da7ddde..e1aef86be81a 100644
--- a/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild
+++ b/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ksplasher-2.0_beta2-r1.ebuild,v 1.1 2010/08/21 15:12:38 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/ksplasher/ksplasher-2.0_beta2-r2.ebuild,v 1.1 2013/09/09 04:20:15 floppym Exp $
 
 EAPI=2
 PYTHON_DEPEND="2"
@@ -25,6 +25,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/${PN}-pillow.patch"
 	python_convert_shebangs -r 2 .
 	# ksplasherx is a bash script which calls 'python foo'. We fix it here.
 	sed -i -e 's:python:/usr/bin/env python2:g' ksplasherx || die