Update to 0.8.5

PR:		ports/157884
Submitted by:	Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer)
Approved by:	bapt (mentor)

6 files changed, 70 insertions, 290 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 7e808946bbeb..59f6ae27518c 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.5
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -59,21 +59,19 @@ MAKE_ENV+=	LDFLAGS="${LDFLAGS}" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}"
 
-MAN1=	calibre-customize.1 \
-	calibre-debug.1 \
-	calibre-server.1 \
-	calibre-smtp.1 \
-	calibredb.1 \
-	ebook-convert.1 \
-	ebook-meta.1 \
-	epub-fix.1 \
-	fetch-ebook-metadata.1 \
-	librarything.1 \
-	lrf2lrs.1 \
-	lrs2lrf.1 \
-	pdfmanipulate.1 \
-	web2disk.1
-MANCOMPRESSED=	no
+MAN1=		calibre-customize.1 \
+		calibre-debug.1 \
+		calibre-server.1 \
+		calibre-smtp.1 \
+		calibredb.1 \
+		ebook-convert.1 \
+		ebook-meta.1 \
+		epub-fix.1 \
+		fetch-ebook-metadata.1 \
+		lrf2lrs.1 \
+		lrs2lrf.1 \
+		pdfmanipulate.1 \
+		web2disk.1
 
 .include <bsd.port.pre.mk>
 
@@ -109,7 +107,7 @@ do-install:
 post-install:
 .if defined(WITH_MOUNTHELPER_SUID)
 	${CHOWN} ${BINOWN}:operator ${PREFIX}/bin/calibre-mount-helper
-	${CHMOD} g+s ${PREFIX}/bin/calibre-mount-helper
+	${CHMOD} ug+s ${PREFIX}/bin/calibre-mount-helper
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index ed33f7cfe73d..1449ac41157e 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.1.tar.gz) = 61df9120bd01e073175c961bb2f9a5d9a5d93e54e2dc4e8552a284a200f670e7
-SIZE (calibre-0.8.1.tar.gz) = 28204665
+SHA256 (calibre-0.8.5.tar.gz) = 8bec7524e6fc42b42182709eed05ddc62c58ac27cfc5fa38dc87daaab84b7bdc
+SIZE (calibre-0.8.5.tar.gz) = 28177595
diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py
index 9a29a2327876..357558e0bc2b 100644
--- a/deskutils/calibre/files/patch-setup_install.py
+++ b/deskutils/calibre/files/patch-setup_install.py
@@ -1,7 +1,7 @@
---- setup/install.py.orig	2011-05-02 21:06:12.000000000 -0500
-+++ setup/install.py	2011-05-02 21:06:17.000000000 -0500
+--- setup/install.py.orig	2011-06-14 14:16:28.000000000 -0500
++++ setup/install.py	2011-06-14 14:16:39.000000000 -0500
 @@ -12,7 +12,7 @@
-         __appname__, __version__
+         __appname__, __version__)
  
  HEADER = '''\
 -#!/usr/bin/env python2
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_scanner.py b/deskutils/calibre/files/patch-src_calibre_devices_scanner.py
index c3d73f8e91e4..1f8c598cabf5 100644
--- a/deskutils/calibre/files/patch-src_calibre_devices_scanner.py
+++ b/deskutils/calibre/files/patch-src_calibre_devices_scanner.py
@@ -1,5 +1,5 @@
---- src/calibre/devices/scanner.py.orig	2011-05-02 11:35:14.000000000 -0500
-+++ src/calibre/devices/scanner.py	2011-05-02 11:38:07.000000000 -0500
+--- src/calibre/devices/scanner.py.orig	2011-06-14 14:10:28.000000000 -0500
++++ src/calibre/devices/scanner.py	2011-06-14 14:12:39.000000000 -0500
 @@ -5,10 +5,10 @@
  manner.
  '''
@@ -13,7 +13,7 @@
  
  osx_scanner = win_scanner = linux_scanner = None
  
-@@ -155,17 +155,66 @@
+@@ -155,17 +155,68 @@
              ans.add(tuple(dev))
          return ans
  
@@ -61,6 +61,7 @@
 +        return ans
 +
 +
++
  linux_scanner = None
  
  if islinux:
@@ -71,6 +72,7 @@
 +if isfreebsd:
 +    freebsd_scanner = FreeBSDScanner()
 +
++
  class DeviceScanner(object):
  
      def __init__(self, *args):
diff --git a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py b/deskutils/calibre/files/patch-src_calibre_utils_help2man.py
index dfa39dc7a032..ee848bd8afde 100644
--- a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py
+++ b/deskutils/calibre/files/patch-src_calibre_utils_help2man.py
@@ -1,12 +1,12 @@
---- src/calibre/utils/help2man.py.orig	2011-05-14 17:55:12.000000000 -0700
-+++ src/calibre/utils/help2man.py	2011-05-14 17:56:18.000000000 -0700
+--- src/calibre/utils/help2man.py.orig	2011-06-14 14:14:49.000000000 -0500
++++ src/calibre/utils/help2man.py	2011-06-14 14:15:31.000000000 -0500
 @@ -3,13 +3,14 @@
  __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
  __docformat__ = 'restructuredtext en'
  
 -import time, bz2
-+import bz2, locale, time
- from calibre.constants import isfreebsd
++import time, bz2, locale
+ from calibre.constants import isbsd
  
  from calibre.constants import __version__, __appname__, __author__
  
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 851087c500be..0e52ed535bd9 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -14,7 +14,6 @@ bin/ebook-meta
 bin/ebook-viewer
 bin/epub-fix
 bin/fetch-ebook-metadata
-bin/librarything
 bin/lrf2lrs
 bin/lrfviewer
 bin/lrs2lrf
@@ -477,6 +476,7 @@ lib/calibre/calibre/gui2/add.py
 lib/calibre/calibre/gui2/add_wizard/__init__.py
 lib/calibre/calibre/gui2/add_wizard/scan_ui.py
 lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
+lib/calibre/calibre/gui2/bars.py
 lib/calibre/calibre/gui2/book_details.py
 lib/calibre/calibre/gui2/catalog/__init__.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
@@ -613,6 +613,7 @@ lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/tweak_epub.py
 lib/calibre/calibre/gui2/dialogs/tweak_epub_ui.py
@@ -650,6 +651,7 @@ lib/calibre/calibre/gui2/preferences/adding.py
 lib/calibre/calibre/gui2/preferences/adding_ui.py
 lib/calibre/calibre/gui2/preferences/behavior.py
 lib/calibre/calibre/gui2/preferences/behavior_ui.py
+lib/calibre/calibre/gui2/preferences/coloring.py
 lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/columns_ui.py
 lib/calibre/calibre/gui2/preferences/conversion.py
@@ -695,6 +697,15 @@ lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/shortcuts_ui.py
 lib/calibre/calibre/gui2/store/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/gandalf_plugin.py
+lib/calibre/calibre/gui2/store/pragmatic_bookshelf_plugin.py
+lib/calibre/calibre/gui2/store/nexto_plugin.py
+lib/calibre/calibre/gui2/store/whsmith_uk_plugin.py
+lib/calibre/calibre/gui2/store/zixo_plugin.py
+lib/calibre/calibre/gui2/store/epubbud_plugin.py
+lib/calibre/calibre/gui2/store/oreilly_plugin.py
+lib/calibre/calibre/gui2/store/woblink_plugin.py
+lib/calibre/calibre/gui2/store/archive_org_plugin.py
 lib/calibre/calibre/gui2/store/weightless_books_plugin.py
 lib/calibre/calibre/gui2/store/epubbuy_de_plugin.py
 lib/calibre/calibre/gui2/store/wizards_tower_books_plugin.py
@@ -724,7 +735,27 @@ lib/calibre/calibre/gui2/store/manybooks_plugin.py
 lib/calibre/calibre/gui2/store/amazon_plugin.py
 lib/calibre/calibre/gui2/store/amazon_uk_plugin.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
+lib/calibre/calibre/gui2/store/legimi_plugin.py
+lib/calibre/calibre/gui2/store/ebookshoppe_uk_plugin.py
+lib/calibre/calibre/gui2/store/virtualo_plugin.py
+lib/calibre/calibre/gui2/store/config/__init__.py
+lib/calibre/calibre/gui2/store/config/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/store.py
+lib/calibre/calibre/gui2/store/config/search/__init__.py
+lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/search/search_widget.py
+lib/calibre/calibre/gui2/store/config/chooser/results_view.py
+lib/calibre/calibre/gui2/store/config/chooser/__init__.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
+lib/calibre/calibre/gui2/store/config/chooser/models.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
+lib/calibre/calibre/gui2/store/google_books_plugin.py
 lib/calibre/calibre/gui2/store/mobileread/__init__.py
+lib/calibre/calibre/gui2/store/mobileread/adv_search_builder.py
+lib/calibre/calibre/gui2/store/mobileread/adv_search_builder_ui.py
 lib/calibre/calibre/gui2/store/mobileread/models.py
 lib/calibre/calibre/gui2/store/mobileread/store_dialog.py
 lib/calibre/calibre/gui2/store/mobileread/cache_progress_dialog_ui.py
@@ -773,6 +804,7 @@ lib/calibre/calibre/library/caches.py
 lib/calibre/calibre/library/catalog.py
 lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/cli.py
+lib/calibre/calibre/library/coloring.py
 lib/calibre/calibre/library/comments.py
 lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
@@ -803,6 +835,7 @@ lib/calibre/calibre/manual/conf.py
 lib/calibre/calibre/manual/custom.py
 lib/calibre/calibre/manual/epub.py
 lib/calibre/calibre/manual/qthelp.py
+lib/calibre/calibre/manual/template_ref_generate.py
 lib/calibre/calibre/manual/plugin_examples/helloworld/__init__.py
 lib/calibre/calibre/manual/plugin_examples/interface_demo/__init__.py
 lib/calibre/calibre/manual/plugin_examples/interface_demo/main.py
@@ -824,6 +857,7 @@ lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/startup.py
+lib/calibre/calibre/test_build.py
 lib/calibre/calibre/trac/__init__.py
 lib/calibre/calibre/trac/bzr_commit_plugin.py
 lib/calibre/calibre/trac/setup.py
@@ -1057,6 +1091,7 @@ share/calibre/content_server/mobile.css
 share/calibre/content_server/next.png
 share/calibre/content_server/previous.png
 share/calibre/content_server/read/monocle.js
+share/calibre/content_server/stacktrace.js
 share/calibre/content_server/star-half.png
 share/calibre/content_server/star-off.png
 share/calibre/content_server/star-on.png
@@ -1230,141 +1265,10 @@ share/calibre/jacket/stylesheet.css
 share/calibre/jacket/template.xhtml
 share/calibre/jquery.simulate.js
 share/calibre/localization/iso639.pickle
-share/calibre/localization/locales/af/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/af/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ar/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ast/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ast/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bg/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/bg/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bn/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/bs/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/bs/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ca/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ca/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/cs/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/da/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/da/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/da/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/de/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/de/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/de/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/el/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/el/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_AU/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_CA/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/en_GB/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/eo/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/eo/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/es/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/es/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/es/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/eu/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/eu/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fa/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fa/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fo/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/fr/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/gl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/gl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/gl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/he/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/he/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/he/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/hi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/hu/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/id/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/id/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/it/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/it/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ja/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ko/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ko/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/lt/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/lt/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ltg/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/lv/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/lv/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ml/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/mr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/mr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ms/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ms/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nb/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/nb/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nds/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/nl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/nl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/oc/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/oc/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pa/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pa/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/pt/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ro/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ro/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ru/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sc/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sk/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sl/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sl/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sl/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/sq/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/sv/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ta/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/ta/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/te/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/th/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/th/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/tr/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/tr/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/uk/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/ur/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/vi/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/vi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/yi/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/zh_HK/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_HK/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
 share/calibre/localization/pykakasi/itaijidict2.pickle
 share/calibre/localization/pykakasi/kanadict2.pickle
-share/calibre/localization/pykakasi/kanwadict2.db
+share/calibre/localization/pykakasi/kanwadict2.pickle
+share/calibre/localization/locales.zip
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
 share/calibre/mime.types
@@ -1427,133 +1331,6 @@ share/calibre/viewer/referencing.js
 @dirrm share/calibre/viewer
 @dirrm share/calibre/templates
 @dirrm share/calibre/localization/pykakasi
-@dirrm share/calibre/localization/locales/zh_TW/LC_MESSAGES
-@dirrm share/calibre/localization/locales/zh_TW
-@dirrm share/calibre/localization/locales/zh_HK/LC_MESSAGES
-@dirrm share/calibre/localization/locales/zh_HK
-@dirrm share/calibre/localization/locales/zh_CN/LC_MESSAGES
-@dirrm share/calibre/localization/locales/zh_CN
-@dirrm share/calibre/localization/locales/yi/LC_MESSAGES
-@dirrm share/calibre/localization/locales/yi
-@dirrm share/calibre/localization/locales/vi/LC_MESSAGES
-@dirrm share/calibre/localization/locales/vi
-@dirrm share/calibre/localization/locales/ur/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ur
-@dirrm share/calibre/localization/locales/uk/LC_MESSAGES
-@dirrm share/calibre/localization/locales/uk
-@dirrm share/calibre/localization/locales/tr/LC_MESSAGES
-@dirrm share/calibre/localization/locales/tr
-@dirrm share/calibre/localization/locales/th/LC_MESSAGES
-@dirrm share/calibre/localization/locales/th
-@dirrm share/calibre/localization/locales/te/LC_MESSAGES
-@dirrm share/calibre/localization/locales/te
-@dirrm share/calibre/localization/locales/ta/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ta
-@dirrm share/calibre/localization/locales/sv/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sv
-@dirrm share/calibre/localization/locales/sr/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sr
-@dirrm share/calibre/localization/locales/sq/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sq
-@dirrm share/calibre/localization/locales/sl/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sl
-@dirrm share/calibre/localization/locales/sk/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sk
-@dirrm share/calibre/localization/locales/sc/LC_MESSAGES
-@dirrm share/calibre/localization/locales/sc
-@dirrm share/calibre/localization/locales/ru/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ru
-@dirrm share/calibre/localization/locales/ro/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ro
-@dirrm share/calibre/localization/locales/pt_BR/LC_MESSAGES
-@dirrm share/calibre/localization/locales/pt_BR
-@dirrm share/calibre/localization/locales/pt/LC_MESSAGES
-@dirrm share/calibre/localization/locales/pt
-@dirrm share/calibre/localization/locales/pl/LC_MESSAGES
-@dirrm share/calibre/localization/locales/pl
-@dirrm share/calibre/localization/locales/pa/LC_MESSAGES
-@dirrm share/calibre/localization/locales/pa
-@dirrm share/calibre/localization/locales/oc/LC_MESSAGES
-@dirrm share/calibre/localization/locales/oc
-@dirrm share/calibre/localization/locales/nl/LC_MESSAGES
-@dirrm share/calibre/localization/locales/nl
-@dirrm share/calibre/localization/locales/nds/LC_MESSAGES
-@dirrm share/calibre/localization/locales/nds
-@dirrm share/calibre/localization/locales/nb/LC_MESSAGES
-@dirrm share/calibre/localization/locales/nb
-@dirrm share/calibre/localization/locales/ms/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ms
-@dirrm share/calibre/localization/locales/mr/LC_MESSAGES
-@dirrm share/calibre/localization/locales/mr
-@dirrm share/calibre/localization/locales/ml/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ml
-@dirrm share/calibre/localization/locales/lv/LC_MESSAGES
-@dirrm share/calibre/localization/locales/lv
-@dirrm share/calibre/localization/locales/lt/LC_MESSAGES
-@dirrm share/calibre/localization/locales/lt
-@dirrm share/calibre/localization/locales/ltg/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ltg
-@dirrm share/calibre/localization/locales/ko/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ko
-@dirrm share/calibre/localization/locales/ja/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ja
-@dirrm share/calibre/localization/locales/it/LC_MESSAGES
-@dirrm share/calibre/localization/locales/it
-@dirrm share/calibre/localization/locales/id/LC_MESSAGES
-@dirrm share/calibre/localization/locales/id
-@dirrm share/calibre/localization/locales/hu/LC_MESSAGES
-@dirrm share/calibre/localization/locales/hu
-@dirrm share/calibre/localization/locales/hr/LC_MESSAGES
-@dirrm share/calibre/localization/locales/hr
-@dirrm share/calibre/localization/locales/hi/LC_MESSAGES
-@dirrm share/calibre/localization/locales/hi
-@dirrm share/calibre/localization/locales/he/LC_MESSAGES
-@dirrm share/calibre/localization/locales/he
-@dirrm share/calibre/localization/locales/gl/LC_MESSAGES
-@dirrm share/calibre/localization/locales/gl
-@dirrm share/calibre/localization/locales/fr/LC_MESSAGES
-@dirrm share/calibre/localization/locales/fr
-@dirrm share/calibre/localization/locales/fo/LC_MESSAGES
-@dirrm share/calibre/localization/locales/fo
-@dirrm share/calibre/localization/locales/fi/LC_MESSAGES
-@dirrm share/calibre/localization/locales/fi
-@dirrm share/calibre/localization/locales/fa/LC_MESSAGES
-@dirrm share/calibre/localization/locales/fa
-@dirrm share/calibre/localization/locales/eu/LC_MESSAGES
-@dirrm share/calibre/localization/locales/eu
-@dirrm share/calibre/localization/locales/es/LC_MESSAGES
-@dirrm share/calibre/localization/locales/es
-@dirrm share/calibre/localization/locales/eo/LC_MESSAGES
-@dirrm share/calibre/localization/locales/eo
-@dirrm share/calibre/localization/locales/en_GB/LC_MESSAGES
-@dirrm share/calibre/localization/locales/en_GB
-@dirrm share/calibre/localization/locales/en_CA/LC_MESSAGES
-@dirrm share/calibre/localization/locales/en_CA
-@dirrm share/calibre/localization/locales/en_AU/LC_MESSAGES
-@dirrm share/calibre/localization/locales/en_AU
-@dirrm share/calibre/localization/locales/el/LC_MESSAGES
-@dirrm share/calibre/localization/locales/el
-@dirrm share/calibre/localization/locales/de/LC_MESSAGES
-@dirrm share/calibre/localization/locales/de
-@dirrm share/calibre/localization/locales/da/LC_MESSAGES
-@dirrm share/calibre/localization/locales/da
-@dirrm share/calibre/localization/locales/cs/LC_MESSAGES
-@dirrm share/calibre/localization/locales/cs
-@dirrm share/calibre/localization/locales/ca/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ca
-@dirrm share/calibre/localization/locales/bs/LC_MESSAGES
-@dirrm share/calibre/localization/locales/bs
-@dirrm share/calibre/localization/locales/bn/LC_MESSAGES
-@dirrm share/calibre/localization/locales/bn
-@dirrm share/calibre/localization/locales/bg/LC_MESSAGES
-@dirrm share/calibre/localization/locales/bg
-@dirrm share/calibre/localization/locales/ast/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ast
-@dirrm share/calibre/localization/locales/ar/LC_MESSAGES
-@dirrm share/calibre/localization/locales/ar
-@dirrm share/calibre/localization/locales/af/LC_MESSAGES
-@dirrm share/calibre/localization/locales/af
-@dirrm share/calibre/localization/locales
 @dirrm share/calibre/localization
 @dirrm share/calibre/jacket
 @dirrm share/calibre/images/mimetypes
@@ -1605,6 +1382,9 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/gui2/wizard
 @dirrm lib/calibre/calibre/gui2/viewer
 @dirrm lib/calibre/calibre/gui2/store/mobileread
+@dirrm lib/calibre/calibre/gui2/store/config/search
+@dirrm lib/calibre/calibre/gui2/store/config/chooser
+@dirrm lib/calibre/calibre/gui2/store/config
 @dirrm lib/calibre/calibre/gui2/store/search
 @dirrm lib/calibre/calibre/gui2/store
 @dirrm lib/calibre/calibre/gui2/progress_indicator