0.9.10 version bump.

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

3 files changed, 20 insertions, 8 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 4331a023044e..0520be576cda 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.246 2012/12/12 10:25:59 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.247 2012/12/14 18:20:44 zmedico Exp $
+
+*calibre-0.9.10 (14 Dec 2012)
+
+  14 Dec 2012; Zac Medico <zmedico@gentoo.org> +calibre-0.9.10.ebuild,
+  -calibre-0.9.8.ebuild:
+  0.9.10 version bump.
 
   12 Dec 2012; Zac Medico <zmedico@gentoo.org> calibre-0.9.9.ebuild:
   Add workaround for PyQt4-4.9.6 compile failure, bug #446790.
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index f6eebdbd0472..8f1b6909c991 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,18 +3,18 @@ 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.9.10.tar.xz 27775784 SHA256 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 SHA512 9c5aeb32f2910d236961ca58e8f079656f6844f2cc2d6c511a1dda561fb4b9b0247c47e5a3fd8c52472c0424ca3f3a8a8567d091f30bf412669255c7541de3fb WHIRLPOOL 2c39cfad0696075a1b3641c909cc6bf05d58742dea3fbc2fa6ad8ac2f45101e6ed8d98b14779838d7698223f8ccf3cf21720798b839516490ed1d89d81a535c3
 DIST calibre-0.9.6.tar.xz 27346664 SHA256 d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f SHA512 6bbacc8ed9af318bdfc09807937ec5e3e2d99a9b1d408cbf4dd4976926b415736928a16ee8d712ae1b93e98ab612841123bb370440c78db9c350ebd6503f8e58 WHIRLPOOL 306662c0b7dae93ec0d5c63903e02fc6a9cdf6427290bd366464dca7c618f602380fec9767a23baafaf1257135f333553c345356bf06560785c0664f9d74cf36
-DIST calibre-0.9.8.tar.xz 27624924 SHA256 8535ef31d8ade68399f6eae110c5929cde2ad2f27c9930648fc93e8e80379e9f SHA512 11b5049f6e8ee47c11dbf7fe03bb59bc6af3b1db27c2205127288bffbd1f4162b8a317e003c17ce12197b9d31fbf9c4a9fcb64d101bd2475b7357b19a0e58b2c WHIRLPOOL f49de7235d6f64b7c71a1cbee0499ca47c292e3ec7d5988053ba8a5e6e09de99603238b473efe5b63ed7b631cffaeeaa300628eacc0f51cb60f84c62431063b7
 DIST calibre-0.9.9.tar.xz 27765504 SHA256 1fde798842c3ea22e04dbcb7e3d5e8f1a5a117e922dfd9e5ba762073feffae94 SHA512 eeaf8d4cc09933388f38b6caa2768e01a2255b8dfac9f4905b6fcda02d0d0bc4dd87553f706cff0419480c28adb02ea36b20a125ce82f90cdd853cc7afef93cd WHIRLPOOL 3cba05a9fe3ce535502b617b4cda76096685485c8c775c4f21b6264ed0bf255113a760f92711128e0708a7bc0f1e6f204784ebbff140996cf49e30d63bba40cf
+EBUILD calibre-0.9.10.ebuild 6324 SHA256 5e38ff3240567740bb187adff8d23a9bb15692f2bf37e32f6f7e78af469bed04 SHA512 5134c2f2184fab1c3f64991cb0b71b3dda6725c74323f8389134c40975a5dcc9cadb04a9f52756d81a028d782b036d84ca35351c07475e491caad082b610e461 WHIRLPOOL d5eae0f388235ba1f72c04769eb9886821946960b6c0315ec4f587c28c7721183b0bde1a78691b06bab350913b07fdac8880fd2e34766fff2b97ff32ad9be11b
 EBUILD calibre-0.9.6.ebuild 6099 SHA256 444f92291d01b04fbfef7b194ffabb957829e82e9243cdd15d9fff436f882bf4 SHA512 72bf4c23053ffa2232ba5b018c33cee2873e8b5800f7e83c337fd2783cf2ca8c83ec7836418721d6e6ceedcc04df253698b1211eb36d01cc6c548d4810025aab WHIRLPOOL 012816435ec5430ae9abb935abb0b1b60762e9f469b224a4ea7591256367f5d37ce3b471466f4130f8da5ad68d9b492e1995a09d556d841826a749f5a059dec2
-EBUILD calibre-0.9.8.ebuild 6099 SHA256 27c3b9b7a4bb2b943d53d37a16186b0a35a3bcbdae4633da02a32d15fb25af04 SHA512 444f6a51750d6c5d622194b70ce8318d5165788cf4a927d9820a60c71edcb2b4256d3fa8d8fd7965503d7b116b84cab503b111943c24f84d88d27d0503787e74 WHIRLPOOL 495e2bceabeb38cf127d8acae7513fb8b6774c6012858ae7efeeff3a076c7bff2313667c65cf68fd2be906bc553e315bfb072806ec71af30942857d27b8caf30
 EBUILD calibre-0.9.9.ebuild 6316 SHA256 0e42ae4ace27ac0ab97f181f9ae1bd40896786359e9f8af2e8625a0f1cdfdf0b SHA512 729cf69e7c269820f5c46362ee98134714b6a29d0297811470e61fd30c23261e808a077e082dc2f36f078b95f454727c45fd4d97be31b598d223a6a0b29eca3c WHIRLPOOL 05aa6e493b3c62d4045c110ab17e19dc704ff3c6e402fd78044c6d7a9da2026fed87484d060ba9360c064801f406ea76303da06022937683da38ee7bd2cee898
-MISC ChangeLog 39334 SHA256 5b6867f7c81129b96f102b218f18c6710c3224d7acd4e382ec737464a69e0305 SHA512 b109b838cf25fb1b70c2ec5aad4094d31844624e1f79d768ac2fee7eaa7ff0afcdd686478523a3b64f1b0b38d54e3234416dff5df48f0e45c304081b961f8821 WHIRLPOOL 1d16db8b2bccafdb7ef1bcb8cfc3941b0bdf085ea6c13150a8836a6174c2809a3026ad5db6621be9b48bef3b4ca995d7e1aec6a3b1631a6a640ad1d44b420421
+MISC ChangeLog 39485 SHA256 1b017f9647392e6b9f26570adb3b37d3cf87edcddd41d2e781d42ead7c631b38 SHA512 1d497b7bf2544d838f9b2279ba5a0a7932f73965d23438eac29f3018e6e4632e0f9f698687b210e11fe93ad1e170763e38abdf87d5f62c90137ffdcec8e22f2b WHIRLPOOL db9efdb46dd2fa23c2d230355dbab8b2fbdb9fbf1cadfe85729bb1dcb06dfe797051be14b0e1d5b25fb9bbb1a45247e698a46b2fe9d8c20231e4205d2a591d88
 MISC metadata.xml 340 SHA256 db5a0163e41af3aa60492fbffbbd971e2ca9d76097d5da9d3aabf3c16e4294b9 SHA512 9cc44065f152a92ed8428da1306dc08ed3222cc84e38c0390480e1fed4f7748ff66fed8456ab25004b406fe019a29b5cab9b4bce5bcd4a934a4390b984a08333 WHIRLPOOL 928948af880ac651243ac947837b22c98528b779e6251aa26e72b4ca6e16bc05caccbae5c665e2ae7dedcecc2f5dd28d05b1f0b598f6e0750c85eedc95aac04c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDIW7kACgkQ/ejvha5XGaMi3wCfWaPUV75WD2wGeCIw9+AItQ6m
-xqgAoJs+usX+0UFPBUsH5VMN+2cC6WvQ
-=2vH3
+iEYEAREIAAYFAlDLbf4ACgkQ/ejvha5XGaNpsQCg02fCFfN7cnwPKTfUVdek7eBs
+940AoKEHv13BvapZXzDUQrgzUgn68WyA
+=D25B
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-0.9.8.ebuild b/app-text/calibre/calibre-0.9.10.ebuild
index e38147e4de20..b3ecdf428fbe 100644
--- a/app-text/calibre/calibre-0.9.8.ebuild
+++ b/app-text/calibre/calibre-0.9.10.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.9.8.ebuild,v 1.1 2012/11/30 09:10:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.10.ebuild,v 1.1 2012/12/14 18:20:44 zmedico Exp $
 
 EAPI=4
 PYTHON_DEPEND=2:2.7
@@ -88,6 +88,12 @@ src_prepare() {
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
 		-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+	# Disable destructive regex for Bug #446790.
+	if has_version '>=dev-python/PyQt4-4.9.6' ; then
+		sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate\\\\(\..*|#\\0|" \
+			-i src/calibre/gui2/__init__.py || die
+	fi
 }
 
 src_install() {