added conditional to not throw exception when locale is 'C', bug 508834; cleaned up no-dialog patch

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

5 files changed, 67 insertions, 21 deletions

diff --git a/app-text/calibre/ChangeLog b/app-text/calibre/ChangeLog
index 34aca43c90a3..218fb751db8c 100644
--- a/app-text/calibre/ChangeLog
+++ b/app-text/calibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/calibre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.316 2014/05/01 02:22:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/ChangeLog,v 1.317 2014/05/01 16:14:31 axs Exp $
+
+  01 May 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org>
+  +files/calibre-1.34-C-locale.patch,
+  +files/calibre-1.34-no_updates_dialog.patch, calibre-1.34.ebuild:
+  added conditional to not throw exception when locale is 'C', bug 508834;
+  cleaned up no-dialog patch
 
 *calibre-1.34 (01 May 2014)
 
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 21a481343d2d..bae966434422 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -2,6 +2,8 @@
 Hash: SHA256
 
 AUX calibre-1.20-no_updates_dialog.patch 896 SHA256 fdc44ced4670ec51be8bacf796b8d793edc3f2735c235fdb1ba708cd3c9121d5 SHA512 84354a286d1258a9496e9adc68317c3016f1bb4551a090ded372376598dad989d02fe93d578a9c497154d49ec1fda098a9e3740145425a6cdbe80cf956ee8764 WHIRLPOOL 2348ce9d068d571d025abfccb5e07e6c2b4c4682242a1b7e77e777e3bc0e9684a214c80b1fa480214d8302115e7209e87a0b3edd140939274037a31445a17859
+AUX calibre-1.34-C-locale.patch 426 SHA256 e62c409510baac35cced6f49cf40396d851de93cb675e66f1592980df564d6ef SHA512 cddc1513857706a8b97c4f950ef6af6b3cf43d4862423f5df71ea739b3e0b75c5d9fcfdaffa59cefb6b2634fc022fcab8de60c4b3be39be335f8ae3924a2ef6b WHIRLPOOL 001e2b4d80eb9d068ba3d4923d98a875bb8e71e9e666244fa683ddd6049ddb5ea971c0e798a99016923b14acec47eb103112b52e27f5d5968e411db5e992e600
+AUX calibre-1.34-no_updates_dialog.patch 1902 SHA256 5e7909e814c3f5cc167674e91f8e2a9f19aafbc471d5044e2561cb9b41a2d672 SHA512 cadefae143474d924bbe1c3a2b48976c35cd660ee9762efd5757cdb7928e83ddade7e9a2d29871894efcb0051235491e2be5146ccb19168599c02ce3f6b9f274 WHIRLPOOL b926814819560fd88fe17faaf995856897366436814826311e1b09716e97f3c46082d23a9856a55a471f5ad8233f2a4d7bb3d80ad7d30e77caa1ac5e17ee7bd3
 AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f308cbf556f2704c001a3dd4dda9dfda2 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 WHIRLPOOL 8a4870df539bc768b9dcfb28623773d730ba27ef307dac856f4fd9ff682b710a7b33dc93e505cb5d974a95885089c079838a59d579c496ad6a173384eb14bdda
 AUX calibre-no_updates_dialog.patch 891 SHA256 59cbef4d8026241bd198f36728c4dfde6fa063af393788c3126f788730d375a5 SHA512 f7cfa4b0675146275c155897b3bced4899487dcd6e3f5d94719d25dd698b4b74b9bb13477552f0ade3d243a35146e4cda36c46cad8bb74c57dcb549825428117 WHIRLPOOL 138bdd85270076d2a5f8560cbc994bc91bddec2385713c19237fe4db665dbf0bedc62941ec70c39b418c469de2fed036a00bfa9639832f7d435bd6bddad391ef
 AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
@@ -15,25 +17,13 @@ EBUILD calibre-1.2.ebuild 7188 SHA256 90113b51d09bd3ab231eeceae07d4aae5f8ebd37ce
 EBUILD calibre-1.20.ebuild 6829 SHA256 97305bb462ce1af08b20a77ff1a27432e52c3d8f05e84c267649badf4a2c59cc SHA512 bec3b0e1bebe234f5bac4782e3c35d0237d6cd5561f3897c049a2c7e0d7e9c1a181897eb1741609cd1386a2594d579142f3a0e6b6045183163d5b0009c5a6b4d WHIRLPOOL 538238eebdf55ad11e3c6e72154e999bf90d17fcb916daf1c3cf0a37f3d3604e16f267707114b99bab1d884c1fe9e790354b02f1c940c72b713459a844eda3e0
 EBUILD calibre-1.25.ebuild 6834 SHA256 fccd4b963ae6a6a2a687566bba722f877f0f5b9b19203420ef181e13c4256cb1 SHA512 197844df92e82346747a6189d04d1a0df4c111c7549bc524ef6dfde7db08dc52147840e1340c738e0c58d81f281f3540c94159cfdb50e2c15dbf8bd1274a8995 WHIRLPOOL a77d7de048579c1d539c9af8583860fea880e21416b40f91591d7aaf7d10a2ed13580b52252a959d8d658f4de45669ee2512d209d7563956ee081c5d9376d644
 EBUILD calibre-1.29.ebuild 6845 SHA256 8b62380e75238694b459a4ab9d40139229a3dd1a09b2018dc8bb6315248ad362 SHA512 67f7d77a509be8d1bfbe1ce04a6e9959f259dd7da71f1023548806ff229ebcb23f95e55fc27e6e41c76aa0d51c3816433fe85f7ec83d82bdeb33c3ec6114aa5f WHIRLPOOL 1158539fadd0fc494c2eaefc496269b77a1d4043bd8d8bdb2a6dd269c4fbb4fe458ae564c22c8df29b362b167ee6956290fdd986182078466f1e41424cc7c299
-EBUILD calibre-1.34.ebuild 6851 SHA256 8ff7e923f4a5e33b65a5843cfcd9f47c3ed47221fb52efd69d1f23a4bd9aa479 SHA512 6d0514c92cff399c0ba66de4713c82c5922efd41f12444f45227eab1800939f2866ff8630092f8c3116b4a0e7fa2c22904184a684c133a4a4042717555e7edb6 WHIRLPOOL b258ffd1a2eb851a13ae939aef165dbf4e64d82a25e7ef2a7ccb5f826276b42930dcbe34748ef88c86dd41b246627576289dc3913a6d42468522bf616e69bc66
-MISC ChangeLog 50188 SHA256 7b88d17a20cd271f9dcd160b1b97b188ac64de903515bb9b9d40b66c6705f30a SHA512 d8b7092c86f7ed29dd9df4f7a44bd8494609676cb05ffb77861c7147963307b5089c4525688b9c2216c490d778fa319660d5ac6b94f3b687d76f49ba8706ce46 WHIRLPOOL c9b73b1ecfa703a7b535d03c22a1454b4422af305d8c00ec7771af02bf092d983dea04b12e77ea3cc0f9e4bade832fdfa1197fde09d6bcd47877456fe8b65110
+EBUILD calibre-1.34.ebuild 6967 SHA256 34a6e733f796e282327db0a6f7be758fcd85e71464cbf9b21df050a763942e3a SHA512 e253d62fd0ad8735ad5d7d9db967ca321cc9972c65c49e46460af41544b8026e1bf18c34d949726a4d67579ae9494789d495a08f9f74a996a07b4ab151463238 WHIRLPOOL 06106d7059e6769ba20e80bd544041ae336ca2665d809589f8fa3a79b2f702d39edcd874b63b1f709c3548fc8db96f70be3990dc96c11ffa5fb0af73b8d25795
+MISC ChangeLog 50453 SHA256 a34b93a125535ba53fd1cf537a4bb366953303477dfd75c26c7725c4b8e2ece5 SHA512 4f4f83bd8609553822d6c86373f75ef752417c4a485f8c986e321c39cbe56786e123d771f7cd335038b00516880c5c0398d1b1a8153e53a204a975112d6e7c44 WHIRLPOOL ed4db31d4d8c8069cb1a40ca201bcb1270305b08886fa8c9ad1d20cac9add4d3f0361e556216e74b0e033c34a1fd00271090b43229e019e1b32d44a324380675
 MISC metadata.xml 494 SHA256 8636a504a39b901333bfb9aa1c1322dde87ddc3fa6c6da3a7b95abcf25d61786 SHA512 c8e1bf8c46e3b3285df1cffa1324042a82d6a40dfbe5384d018386e661c446204bfbf24b21d7afe893ceb1e1de07719b84ad2af3345c04e4419141f8e789ca2c WHIRLPOOL 7d89476c21141740f9b27f947b722bd64004b6e705fe6ee35237f94ef318f626e49a5adad5ac0ab86d015913c3663d4bb80d9a9f4014bb3e139623eb0938179a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTYa/PXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyOTZFRkUxOEEyRDM1Qzc2QTY0M0Y2QjQw
-RjlDNTkwQjdGRjMyNEY2AAoJEA+cWQt/8yT23JIQAJjhdNo/mA3XOi1iPug/LZ0D
-ilJXz9ispLOBEdmb9o4QkhxMJoTIxdqkaemQHI8tWA+hSaIW5LiMVJ3q9WMAZCAQ
-O2S0l/rlAnZG+qMFjrmFL49v3LzHwqLoaUhJHlOllLQzHffKTUDvsqe+dtp2o0YO
-oT3uidwosMlxP4RJ/MT7ZrbvyNDdU9dviYPaLEdVzdChXeDiKCm5+IkhS2qZkiPz
-eDAi2JSJEIPjFSXSHWDYaLzc93thEHbA2vUBTHA5dXl6LLE0lCMhwq3qYDzARRl6
-FGx+YFPg/J8yHY7dvHFEkrimUH8uEadDJJICxuCJe+kY3HOaByreBbRnvGgfRm1c
-R9xlEfUXcgj6DUj2ywIhqDgmNXbSbhq8XxDquW3oL8bFjES/4KcBHRqlors0fbu1
-gcjsFd2RqRFP+4K+JcWKP7ozWwsR8ADB8mkuDzHELG0DJaSd6o/XR1C/fvlCfBOR
-jNHcoxvnXu2/4O5W8etvaYoXfu62lXrDLZcuLtCOIJrzK5FYb6FdY98osWX5pjs/
-kRqIYcQrchuizbN4vlIoJscQwMuqr6s56vmsF/NL7p4rFIgFCLUFy73xUNA/QSQM
-EUno2GAGWm6VF5dpFx8+OIrvJm5vYaRxeF2PGYHxQoomxYrXpXcOH8cnCwZtXlgN
-3qNrDOGdAi/CQ2XvhqVg
-=WFg1
+iF4EAREIAAYFAlNicucACgkQ2ugaI38ACPACugD+PNeFcmMCGnN1y/z5C3kx7ZIl
+83dBdaN0sBIX/DQV3m8A/0pt6b2iCcAmJJ3LPj9zfgC6jJktBoHhGVKs96yzWloT
+=lwEK
 -----END PGP SIGNATURE-----
diff --git a/app-text/calibre/calibre-1.34.ebuild b/app-text/calibre/calibre-1.34.ebuild
index f2486abdc2a6..9836098a7ab5 100644
--- a/app-text/calibre/calibre-1.34.ebuild
+++ b/app-text/calibre/calibre-1.34.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.34.ebuild,v 1.1 2014/05/01 02:22:00 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-1.34.ebuild,v 1.2 2014/05/01 16:14:31 axs Exp $
 
 EAPI=5
 
@@ -104,9 +104,11 @@ src_prepare() {
 
 	# no_updates: do not annoy user with "new version is availible all the time
 	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	# C locale: if LC_ALL=C do not raise an exception when locale cannot be canonicalized
 	epatch \
-		"${FILESDIR}/${PN}-1.20-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
+		"${FILESDIR}/${P}-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${P}-C-locale.patch"
 }
 
 src_install() {
diff --git a/app-text/calibre/files/calibre-1.34-C-locale.patch b/app-text/calibre/files/calibre-1.34-C-locale.patch
new file mode 100644
index 000000000000..6a91d942bf90
--- /dev/null
+++ b/app-text/calibre/files/calibre-1.34-C-locale.patch
@@ -0,0 +1,11 @@
+--- a/src/calibre/spell/dictionary.py	2014-05-01 11:38:04.051290252 -0400
++++ b/src/calibre/spell/dictionary.py	2014-05-01 11:37:55.061290088 -0400
+@@ -52,7 +52,7 @@
+     raw = raw or ''
+     parts = raw.replace('_', '-').split('-')
+     lc = canonicalize_lang(parts[0])
+-    if lc is None:
++    if lc is None and raw != 'C':
+         raise ValueError('Invalid language code: %r' % raw)
+     cc = None
+     if len(parts) > 1:
diff --git a/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
new file mode 100644
index 000000000000..dd6b3940f72b
--- /dev/null
+++ b/app-text/calibre/files/calibre-1.34-no_updates_dialog.patch
@@ -0,0 +1,37 @@
+--- a/src/calibre/gui2/main.py	2014-01-17 11:49:16.000000000 +0800
++++ b/src/calibre/gui2/main.py	2014-01-18 18:28:53.322911344 +0800
+@@ -37,8 +37,9 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True,
++            action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
+--- a/src/calibre/gui2/update.py	2014-04-24 22:02:21.000000000 -0400
++++ b/src/calibre/gui2/update.py	2014-05-01 12:02:27.631316967 -0400
+@@ -139,6 +139,8 @@
+             self.update_checker.update_found.connect(self.update_found,
+                     type=Qt.QueuedConnection)
+             self.update_checker.start()
++        else:
++            self.update_checker = None
+ 
+     def recalc_update_label(self, number_of_plugin_updates):
+         self.update_found('%s%s%d'%(self.last_newest_calibre_version, VSEP,
+--- a/src/calibre/gui2/ui.py	2014-04-24 22:02:21.000000000 -0400
++++ b/src/calibre/gui2/ui.py	2014-05-01 11:53:58.371307671 -0400
+@@ -858,7 +858,8 @@
+         if write_settings:
+             self.write_settings()
+         self.check_messages_timer.stop()
+-        self.update_checker.terminate()
++        if self.update_checker is not None:
++            self.update_checker.terminate()
+         self.listener.close()
+         self.job_manager.server.close()
+         self.job_manager.threaded_server.close()