- update to 3.0.0

- pass maintainership to submitter

PR:		248525
Submitted by:	James French <james@french.id.au>
Approved by:	joshruehlig@gmail.com (previous maintainer)

4 files changed, 94 insertions, 136 deletions

diff --git a/news/sabnzbdplus/Makefile b/news/sabnzbdplus/Makefile
index 2dc8a035e632..55a65cdf7483 100644
--- a/news/sabnzbdplus/Makefile
+++ b/news/sabnzbdplus/Makefile
@@ -1,23 +1,23 @@
 # $FreeBSD$
 
 PORTNAME=	sabnzbdplus
-PORTVERSION=	2.3.9
+PORTVERSION=	3.0.0
 CATEGORIES=	news
 
-MAINTAINER=	joshruehlig@gmail.com
+MAINTAINER=	james@french.id.au
 COMMENT=	Web-interface based binary newsgrabber in python, with nzb support
 
 LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+ ISCL MIT PSFL
 LICENSE_COMB=	multi
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah3>=0:devel/py-cheetah3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cherrypy>=8.9.1:www/py-cherrypy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}portend>=0:net/py-portend@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 
-RUN_DEPENDS=	cheetah:devel/py-cheetah@${PY_FLAVOR} \
-		${PYTHON_SITELIBDIR}/pythonutils/configobj.py:devel/py-utils@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
-
-USES=		python:2.7 shebangfix
+USES=		python:3.5+ shebangfix gettext
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	sabnzbd
@@ -39,19 +39,25 @@ PORTDOCS=	ABOUT.txt \
 USERS=		_sabnzbd
 GROUPS=		_sabnzbd
 
-OPTIONS_DEFINE=	PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC SSL DOCS
+OPTIONS_DEFINE=	PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC SSL DOCS NOTIFY2 DBUS PYGOBJECT
 OPTIONS_DEFAULT=	PAR2CMDLINE UNRAR 7ZIP FEEDPARSER YENC SSL
 PAR2CMDLINE_DESC=	Required for postprocessing of par files
 7ZIP_DESC=	Needed for unpacking 7-Zip posts
-FEEDPARSER_DESC=	rss-feed support
+FEEDPARSER_DESC=	RSS feed support
 YENC_DESC=	yenc support
+NOTIFY2_DESC=	Notify2 support
+DBUS_DESC=	DBUS support for system power management
+PYGOBJECT_DESC=	PyGObject support for system tray icon (requires cairo)
 
 PAR2CMDLINE_RUN_DEPENDS=	par2repair:archivers/par2cmdline-tbb
 FEEDPARSER_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${PY_FLAVOR}
-YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sabyenc>=3.3.1:news/py-sabyenc@${PY_FLAVOR}
+YENC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sabyenc3>=0:news/py-sabyenc3@${PY_FLAVOR}
 SSL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR}
 UNRAR_RUN_DEPENDS=	unrar:archivers/unrar
 7ZIP_RUN_DEPENDS=	7za:archivers/p7zip
+NOTIFY2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify2>=0:devel/py-notify2@${PY_FLAVOR}
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
+PYGOBJECT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>=3.10.2:devel/py-gobject3@${PY_FLAVOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s:%%DATADIR%%:'${DATADIR}':g" \
@@ -66,7 +72,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	cd ${WRKSRC}/sabnzbd && ${COPYTREE_SHARE} \* ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/sabnzbd
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-.for i in cherrypy gntp interfaces locale po tools util
+.for i in email icons interfaces locale po tools
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${i}
 	cd ${WRKSRC}/${i} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR}/${i}
 .endfor
diff --git a/news/sabnzbdplus/distinfo b/news/sabnzbdplus/distinfo
index 12eb7f26bca0..5f20e86bb914 100644
--- a/news/sabnzbdplus/distinfo
+++ b/news/sabnzbdplus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559445969
-SHA256 (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = e5071e66e06e9d10f5d04695cb63aba3e77b0c89deb6dd0f80246218d7940b3c
-SIZE (sabnzbd-sabnzbd-2.3.9_GH0.tar.gz) = 4610937
+TIMESTAMP = 1596610914
+SHA256 (sabnzbd-sabnzbd-3.0.0_GH0.tar.gz) = 584afe647fc2dfd916314f10cd603bf281b9acc5f65be9340bc8cfa88524e261
+SIZE (sabnzbd-sabnzbd-3.0.0_GH0.tar.gz) = 4285538
diff --git a/news/sabnzbdplus/files/patch-SABnzbd.py b/news/sabnzbdplus/files/patch-SABnzbd.py
index d8334782f7af..9cb4e2da66e1 100644
--- a/news/sabnzbdplus/files/patch-SABnzbd.py
+++ b/news/sabnzbdplus/files/patch-SABnzbd.py
@@ -1,17 +1,7 @@
---- SABnzbd.py.orig	2016-06-04 11:45:01 UTC
+--- SABnzbd.py.orig	2020-08-08 04:14:33 UTC
 +++ SABnzbd.py
-@@ -51,6 +51,9 @@ except:
-     print "The Python module Cheetah is required"
-     sys.exit(1)
+@@ -930,7 +930,7 @@ def main():
  
-+# Force python to load the patched version of cherrypy included with the port,
-+# instead of any version that may be installed otherwise.
-+sys.path.insert(0,%%DATADIR%%)
- import cherrypy
- if [int(n) for n in cherrypy.__version__.split('.')] < [3, 8, 0]:
-     print 'Sorry, requires Python module Cherrypy 3.8.0+ (use the included version)'
-@@ -1006,7 +1009,7 @@ def main():
-             
      sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
      sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
 -    sabnzbd.DIR_PROG = os.path.dirname(sabnzbd.MY_FULLNAME)
diff --git a/news/sabnzbdplus/pkg-plist b/news/sabnzbdplus/pkg-plist
index 37012f8b2b9d..f04e8041b230 100644
--- a/news/sabnzbdplus/pkg-plist
+++ b/news/sabnzbdplus/pkg-plist
@@ -15,6 +15,7 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/downloader.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/emailer.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/encoding.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/filesystem.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/getipaddress.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/interface.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/lang.py
@@ -22,6 +23,7 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/newsunpack.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/newswrapper.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/notifier.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/nzbparser.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbqueue.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/nzbstuff.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/osxmenu.py
@@ -38,83 +40,83 @@ bin/SABnzbd.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/sorting.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/urlgrabber.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/__init__.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/apireg.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/certgen.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/checkdir.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/configobj.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/diskspeed.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/feedparser.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/getperformance.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/happyeyeballs.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/json.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/internetspeed.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/kronos.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pathbrowser.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pybonjour.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/pystone.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarfile.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rsslib.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/rarvolinfo.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/servertests.py
+%%PYTHON_SITELIBDIR%%/sabnzbd/utils/sleepless.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/utils/systrayiconthread.py
-%%PYTHON_SITELIBDIR%%/sabnzbd/utils/upload.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/version.py
 %%PYTHON_SITELIBDIR%%/sabnzbd/zconfig.py
-%%DATADIR%%/cherrypy/VERSION.txt
-%%DATADIR%%/cherrypy/__init__.py
-%%DATADIR%%/cherrypy/__main__.py
-%%DATADIR%%/cherrypy/_cpchecker.py
-%%DATADIR%%/cherrypy/_cpcompat.py
-%%DATADIR%%/cherrypy/_cpconfig.py
-%%DATADIR%%/cherrypy/_cpdispatch.py
-%%DATADIR%%/cherrypy/_cperror.py
-%%DATADIR%%/cherrypy/_cplogging.py
-%%DATADIR%%/cherrypy/_cpmodpy.py
-%%DATADIR%%/cherrypy/_cpnative_server.py
-%%DATADIR%%/cherrypy/_cpreqbody.py
-%%DATADIR%%/cherrypy/_cprequest.py
-%%DATADIR%%/cherrypy/_cpserver.py
-%%DATADIR%%/cherrypy/_cptools.py
-%%DATADIR%%/cherrypy/_cptree.py
-%%DATADIR%%/cherrypy/_cpwsgi.py
-%%DATADIR%%/cherrypy/_cpwsgi_server.py
-%%DATADIR%%/cherrypy/_helper.py
-%%DATADIR%%/cherrypy/cherryd
-%%DATADIR%%/cherrypy/daemon.py
-%%DATADIR%%/cherrypy/favicon.ico
-%%DATADIR%%/cherrypy/lib/__init__.py
-%%DATADIR%%/cherrypy/lib/auth.py
-%%DATADIR%%/cherrypy/lib/auth_basic.py
-%%DATADIR%%/cherrypy/lib/auth_digest.py
-%%DATADIR%%/cherrypy/lib/caching.py
-%%DATADIR%%/cherrypy/lib/covercp.py
-%%DATADIR%%/cherrypy/lib/cpstats.py
-%%DATADIR%%/cherrypy/lib/cptools.py
-%%DATADIR%%/cherrypy/lib/encoding.py
-%%DATADIR%%/cherrypy/lib/gctools.py
-%%DATADIR%%/cherrypy/lib/httpauth.py
-%%DATADIR%%/cherrypy/lib/httputil.py
-%%DATADIR%%/cherrypy/lib/jsontools.py
-%%DATADIR%%/cherrypy/lib/lockfile.py
-%%DATADIR%%/cherrypy/lib/locking.py
-%%DATADIR%%/cherrypy/lib/profiler.py
-%%DATADIR%%/cherrypy/lib/reprconf.py
-%%DATADIR%%/cherrypy/lib/sessions.py
-%%DATADIR%%/cherrypy/lib/static.py
-%%DATADIR%%/cherrypy/lib/xmlrpcutil.py
-%%DATADIR%%/cherrypy/process/__init__.py
-%%DATADIR%%/cherrypy/process/plugins.py
-%%DATADIR%%/cherrypy/process/servers.py
-%%DATADIR%%/cherrypy/process/win32.py
-%%DATADIR%%/cherrypy/process/wspbus.py
-%%DATADIR%%/cherrypy/wsgiserver/__init__.py
-%%DATADIR%%/cherrypy/wsgiserver/ssl_builtin.py
-%%DATADIR%%/cherrypy/wsgiserver/ssl_pyopenssl.py
-%%DATADIR%%/gntp/__init__.py
-%%DATADIR%%/gntp/cli.py
-%%DATADIR%%/gntp/config.py
-%%DATADIR%%/gntp/core.py
-%%DATADIR%%/gntp/errors.py
-%%DATADIR%%/gntp/notifier.py
-%%DATADIR%%/gntp/shim.py
-%%DATADIR%%/gntp/version.py
+%%DATADIR%%/email/badfetch-da.tmpl
+%%DATADIR%%/email/badfetch-de.tmpl
+%%DATADIR%%/email/badfetch-en.tmpl
+%%DATADIR%%/email/badfetch-es.tmpl
+%%DATADIR%%/email/badfetch-fi.tmpl
+%%DATADIR%%/email/badfetch-fr.tmpl
+%%DATADIR%%/email/badfetch-he.tmpl
+%%DATADIR%%/email/badfetch-nb.tmpl
+%%DATADIR%%/email/badfetch-nl.tmpl
+%%DATADIR%%/email/badfetch-pl.tmpl
+%%DATADIR%%/email/badfetch-pt_BR.tmpl
+%%DATADIR%%/email/badfetch-ro.tmpl
+%%DATADIR%%/email/badfetch-ru.tmpl
+%%DATADIR%%/email/badfetch-sr.tmpl
+%%DATADIR%%/email/badfetch-sv.tmpl
+%%DATADIR%%/email/badfetch-zh_CN.tmpl
+%%DATADIR%%/email/email-da.tmpl
+%%DATADIR%%/email/email-de.tmpl
+%%DATADIR%%/email/email-en.tmpl
+%%DATADIR%%/email/email-es.tmpl
+%%DATADIR%%/email/email-fi.tmpl
+%%DATADIR%%/email/email-fr.tmpl
+%%DATADIR%%/email/email-he.tmpl
+%%DATADIR%%/email/email-nb.tmpl
+%%DATADIR%%/email/email-nl.tmpl
+%%DATADIR%%/email/email-pl.tmpl
+%%DATADIR%%/email/email-pt_BR.tmpl
+%%DATADIR%%/email/email-ro.tmpl
+%%DATADIR%%/email/email-ru.tmpl
+%%DATADIR%%/email/email-sr.tmpl
+%%DATADIR%%/email/email-sv.tmpl
+%%DATADIR%%/email/email-zh_CN.tmpl
+%%DATADIR%%/email/rss-da.tmpl
+%%DATADIR%%/email/rss-de.tmpl
+%%DATADIR%%/email/rss-en.tmpl
+%%DATADIR%%/email/rss-es.tmpl
+%%DATADIR%%/email/rss-fi.tmpl
+%%DATADIR%%/email/rss-fr.tmpl
+%%DATADIR%%/email/rss-he.tmpl
+%%DATADIR%%/email/rss-nb.tmpl
+%%DATADIR%%/email/rss-nl.tmpl
+%%DATADIR%%/email/rss-pl.tmpl
+%%DATADIR%%/email/rss-pt_BR.tmpl
+%%DATADIR%%/email/rss-ro.tmpl
+%%DATADIR%%/email/rss-ru.tmpl
+%%DATADIR%%/email/rss-sr.tmpl
+%%DATADIR%%/email/rss-sv.tmpl
+%%DATADIR%%/email/rss-zh_CN.tmpl
+%%DATADIR%%/icons/logo-arrow.svg
+%%DATADIR%%/icons/logo-arrow_gray.svg
+%%DATADIR%%/icons/logo-arrow_green.svg
+%%DATADIR%%/icons/nzb.ico
+%%DATADIR%%/icons/sabnzbd.ico
+%%DATADIR%%/icons/sabnzbd16_32.ico
+%%DATADIR%%/icons/sabnzbd16_32green.ico
+%%DATADIR%%/icons/sabnzbd16_32paused.ico
+%%DATADIR%%/icons/sabnzbd_osx_clicked.tiff
+%%DATADIR%%/icons/sabnzbd_osx_idle.tiff
+%%DATADIR%%/icons/sabnzbd_osx_pause.tiff
 %%DATADIR%%/interfaces/Config/README.txt
 %%DATADIR%%/interfaces/Config/templates/_inc_footer_uc.tmpl
 %%DATADIR%%/interfaces/Config/templates/_inc_header_uc.tmpl
@@ -152,7 +154,7 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Config/templates/staticcfg/images/logo-small.svg
 %%DATADIR%%/interfaces/Config/templates/staticcfg/js/chartist.min.js
 %%DATADIR%%/interfaces/Config/templates/staticcfg/js/filesize.min.js
-%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-3.2.1.min.js
+%%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-3.5.1.min.js
 %%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery-ui.min.js
 %%DATADIR%%/interfaces/Config/templates/staticcfg/js/jquery.tablesort.min.js
 %%DATADIR%%/interfaces/Config/templates/staticcfg/js/script.js
@@ -180,12 +182,12 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.main.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/glitter.queue.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-3.5.1.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery-ui.min.js
-%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/jquery.peity.min.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-3.5.1.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-extensions.js
-%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/knockout-latest.js
-%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/moment.min.js
+%%DATADIR%%/interfaces/Glitter/templates/static/javascripts/moment-2.26.0.min.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/da.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/de.js
 %%DATADIR%%/interfaces/Glitter/templates/static/javascripts/momentjs_locale/es.js
@@ -271,44 +273,6 @@ bin/SABnzbd.py
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/rateit.css
 %%DATADIR%%/interfaces/Plush/templates/static/stylesheets/rateit/star.gif
 %%DATADIR%%/interfaces/Plush/templates/status.tmpl
-%%DATADIR%%/interfaces/smpl/CreativeCommons2-5.txt
-%%DATADIR%%/interfaces/smpl/CreativeCommons3-0.txt
-%%DATADIR%%/interfaces/smpl/GPL2.txt
-%%DATADIR%%/interfaces/smpl/GPL3.txt
-%%DATADIR%%/interfaces/smpl/LICENCE-silk_icons.txt
-%%DATADIR%%/interfaces/smpl/LICENSE.txt
-%%DATADIR%%/interfaces/smpl/License-ExCanvas.txt
-%%DATADIR%%/interfaces/smpl/License-MochiKit.txt
-%%DATADIR%%/interfaces/smpl/License-Nuvola.txt
-%%DATADIR%%/interfaces/smpl/License-PlotKit.txt
-%%DATADIR%%/interfaces/smpl/License-getElementPosition.txt
-%%DATADIR%%/interfaces/smpl/README.txt
-%%DATADIR%%/interfaces/smpl/templates/history.tmpl
-%%DATADIR%%/interfaces/smpl/templates/main.tmpl
-%%DATADIR%%/interfaces/smpl/templates/nzo.tmpl
-%%DATADIR%%/interfaces/smpl/templates/queue.tmpl
-%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/MochiKit.js
-%%DATADIR%%/interfaces/smpl/templates/static/MochiKit/__package__.js
-%%DATADIR%%/interfaces/smpl/templates/static/PlotKit/PlotKit.js
-%%DATADIR%%/interfaces/smpl/templates/static/excanvas/excanvas.js
-%%DATADIR%%/interfaces/smpl/templates/static/feed-icon-14x14.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/browser.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/bullet_arrow_down.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/control_pause.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/control_play.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/down.gif
-%%DATADIR%%/interfaces/smpl/templates/static/images/drive.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/drive_go.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/favicon.ico
-%%DATADIR%%/interfaces/smpl/templates/static/images/key_enter.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/messagebox_critical.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/nuvola/kgpg.png
-%%DATADIR%%/interfaces/smpl/templates/static/images/up.gif
-%%DATADIR%%/interfaces/smpl/templates/static/sabnzbd_small4.png
-%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/black.css
-%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/colorschemes/white.css
-%%DATADIR%%/interfaces/smpl/templates/static/stylesheets/smpl.css
-%%DATADIR%%/interfaces/smpl/templates/status.tmpl
 %%DATADIR%%/interfaces/wizard/README.TXT
 %%DATADIR%%/interfaces/wizard/inc_bottom.tmpl
 %%DATADIR%%/interfaces/wizard/inc_top.tmpl
@@ -387,6 +351,4 @@ bin/SABnzbd.py
 %%DATADIR%%/tools/extract_pot.py
 %%DATADIR%%/tools/make_mo.py
 %%DATADIR%%/tools/msgfmt.py
-%%DATADIR%%/util/__init__.py
-%%DATADIR%%/util/apireg.py
-%%DATADIR%%/util/mailslot.py
+%%DATADIR%%/tools/pygettext.py