Update to version 3.18.0, now requires Python 3

3 files changed, 125 insertions, 124 deletions

diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 00166c18af09..a62f10571ea6 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	meld
-PORTVERSION=	3.16.3
+PORTVERSION=	3.18.0
 CATEGORIES=	textproc devel python
 MASTER_SITES=	GNOME
 
@@ -15,11 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	itstool:textproc/itstool
 RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
-USES=		desktop-file-utils gettext python:2 shared-mime-info \
+USES=		desktop-file-utils gettext python:3.4+ shared-mime-info \
 		shebangfix tar:xz
 SHEBANG_FILES=	bin/meld
 USE_PYTHON=	distutils
-USE_GNOME=	gtksourceview3 pygobject3 intltool
+USE_GNOME=	gtksourceview3 intltool libxml2:build pygobject3
 GLIB_SCHEMAS=	org.gnome.meld.gschema.xml
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 PYDISTUTILS_INSTALL_TARGET=	--no-update-icon-cache --no-compile-schemas install
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index d01493f697a5..d39bf3c701e2 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474901518
-SHA256 (meld-3.16.3.tar.xz) = efcae1530bf78113dfad42785ecb03cc06e48cd6a325c3e9236d99948269884c
-SIZE (meld-3.16.3.tar.xz) = 533156
+TIMESTAMP = 1512506220
+SHA256 (meld-3.18.0.tar.xz) = 848158b1e5c7473b9da3ddc16e057aad8951ec82979beb5914b8b4acdf97223e
+SIZE (meld-3.18.0.tar.xz) = 553772
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index 816b66f5d9bb..f36b30f52149 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -1,165 +1,171 @@
 bin/meld
 %%PYTHON_SITELIBDIR%%/meld/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/__init__.pyc
-%%PYTHON_SITELIBDIR%%/meld/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/build_helpers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/conf.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/const.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffgrid.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/diffmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/dirdiff.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filediff.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filemerge.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/filters.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/gutterrendererchunk.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/linkmap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldapp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldbuffer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/melddoc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/meldwindow.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/misc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/newdifftab.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/patchdialog.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/preferences.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/recent.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/sourceview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/task.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/tree.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/undo.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/vcview.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/__pycache__/windowstate.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/build_helpers.py
-%%PYTHON_SITELIBDIR%%/meld/build_helpers.pyc
-%%PYTHON_SITELIBDIR%%/meld/build_helpers.pyo
 %%PYTHON_SITELIBDIR%%/meld/conf.py
-%%PYTHON_SITELIBDIR%%/meld/conf.pyc
-%%PYTHON_SITELIBDIR%%/meld/conf.pyo
 %%PYTHON_SITELIBDIR%%/meld/const.py
-%%PYTHON_SITELIBDIR%%/meld/const.pyc
-%%PYTHON_SITELIBDIR%%/meld/const.pyo
 %%PYTHON_SITELIBDIR%%/meld/diffgrid.py
-%%PYTHON_SITELIBDIR%%/meld/diffgrid.pyc
-%%PYTHON_SITELIBDIR%%/meld/diffgrid.pyo
 %%PYTHON_SITELIBDIR%%/meld/diffmap.py
-%%PYTHON_SITELIBDIR%%/meld/diffmap.pyc
-%%PYTHON_SITELIBDIR%%/meld/diffmap.pyo
-%%PYTHON_SITELIBDIR%%/meld/diffutil.py
-%%PYTHON_SITELIBDIR%%/meld/diffutil.pyc
-%%PYTHON_SITELIBDIR%%/meld/diffutil.pyo
 %%PYTHON_SITELIBDIR%%/meld/dirdiff.py
-%%PYTHON_SITELIBDIR%%/meld/dirdiff.pyc
-%%PYTHON_SITELIBDIR%%/meld/dirdiff.pyo
 %%PYTHON_SITELIBDIR%%/meld/filediff.py
-%%PYTHON_SITELIBDIR%%/meld/filediff.pyc
-%%PYTHON_SITELIBDIR%%/meld/filediff.pyo
 %%PYTHON_SITELIBDIR%%/meld/filemerge.py
-%%PYTHON_SITELIBDIR%%/meld/filemerge.pyc
-%%PYTHON_SITELIBDIR%%/meld/filemerge.pyo
 %%PYTHON_SITELIBDIR%%/meld/filters.py
-%%PYTHON_SITELIBDIR%%/meld/filters.pyc
-%%PYTHON_SITELIBDIR%%/meld/filters.pyo
 %%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.py
-%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.pyc
-%%PYTHON_SITELIBDIR%%/meld/gutterrendererchunk.pyo
 %%PYTHON_SITELIBDIR%%/meld/linkmap.py
-%%PYTHON_SITELIBDIR%%/meld/linkmap.pyc
-%%PYTHON_SITELIBDIR%%/meld/linkmap.pyo
-%%PYTHON_SITELIBDIR%%/meld/matchers.py
-%%PYTHON_SITELIBDIR%%/meld/matchers.pyc
-%%PYTHON_SITELIBDIR%%/meld/matchers.pyo
+%%PYTHON_SITELIBDIR%%/meld/matchers/__init__.py
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/diffutil.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/helpers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/merge.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/matchers/__pycache__/myers.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/matchers/diffutil.py
+%%PYTHON_SITELIBDIR%%/meld/matchers/helpers.py
+%%PYTHON_SITELIBDIR%%/meld/matchers/merge.py
+%%PYTHON_SITELIBDIR%%/meld/matchers/myers.py
 %%PYTHON_SITELIBDIR%%/meld/meldapp.py
-%%PYTHON_SITELIBDIR%%/meld/meldapp.pyc
-%%PYTHON_SITELIBDIR%%/meld/meldapp.pyo
 %%PYTHON_SITELIBDIR%%/meld/meldbuffer.py
-%%PYTHON_SITELIBDIR%%/meld/meldbuffer.pyc
-%%PYTHON_SITELIBDIR%%/meld/meldbuffer.pyo
 %%PYTHON_SITELIBDIR%%/meld/melddoc.py
-%%PYTHON_SITELIBDIR%%/meld/melddoc.pyc
-%%PYTHON_SITELIBDIR%%/meld/melddoc.pyo
 %%PYTHON_SITELIBDIR%%/meld/meldwindow.py
-%%PYTHON_SITELIBDIR%%/meld/meldwindow.pyc
-%%PYTHON_SITELIBDIR%%/meld/meldwindow.pyo
-%%PYTHON_SITELIBDIR%%/meld/merge.py
-%%PYTHON_SITELIBDIR%%/meld/merge.pyc
-%%PYTHON_SITELIBDIR%%/meld/merge.pyo
 %%PYTHON_SITELIBDIR%%/meld/misc.py
-%%PYTHON_SITELIBDIR%%/meld/misc.pyc
-%%PYTHON_SITELIBDIR%%/meld/misc.pyo
 %%PYTHON_SITELIBDIR%%/meld/newdifftab.py
-%%PYTHON_SITELIBDIR%%/meld/newdifftab.pyc
-%%PYTHON_SITELIBDIR%%/meld/newdifftab.pyo
 %%PYTHON_SITELIBDIR%%/meld/patchdialog.py
-%%PYTHON_SITELIBDIR%%/meld/patchdialog.pyc
-%%PYTHON_SITELIBDIR%%/meld/patchdialog.pyo
 %%PYTHON_SITELIBDIR%%/meld/preferences.py
-%%PYTHON_SITELIBDIR%%/meld/preferences.pyc
-%%PYTHON_SITELIBDIR%%/meld/preferences.pyo
 %%PYTHON_SITELIBDIR%%/meld/recent.py
-%%PYTHON_SITELIBDIR%%/meld/recent.pyc
-%%PYTHON_SITELIBDIR%%/meld/recent.pyo
 %%PYTHON_SITELIBDIR%%/meld/settings.py
-%%PYTHON_SITELIBDIR%%/meld/settings.pyc
-%%PYTHON_SITELIBDIR%%/meld/settings.pyo
 %%PYTHON_SITELIBDIR%%/meld/sourceview.py
-%%PYTHON_SITELIBDIR%%/meld/sourceview.pyc
-%%PYTHON_SITELIBDIR%%/meld/sourceview.pyo
 %%PYTHON_SITELIBDIR%%/meld/task.py
-%%PYTHON_SITELIBDIR%%/meld/task.pyc
-%%PYTHON_SITELIBDIR%%/meld/task.pyo
 %%PYTHON_SITELIBDIR%%/meld/tree.py
-%%PYTHON_SITELIBDIR%%/meld/tree.pyc
-%%PYTHON_SITELIBDIR%%/meld/tree.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/emblemcellrenderer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/findbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gladesupport.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gnomeglade.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/gtkcompat.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/historyentry.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/listwidget.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/msgarea.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebook.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/notebooklabel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/statusbar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/ui/__pycache__/vcdialogs.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.py
-%%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/emblemcellrenderer.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/findbar.py
-%%PYTHON_SITELIBDIR%%/meld/ui/findbar.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/findbar.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.py
-%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/gladesupport.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.py
-%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/gnomeglade.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/gtkcompat.py
 %%PYTHON_SITELIBDIR%%/meld/ui/historyentry.py
-%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/historyentry.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/listwidget.py
-%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/listwidget.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/msgarea.py
-%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/msgarea.pyo
+%%PYTHON_SITELIBDIR%%/meld/ui/notebook.py
 %%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.py
-%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/notebooklabel.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/statusbar.py
-%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/statusbar.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/util.py
-%%PYTHON_SITELIBDIR%%/meld/ui/util.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/util.pyo
 %%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.py
-%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/vcdialogs.pyo
-%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.py
-%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.pyc
-%%PYTHON_SITELIBDIR%%/meld/ui/wraplabel.pyo
 %%PYTHON_SITELIBDIR%%/meld/undo.py
-%%PYTHON_SITELIBDIR%%/meld/undo.pyc
-%%PYTHON_SITELIBDIR%%/meld/undo.pyo
-%%PYTHON_SITELIBDIR%%/meld/util/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/meld/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/meld/util/compat.py
-%%PYTHON_SITELIBDIR%%/meld/util/compat.pyc
-%%PYTHON_SITELIBDIR%%/meld/util/compat.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/COPYING
 %%PYTHON_SITELIBDIR%%/meld/vc/README
 %%PYTHON_SITELIBDIR%%/meld/vc/__init__.py
-%%PYTHON_SITELIBDIR%%/meld/vc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_null.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/_vc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/bzr.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/darcs.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/git.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/mercurial.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.%%PYTHON_PYOEXTENSION%%
+%%PYTHON_SITELIBDIR%%/meld/vc/__pycache__/svn.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/meld/vc/_null.py
-%%PYTHON_SITELIBDIR%%/meld/vc/_null.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/_null.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/_vc.py
-%%PYTHON_SITELIBDIR%%/meld/vc/_vc.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/_vc.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/bzr.py
-%%PYTHON_SITELIBDIR%%/meld/vc/bzr.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/bzr.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/darcs.py
-%%PYTHON_SITELIBDIR%%/meld/vc/darcs.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/darcs.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/git.py
-%%PYTHON_SITELIBDIR%%/meld/vc/git.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/git.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/mercurial.py
-%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/mercurial.pyo
 %%PYTHON_SITELIBDIR%%/meld/vc/svn.py
-%%PYTHON_SITELIBDIR%%/meld/vc/svn.pyc
-%%PYTHON_SITELIBDIR%%/meld/vc/svn.pyo
 %%PYTHON_SITELIBDIR%%/meld/vcview.py
-%%PYTHON_SITELIBDIR%%/meld/vcview.pyc
-%%PYTHON_SITELIBDIR%%/meld/vcview.pyo
+%%PYTHON_SITELIBDIR%%/meld/windowstate.py
 man/man1/meld.1.gz
 share/appdata/meld.appdata.xml
 share/applications/meld.desktop
@@ -314,6 +320,7 @@ share/locale/sr/LC_MESSAGES/meld.mo
 share/locale/sr@latin/LC_MESSAGES/meld.mo
 share/locale/sv/LC_MESSAGES/meld.mo
 share/locale/tr/LC_MESSAGES/meld.mo
+share/locale/uk/LC_MESSAGES/meld.mo
 share/locale/vi/LC_MESSAGES/meld.mo
 share/locale/zh_CN/LC_MESSAGES/meld.mo
 share/locale/zh_TW/LC_MESSAGES/meld.mo
@@ -351,9 +358,3 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
 %%DATADIR%%/ui/vcview-ui.xml
 %%DATADIR%%/ui/vcview.ui
 share/mime/packages/meld.xml
-@dir share/help/sv/meld/figures
-@dir share/help/es/meld/figures
-@dir share/help/el/meld/figures
-@dir share/help/de/meld/figures
-@dir share/help/cs/meld/figures
-@dir share/help/C/meld/figures