Fix PIL import for Pillow compat. Revert imaging dep change in ebuild which do not apply this fix.

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

6 files changed, 36 insertions, 15 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index e47130be7971..08ef7b643e3d 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.284 2013/06/07 08:00:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.285 2013/06/08 15:34:44 floppym Exp $
+
+*calibre-0.9.34-r1 (08 Jun 2013)
+
+  08 Jun 2013; Mike Gilbert <floppym@gentoo.org> +calibre-0.9.34-r1.ebuild,
+  +files/calibre-pillow.patch, -calibre-0.9.34.ebuild, calibre-0.9.27.ebuild,
+  calibre-0.9.33.ebuild:
+  Fix PIL import for Pillow compat. Revert imaging dep change in ebuild which do
+  not apply this fix.
 
 *calibre-0.9.34 (07 Jun 2013)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 43734c3ff980..826eed759117 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,20 +3,21 @@ Hash: SHA256
 
 AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f308cbf556f2704c001a3dd4dda9dfda2 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 WHIRLPOOL 8a4870df539bc768b9dcfb28623773d730ba27ef307dac856f4fd9ff682b710a7b33dc93e505cb5d974a95885089c079838a59d579c496ad6a173384eb14bdda
 AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6fa063af393788c3126f788730d375a5 SHA512 f7cfa4b0675146275c155897b3bced4899487dcd6e3f5d94719d25dd698b4b74b9bb13477552f0ade3d243a35146e4cda36c46cad8bb74c57dcb549825428117 WHIRLPOOL 138bdd85270076d2a5f8560cbc994bc91bddec2385713c19237fe4db665dbf0bedc62941ec70c39b418c469de2fed036a00bfa9639832f7d435bd6bddad391ef
+AUX calibre-pillow.patch 278 SHA256 9b15896657861a2ad6d7d6ec011cd534466812fd8f19ac145e783bd05627dbeb SHA512 48ef61a2b208ce462f1200d4b9df8b3a0719a501ad8e745e4d95f12854f6ea7d9e6a59f9f95542091ae06398aa833e20ed8b16d0cd625bed5f8f01b39d6b6b5c WHIRLPOOL 4aa8e361f56a02438354acb593c4e229be027ce5a8b7bcaf9d893aaf50d05791a174b1b08c72701e879056c72b0d1fba98c4421eacf85eaf615dc01b964f85da
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
 AUX calibre-server.init 1928 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b SHA512 c51c7cae899bebe7fb339f9cfd4070caa778f86ce997dce26052e158dac12444d3a72db91fd83528ccad07d9bd9a9e72edca9ba91d1805e91c91a0a6ed32f579 WHIRLPOOL cf91dc9993b0329821a9a7b9b4a5245c8ef7a6a2a407cddae4b7b94aff1698e663e9ba08352b61b48fe34a1e3c83701ac71ac549142fd12795e1828d5d8f779d
 DIST calibre-0.9.27.tar.xz 28696180 SHA256 8fd3779c8f878420333f6919f80493bf69d4b64bf427697ebc365497d2450d1f SHA512 91970f7c7349f661fc582eb43b89b81e77350b1cf2237c78e55c9f028a94b803b5d72bdac3ac11722c4fcf93077c1f8042567f8e380ad03423ba6c7f5dec7318 WHIRLPOOL 2313f94ee2417343693e1b48736434d1bf356795eb781abbaf68b858ba9fd57eb2a78e8afe04b9c992a1879a99eb9cf65527ccea7ed1a91d7554a62dcee7822b
 DIST calibre-0.9.33.tar.xz 29008944 SHA256 3a94a495bde1b215c37eabf94c974b915f749edb2e344c4ae225de676f40987f SHA512 91eb21c15236ac9c74c01e24d603c7329b6457f47356cae7fb3fd540ba51aa8ecd3efe275e84ee87b1a3587394f741df028d8f09551d5248a4c61f480df74d1a WHIRLPOOL 0bab68543e23f34e02e084d33026eb7e2a59666fc65de0184319bddddd5193817bf1eb35fc0c366545d57124a2a9f25e0eea43abd310e0f3b8bb68467506e503
 DIST calibre-0.9.34.tar.xz 29045956 SHA256 8777691a85df1e5edca131351579e2465fe47df23bab8bc5e38e9f119bcfd58c SHA512 06a544bde8a40ea00b2e694611ca2b0084c092fbfdc92f471f71077518ec4ccf0084d11d5f0d52666d98cb0136487c76f58cce14f655e6736b708b1876afa9b1 WHIRLPOOL fefb099c4baa36f12493441e00962ebf15c2c32a29967ea915daa69d5be1ceb402b1efaa17a302dc84e49570c225a8d549265f125b9d84feb8237e99833cf643
-EBUILD calibre-0.9.27.ebuild 6948 SHA256 3f12413f74c460081dfa6d196c582f10fda4925bf378987afe365846409874b7 SHA512 c592f9d858b0fa0163c2606fce52bcb90f92ee4eeb3ff42fccd0205ce644968e1d5ad1462e563a8b09b722f4ee75e7401765b7f83c45284ec4dfcc901dc7b455 WHIRLPOOL d74a1c5981d1a34ac65b69e8ce477838c9644d49ad6acb772996347b241fe66057dd1925ff1e88435598ac53bfb61d328d419b8ef671d40c001edcc88729aad8
-EBUILD calibre-0.9.33.ebuild 6980 SHA256 4795973aab8a215af1a837648fc02813d4e9dee868a68458140bb1941cbce8e7 SHA512 e4591ee1aa21b4e7d98f58081e6609fba2f67aaef6fb207c1ea5f9eb77d6c874bdf0b2978c5ce89a4bb4ff760133a853467da0ff75dbaeb46ce82e065a300be7 WHIRLPOOL 85976458272cf9c2f22c93515db707e3ac19dc19349625e3feeab2d6b85139cf4badc0140a29d6576af3997861200d74e38e8eaf0a32653f84acbd32e616138b
-EBUILD calibre-0.9.34.ebuild 6950 SHA256 3d9557f87d9a8496b45263b70425e2ef2e077630462224eb3bede8bc1edb2b46 SHA512 985fde62a970d142787becda8387c7524983b35f11cdaf17517d7a71f6a559051848c5165f8a6d64aa8896890e969e2f9fb6f5b97c51f72f7477ef6cdc33cd77 WHIRLPOOL 319baef8cac8ac5f9d32fcd4fd6f41df116a0515ab105330810682f7c58d21718ec352a41ae0a9e689a5246515276760d10c2e1c939dcbcd6f620dcc5612986a
-MISC ChangeLog 45198 SHA256 f45996dbd6d56c93283438a9d040457058a33994b5713e85fae15a57d356dd24 SHA512 99af1a4b08ef90cf268e4e15023c0978a52b37a98d6e7eb576106cb082357a6b760937a9768c22c1d0acd647ac3d51bb45ccb1dd76e4b81d7edf107670aa83b0 WHIRLPOOL fd94a4500f3e5dd59ca5b70ddf22f69ca266690eb7dc6f770d3e611d80402741a547586e233f1e14e1e94e8463622713c650df2a02e88684111cb2b504eddb80
+EBUILD calibre-0.9.27.ebuild 6944 SHA256 df188bc4ad99b41088f313b1a6f6ac7f963bfca588512d4aafd7874035408779 SHA512 f217e44002c7948404c1281da5eb11803ae42612de9137d40032fe0b2a452083ae38960365fd845c69ba93b89707dc22ef6327bb4bb4273a3f24b5f22513433d WHIRLPOOL f4f9da0178b37aea42a82b8ea8be1791907e821e043e2aae8aafadf725d5f7cfb07093e9060ff34f67ba2c5e9e6e1eb4f479922509ddaec466a2172117e7c3b3
+EBUILD calibre-0.9.33.ebuild 6976 SHA256 53d76d15ae41fd796d0b287b8186815db3a579660e09c09ad445a9916469eaf2 SHA512 4b6d207ea894e9d55ea71fc61b83bdf28fc59cb90acf72b813ff29828577d5736175d9b3dab2cf05768a847fa43250103f9a84d4e8ba455fdf40e539146036bb WHIRLPOOL 8da9e11e13ad43ad9f29f9f8a122ba7e9cd8095671191f4c83a0191a39c3e2fd5acdd3d7fd3348774428c9f9621c5137396e8631ad2dc5a6042291b7210943dd
+EBUILD calibre-0.9.34-r1.ebuild 6990 SHA256 f2575663a7b3d1af12ce18d59f51c0a039884c136cde2ad6025f3af8057ddfbb SHA512 3d5f7b13d98f36f7afe4d189b84373854f65ae453905280da690c05e3aed09beb4c555438ae45d7c92f653296435e0fba7737527d1dbba8199b6ab33f60c039a WHIRLPOOL 07d7a9099dfa983a3ea2b069bc6bcbb9aa203882133a77d3abbf0afcda773c3c6908ebe1e7bb66ad3b245c37546970724a0ab8a738135a627533e20317a13fd7
+MISC ChangeLog 45515 SHA256 6c1f285334a4e6329adc1c1c03dceb9c7131b0d2325134a114d562836cfe45ae SHA512 6bedf53408d5e9bc82f35cf86fc954195f710f20d523f34f12f292f55d11fc800a8405b48592f842a4eb4c974614c1c065c204cfa740d68d9c7fa6531eabd9c8 WHIRLPOOL a3da9a9253a461454f079fc1df8dd9fc20f1f097562af874c6bf4349b3dbdc4778f721f37800f5e1825b563a7e753d95943aea6f559a7da522488ab41cc51441
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGxkxUACgkQ/ejvha5XGaNnOgCcD1aWbVNUeONN3D3bGKI7zdq3
-yRQAoNNkyvSrskUwamqqObS1ycDgoowh
-=nEdd
+iF4EAREIAAYFAlGzTxUACgkQC77qH+pIQ6QevwD/Zw5nUWHZPy9q91eh9EElHaA7
+QiSZTdqtP+eJqZuSIaIBAIitDBI9ENQAhpn+UFid8/dkBgMxKrvC1+tObMinDwvv
+=3LAs
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.27.ebuild b/app-text/calibre/calibre-0.9.27.ebuild
index 39a2430e1497..cc20afecfe1a 100644
--- a/app-text/calibre/calibre-0.9.27.ebuild
+++ b/app-text/calibre/calibre-0.9.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.7 2013/06/05 10:59:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.27.ebuild,v 1.8 2013/06/08 15:34:44 floppym Exp $
 
 EAPI=5
 
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
-	virtual/python-imaging
+	dev-python/imaging
 	>=dev-python/lxml-2.2.1
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
diff --git a/app-text/calibre/calibre-0.9.33.ebuild b/app-text/calibre/calibre-0.9.33.ebuild
index f49392a41ce5..e933c7a333f4 100644
--- a/app-text/calibre/calibre-0.9.33.ebuild
+++ b/app-text/calibre/calibre-0.9.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild,v 1.2 2013/06/05 10:59:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.33.ebuild,v 1.3 2013/06/08 15:34:44 floppym Exp $
 
 EAPI=5
 
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	>=dev-python/cssselect-0.7.1
 	>=dev-python/cssutils-0.9.9
 	>=dev-python/dbus-python-0.82.2
-	virtual/python-imaging
+	dev-python/imaging
 	>=dev-python/lxml-2.2.1
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
diff --git a/app-text/calibre/calibre-0.9.34.ebuild b/app-text/calibre/calibre-0.9.34-r1.ebuild
index a176eeff2428..94da3c5cbd74 100644
--- a/app-text/calibre/calibre-0.9.34.ebuild
+++ b/app-text/calibre/calibre-0.9.34-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.34.ebuild,v 1.1 2013/06/07 08:00:21 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.34-r1.ebuild,v 1.1 2013/06/08 15:34:44 floppym Exp $
 
 EAPI=5
 
@@ -109,7 +109,8 @@ src_prepare() {
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
 	epatch \
 		"${FILESDIR}/${PN}-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-pillow.patch"
 
 	# Remove non-free fonts (bug #470212).
 	rm -r resources/fonts/prs500 || die
diff --git a/app-text/calibre/files/calibre-pillow.patch b/app-text/calibre/files/calibre-pillow.patch
new file mode 100644
index 000000000000..3ee7862ecdee
--- /dev/null
+++ b/app-text/calibre/files/calibre-pillow.patch
@@ -0,0 +1,11 @@
+--- a/calibre/src/calibre/ebooks/textile/functions.py
++++ b/calibre/src/calibre/ebooks/textile/functions.py
+@@ -86,7 +86,7 @@
+     """
+ 
+     try:
+-        import ImageFile
++        from PIL import ImageFile
+         import urllib2
+     except ImportError:
+         return None