- Update to 1.48.0

- Remove deprecated @dirrms from plist
- Switch dependency on py-imaging with py-pilllow
- Convert to USES=python

PR:		193397
Submitted by:	rnejdl@ringofsaturn.com (maintainer)

3 files changed, 7 insertions, 281 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index d1d4a2fa29e4..204070f378a6 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	1.47.0
-PORTREVISION=	2
+PORTVERSION=	1.48.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -24,14 +23,14 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \
 		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \
-		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
@@ -51,11 +50,10 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 USE_RC_SUBR=	calibre
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
 
-USES=		desktop-file-utils pkgconfig shared-mime-info shebangfix tar:xz
+USES=		desktop-file-utils pkgconfig python:2 shared-mime-info shebangfix tar:xz
 SHEBANG_FILES=	src/calibre/ebooks/metadata/odt.py \
 		src/calibre/utils/*.py \
 		src/odf/*.py
-USE_PYTHON=	2
 USE_QT4=	dbus qmake_build moc_build
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-src
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index f83bb88c89d8..42de94f16496 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-1.47.0.tar.xz) = efeb71a5bb4742a9c0a99038fdd97baa55c35e8ba5312e19e422c004bbf5b8c2
-SIZE (calibre-1.47.0.tar.xz) = 36581960
+SHA256 (calibre-1.48.0.tar.xz) = e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472
+SIZE (calibre-1.48.0.tar.xz) = 35126680
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index c4ac1ee22ad5..22916e0746d5 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -1045,7 +1045,6 @@ lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
-lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
 lib/calibre/calibre/gui2/viewer/documentview.py
@@ -1056,11 +1055,11 @@ lib/calibre/calibre/gui2/viewer/inspector.py
 lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
-lib/calibre/calibre/gui2/viewer/main_ui.py
 lib/calibre/calibre/gui2/viewer/position.py
 lib/calibre/calibre/gui2/viewer/printing.py
 lib/calibre/calibre/gui2/viewer/table_popup.py
 lib/calibre/calibre/gui2/viewer/toc.py
+lib/calibre/calibre/gui2/viewer/ui.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
 lib/calibre/calibre/gui2/wizard/__init__.py
@@ -2020,274 +2019,3 @@ share/mime/application/x-topaz-ebook.xml
 share/mime/packages/calibre-mimetypes.xml
 share/mime/text/lrs.xml
 share/zsh/site-functions/_calibre
-@dirrmtry share/mime/text
-@dirrmtry share/mime/packages
-@dirrmtry share/mime/application
-@dirrmtry share/mime
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
-@dirrmtry share/icons/hicolor/128x128/mimetypes
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
-@dirrmtry share/desktop-directories
-@dirrmtry share/bash-completion
-@dirrmtry share/appdata
-@dirrmtry share/zsh/site-functions
-@dirrmtry share/zsh
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size4/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size4
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size3/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size3
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size2/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size2
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size1/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Size1
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Script/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Script
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Italic
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif/Bold
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/SansSerif
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Math/Italic
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Math/BoldItalic
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Math
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Bold
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG/autoload
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output/SVG
-@dirrm %%DATADIR%%/viewer/mathjax/jax/output
-@dirrm %%DATADIR%%/viewer/mathjax/jax/input/TeX
-@dirrm %%DATADIR%%/viewer/mathjax/jax/input/MathML/entities
-@dirrm %%DATADIR%%/viewer/mathjax/jax/input/MathML
-@dirrm %%DATADIR%%/viewer/mathjax/jax/input/AsciiMath
-@dirrm %%DATADIR%%/viewer/mathjax/jax/input
-@dirrm %%DATADIR%%/viewer/mathjax/jax/element/mml/optable
-@dirrm %%DATADIR%%/viewer/mathjax/jax/element/mml
-@dirrm %%DATADIR%%/viewer/mathjax/jax/element
-@dirrm %%DATADIR%%/viewer/mathjax/jax
-@dirrm %%DATADIR%%/viewer/mathjax/extensions/TeX
-@dirrm %%DATADIR%%/viewer/mathjax/extensions
-@dirrm %%DATADIR%%/viewer/mathjax
-@dirrm %%DATADIR%%/viewer/hyphenate
-@dirrm %%DATADIR%%/viewer
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/quick_start
-@dirrm %%DATADIR%%/localization/pykakasi
-@dirrm %%DATADIR%%/localization
-@dirrm %%DATADIR%%/jacket
-@dirrm %%DATADIR%%/images/textures
-@dirrm %%DATADIR%%/images/plugins
-@dirrm %%DATADIR%%/images/mimetypes
-@dirrm %%DATADIR%%/images/devices
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/fonts/liberation
-@dirrm %%DATADIR%%/fonts
-@dirrm %%DATADIR%%/editor-help
-@dirrm %%DATADIR%%/dictionaries/es-ES
-@dirrm %%DATADIR%%/dictionaries/en-US
-@dirrm %%DATADIR%%/dictionaries/en-GB
-@dirrm %%DATADIR%%/dictionaries
-@dirrm %%DATADIR%%/content_server/read
-@dirrm %%DATADIR%%/content_server/jquery_ui/js
-@dirrm %%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images
-@dirrm %%DATADIR%%/content_server/jquery_ui/css/humanity-custom
-@dirrm %%DATADIR%%/content_server/jquery_ui/css
-@dirrm %%DATADIR%%/content_server/jquery_ui
-@dirrm %%DATADIR%%/content_server/browse
-@dirrm %%DATADIR%%/content_server
-@dirrm %%DATADIR%%/catalog
-@dirrm %%DATADIR%%
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrm lib/calibre/tinycss/tests
-@dirrm lib/calibre/tinycss
-@dirrm lib/calibre/templite
-@dirrm lib/calibre/routes
-@dirrm lib/calibre/regex
-@dirrm lib/calibre/qtcurve
-@dirrm lib/calibre/odf
-@dirrm lib/calibre/html5lib/trie
-@dirrm lib/calibre/html5lib/treewalkers
-@dirrm lib/calibre/html5lib/treeadapters
-@dirrm lib/calibre/html5lib/treebuilders
-@dirrm lib/calibre/html5lib/serializer
-@dirrm lib/calibre/html5lib/filters
-@dirrm lib/calibre/html5lib
-@dirrm lib/calibre/cherrypy/wsgiserver
-@dirrm lib/calibre/cherrypy/scaffold
-@dirrm lib/calibre/cherrypy/process
-@dirrm lib/calibre/cherrypy/lib
-@dirrm lib/calibre/cherrypy
-@dirrm lib/calibre/chardet
-@dirrm lib/calibre/calibre/web/jsbrowser
-@dirrm lib/calibre/calibre/web/fetch
-@dirrm lib/calibre/calibre/web/feeds/recipes
-@dirrm lib/calibre/calibre/web/feeds
-@dirrm lib/calibre/calibre/web
-@dirrm lib/calibre/calibre/utils/wmf
-@dirrm lib/calibre/calibre/utils/spell
-@dirrm lib/calibre/calibre/utils/pyconsole
-@dirrm lib/calibre/calibre/utils/podofo
-@dirrm lib/calibre/calibre/utils/opensearch
-@dirrm lib/calibre/calibre/utils/magick
-@dirrm lib/calibre/calibre/utils/ipc
-@dirrm lib/calibre/calibre/utils/fonts/woff
-@dirrm lib/calibre/calibre/utils/fonts/sfnt/cff
-@dirrm lib/calibre/calibre/utils/fonts/sfnt
-@dirrm lib/calibre/calibre/utils/fonts
-@dirrm lib/calibre/calibre/utils/chm
-@dirrm lib/calibre/calibre/utils
-@dirrm lib/calibre/calibre/translations
-@dirrm lib/calibre/calibre/spell
-@dirrm lib/calibre/calibre/plugins
-@dirrm lib/calibre/calibre/library/server
-@dirrm lib/calibre/calibre/library/catalogs
-@dirrm lib/calibre/calibre/library
-@dirrm lib/calibre/calibre/gui2/wizard
-@dirrm lib/calibre/calibre/gui2/viewer
-@dirrm lib/calibre/calibre/gui2/tweak_book/editor/syntax
-@dirrm lib/calibre/calibre/gui2/tweak_book/editor/smart
-@dirrm lib/calibre/calibre/gui2/tweak_book/editor
-@dirrm lib/calibre/calibre/gui2/tweak_book/diff
-@dirrm lib/calibre/calibre/gui2/tweak_book
-@dirrm lib/calibre/calibre/gui2/toc
-@dirrm lib/calibre/calibre/gui2/tag_browser
-@dirrm lib/calibre/calibre/gui2/store/stores/mobileread
-@dirrm lib/calibre/calibre/gui2/store/stores
-@dirrm lib/calibre/calibre/gui2/store/search
-@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
-@dirrm lib/calibre/calibre/gui2/progress_indicator
-@dirrm lib/calibre/calibre/gui2/preferences
-@dirrm lib/calibre/calibre/gui2/metadata
-@dirrm lib/calibre/calibre/gui2/lrf_renderer
-@dirrm lib/calibre/calibre/gui2/library
-@dirrm lib/calibre/calibre/gui2/dialogs
-@dirrm lib/calibre/calibre/gui2/device_drivers
-@dirrm lib/calibre/calibre/gui2/convert
-@dirrm lib/calibre/calibre/gui2/catalog
-@dirrm lib/calibre/calibre/gui2/add_wizard
-@dirrm lib/calibre/calibre/gui2/actions
-@dirrm lib/calibre/calibre/gui2
-@dirrm lib/calibre/calibre/ebooks/unihandecode/pykakasi
-@dirrm lib/calibre/calibre/ebooks/unihandecode
-@dirrm lib/calibre/calibre/ebooks/txt
-@dirrm lib/calibre/calibre/ebooks/textile
-@dirrm lib/calibre/calibre/ebooks/tcr
-@dirrm lib/calibre/calibre/ebooks/snb
-@dirrm lib/calibre/calibre/ebooks/rtf2xml
-@dirrm lib/calibre/calibre/ebooks/rtf
-@dirrm lib/calibre/calibre/ebooks/readability
-@dirrm lib/calibre/calibre/ebooks/rb
-@dirrm lib/calibre/calibre/ebooks/pml
-@dirrm lib/calibre/calibre/ebooks/pdf/render
-@dirrm lib/calibre/calibre/ebooks/pdf
-@dirrm lib/calibre/calibre/ebooks/pdb/ztxt
-@dirrm lib/calibre/calibre/ebooks/pdb/plucker
-@dirrm lib/calibre/calibre/ebooks/pdb/pdf
-@dirrm lib/calibre/calibre/ebooks/pdb/palmdoc
-@dirrm lib/calibre/calibre/ebooks/pdb/haodoo
-@dirrm lib/calibre/calibre/ebooks/pdb/ereader
-@dirrm lib/calibre/calibre/ebooks/pdb
-@dirrm lib/calibre/calibre/ebooks/oeb/transforms
-@dirrm lib/calibre/calibre/ebooks/oeb/polish/tests
-@dirrm lib/calibre/calibre/ebooks/oeb/polish/check
-@dirrm lib/calibre/calibre/ebooks/oeb/polish
-@dirrm lib/calibre/calibre/ebooks/oeb/iterator
-@dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi
-@dirrm lib/calibre/calibre/ebooks/oeb/display
-@dirrm lib/calibre/calibre/ebooks/oeb
-@dirrm lib/calibre/calibre/ebooks/odt
-@dirrm lib/calibre/calibre/ebooks/mobi/writer8
-@dirrm lib/calibre/calibre/ebooks/mobi/writer2
-@dirrm lib/calibre/calibre/ebooks/mobi/reader
-@dirrm lib/calibre/calibre/ebooks/mobi/debug
-@dirrm lib/calibre/calibre/ebooks/mobi
-@dirrm lib/calibre/calibre/ebooks/metadata/sources
-@dirrm lib/calibre/calibre/ebooks/metadata/book
-@dirrm lib/calibre/calibre/ebooks/metadata
-@dirrm lib/calibre/calibre/ebooks/markdown/extensions
-@dirrm lib/calibre/calibre/ebooks/markdown
-@dirrm lib/calibre/calibre/ebooks/lrf/pylrs
-@dirrm lib/calibre/calibre/ebooks/lrf/lrs
-@dirrm lib/calibre/calibre/ebooks/lrf/html
-@dirrm lib/calibre/calibre/ebooks/lrf
-@dirrm lib/calibre/calibre/ebooks/lit/maps
-@dirrm lib/calibre/calibre/ebooks/lit
-@dirrm lib/calibre/calibre/ebooks/iterator
-@dirrm lib/calibre/calibre/ebooks/htmlz
-@dirrm lib/calibre/calibre/ebooks/html
-@dirrm lib/calibre/calibre/ebooks/fb2
-@dirrm lib/calibre/calibre/ebooks/epub
-@dirrm lib/calibre/calibre/ebooks/docx/writer
-@dirrm lib/calibre/calibre/ebooks/docx
-@dirrm lib/calibre/calibre/ebooks/djvu
-@dirrm lib/calibre/calibre/ebooks/conversion/plugins
-@dirrm lib/calibre/calibre/ebooks/conversion
-@dirrm lib/calibre/calibre/ebooks/compression
-@dirrm lib/calibre/calibre/ebooks/comic
-@dirrm lib/calibre/calibre/ebooks/chm
-@dirrm lib/calibre/calibre/ebooks/azw4
-@dirrm lib/calibre/calibre/ebooks
-@dirrm lib/calibre/calibre/devices/user_defined
-@dirrm lib/calibre/calibre/devices/usbobserver
-@dirrm lib/calibre/calibre/devices/usbms
-@dirrm lib/calibre/calibre/devices/teclast
-@dirrm lib/calibre/calibre/devices/sne
-@dirrm lib/calibre/calibre/devices/smart_device_app
-@dirrm lib/calibre/calibre/devices/prst1
-@dirrm lib/calibre/calibre/devices/prs505
-@dirrm lib/calibre/calibre/devices/nuut2
-@dirrm lib/calibre/calibre/devices/nook
-@dirrm lib/calibre/calibre/devices/nokia
-@dirrm lib/calibre/calibre/devices/mtp/windows
-@dirrm lib/calibre/calibre/devices/mtp/unix/upstream
-@dirrm lib/calibre/calibre/devices/mtp/unix
-@dirrm lib/calibre/calibre/devices/mtp
-@dirrm lib/calibre/calibre/devices/kobo
-@dirrm lib/calibre/calibre/devices/kindle
-@dirrm lib/calibre/calibre/devices/jetbook
-@dirrm lib/calibre/calibre/devices/iriver
-@dirrm lib/calibre/calibre/devices/irexdr
-@dirrm lib/calibre/calibre/devices/iliad
-@dirrm lib/calibre/calibre/devices/idevice
-@dirrm lib/calibre/calibre/devices/hanvon
-@dirrm lib/calibre/calibre/devices/hanlin
-@dirrm lib/calibre/calibre/devices/folder_device
-@dirrm lib/calibre/calibre/devices/eslick
-@dirrm lib/calibre/calibre/devices/edge
-@dirrm lib/calibre/calibre/devices/eb600
-@dirrm lib/calibre/calibre/devices/cybook
-@dirrm lib/calibre/calibre/devices/boeye
-@dirrm lib/calibre/calibre/devices/blackberry
-@dirrm lib/calibre/calibre/devices/binatone
-@dirrm lib/calibre/calibre/devices/bambook
-@dirrm lib/calibre/calibre/devices/apple
-@dirrm lib/calibre/calibre/devices/android
-@dirrm lib/calibre/calibre/devices
-@dirrm lib/calibre/calibre/db/tests
-@dirrm lib/calibre/calibre/db
-@dirrm lib/calibre/calibre/customize
-@dirrm lib/calibre/calibre
-@dirrm lib/calibre
-@exec mkdir -p %D/share/mime/packages
-@exec mkdir -p %D/share/icons/hicolor/128x128/apps
-@exec mkdir -p %D/share/gnome/apps
-@exec mkdir -p %D/share/desktop-directories