Update deskutils/calibre to 3.0.0.

8 files changed, 57 insertions, 218 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 276b38fde283..0f984e4aafb1 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	2.85.1
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
@@ -24,10 +23,12 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9,1:www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw
+		${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9,1:www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.1,1:www/py-cssutils \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:www/py-beautifulsoup32 \
@@ -39,6 +40,9 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces \
 		${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3:devel/py-msgpack-python \
+		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex \
+		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
 		pdftohtml:graphics/poppler-utils
 
 USE_RC_SUBR=	calibre
@@ -71,9 +75,6 @@ MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${FIND} ${WRKSRC}/resources/content_server -name "*.orig" -delete
-
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index f35088a0056a..cccb99866f0b 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1494660273
-SHA256 (calibre-2.85.1.tar.xz) = 8c8db280c51b26284bff1c066fb503ecef9e1f15f7e2e7b4f705c817ee041abd
-SIZE (calibre-2.85.1.tar.xz) = 37783284
+TIMESTAMP = 1497602270
+SHA256 (calibre-3.0.0.tar.xz) = 7cdaa5c55c8c13d6b5389ee11231c64944f5272297938e426be3a4fcf63a13fe
+SIZE (calibre-3.0.0.tar.xz) = 35969076
diff --git a/deskutils/calibre/files/patch-resources_content__server_browse_browse.html b/deskutils/calibre/files/patch-resources_content__server_browse_browse.html
deleted file mode 100644
index 3a7194532952..000000000000
--- a/deskutils/calibre/files/patch-resources_content__server_browse_browse.html
+++ /dev/null
@@ -1,20 +0,0 @@
---- resources/content_server/browse/browse.html.orig	2016-01-29 02:33:14 UTC
-+++ resources/content_server/browse/browse.html
-@@ -7,7 +7,7 @@
-     <title>..:: calibre {library} ::.. {title}</title>
-     <meta http-equiv="X-UA-Compatible" content="IE=100" />
-     <meta name="robots" content="noindex" />
--    <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
-+    <link rel="icon" type="image/x-icon" href="{prefix}/static/favicon.ico" />
- 
-     <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
-     <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
-@@ -63,8 +63,6 @@
-                     <input type="image"
-                     src="{prefix}/static/button-donate.png"
-                         name="submit"></input>
--                    <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
--                        width="1" height="1"></img>
-                 </div>
-             </form>
-             <div id="calibre-home-link" title="Go to the calibre website"></div>
diff --git a/deskutils/calibre/files/patch-resources_content__server_index.html b/deskutils/calibre/files/patch-resources_content__server_index.html
deleted file mode 100644
index f0750d956c99..000000000000
--- a/deskutils/calibre/files/patch-resources_content__server_index.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- resources/content_server/index.html.orig	2016-01-29 02:33:14 UTC
-+++ resources/content_server/index.html
-@@ -9,7 +9,7 @@
-         <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
-         <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
-         <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
--		<link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
-+		<link rel="icon" href="{prefix}/static/favicon.ico" type="image/x-icon" />
- 	</head>
- 	<body>
- 	    <div id="banner">
diff --git a/deskutils/calibre/files/patch-setup_build__environment.py b/deskutils/calibre/files/patch-setup_build__environment.py
index 4480f3a108df..801d79741bae 100644
--- a/deskutils/calibre/files/patch-setup_build__environment.py
+++ b/deskutils/calibre/files/patch-setup_build__environment.py
@@ -1,11 +1,11 @@
---- setup/build_environment.py.orig	2016-06-24 01:54:27 UTC
+--- setup/build_environment.py.orig	2017-06-16 04:00:12 UTC
 +++ setup/build_environment.py
-@@ -98,7 +98,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BI
+@@ -84,7 +84,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BIN', 'sip')
  from PyQt5.QtCore import PYQT_CONFIGURATION
  pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
  def get_sip_dir():
--    q = os.environ.get('SIP_DIR', sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
-+    q = os.environ.get('SIP_DIR', sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
+-    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
++    q = os.environ.get('SIP_DIR', os.path.join(sys.prefix, 'share', 'sip') if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
      for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
          base = os.path.join(q, x)
          if os.path.exists(os.path.join(base, 'QtWidgets')):
diff --git a/deskutils/calibre/files/patch-src_calibre_library_server_content.py b/deskutils/calibre/files/patch-src_calibre_library_server_content.py
deleted file mode 100644
index d3fe1e739c64..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_library_server_content.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/calibre/library/server/content.py.orig	2016-05-20 11:45:27 UTC
-+++ src/calibre/library/server/content.py
-@@ -110,6 +110,7 @@ class ContentServer(object):
-                      'png'  : 'image/png',
-                      'gif'  : 'image/gif',
-                      'html' : 'text/html',
-+                     'ico'  : 'image/x-icon',
-                      }[fname.rpartition('.')[-1].lower()]
-         except KeyError:
-             raise cherrypy.HTTPError(404, '%r not a valid resource type'%name)
diff --git a/deskutils/calibre/files/patch-src_calibre_linux.py b/deskutils/calibre/files/patch-src_calibre_linux.py
index 84108c34e152..be17c814e954 100644
--- a/deskutils/calibre/files/patch-src_calibre_linux.py
+++ b/deskutils/calibre/files/patch-src_calibre_linux.py
@@ -1,6 +1,6 @@
---- src/calibre/linux.py.orig	2015-08-28 03:16:27 UTC
+--- src/calibre/linux.py.orig	2017-06-16 04:00:12 UTC
 +++ src/calibre/linux.py
-@@ -997,7 +997,7 @@ Name=E-book Viewer
+@@ -1008,7 +1008,7 @@ Name=E-book Viewer
  GenericName=Viewer for E-books
  Comment=Viewer for E-books in all the major formats
  TryExec=ebook-viewer
@@ -9,7 +9,7 @@
  Icon=calibre-viewer
  Categories=Graphics;Viewer;
  '''
-@@ -1010,7 +1010,7 @@ Name=Edit E-book
+@@ -1021,7 +1021,7 @@ Name=Edit E-book
  GenericName=Edit E-books
  Comment=Edit e-books in various formats
  TryExec=ebook-edit
@@ -18,7 +18,7 @@
  Icon=calibre-ebook-edit
  Categories=Office;
  '''
-@@ -1023,7 +1023,7 @@ Name=calibre
+@@ -1034,7 +1034,7 @@ Name=calibre
  GenericName=E-book library management
  Comment=E-book library management: Convert, view, share, catalogue all your e-books
  TryExec=calibre
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index f4fa049683e5..f4f033b3f9b0 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -32,6 +32,31 @@ lib/calibre/calibre/db/backend.py
 lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
 lib/calibre/calibre/db/categories.py
+lib/calibre/calibre/db/cli/__init__.py
+lib/calibre/calibre/db/cli/cmd_add.py
+lib/calibre/calibre/db/cli/cmd_add_custom_column.py
+lib/calibre/calibre/db/cli/cmd_add_format.py
+lib/calibre/calibre/db/cli/cmd_backup_metadata.py
+lib/calibre/calibre/db/cli/cmd_catalog.py
+lib/calibre/calibre/db/cli/cmd_check_library.py
+lib/calibre/calibre/db/cli/cmd_clone.py
+lib/calibre/calibre/db/cli/cmd_custom_columns.py
+lib/calibre/calibre/db/cli/cmd_embed_metadata.py
+lib/calibre/calibre/db/cli/cmd_export.py
+lib/calibre/calibre/db/cli/cmd_list.py
+lib/calibre/calibre/db/cli/cmd_list_categories.py
+lib/calibre/calibre/db/cli/cmd_remove.py
+lib/calibre/calibre/db/cli/cmd_remove_custom_column.py
+lib/calibre/calibre/db/cli/cmd_remove_format.py
+lib/calibre/calibre/db/cli/cmd_restore_database.py
+lib/calibre/calibre/db/cli/cmd_saved_searches.py
+lib/calibre/calibre/db/cli/cmd_search.py
+lib/calibre/calibre/db/cli/cmd_set_custom.py
+lib/calibre/calibre/db/cli/cmd_set_metadata.py
+lib/calibre/calibre/db/cli/cmd_show_metadata.py
+lib/calibre/calibre/db/cli/main.py
+lib/calibre/calibre/db/cli/tests.py
+lib/calibre/calibre/db/cli/utils.py
 lib/calibre/calibre/db/delete_service.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
@@ -335,6 +360,7 @@ lib/calibre/calibre/ebooks/metadata/book/base.py
 lib/calibre/calibre/ebooks/metadata/book/formatter.py
 lib/calibre/calibre/ebooks/metadata/book/json_codec.py
 lib/calibre/calibre/ebooks/metadata/book/render.py
+lib/calibre/calibre/ebooks/metadata/book/serialize.py
 lib/calibre/calibre/ebooks/metadata/cli.py
 lib/calibre/calibre/ebooks/metadata/docx.py
 lib/calibre/calibre/ebooks/metadata/epub.py
@@ -690,6 +716,7 @@ lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
 lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
+lib/calibre/calibre/gui2/changes.py
 lib/calibre/calibre/gui2/comments_editor.py
 lib/calibre/calibre/gui2/complete2.py
 lib/calibre/calibre/gui2/convert/__init__.py
@@ -830,8 +857,6 @@ lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/search.py
-lib/calibre/calibre/gui2/dialogs/search_item_ui.py
-lib/calibre/calibre/gui2/dialogs/search_ui.py
 lib/calibre/calibre/gui2/dialogs/select_formats.py
 lib/calibre/calibre/gui2/dialogs/smartdevice.py
 lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
@@ -919,7 +944,6 @@ lib/calibre/calibre/gui2/preferences/search_ui.py
 lib/calibre/calibre/gui2/preferences/sending.py
 lib/calibre/calibre/gui2/preferences/sending_ui.py
 lib/calibre/calibre/gui2/preferences/server.py
-lib/calibre/calibre/gui2/preferences/server_ui.py
 lib/calibre/calibre/gui2/preferences/template_functions.py
 lib/calibre/calibre/gui2/preferences/template_functions_ui.py
 lib/calibre/calibre/gui2/preferences/texture_chooser.py
@@ -1139,7 +1163,6 @@ lib/calibre/calibre/library/catalogs/epub_mobi.py
 lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
 lib/calibre/calibre/library/catalogs/utils.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
@@ -1150,29 +1173,15 @@ lib/calibre/calibre/library/prefs.py
 lib/calibre/calibre/library/restore.py
 lib/calibre/calibre/library/save_to_disk.py
 lib/calibre/calibre/library/schema_upgrades.py
-lib/calibre/calibre/library/server/__init__.py
-lib/calibre/calibre/library/server/ajax.py
-lib/calibre/calibre/library/server/base.py
-lib/calibre/calibre/library/server/browse.py
-lib/calibre/calibre/library/server/cache.py
-lib/calibre/calibre/library/server/content.py
-lib/calibre/calibre/library/server/main.py
-lib/calibre/calibre/library/server/mobile.py
-lib/calibre/calibre/library/server/opds.py
-lib/calibre/calibre/library/server/utils.py
-lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
-lib/calibre/calibre/library/test_cli.py
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
-lib/calibre/calibre/plugins/_regex.so
 lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
-lib/calibre/calibre/plugins/dukpy.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
@@ -1205,14 +1214,18 @@ lib/calibre/calibre/srv/auth.py
 lib/calibre/calibre/srv/auto_reload.py
 lib/calibre/calibre/srv/bonjour.py
 lib/calibre/calibre/srv/books.py
+lib/calibre/calibre/srv/cdb.py
+lib/calibre/calibre/srv/changes.py
 lib/calibre/calibre/srv/code.py
 lib/calibre/calibre/srv/content.py
+lib/calibre/calibre/srv/embedded.py
 lib/calibre/calibre/srv/errors.py
 lib/calibre/calibre/srv/handler.py
 lib/calibre/calibre/srv/http_request.py
 lib/calibre/calibre/srv/http_response.py
 lib/calibre/calibre/srv/jobs.py
 lib/calibre/calibre/srv/legacy.py
+lib/calibre/calibre/srv/library_broker.py
 lib/calibre/calibre/srv/loop.py
 lib/calibre/calibre/srv/metadata.py
 lib/calibre/calibre/srv/opds.py
@@ -1337,6 +1350,7 @@ lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/run_tests.py
 lib/calibre/calibre/utils/search_query_parser.py
+lib/calibre/calibre/utils/serialize.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/shared_file.py
@@ -1349,6 +1363,7 @@ lib/calibre/calibre/utils/soupparser.py
 lib/calibre/calibre/utils/speedups.py
 lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/terminal.py
+lib/calibre/calibre/utils/test_lock.py
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
@@ -1374,89 +1389,6 @@ lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
 lib/calibre/calibre/web/fetch/simple.py
 lib/calibre/calibre/web/fetch/utils.py
-lib/calibre/chardet/__init__.py
-lib/calibre/chardet/big5freq.py
-lib/calibre/chardet/big5prober.py
-lib/calibre/chardet/chardistribution.py
-lib/calibre/chardet/charsetgroupprober.py
-lib/calibre/chardet/charsetprober.py
-lib/calibre/chardet/codingstatemachine.py
-lib/calibre/chardet/constants.py
-lib/calibre/chardet/escprober.py
-lib/calibre/chardet/escsm.py
-lib/calibre/chardet/eucjpprober.py
-lib/calibre/chardet/euckrfreq.py
-lib/calibre/chardet/euckrprober.py
-lib/calibre/chardet/euctwfreq.py
-lib/calibre/chardet/euctwprober.py
-lib/calibre/chardet/gb2312freq.py
-lib/calibre/chardet/gb2312prober.py
-lib/calibre/chardet/hebrewprober.py
-lib/calibre/chardet/jisfreq.py
-lib/calibre/chardet/jpcntx.py
-lib/calibre/chardet/langbulgarianmodel.py
-lib/calibre/chardet/langcyrillicmodel.py
-lib/calibre/chardet/langgreekmodel.py
-lib/calibre/chardet/langhebrewmodel.py
-lib/calibre/chardet/langhungarianmodel.py
-lib/calibre/chardet/langthaimodel.py
-lib/calibre/chardet/latin1prober.py
-lib/calibre/chardet/mbcharsetprober.py
-lib/calibre/chardet/mbcsgroupprober.py
-lib/calibre/chardet/mbcssm.py
-lib/calibre/chardet/sbcharsetprober.py
-lib/calibre/chardet/sbcsgroupprober.py
-lib/calibre/chardet/sjisprober.py
-lib/calibre/chardet/test.py
-lib/calibre/chardet/universaldetector.py
-lib/calibre/chardet/utf8prober.py
-lib/calibre/cherrypy/__init__.py
-lib/calibre/cherrypy/_cpchecker.py
-lib/calibre/cherrypy/_cpcompat.py
-lib/calibre/cherrypy/_cpconfig.py
-lib/calibre/cherrypy/_cpdispatch.py
-lib/calibre/cherrypy/_cperror.py
-lib/calibre/cherrypy/_cplogging.py
-lib/calibre/cherrypy/_cpmodpy.py
-lib/calibre/cherrypy/_cpnative_server.py
-lib/calibre/cherrypy/_cpreqbody.py
-lib/calibre/cherrypy/_cprequest.py
-lib/calibre/cherrypy/_cpserver.py
-lib/calibre/cherrypy/_cpthreadinglocal.py
-lib/calibre/cherrypy/_cptools.py
-lib/calibre/cherrypy/_cptree.py
-lib/calibre/cherrypy/_cpwsgi.py
-lib/calibre/cherrypy/_cpwsgi_server.py
-lib/calibre/cherrypy/lib/__init__.py
-lib/calibre/cherrypy/lib/auth.py
-lib/calibre/cherrypy/lib/auth_basic.py
-lib/calibre/cherrypy/lib/auth_digest.py
-lib/calibre/cherrypy/lib/caching.py
-lib/calibre/cherrypy/lib/covercp.py
-lib/calibre/cherrypy/lib/cpstats.py
-lib/calibre/cherrypy/lib/cptools.py
-lib/calibre/cherrypy/lib/encoding.py
-lib/calibre/cherrypy/lib/gctools.py
-lib/calibre/cherrypy/lib/http.py
-lib/calibre/cherrypy/lib/httpauth.py
-lib/calibre/cherrypy/lib/httputil.py
-lib/calibre/cherrypy/lib/jsontools.py
-lib/calibre/cherrypy/lib/profiler.py
-lib/calibre/cherrypy/lib/reprconf.py
-lib/calibre/cherrypy/lib/sessions.py
-lib/calibre/cherrypy/lib/static.py
-lib/calibre/cherrypy/lib/xmlrpcutil.py
-lib/calibre/cherrypy/process/__init__.py
-lib/calibre/cherrypy/process/plugins.py
-lib/calibre/cherrypy/process/servers.py
-lib/calibre/cherrypy/process/win32.py
-lib/calibre/cherrypy/process/wspbus.py
-lib/calibre/cherrypy/scaffold/__init__.py
-lib/calibre/cherrypy/wsgiserver/__init__.py
-lib/calibre/cherrypy/wsgiserver/ssl_builtin.py
-lib/calibre/cherrypy/wsgiserver/ssl_pyopenssl.py
-lib/calibre/cherrypy/wsgiserver/wsgiserver2.py
-lib/calibre/cherrypy/wsgiserver/wsgiserver3.py
 lib/calibre/css_selectors/__init__.py
 lib/calibre/css_selectors/errors.py
 lib/calibre/css_selectors/ordered_set.py
@@ -1539,15 +1471,6 @@ lib/calibre/odf/text.py
 lib/calibre/odf/thumbnail.py
 lib/calibre/odf/userfield.py
 lib/calibre/odf/xforms.py
-lib/calibre/regex/__init__.py
-lib/calibre/regex/_regex_core.py
-lib/calibre/routes/__init__.py
-lib/calibre/routes/base.py
-lib/calibre/routes/lru.py
-lib/calibre/routes/mapper.py
-lib/calibre/routes/middleware.py
-lib/calibre/routes/route.py
-lib/calibre/routes/util.py
 lib/calibre/templite/__init__.py
 lib/calibre/tinycss/__init__.py
 lib/calibre/tinycss/color3.py
@@ -1592,54 +1515,6 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/content-server/mathjax.zip.xz
 %%DATADIR%%/content-server/mobile.css
 %%DATADIR%%/content-server/reset.css
-%%DATADIR%%/content_server/av.jpg
-%%DATADIR%%/content_server/bg_search_box.png
-%%DATADIR%%/content_server/browse/browse.css
-%%DATADIR%%/content_server/browse/browse.html
-%%DATADIR%%/content_server/browse/browse.js
-%%DATADIR%%/content_server/browse/details.html
-%%DATADIR%%/content_server/browse/summary.html
-%%DATADIR%%/content_server/btn_search_box.png
-%%DATADIR%%/content_server/button-donate.png
-%%DATADIR%%/content_server/calibre.png
-%%DATADIR%%/content_server/calibre_banner.png
-%%DATADIR%%/content_server/date.js
-%%DATADIR%%/content_server/default_cover.jpg
-%%DATADIR%%/content_server/first.png
-%%DATADIR%%/content_server/gui.css
-%%DATADIR%%/content_server/gui.js
-%%DATADIR%%/content_server/index.html
-%%DATADIR%%/content_server/jquery.corner.js
-%%DATADIR%%/content_server/jquery.js
-%%DATADIR%%/content_server/jquery.multiselect.css
-%%DATADIR%%/content_server/jquery.multiselect.min.js
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png
-%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css
-%%DATADIR%%/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js
-%%DATADIR%%/content_server/last.png
-%%DATADIR%%/content_server/loading.gif
-%%DATADIR%%/content_server/logo.png
-%%DATADIR%%/content_server/mobile.css
-%%DATADIR%%/content_server/next.png
-%%DATADIR%%/content_server/previous.png
-%%DATADIR%%/content_server/read/monocle.js
-%%DATADIR%%/content_server/stacktrace.js
-%%DATADIR%%/content_server/star-half.png
-%%DATADIR%%/content_server/star-off.png
-%%DATADIR%%/content_server/star-on.png
 %%DATADIR%%/csscolorparser.js
 %%DATADIR%%/default_tweaks.py
 %%DATADIR%%/dictionaries/en-GB/en-GB.aff
@@ -1674,6 +1549,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/fonts/liberation/LiberationSerif-Regular.ttf
 %%DATADIR%%/images.qrc
 %%DATADIR%%/images/add_book.png
+%%DATADIR%%/images/apple-touch-icon.png
 %%DATADIR%%/images/arrow-down.png
 %%DATADIR%%/images/arrow-up.png
 %%DATADIR%%/images/auto-reload.png
@@ -1760,6 +1636,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/format-text-superscript.png
 %%DATADIR%%/images/format-text-underline.png
 %%DATADIR%%/images/forward.png
+%%DATADIR%%/images/gear.png
 %%DATADIR%%/images/gmail_logo.png
 %%DATADIR%%/images/grid.png
 %%DATADIR%%/images/help.png
@@ -1907,6 +1784,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/quick_start/eng.epub
 %%DATADIR%%/quick_start/fra.epub
 %%DATADIR%%/quick_start/ita.epub
+%%DATADIR%%/quick_start/swe.epub
 %%DATADIR%%/rapydscript/compiler.js.xz
 %%DATADIR%%/rapydscript/lib/aes.pyj
 %%DATADIR%%/rapydscript/lib/elementmaker.pyj
@@ -1941,6 +1819,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/hyphenate/patterns.zip
 %%DATADIR%%/viewer/hyphenation.js
 %%DATADIR%%/viewer/images.js
+%%DATADIR%%/viewer/jquery.js
 %%DATADIR%%/viewer/jquery_scrollTo.js
 %%DATADIR%%/viewer/mathjax/MathJax.js
 %%DATADIR%%/viewer/mathjax/extensions/AssistiveMML.js