0.8.60 version bump.

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

3 files changed, 20 insertions, 13 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 6b64c6796ac3..22b386a82bde 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.214 2012/07/06 23:31:34 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.215 2012/07/14 02:31:36 zmedico Exp $
+
+*calibre-0.8.60 (14 Jul 2012)
+
+  14 Jul 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.8.60.ebuild,
+  -calibre-0.8.58.ebuild:
+  0.8.60 version bump.
 
 *calibre-0.8.59 (06 Jul 2012)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 10799f7e10fc..92c7fbb36a79 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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.8.52.tar.xz 24690364 SHA256 29eebc8c82dd2cacc70e3fb5bc309020348028752a23765d8956769b79deaf2a SHA512 9fb6bb085b8f42a0ad3f63141ce2de63cc7e7c0d5ed914904ddd05fac3713c4c47f093e4579ceab7080627585167e7312039cbc8bc2a1e969937553e123d072a WHIRLPOOL 569be4afc50c78bb4bb35f5d61201760c8ea5fa25d6bcafb343dd6cdfc4a5fc2ff4175549438a9473302331c982f4cfc1d0a916ff2ac3593072f4154142966e2
-DIST calibre-0.8.58.tar.xz 24990000 SHA256 f0b9ca637793c9817e2051d4bd6eacd5388a030b11c1470ca5b5b929d4115149 SHA512 6e9b6ef2ddfda17b4ba8627055ae625022fa0ca6d907f050b186364b092189029654c146526875476c9e55063ccb9b66d89c590771cd45b4b844014d01c55765 WHIRLPOOL 37e3c8a975d110222192cdb8b6f7ea576537362dc2875549928ddd99dc99773aa50a413dfa4e9954998b9d3170c2e9680af8a9a229f4c9b96b594d2de8ae5335
 DIST calibre-0.8.59.tar.xz 25001852 SHA256 cdab81f39cf558bf09b16eb3327b33e7edb958395f9180172e08f9879deeb7af SHA512 8f59b9eb68bde65efa2ec7f9045e7ca12a21db603dda4ddc7f5dc01ab7ec0e213d2137bcc9c899e31c895edb793603fa920a00747ad20a811cf0bfd43438045e WHIRLPOOL 2ed37c682752b281286f37a310019cad354030189b9f35349c2f7d4d35cf32235e5ebd4fcf70663705c845ea906844ea205b5de88244453c7ec3a18a92a9355a
+DIST calibre-0.8.60.tar.xz 25020596 SHA256 5f5a80ca2f6e9523f3911067090f7d1d9befc62ee90095e6188302c387646df1 SHA512 78267f30a1aa89edba17a5b27868b151b0b853f173b9ff01d5e0e8d78d20cae623120eac5418a3733bb768c9e6e835a3467f96a3d42e4b44e62bc188b7bfcf03 WHIRLPOOL 5001a766a6ebd7fdfcb3983049214a922d08b32498133ad4540efc1276d63e3853405eedf5b4f2e7075814f720c6a724742015792ec6497bbcee277b271632de
 EBUILD calibre-0.8.52.ebuild 5640 SHA256 7e7187ac3e38cf8c5971e787866bfe70c523935cbad00d09e67107b0d190e82e SHA512 4b31abf4dff447ba93660dbc41178495562435af208d35b502ecb2d0352d2aad51d26b0688d7d2bf56be0fae70d46b0a244ee6ed92176c5d3f19dae0bf768c45 WHIRLPOOL 905cc762ec395ce4c736826838711e977d1d497998b4498b2e4e35d5bb684194cc1e560d355759eb6d3e98c63089586956404ffd8a9cdce411021cf70507d2b2
-EBUILD calibre-0.8.58.ebuild 5669 SHA256 921bc80a0b8d2c29f7a8785cc8d9cae2d9e4fc3c5ef92c4cb8094e2b6ecebfb5 SHA512 782c8dabf650b7da21933cade200b9a69c0dedf4271883ffdca496b568d2f04fa7b71c4924d9c31be6c7ac6bc93714a59e3d135878b2c5d7b368ba05d4f1db75 WHIRLPOOL 2b37b1ae9ae932ab622549607b6811f1987cfc5241503af5da355e91a83810e2c2887fce60ee8d611653261b5e160f6cbc8e2f3c51e6e803cf556117f851e4a3
 EBUILD calibre-0.8.59.ebuild 5669 SHA256 40b9bbbd7fd53d42c990e673cfb59388c3d4ac31c3850f26a060eb47ce3f1c2d SHA512 28e562ad2cdb3e9699911db17573ca4721eff2598f3c10957cf95df9609744e71a2a4ee0e71501a35f481f3aaba4d6f2b8fbd41a7cae942dc99916799c26b95d WHIRLPOOL af50e398861c8050e4b7ebe66766be7619187ed2fc4da77329b94e6ed7d7051d4ca14d2a2705a35fc414e8c8883c7cf101fbd1d016edccc293ba9c80ac85fb89
-MISC ChangeLog 34465 SHA256 ca11262c3b7172a01ce5a20135a6d749595865056e39392be7fb6908e9f21519 SHA512 9ee5f018c9e7637a95748297a16648f6daeb1441ccf6e1371679ae0b5baaaf14a973c0865cae5123d339c9648794211668a87b939c6b669fc85cdef8db9b4694 WHIRLPOOL 9eba29e6da78c5dc8a72062db204ae6fa2ab8f8d495f52179c047708ea12f4afca161f46badda16391d1c81eeccd7cd0fe0f5f9e6f03514932a75958a200fd4e
+EBUILD calibre-0.8.60.ebuild 5730 SHA256 26cb521d0f7ea3398214963d6be239fc23dd023a41cf324ed18469fc760a536d SHA512 5145ee22f8f012619ac79ef1241220541d632004172fbfce7d4ccc85798d557155b89696baab63736abc2b47063c02823767aa4e8d75ebe4e9727c9251ca6475 WHIRLPOOL 5e899eb8d6d12b8d94a2f65aa463671656e2da946c7a8d0bdb4c2188b04fc17f27988e1c338cde61b7142fb2bcd1abf03c82afd457b7445d5363ecedef767e40
+MISC ChangeLog 34617 SHA256 5d04095f5c3b191b0518f063734a0fac235710441be0f5fb502a07ab3d8d97ff SHA512 00ec1131e50e92f9717b53a0ee224fdd0e3bfe94d474b7b74a555da482727de6cca625dfca5f7c153fa9be419c5529d5086d43d8b0b2a0bb0f75ab7f472fc9d9 WHIRLPOOL 5fe547ed933fef21cbceae7f5bfef7fd2e56f23ad583f65d895ddd6d8cc707feb9f7888f8b1c7b31cd82140ef215c66240f7220dfbbe30f9d5d03b6618d1b6a2
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/3dVwACgkQ/ejvha5XGaPeFgCgijS+mAk73oXAR2doPnwDHqB+
-JRgAmQEkuOkIgxBq6huNSR9fUuJdsz8n
-=MJic
+iEYEAREIAAYFAlAA2hAACgkQ/ejvha5XGaO/5QCeKJgjfqj4zk84ND69+khqanpI
+HhoAni6fOuN1TCp2yy344N1rX7+GIlWX
+=HYaq
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.8.58.ebuild b/app-text/calibre/calibre-0.8.60.ebuild
index 04d1b72256bb..a1607509bf48 100644
--- a/app-text/calibre/calibre-0.8.58.ebuild
+++ b/app-text/calibre/calibre-0.8.60.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.58.ebuild,v 1.1 2012/06/29 20:17:28 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.60.ebuild,v 1.1 2012/07/14 02:31:36 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -63,12 +63,13 @@ src_prepare() {
 
 	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
 	# calls xdg-* (bug #258938).
-	sed -e "s:'xdg-desktop-menu', 'install':\\0, '--mode', 'user':" \
-		-e "s:check_call(\\['xdg-desktop-menu', 'forceupdate'\\]):#\\0:" \
+	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:" \
+		-e "s|xdg-icon-resource install|\\0 --mode user|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|xdg-mime install|\\0 --mode user|" \
 		-i src/calibre/linux.py || die "sed failed to patch linux.py"
 
 	# Disable unnecessary privilege dropping for bug #287067.