0.9.36 version bump.

Package-Manager: portage-2.2.0_alpha183/cvs/Linux i686
Manifest-Sign-Key: 0xFDE8EF85AE5719A3

4 files changed, 15 insertions, 22 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index e0e9ba2d2367..8f31ad43a322 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # 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.287 2013/06/14 07:53:44 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.288 2013/06/21 23:33:57 zmedico Exp $
+
+*calibre-0.9.36 (21 Jun 2013)
+
+  21 Jun 2013; Zac Medico <zmedico@gentoo.org> +calibre-0.9.36.ebuild,
+  -calibre-0.9.34-r1.ebuild, -files/calibre-pillow.patch:
+  0.9.36 version bump.
 
 *calibre-0.9.35 (14 Jun 2013)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 780b61385037..518b95f4a305 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,21 +3,20 @@ 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.34.tar.xz 29045956 SHA256 8777691a85df1e5edca131351579e2465fe47df23bab8bc5e38e9f119bcfd58c SHA512 06a544bde8a40ea00b2e694611ca2b0084c092fbfdc92f471f71077518ec4ccf0084d11d5f0d52666d98cb0136487c76f58cce14f655e6736b708b1876afa9b1 WHIRLPOOL fefb099c4baa36f12493441e00962ebf15c2c32a29967ea915daa69d5be1ceb402b1efaa17a302dc84e49570c225a8d549265f125b9d84feb8237e99833cf643
 DIST calibre-0.9.35.tar.xz 29150556 SHA256 6b0355828e38390bb5ee701ea5cff3e9e9b6656e00804edfcaab32cc451bf5de SHA512 8c44627abe666c6d6e5854ea14ec68622fdfd0fd485a1d8a7b808a0f6030fcba04875eaaaba89e93fda937a3be388cebaf87e945998438c9661fade42af4215b WHIRLPOOL f16a25f69699ce21641885c065d6721a0c8ebbe6a479e8f2d94cde3d012ad256c1ad1f58a22ef150ff6343f17028b15589ce3f973c369e1e62220291ac65b8cf
+DIST calibre-0.9.36.tar.xz 29117576 SHA256 4e0522d61ff5578777603b70d911450badb1b41801dbfd6303eeea196006cbaa SHA512 1663f84bd4c066eacfc73b6411b030cd81b7d0bb84ca99508d59e1418f0c8678b53b04b08eb95412ac0f4ec478619ac35ef48035be652fdd511274f46463b809 WHIRLPOOL 794f541fc80d7badc840706780a128534cede993a70e58353e410b6698257361189bcb67d5bbb9b727985837801d033d7fbbac3a941dca019974788d971a7cc4
 EBUILD calibre-0.9.27.ebuild 7090 SHA256 d70a64b711af1399eee7c3c4742b455640bc49012b483a08b41d9211fa72d712 SHA512 b155a496a1f1f562bcbc05f0e3517d94e101e09d53f574a51dcde30db87693d3eba9ae8505033f836db9f1eaa23dcbcec287debcbcacc997a668d01b52979aa6 WHIRLPOOL 2d5224e63766477444a14c8a38a20e4a3653db0f7ff1760fed9cfb95395e7553bbe2908db52f8e04a4a4f4131773d7ea127f569754a86ea3ec579bba04e1da3c
-EBUILD calibre-0.9.34-r1.ebuild 7136 SHA256 6c897935a1b81014558356df623f2c7ff64c3d70006d0bde67c93ea1cf665e46 SHA512 6d67759e07cc6b3ac1eef0b0b844280264072cb1477489335001b63f6247bbb766c254025f904a904002af6592cd122bb48cb70a512c58e5cf1da97f9edda0fd WHIRLPOOL 8a64cbbff3fecfe5c6c6f7ad183a6efdce6d4ce7e27b5f57d9b823ccb14f878a40cc0e70da81c79cc24f05b28285e63385f2d69a17b923643f422c76ff128fcc
 EBUILD calibre-0.9.35.ebuild 7270 SHA256 575a8826de91ff4458d17f724bfd96b85cb794a9f90c0602404b3970080bb3e3 SHA512 123c992746536a02dfe5387ff6490910d8ced80e8be12f9cd2e02bb9071867759ecaca10b440c0a355dcdc113c4be442baf900b8c4d8f2c542bb1ba260864235 WHIRLPOOL f95f7cb9c6b05b2d725591fea1bdfcdef437a6f4ed90ad7432dee787b29693bf8a5b6f3768bb5d5971483ae79e202772d2f8d2966cdbd94793745e4ff911b025
-MISC ChangeLog 45849 SHA256 683062f9ff5baa80613f639efbd965b520ea0450be1392a54913f96ed100773c SHA512 bd17b6edb288f57008006bcafa746922a13ce8545d41d93f2cdd95f653602d7f86a1fad556dbcab5a5fcb6b29a906beecee732da7b4c0261870fc9b85977c70f WHIRLPOOL def672461678938fd44a5ee48d81efa37a533e835af1c00617137cb856dc4ef28454f86315c4edc3cb03f0c7974b5ce245cc60c76472b5e7487281374a815b02
+EBUILD calibre-0.9.36.ebuild 7096 SHA256 c3f4a083736ecb41bfe8c3460d144da85775b867431e05eb27018a9d1c37fcf2 SHA512 e5762372d34c96d8100fb612b932b6d6473f9e8343c9d0a59c8e93c8b527e2fdc608ca3900d4f029a21d7714bed572ae4cc3dd65970f1d0a1a1b26607856af3c WHIRLPOOL 1d1f83283ae11f8f31ac97d4198c1469def113f859979f14b52eb60ec6e88edd5277d874c2b92a57446a3899b4183844180efd30c22c84998f61bc7558708be3
+MISC ChangeLog 46033 SHA256 90387fe6dedc56f5da24a22ab99fca373264beca34d3264ce61ce8a8802d3f0b SHA512 e8ba34692dce85ea1092379bc00496cef00b2e85b241f9ca225a9fddb732ff925e4716d581098f9e2db000094d0f84cf0d771384d67d112bd51be23122e9f74c WHIRLPOOL b8a48c2a41f3a3e4aa0b8784b9fe0f3050a82bbe3b71247a2135d4fe4fcc751ed3639d2a83bccced7c6a9243a603f30afcb41ed0a5930014be99e0ba72a74cc0
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlG6zAoACgkQ/ejvha5XGaONOACcDeoJXILJvxgMawytxTYHIl2n
-0MAAoI4F66BgdCAzJYjy7+oW0mhx/FT6
-=rLi7
+iEYEAREIAAYFAlHE4uYACgkQ/ejvha5XGaMWdgCeP0Rg25EYQRill8muTEULLCzp
+yhMAoLU8E4JnwoUZOPM336qARRZUwRdA
+=yAQ3
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.34-r1.ebuild b/app-text/calibre/calibre-0.9.36.ebuild
index 2b4a6eb24449..1165e73f44f6 100644
--- a/app-text/calibre/calibre-0.9.34-r1.ebuild
+++ b/app-text/calibre/calibre-0.9.36.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-r1.ebuild,v 1.2 2013/06/09 03:25:26 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.36.ebuild,v 1.1 2013/06/21 23:33:57 zmedico Exp $
 
 EAPI=5
 
@@ -109,8 +109,7 @@ 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}-pillow.patch"
+		"${FILESDIR}/${PN}-disable_plugins.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
deleted file mode 100644
index 3ee7862ecdee..000000000000
--- a/app-text/calibre/files/calibre-pillow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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