summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-06-21 23:33:57 +0000
committerZac Medico <zmedico@gentoo.org>2013-06-21 23:33:57 +0000
commit4ef76ef1fd1cf091d8cf008cbaec9ffa2037f91e (patch)
treec436b8129c677d2e084fcbd8cccf0511984aad01 /app-text/calibre
parentbump (diff)
downloadgentoo-2-4ef76ef1fd1cf091d8cf008cbaec9ffa2037f91e.tar.gz
gentoo-2-4ef76ef1fd1cf091d8cf008cbaec9ffa2037f91e.tar.bz2
gentoo-2-4ef76ef1fd1cf091d8cf008cbaec9ffa2037f91e.zip
0.9.36 version bump.
(Portage version: 2.2.0_alpha183/cvs/Linux i686, signed Manifest commit with key 0xFDE8EF85AE5719A3)
Diffstat (limited to 'app-text/calibre')
-rw-r--r--app-text/calibre/ChangeLog8
-rw-r--r--app-text/calibre/calibre-0.9.36.ebuild (renamed from app-text/calibre/calibre-0.9.34-r1.ebuild)5
-rw-r--r--app-text/calibre/files/calibre-pillow.patch11
3 files changed, 9 insertions, 15 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/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