0.8.46 version bump.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

3 files changed, 21 insertions, 16 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 38a2c17628f8..fc7b5b4c746c 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.195 2012/04/01 04:39:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.196 2012/04/06 16:48:10 zmedico Exp $
+
+*calibre-0.8.46 (06 Apr 2012)
+
+  06 Apr 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.46.ebuild,
+  -calibre-0.8.44.ebuild:
+  0.8.46 version bump.
 
   01 Apr 2012; Mike Gilbert <floppym@gentoo.org> calibre-0.8.44.ebuild,
   calibre-0.8.45.ebuild:
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f71d9a63c34f..48b4811436f3 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX calibre-server.conf 523 RMD160 4cae757bc84775b66304d969f241b5e377b0e469 SHA1 4b88e517fb24c2b306e12d306bdcff4709f4820e SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213
 AUX calibre-server.init 1928 RMD160 673b3128df7c24151a74a5c87b54020cb63bee62 SHA1 8192780f7c70a027fa962619d519b136d3d8a7b8 SHA256 d5632da5955d1304a0b750850b8933eb053ee3462d0a9f74c941a45d8b65707b
-DIST calibre-0.8.44.tar.xz 24361440 RMD160 eec76be6b7dd204d32da96c3cddc1092b3635a07 SHA1 8a809d9500a9b17da706736c4bd5d1f69ae9123e SHA256 1841bf5816675cbe0507b5e859ebf4dd49a07f7531f5b1f5b787055131992a06
 DIST calibre-0.8.45.tar.xz 24418632 RMD160 c20444315159af460856c91537e12f29a7346fc8 SHA1 7fba152688f7f685b41636bb5395c132f662bdaf SHA256 e145f9dc3cb8f2991a55ad87413b6d286acc5ac03308851ae72cfda14797be12
-EBUILD calibre-0.8.44.ebuild 6050 RMD160 33fefb6eda605909509aaf2b3beeb4b7148b81e6 SHA1 987ef97338d867bda4658ac3d71243b3057371cf SHA256 33fd8aaed4b92f38f2b1cb257799359ab0d6afb2a62834e3a15162da481befd8
+DIST calibre-0.8.46.tar.xz 24420412 RMD160 8628ede38561db58c366ba8f699acf5b3747fb62 SHA1 845bd5b7ef47aea3781e6180ff31dcae2e8ad1df SHA256 53d4a8873eeb91053685f4e43cb855739f4a842158207aefae0c80b3ac28c8e9
 EBUILD calibre-0.8.45.ebuild 6051 RMD160 1e4c55af067c143487ea699884c43f8a145ca88b SHA1 d6c4bcd3fb53286fba3e05e154ab52f0814cc562 SHA256 9654972918fccbd8fdb5e8c26068de0cd2d95b8b630ddf3bdc798621c2310dfe
-MISC ChangeLog 31717 RMD160 e88ee00c58a416a34a39a3e4cc40664bf28f7a38 SHA1 3ee810ea138a2ecf595982e0450834c02eaef3ab SHA256 5b5e95cbe09b0560bd46f5177da3710cceaf4b4d7cbb66310b9aa0e2f3786b4b
+EBUILD calibre-0.8.46.ebuild 6051 RMD160 50de80a4e31a05077845c8f6dc471c60a7ce9c3b SHA1 11843c9a3051f77b7307a64892d02739ed7d0081 SHA256 d3703e2ffc79da389f2da369d2d960179514c278e1019ce035d7b2e13a1224b7
+MISC ChangeLog 31869 RMD160 5582a42eeb21c826da5ae43a82d0f4b099511e56 SHA1 bb1bda2a7e7e425c8e7f12eb17bbdeb74c970b31 SHA256 486d62d58c044baaccf6f12e60771d69dc050b1ae056e29f71af64f4fba2db4b
 MISC metadata.xml 340 RMD160 87b372ab564a33c6eb65bc2656e39cafe431ee97 SHA1 3b79f0e21800238651f138d5e1f7101bb80c8f5a SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk932/8ACgkQC77qH+pIQ6RsGQEAqkbTdSqi4R4qUOQVze8euoPF
-a9Szjm3PFWAjnT06fxsA/jrdkW76jT3BI4zT1PIxUPt7yN4lWQW2vmarY/Vjp85B
-=RFv5
+iEYEARECAAYFAk9/HlAACgkQ/ejvha5XGaPXGwCglCyGLeGGBWz9ixoTmtrYkwjf
+DI4AoImRY7VM/nLc/IFvlX1qpGIh/gdq
+=3LFJ
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.44.ebuild b/app-text/calibre/calibre-0.8.46.ebuild
index ecceb38d2ac6..c99b4522f6ec 100644
--- a/app-text/calibre/calibre-0.8.44.ebuild
+++ b/app-text/calibre/calibre-0.8.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.44.ebuild,v 1.3 2012/04/01 04:39:20 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.46.ebuild,v 1.1 2012/04/06 16:48:10 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -34,20 +34,17 @@ COMMON_DEPEND="
 	>=dev-python/lxml-2.2.1
 	>=dev-python/mechanize-0.1.11
 	>=dev-python/python-dateutil-1.4.1
-	>=dev-python/PyQt4-4.8.2[X,svg,webkit]
+	>=dev-python/PyQt4-4.9.1[X,svg,webkit]
 	>=media-gfx/imagemagick-6.5.9[jpeg,png]
 	>=media-libs/libwmf-0.2.8
 	virtual/libusb:0
-	>=x11-misc/xdg-utils-1.0.2"
+	>=x11-misc/xdg-utils-1.0.2-r2"
 
 RDEPEND="${COMMON_DEPEND}
-	>=dev-python/reportlab-2.1
 	udisks? ( sys-fs/udisks:0 )"
 
 DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5
-	>=gnome-base/librsvg-2.0.0
-	>=x11-misc/xdg-utils-1.0.2-r2"
+	>=dev-python/setuptools-0.6_rc5"
 
 S=${WORKDIR}/${PN}
 
@@ -66,6 +63,8 @@ src_prepare() {
 	# calls xdg-* (bug #258938).
 	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
 		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|PreserveMIMEDefaults():||" \
 		-e "s:xdg-icon-resource install:\\0 --mode user:" \
 		-e "s:xdg-mime install:\\0 --mode user:" \
 		-i src/calibre/linux.py || die "sed failed to patch linux.py"