3 files changed, 115 insertions, 158 deletions

diff --git a/multimedia/gpodder/Makefile b/multimedia/gpodder/Makefile
index d25dab353047..938a575325af 100644
--- a/multimedia/gpodder/Makefile
+++ b/multimedia/gpodder/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gpodder
-PORTVERSION=	3.6.1
+PORTVERSION=	3.8.1
 CATEGORIES=	multimedia python
 MASTER_SITES=	http://gpodder.org/src/
 
@@ -10,6 +10,7 @@ MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Media aggregator and podcast client
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
 		help2man:${PORTSDIR}/misc/help2man
@@ -21,6 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
 
 OPTIONS_DEFINE=		GTK2 NOTIFY MUTAGEN OGG2MP3
 OPTIONS_DEFAULT=	GTK2
+OPTIONS_SUB=		yes
 MUTAGEN_DESC=		Allow metadata manipulation
 OGG2MP3_DESC=		Ogg Vorbis conversion to MP3 support
 OPTIONS_EXCLUDE=	NLS
@@ -32,8 +34,7 @@ OGG2MP3_RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 ALL_TARGET=	messages
 MAKE_ENV=	GPODDER_MANPATH_NO_SHARE="yes"
 MAKEFILE=	makefile
-USES=		gettext gmake shebangfix
-USE_PYTHON=	2
+USES=		gettext gmake python:2 shebangfix
 SHEBANG_FILES=	src/gpodder/*.py share/gpodder/examples/*.py share/gpodder/extensions/*.py
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
@@ -43,13 +44,11 @@ PORTDOCS=	PKG-INFO README
 
 .if ${PORT_OPTIONS:MGTK2}
 MAKE_ENV+=	GPODDER_INSTALL_UIS="cli gtk"
-PLIST_SUB+=	GTK=""
 RUN_DEPENDS+=	gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 USE_GNOME=	pygtk2
 .else
 MAKE_ENV+=	GPODDER_INSTALL_UIS="cli"
-PLIST_SUB+=	GTK="@comment "
 .endif
 
 post-install:
diff --git a/multimedia/gpodder/distinfo b/multimedia/gpodder/distinfo
index e32c5ccdb918..0aabafd17110 100644
--- a/multimedia/gpodder/distinfo
+++ b/multimedia/gpodder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.6.1.tar.gz) = badfbb448cea4f0cb9da4868adeaf60e10ae35d0aede001ffa7416739ae32961
-SIZE (gpodder-3.6.1.tar.gz) = 1552690
+SHA256 (gpodder-3.8.1.tar.gz) = a2d80c0a2fe243153960bcddc33a9ac1ec4a6de46f12a554e215b16e667c254f
+SIZE (gpodder-3.8.1.tar.gz) = 1646430
diff --git a/multimedia/gpodder/pkg-plist b/multimedia/gpodder/pkg-plist
index 105a078e6906..e9647a6d1538 100644
--- a/multimedia/gpodder/pkg-plist
+++ b/multimedia/gpodder/pkg-plist
@@ -1,8 +1,10 @@
 bin/gpo
 man/man1/gpo.1.gz
-%%GTK%%man/man1/gpodder.1.gz
-%%GTK%%bin/gpodder
+man/man1/gpodder-migrate2tres.1.gz
+%%GTK2%%man/man1/gpodder.1.gz
+%%GTK2%%bin/gpodder
 bin/gpodder-migrate2tres
+%%PYTHON_SITELIBDIR%%/gpodder-3.8.1-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.py
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/__init__.pyo
@@ -39,87 +41,87 @@ bin/gpodder-migrate2tres
 %%PYTHON_SITELIBDIR%%/gpodder/flattr.py
 %%PYTHON_SITELIBDIR%%/gpodder/flattr.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/flattr.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.pyo
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.py
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyc
-%%GTK%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/welcome.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/flattr.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/macosx.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/main.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/shownotes.pyo
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.py
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyc
+%%GTK2%%%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyo
 %%PYTHON_SITELIBDIR%%/gpodder/jsonconfig.py
 %%PYTHON_SITELIBDIR%%/gpodder/jsonconfig.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/jsonconfig.pyo
@@ -150,9 +152,6 @@ bin/gpodder-migrate2tres
 %%PYTHON_SITELIBDIR%%/gpodder/plugins/soundcloud.py
 %%PYTHON_SITELIBDIR%%/gpodder/plugins/soundcloud.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/plugins/soundcloud.pyo
-%%PYTHON_SITELIBDIR%%/gpodder/plugins/xspf.py
-%%PYTHON_SITELIBDIR%%/gpodder/plugins/xspf.pyc
-%%PYTHON_SITELIBDIR%%/gpodder/plugins/xspf.pyo
 %%PYTHON_SITELIBDIR%%/gpodder/query.py
 %%PYTHON_SITELIBDIR%%/gpodder/query.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/query.pyo
@@ -186,21 +185,24 @@ bin/gpodder-migrate2tres
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.py
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
 %%PYTHON_SITELIBDIR%%/gpodder/youtube.pyo
-%%GTK%%share/applications/gpodder.desktop
-%%GTK%%share/dbus-1/services/org.gpodder.service
+%%GTK2%%share/applications/gpodder.desktop
+%%GTK2%%share/dbus-1/services/org.gpodder.service
 %%DATADIR%%/credits.txt
 %%DATADIR%%/examples/gpodder_mark_played.py
 %%DATADIR%%/examples/hello_world.py
 %%DATADIR%%/extensions/audio_converter.py
+%%DATADIR%%/extensions/concatenate_videos.py
 %%DATADIR%%/extensions/enqueue_in_mediaplayer.py
 %%DATADIR%%/extensions/gtk_statusicon.py
 %%DATADIR%%/extensions/minimize_on_start.py
+%%DATADIR%%/extensions/mpris-listener.py
 %%DATADIR%%/extensions/normalize_audio.py
 %%DATADIR%%/extensions/notification-win32.py
 %%DATADIR%%/extensions/notification.py
 %%DATADIR%%/extensions/rename_download.py
 %%DATADIR%%/extensions/rm_ogg_cover.py
 %%DATADIR%%/extensions/rockbox_convert2mp4.py
+%%DATADIR%%/extensions/rockbox_coverart.py
 %%DATADIR%%/extensions/sonos.py
 %%DATADIR%%/extensions/tagging.py
 %%DATADIR%%/extensions/taskbar_progress.py
@@ -218,30 +220,30 @@ bin/gpodder-migrate2tres
 %%DATADIR%%/images/podcast-3.png
 %%DATADIR%%/images/podcast-4.png
 %%DATADIR%%/images/podcast-all.png
-%%GTK%%%%DATADIR%%/ui/gtk/gpodder.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderaddpodcast.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderchannel.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderconfigeditor.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderepisodeselector.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderflattrsignin.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderpodcastdirectory.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderpreferences.ui
-%%GTK%%%%DATADIR%%/ui/gtk/gpodderwelcome.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodder.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderaddpodcast.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderchannel.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderconfigeditor.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderepisodeselector.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderflattrsignin.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderpodcastdirectory.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderpreferences.ui
+%%GTK2%%%%DATADIR%%/ui/gtk/gpodderwelcome.ui
 %%DATADIR%%/ui/web/gpodder.js
 %%DATADIR%%/ui/web/images/audio.png
 %%DATADIR%%/ui/web/images/video.png
 %%DATADIR%%/ui/web/index.html
 %%DATADIR%%/ui/web/style.css
-%%GTK%%share/icons/hicolor/16x16/apps/gpodder.ico
-%%GTK%%share/icons/hicolor/16x16/apps/gpodder.png
-%%GTK%%share/icons/hicolor/22x22/apps/gpodder.png
-%%GTK%%share/icons/hicolor/24x24/apps/gpodder.png
-%%GTK%%share/icons/hicolor/26x26/apps/gpodder.png
-%%GTK%%share/icons/hicolor/32x32/apps/gpodder.png
-%%GTK%%share/icons/hicolor/40x40/apps/gpodder.png
-%%GTK%%share/icons/hicolor/48x48/apps/gpodder.png
-%%GTK%%share/icons/hicolor/64x64/apps/gpodder.png
-%%GTK%%share/icons/hicolor/scalable/apps/gpodder.svg
+%%GTK2%%share/icons/hicolor/16x16/apps/gpodder.ico
+%%GTK2%%share/icons/hicolor/16x16/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/22x22/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/24x24/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/26x26/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/32x32/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/40x40/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/48x48/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/64x64/apps/gpodder.png
+%%GTK2%%share/icons/hicolor/scalable/apps/gpodder.svg
 share/locale/ca/LC_MESSAGES/gpodder.mo
 share/locale/cs/LC_MESSAGES/gpodder.mo
 share/locale/cs_CZ/LC_MESSAGES/gpodder.mo
@@ -273,47 +275,3 @@ share/locale/tr/LC_MESSAGES/gpodder.mo
 share/locale/tr_TR/LC_MESSAGES/gpodder.mo
 share/locale/uk/LC_MESSAGES/gpodder.mo
 share/locale/zh_CN/LC_MESSAGES/gpodder.mo
-@dirrmtry share/locale/tr_TR/LC_MESSAGES
-@dirrmtry share/locale/tr_TR
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/id_ID/LC_MESSAGES
-@dirrmtry share/locale/id_ID
-@dirrmtry share/locale/cs_CZ/LC_MESSAGES
-@dirrmtry share/locale/cs_CZ
-%%GTK%%@dirrmtry share/icons/hicolor/scalable/apps
-%%GTK%%@dirrmtry share/icons/hicolor/scalable
-%%GTK%%@dirrmtry share/icons/hicolor/64x64/apps
-%%GTK%%@dirrmtry share/icons/hicolor/64x64
-%%GTK%%@dirrmtry share/icons/hicolor/48x48/apps
-%%GTK%%@dirrmtry share/icons/hicolor/48x48
-%%GTK%%@dirrmtry share/icons/hicolor/40x40/apps
-%%GTK%%@dirrmtry share/icons/hicolor/40x40
-%%GTK%%@dirrmtry share/icons/hicolor/32x32/apps
-%%GTK%%@dirrmtry share/icons/hicolor/32x32
-%%GTK%%@dirrmtry share/icons/hicolor/26x26/apps
-%%GTK%%@dirrmtry share/icons/hicolor/26x26
-%%GTK%%@dirrmtry share/icons/hicolor/24x24/apps
-%%GTK%%@dirrmtry share/icons/hicolor/24x24
-%%GTK%%@dirrmtry share/icons/hicolor/22x22/apps
-%%GTK%%@dirrmtry share/icons/hicolor/22x22
-%%GTK%%@dirrmtry share/icons/hicolor/16x16/apps
-%%GTK%%@dirrmtry share/icons/hicolor/16x16
-%%GTK%%@dirrmtry share/icons/hicolor
-%%GTK%%@dirrmtry share/icons
-@dirrm %%DATADIR%%/ui/web/images
-@dirrm %%DATADIR%%/ui/web
-%%GTK%%@dirrm %%DATADIR%%/ui/gtk
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/extensions
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/gpodder/webui
-@dirrm %%PYTHON_SITELIBDIR%%/gpodder/test
-@dirrm %%PYTHON_SITELIBDIR%%/gpodder/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/gpodder/pipe
-%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface
-%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop
-%%GTK%%@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui
-@dirrm %%PYTHON_SITELIBDIR%%/gpodder