Version bump to latest which includes the png patch.

Package-Manager: portage-2.2.0_alpha35/cvs/Linux x86_64

4 files changed, 14 insertions, 36 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 74aa5ca8c81a..6d1c3db7b827 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.149 2011/05/23 17:31:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.150 2011/05/24 09:49:28 scarabeus Exp $
+
+*calibre-0.8.2 (24 May 2011)
+
+  24 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> -calibre-0.8.1.ebuild,
+  +calibre-0.8.2.ebuild, -files/0.8.1-libpng-1.5.patch:
+  Version bump to latest which includes the png patch.
 
   23 May 2011; Tomáš Chvátal <scarabeus@gentoo.org> calibre-0.8.1.ebuild,
   +files/0.8.1-libpng-1.5.patch:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 8286e008d467..915add585001 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,15 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 0.8.1-libpng-1.5.patch 948 RMD160 8c5d1e1bff2a477b401da8c693262163a1606efb SHA1 8d046488ad9bd37321f011fd062fa77835fc1006 SHA256 af0fe8253770039692226a9a9067678c3cd81b6e447c37183f0dd84ef9a9b889
-DIST calibre-0.8.1.tar.gz 28204665 RMD160 5607062ff9b643b42e48dd42eeed29a198f760e2 SHA1 d97cb9eadd80ac7b60a3992e4bd295885d5d2441 SHA256 61df9120bd01e073175c961bb2f9a5d9a5d93e54e2dc4e8552a284a200f670e7
-EBUILD calibre-0.8.1.ebuild 6247 RMD160 5af63c6ffd78114d04a9fbd295798df30b7c5ecd SHA1 584f44c7fad82dac95514410e6343df26045c094 SHA256 3c1fd29aae69467067cc56ab53e522ea1e61d47afdeeedc37838f5327f6567a7
-MISC ChangeLog 23704 RMD160 e8a63ec2e2310f9252e5b0640385f1f018f8e758 SHA1 2a1e21848919ad1402ff48a27246c81d90eae8ef SHA256 7dd6bff4d8e08e991b82ff550d91327236e95a081634c2152531d82c31a4d379
+DIST calibre-0.8.2.tar.gz 28195417 RMD160 05ef243ee65405f3243c74cd444278411b949b7c SHA1 4e5a19b063aa3f8a7af3fcbdd6c4bad5cfb28ca0 SHA256 bf8687fa4b6800ea25a02336c225bb784dbf2ce6ec680f6bf15f3743e2082abf
+EBUILD calibre-0.8.2.ebuild 6201 RMD160 628aa5dab657f8962065c4af4cbfdf1c8d3144d0 SHA1 ae5dc189787bd365d6632996efc25f4d86ab9309 SHA256 abf592337e7152fc5e41c31e119c90ea43b6d42200fb1749ecb43f278fedc2c9
+MISC ChangeLog 23924 RMD160 0bf1413857dd056aa72444cdd26d9413c8ff3c6a SHA1 864d810d891613bb9904110b1ae5206c1bc80303 SHA256 fffc940d18ab2745ba13fc6ea227cda59d50e0c60b23b44529122e1b84fdda25
 MISC metadata.xml 231 RMD160 d960211907e25a59573b7be5bb36be9b47bd4c3c SHA1 197ba481e4ddb1dd2776f589fe7339d5f0f9868f SHA256 c97fff2a7f866fcaaa116ae2b946a9422dca2d6b04c702097b02e175d0a07572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3ameoACgkQHB6c3gNBRYfigACfdHCOF/zGmjwZbvNY/W3qgcG/
-YsAAoITxzL2LilAqgagYYDxwdS9GQrdj
-=QbPd
+iEYEARECAAYFAk3bfyYACgkQHB6c3gNBRYedxwCdEIEjaceLTUp53xJM2WL6qsjB
+HEwAoM1IW6ZvFia5xHdk54SqnPhCdGhv
+=J4Ar
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.1.ebuild b/app-text/calibre/calibre-0.8.2.ebuild
index 641a82264f02..a33e6a6f1962 100644
--- a/app-text/calibre/calibre-0.8.1.ebuild
+++ b/app-text/calibre/calibre-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.1.ebuild,v 1.3 2011/05/23 17:31:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.2.ebuild,v 1.1 2011/05/24 09:49:28 scarabeus Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.7
@@ -65,8 +65,6 @@ src_prepare() {
 	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
 		-i setup/install.py || die "sed'ing in the IMAGE path failed"
 
-	epatch "${FILESDIR}/${PV}-libpng-1.5.patch"
-
 	distutils_src_prepare
 }
 
diff --git a/app-text/calibre/files/0.8.1-libpng-1.5.patch b/app-text/calibre/files/0.8.1-libpng-1.5.patch
deleted file mode 100644
index 622be87a5be0..000000000000
--- a/app-text/calibre/files/0.8.1-libpng-1.5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-=== modified file 'recipes/economist.recipe'
---- recipes/economist.recipe	2011-04-07 15:33:47 +0000
-+++ recipes/economist.recipe	2011-05-14 14:35:14 +0000
-@@ -20,7 +20,7 @@
-     INDEX = 'http://www.economist.com/printedition'
-     description = ('Global news and current affairs from a European'
-             ' perspective. Best downloaded on Friday mornings (GMT)')
--
-+    extra_css      = '.headline {font-size: x-large;} \n h2 { font-size: small;  } \n h1 { font-size: medium;  }'
-     oldest_article = 7.0
-     cover_url = 'http://www.economist.com/images/covers/currentcoverus_large.jpg'
-     remove_tags = [
-
-=== modified file 'src/calibre/ebooks/pdf/images.cpp'
---- src/calibre/ebooks/pdf/images.cpp	2011-02-20 07:07:51 +0000
-+++ src/calibre/ebooks/pdf/images.cpp	2011-05-14 14:35:14 +0000
-@@ -13,6 +13,7 @@
- #include <math.h>
- #include <iostream>
- #include <wand/MagickWand.h>
-+#include <zlib.h>
- 
- #include "images.h"
- #include "utils.h"
-