fix ImageFile import wrt #471528

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020

4 files changed, 55 insertions, 22 deletions

diff --git a/media-tv/freevo/ChangeLog b/media-tv/freevo/ChangeLog
index f59ca94c1b21..0cd8956c2c05 100644
--- a/media-tv/freevo/ChangeLog
+++ b/media-tv/freevo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/freevo
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.81 2013/08/03 09:45:47 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/ChangeLog,v 1.82 2014/03/09 13:09:53 hasufell Exp $
+
+  09 Mar 2014; Julian Ospald <hasufell@gentoo.org> freevo-1.9.0.ebuild,
+  +files/freevo-1.9.0-PIL.patch:
+  fix ImageFile import wrt #471528
 
   03 Aug 2013; Michał Górny <mgorny@gentoo.org> freevo-1.7.6.1.ebuild,
   freevo-1.9.0.ebuild:
diff --git a/media-tv/freevo/Manifest b/media-tv/freevo/Manifest
index 6a2af92ccae2..f7b5d39a17d1 100644
--- a/media-tv/freevo/Manifest
+++ b/media-tv/freevo/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX freevo-1.8.2.boot 1632 SHA256 36d047e29c8707d73c7e63538ee0ea2b77f64045954f73e0838f5ef7532982bc SHA512 b8bf95ea34e9c77d8f8df170a3b1455361634265bd1205a03760d51b647efb74635a7776d7c94a92799e9be4cc2aaad3e72b6df87e29c07cf6595e1c1b3b6ec4 WHIRLPOOL 90c5329c5ea1231b0d6eee20befb16e7e96f107fe3c22626465189d4fa16d30b8ce40e9908c075a145940ba084fe3c7ddd6580f284c3f95f0827ff6188b4486f
+AUX freevo-1.9.0-PIL.patch 905 SHA256 208f1ec7d72443548f58dd4491b8b86b9c3a20b529a4c89504c0740178c2afaa SHA512 324ea349ce6c2a860e2f13c445ea3d21631e6400541d48c294a745df1f73e5366e82988dd59712470edbb0228e518e2387ff08f40fbe718e52c2a49eeaa99984 WHIRLPOOL caaa551cdd12975ce38fe19c0554c76b51e34494a5a5d0fecbe19d94fec65f3b6557e99ec380ae15694d5cde9d3fcdb655efc6916c766e1747ff287f5a012dc9
 AUX freevo.boot 1553 SHA256 754c16099054887a178372759aac0bab7104cb6dd0a829f6f534c6523e31002d SHA512 17931938c5079c64290a5fe2f9683f29b2e324e7361a83779c0467912ebc6337f8a0e1504e2a4625fad9d41a30ab50ff2c5abd949f7bcb9ce78ee74ca404f084 WHIRLPOOL 271f9bc7d2ddb1ad4e52bd8f5e2617c075b902fba6dadaf8ceb0da15caeabde56ee869a3ee97a59ac202a515a3a4a6182770407a75d642cdd3433291844a2ece
 AUX freevo.conf 1265 SHA256 c74b609e3b1177cbbbd3ca507e65b5392eed18fcd488e327c63478664fbd6143 SHA512 80b3282408e4343dba1eb45f4c8221c14e7e6b0199fc6283daf470371530563ebfdcef13f88b008c0b8c96f4133282ed75d55d9f9dae3ce3634e518c53d30905 WHIRLPOOL 48f51c010efb8f1ef402241bae2995a994956389a8a4071aec5c3c07d7c6ce0744493ab3ed191b5f905499b832b339e0aaed3754c01eec08e50cf53f0f6b76b8
 AUX freevo.desktop 126 SHA256 9553d646d154710af8d22b300c5a792433fad47efcd75224f416c46cd45e03e4 SHA512 d7f4d4368bf911b6dc2911609a6fa0bc897610347a8846840289ddaa05cd7c3a94f7297eed8d40f57aefeb97cea330413b24aa6d07c63f0980de6859bda0ea4e WHIRLPOOL f9ba175247e985a5fee02a070a87af17b2208aed662fde963e78ec88d55da210f2eaf2a8e63aed6d59b245cc5b9d969b561c0cc88de932f3a5390d170198d63f
@@ -9,25 +10,25 @@ AUX xbox-lircrc 1690 SHA256 91e726a9a99c705067931d1361352a8200a03cebb0d9e1e79187
 DIST freevo-1.7.6.1.tar.gz 20856412 SHA256 1a0392a858ef428b3a511107322921eb9f45ad0ed02f7f05543486aafba0221e SHA512 f8562990ac4137042bfd9657bffb3b5f38bc02c3809a528cb798de67fbfa0c6fe2ba87b3cc0a6a2f65fbc11bc456ebba4dd27b4975202859835858893414f9b8 WHIRLPOOL 44019711a03a8736ff05518f1bbd3f0173facbe3ebf2f104e4f1b3820ccdca6e8be6785bc3d6b18569e334b2512fcaf00f64225b4dfa04d2b32b6837afc2e0df
 DIST freevo-1.9.0.tar.gz 27182867 SHA256 e3c97e1404bc5a171350d0c0edf8decaa6d4eb3eaa9e42112a903d375aaf8722 SHA512 4dc722efbf81101bda1ab4437516faa6d4471d4106553617d30dd6de860bb7ca5a3c7bfc9865f4a7589d6726c7ef838161213f86c679889e1cd086362921ebac WHIRLPOOL 16abf397c20b9dd18271c5933e343c846746cbbbf5bef8a126a364ce945c820e8e0f164e66fb56a61d86f256e6d7b98ba110a39395d8d26c278c6e54ede8a543
 EBUILD freevo-1.7.6.1.ebuild 5409 SHA256 f363bd407c7c7cdf016586c6e95ecd12ffa7bdb1553126e91fd165ba9ff6e300 SHA512 6168a8d2c8a496557c1601409b5270a16ed3ac4f6be33d215111679931a1c4d392966ff1e9d6c7ea132cfeca16d3632aeaa95b88ab54179097f764e9d98c5c06 WHIRLPOOL cb8691fe0fa5d8bb80cf41861a42bfeaddc3e37e99cbeb0e3b5cbfd6e8d7583dbd4bf3668bf703768dd0e4e3e6ab3c17d8b53b8075292890c0a160f47a3ab05c
-EBUILD freevo-1.9.0.ebuild 5776 SHA256 74460611edf571b7cc3c3a81b46ac07fdb4b19e0212fb04858204e094edbe602 SHA512 2c3dccb2a4b6ef25a34d1e72aadd52b2e1b0ae4858823e74047c6f09eaf0154b57a45659a2f8ed123b55237ff993fcc49a84903bf2ce23ca0ab25537d4217574 WHIRLPOOL 84d4afdb822fdf4d8841396139699d654c8a3cd4a54f8374a095dc5067893bc0931e1d8252bb9bff3e0384b1680284b425b1bc2da7e43b54b51d9a3737a6d709
-MISC ChangeLog 12753 SHA256 0ea3bbd1188b6bd9d7a22093339f7b0790d60ce4fdcc085728f1e722cda43bb6 SHA512 b43f4c60466184f4b869d606a0303530c429f2522e1aa10c45db6abf5d117334074e95af7321f5913c05a8b1aab24e3983dc124a65ae0e483cda4ec29b2d5756 WHIRLPOOL 465850dd8680aed3d03b0afafc3c7248c649945be495d26c910a8c5884a83e0fd1a2d95e58264398228102e282b7a97c8ddb919ac02e8913ce8fa6cbc06f528f
+EBUILD freevo-1.9.0.ebuild 5816 SHA256 13875f730854aaabdebf3a4a753c3042528777e3694b4155ea7b7235f2cf1b51 SHA512 fcc5b7fb2dbd0bb540edbbe735a37f0956c0ce216bb94c3cc93eaaf06a3ce9cac43e6689f5fd5477deb96d21b59ebcabc65be96473483f13bef9a888ecb04ada WHIRLPOOL e5fc232ff018f83b18f11afedebedaa2eede524f309ae740f5495c612613dfb925ce0763ff58765eece3a8cb68d1bd80b7994a27983921161c513ca4c476fe12
+MISC ChangeLog 12896 SHA256 1fcda3083ea35c9d8a66b061abf1eb1a00c29e53068058f60606480b6b22c00a SHA512 aa4daaad56462b8e18bcfdeea3079dfd73bdc2813390f67563c08667fd4f1c62087984850bdd75665a1c59cb9f5efcfccccfbc38cd4ad889743468467fb24c5e WHIRLPOOL 9498a3dca72f2922f4589d8ebd557425437876d3314f39001ebb8e413dcfb9674632f166e48f11ca0ee31329ef2e5e57d71a97dc9042a8a942e1b7268b549ecf
 MISC metadata.xml 798 SHA256 b7ebe5b40248cb8bd1aad4533cec8430c73a0734a378b679d5a1c5f0fd799674 SHA512 be9be1db80da67a6e6284fd314eaaab92c03335454a663dc8a4664194b52ff06bcced552556e8ac9ce78c05b8dd64100eeb4dc9f7d93b3fec6c2906e4de083c0 WHIRLPOOL 5eb59bf2c9b7014672e83991c6629849a16df97a7a7cad79a949d254b41f5afb808c619c34ce56665af176f0bc8e57edb90e9f80a378405dc5ff15203a070779
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJR/NGlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDZ8EP/3r3iv+mht7rKOvzUQX1wf5y
-3siRsjVi9MezSKC3ku8P5yWSjqpQ2FpKcL/+cZXrxbZiJMx/wVbVMkCBeAk/xLNP
-AAJ+MJqwhdBHsX5bxQCd/rPtHz05lABUhjQKj3QQqkx6PgYQiR9ObR8EXceWKQp1
-2uBH+gLYjo7JJ+IOFl8Eg5eFNQjhdSQ8RJ5qrcBjVdfXklcqY2GIv3JZ3wFekJMy
-k4671340xrp53EBZ4DWmtap76yIS9+hSalfsgbFpinDwl6qMvUcXFrk49doJTDvW
-3dDz7ckhoHsrpAQtu+TCU8duJFca5zza1HExl1zJoJcSdmyWxJ/7p74ev+/KV/a2
-uMi7oGlbKZPHMeJLoGhqW2FZdi+8bmVuudKeHgfJtvGVCKQ/u+pZMhvFfiul+079
-Vu0TpY0UOymoY+3FNnyEd0CqUSZbjmzl/N9Poz8VwdLfTvZg0jLNOUsNO0RpBR9F
-HuYpTRKHT3XWse3Sqsbv45yl13BfG7F/Fz7vx2QMNSSVpdcBdljP7PkRPo8ysMMm
-TBHjWxX2ceS1mFmSy2oo3q3xexytttX1/uA+5JuFtBaq/1KcaWnBS08iwmbazTkM
-H1ZlpkW0UjEJCQKLvGdnrjJu8DAV5Ndbev1etOP0QStZ+6hFMPGU/wBZQVYFDrM8
-nKSf7+3cCEcxs6EFa6w8
-=767v
+iQJ8BAEBCABmBQJTHGgkXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy
+MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgZdQP/3/ucLbTY95qR9tAz6/zpvIb
+xUqnwyYD8lPKiGBaBrJIRtMx2e1soouBlNP1TIGBbU4Vu46YWbseZtAE4zj/8axP
+bL5pSB7rnH9eGV52Oee+3J+d/rZViKUKzBG3QlFOOLL8bKoDR/Q1FSAyaKuj6iRD
+SZoNDy6zflZZdRyUdIme/dDLMSs9RpXYsL6xCiTI/sFU4Dd0oiDxr29CVhLLb5Vj
+vOgx/VkfSoULO43e3E2Nv6QdO6y/z9BPoB4iilcUUlFKm1oLb9WJLlDUPs2Em7ti
+ZYi2IjgQWymwtwmBD94d4S00K9UQTbXXHc1JW1rjYFroayyuE7NRJPHlfkH5eeVS
+JbknJke83lwCdXl3xBdeImYZ60USehYs6P8QtTbmLZ/GxDLFj85/YNzDD0Ih6tjk
+K2ES/t3XfZ6EpeCKZOUtyp2ciXLaM7olI0op1GDK/Pew9ujM7mhpgI/uEdYKJP9k
+uU2Icc4e2a3m0tyT1T5RifHL9oBl2Qa4ndbjzVe7xqQBv9S9HqGl2p0ixLdlLkya
+l/9GiW5DRLn6EeqC3G3nHoMj4hmckGjtezFHEAzP/pRUEjR4/mgdXULVqQMt8YlS
+74RvMkLI8QTAi8QNHVbbElvtDM5QlulnHQ7cnjNjnO8BYWiJvToXmtKzJu7N72WT
+WlM+Z64YwqRgpv/vYrSk
+=3H72
 -----END PGP SIGNATURE-----
diff --git a/media-tv/freevo/files/freevo-1.9.0-PIL.patch b/media-tv/freevo/files/freevo-1.9.0-PIL.patch
new file mode 100644
index 000000000000..c24d4c4314fc
--- /dev/null
+++ b/media-tv/freevo/files/freevo-1.9.0-PIL.patch
@@ -0,0 +1,26 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Mar  9 13:03:10 UTC 2014
+Subject: fix ImageFile import for pillow
+
+--- freevo-1.9.0/setup.py
++++ freevo-1.9.0/setup.py
+@@ -26,7 +26,7 @@
+     ('kaa.imlib2', '\"svn co svn://svn.freevo.org/kaa/trunk/ kaa\"' ),
+     ('BeautifulSoup', 'http://www.crummy.com/software/BeautifulSoup/' ),
+     ('pygame', 'http://www.pygame.org'),
+-    ('Image', 'http://www.pythonware.com/products/pil/'),
++    ('PIL.Image', 'http://pypi.python.org/pypi/Pillow'),
+     ('twisted', 'http://www.twistedmatrix.com/'),
+     ('zope.interface', 'http://www.zope.org/Products/ZopeInterface'),
+     ('twisted.web.microdom', 'http://www.twistedmatrix.com/'),
+--- freevo-1.9.0/src/plugins/zoneminder.py
++++ freevo-1.9.0/src/plugins/zoneminder.py
+@@ -50,7 +50,7 @@
+ import pygame
+ import MySQLdb
+ import threading
+-import ImageFile
++from PIL import ImageFile
+ 
+ # Freevo
+ import config
diff --git a/media-tv/freevo/freevo-1.9.0.ebuild b/media-tv/freevo/freevo-1.9.0.ebuild
index 28716182caf1..99e7d082415c 100644
--- a/media-tv/freevo/freevo-1.9.0.ebuild
+++ b/media-tv/freevo/freevo-1.9.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.17 2013/08/03 09:45:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/freevo/freevo-1.9.0.ebuild,v 1.18 2014/03/09 13:09:53 hasufell Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.5"
@@ -66,6 +66,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-PIL.patch
+
 	distutils_src_prepare
 	python_convert_shebangs -r 2 .
 }