4 files changed, 19 insertions, 13 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index ed5c3dc08e0b..eca3ef561113 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	2.59.0
+PORTVERSION=	2.60.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index efd272c79c54..d39d57f66172 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466172933
-SHA256 (calibre-2.59.0.tar.xz) = b846f44574366bee3d8cb9326c655609ba61877ec112da253d9c46ba522a31f3
-SIZE (calibre-2.59.0.tar.xz) = 40487560
+TIMESTAMP = 1467024179
+SHA256 (calibre-2.60.0.tar.xz) = 30cca18269fcf94400bdc428e7ac706b6265e550b9572668f998ebab5de5c83b
+SIZE (calibre-2.60.0.tar.xz) = 40604012
diff --git a/deskutils/calibre/files/patch-setup_build__environment.py b/deskutils/calibre/files/patch-setup_build__environment.py
index bf78f80baf70..4480f3a108df 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-05-20 11:45:27 UTC
+--- setup/build_environment.py.orig	2016-06-24 01:54:27 UTC
 +++ setup/build_environment.py
-@@ -103,7 +103,7 @@ def get_sip_dir(q):
+@@ -98,7 +98,7 @@ pyqt['sip_bin'] = os.environ.get('SIP_BI
+ 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'))
+     for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
+         base = os.path.join(q, x)
          if os.path.exists(os.path.join(base, 'QtWidgets')):
-             return base
-     raise EnvironmentError('Failed to find the location of the PyQt5 .sip files')
--pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
-+pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'py-sip'))
- pyqt['sip_inc_dir'] = sysconfig.get_path('include')
- 
- glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else ''
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 628010c46682..3535915dd2da 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -107,6 +107,7 @@ lib/calibre/calibre/devices/kobo/__init__.py
 lib/calibre/calibre/devices/kobo/bookmark.py
 lib/calibre/calibre/devices/kobo/books.py
 lib/calibre/calibre/devices/kobo/driver.py
+lib/calibre/calibre/devices/kobo/kobotouch_config.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
 lib/calibre/calibre/devices/misc.py
@@ -352,6 +353,8 @@ lib/calibre/calibre/ebooks/metadata/mobi.py
 lib/calibre/calibre/ebooks/metadata/odt.py
 lib/calibre/calibre/ebooks/metadata/opf.py
 lib/calibre/calibre/ebooks/metadata/opf2.py
+lib/calibre/calibre/ebooks/metadata/opf3.py
+lib/calibre/calibre/ebooks/metadata/opf3_test.py
 lib/calibre/calibre/ebooks/metadata/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
 lib/calibre/calibre/ebooks/metadata/plucker.py
@@ -473,6 +476,7 @@ lib/calibre/calibre/ebooks/oeb/polish/tests/cascade.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
 lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/structure.py
 lib/calibre/calibre/ebooks/oeb/polish/toc.py
 lib/calibre/calibre/ebooks/oeb/polish/utils.py
 lib/calibre/calibre/ebooks/oeb/reader.py
@@ -771,6 +775,7 @@ lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
 lib/calibre/calibre/gui2/device_drivers/mtp_config.py
 lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
+lib/calibre/calibre/gui2/device_drivers/tabbed_device_config.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/add_empty_book.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
@@ -1346,6 +1351,7 @@ lib/calibre/calibre/utils/rapydscript.py
 lib/calibre/calibre/utils/recycle_bin.py
 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/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py