- Update 2.54.0

- Remove patch accepted upstream

4 files changed, 8 insertions, 17 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index db25674bec1d..0447171beb6e 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	2.53.0
-PORTREVISION=	2
+PORTVERSION=	2.54.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 57f957a28374..e8766fa58695 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-2.53.0.tar.xz) = 1f36c5f4144571576637a401067d0cf5aa0ef75ff97773511ab948a3d2806e67
-SIZE (calibre-2.53.0.tar.xz) = 40086616
+SHA256 (calibre-2.54.0.tar.xz) = e9e0d8e05d298a555e66b628e0d6be3f45543e457f20c1d70ba55b1cb1ed4ce4
+SIZE (calibre-2.54.0.tar.xz) = 40211808
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
deleted file mode 100644
index 567d1afa7b92..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/calibre/devices/usbms/device.py.orig	2016-03-11 03:07:28 UTC
-+++ src/calibre/devices/usbms/device.py
-@@ -699,7 +699,8 @@ class Device(DeviceConfig, DevicePlugin)
-                         d.manufacturer == objif.GetProperty('usb.vendor') and \
-                         d.product == objif.GetProperty('usb.product') and \
-                         d.serial == objif.GetProperty('usb.serial'):
--                    dpaths = manager.FindDeviceStringMatch('storage.originating_device', path)
-+                    midpath = manager.FindDeviceStringMatch('info.parent', path)
-+                    dpaths = manager.FindDeviceStringMatch('storage.originating_device', path) + manager.FindDeviceStringMatch('storage.originating_device', midpath[0])
-                     for dpath in dpaths:
-                         # devif = dbus.Interface(bus.get_object('org.freedesktop.Hal', dpath), 'org.freedesktop.Hal.Device')
-                         try:
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 80bbb9c68180..d6f1335b7b09 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -838,6 +838,7 @@ 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/trim_image.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/dnd.py
@@ -1198,6 +1199,7 @@ lib/calibre/calibre/srv/ajax.py
 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/code.py
 lib/calibre/calibre/srv/content.py
 lib/calibre/calibre/srv/errors.py
@@ -1596,9 +1598,9 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.ttf
 %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff
 %%DATADIR%%/content-server/font-awesome/fontawesome-webfont.woff2
+%%DATADIR%%/content-server/index-generated.html
 %%DATADIR%%/content-server/index.html
 %%DATADIR%%/content-server/locales.zip
-%%DATADIR%%/content-server/main.js
 %%DATADIR%%/content-server/mobile.css
 %%DATADIR%%/content-server/reset.css
 %%DATADIR%%/content_server/av.jpg
@@ -1917,7 +1919,9 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/quick_start/fra.epub
 %%DATADIR%%/quick_start/ita.epub
 %%DATADIR%%/rapydscript/compiler.js.xz
+%%DATADIR%%/rapydscript/lib/aes.pyj
 %%DATADIR%%/rapydscript/lib/elementmaker.pyj
+%%DATADIR%%/rapydscript/lib/encodings.pyj
 %%DATADIR%%/rapydscript/lib/gettext.pyj
 %%DATADIR%%/rapydscript/lib/math.pyj
 %%DATADIR%%/rapydscript/lib/operator.pyj