audio/rhythmbox: update to 3.4.6

Temporary disable the LIRC option it requires an update to lirc
whcih I cannot perform safely due to the lack of devices to test

3 files changed, 37 insertions, 257 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index f2b7194f10ee..90c921a77b6a 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,11 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	rhythmbox
-PORTVERSION=	3.4.4
-PORTREVISION=	3
+PORTVERSION=	3.4.6
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Audio player for GNOME
@@ -15,64 +14,58 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		valac:lang/vala \
-		gtkdoc-check:textproc/gtk-doc \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libmusicbrainz5.so:audio/libmusicbrainz5 \
 		libtotem-plparser.so:multimedia/totem-pl-parser \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libsoup-2.4.so:devel/libsoup \
-		libcheck.so:devel/check \
 		libpeas-1.0.so:devel/libpeas \
 		libjson-glib-1.0.so:devel/json-glib \
 		libsecret-1.so:security/libsecret \
 		libgudev-1.0.so:devel/libgudev \
 		libtdb.so:databases/tdb
 
-USES=		desktop-file-utils gmake gnome gstreamer libtool localbase \
+USES=		desktop-file-utils gettext gnome gstreamer localbase:ldflags meson \
 		pathfix pkgconfig tar:xz xorg
-USE_GNOME=	cairo intlhack glib20 gnomeprefix gtk30 introspection \
+USE_GNOME=	cairo glib20 gtk30 introspection \
 		pygobject3 libxml2
 USE_XORG=	ice x11 xorgproto
-GNU_CONFIGURE=	yes
 USE_GSTREAMER=	flac lame jpeg cdparanoia vorbis
-CONFIGURE_ARGS=	--enable-vala \
-		--enable-visualizer=no \
-		--with-python=yes \
-		--with-libsecret=yes
+MESON_ARGS=	-Dplugins_vala=enabled \
+		-Dlibsecret=enabled \
+		-Dgtk_doc=false \
+		-Dtests=disabled
 USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BRASERO DAAP DOCS GRILO IPOD LIRC MTP NLS NOTIFY PYTHON
+OPTIONS_DEFINE=	BRASERO DAAP DOCS GRILO IPOD MTP NLS NOTIFY PYTHON
 OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON
 BRASERO_DESC=	Brasero disc burning support
-BRASERO_CONFIGURE_WITH=	brasero
+BRASERO_MESON_ENABLED=	brasero
 BRASERO_LIB_DEPENDS=	libbrasero-media3.so:sysutils/brasero
 DAAP_DESC=	DAAP support
-DAAP_CONFIGURE_ENABLE=	daap
+DAAP_MESON_ENABLED=	daap
 DAAP_LIB_DEPENDS=	libdmapsharing-3.0.so:net/libdmapsharing
 GRILO_DESC=		Media discovery with Grilo
-GRILO_CONFIGURE_ENABLE=	grilo
+GRILO_MESON_ENABLED=	grilo
 GRILO_BUILD_DEPENDS=	grilo>=0.3.1:net/grilo
 GRILO_LIB_DEPENDS=	libgrilo-0.3.so:net/grilo
 GRILO_RUN_DEPENDS=	grilo-plugins>=0.3.2:net/grilo-plugins
 IPOD_DESC=		iPod support
-IPOD_CONFIGURE_WITH=	ipod
+IPOD_MESON_ENABLED=	ipod
 IPOD_LIB_DEPENDS=	libgpod.so:audio/libgpod \
 			libplist-2.0.so:devel/libplist \
 			libimobiledevice-1.0.so:comms/libimobiledevice
-LIRC_CONFIGURE_ENABLE=	lirc
-LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
-MTP_CONFIGURE_WITH=	mtp
+#LIRC_MESON_ENABLED=	lirc
+#LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
+MTP_MESON_ENABLED=	mtp
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
-NLS_USES=		gettext
-NLS_CONFIGURE_OFF=	--disable-nls
-NOTIFY_CONFIGURE_ENABLE=	libnotify
+NOTIFY_MESON_ENABLED=	libnotify
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-PYTHON_CONFIGURE_ENABLE=	python
+PYTHON_MESON_ENABLED=	plugins_python
 PYTHON_USES=		python:3.3+
 PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index 025103c32de1..f06f31ca11dc 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612673232
-SHA256 (gnome3/rhythmbox-3.4.4.tar.xz) = ee0eb0d7d7bdf696ac9471b19ff3bea3240d63b6cb8a134bf632054af8665d90
-SIZE (gnome3/rhythmbox-3.4.4.tar.xz) = 3890320
+TIMESTAMP = 1656163577
+SHA256 (gnome/rhythmbox-3.4.6.tar.xz) = f9568210ce55e411e929c8fb95e111a211dbd19cc47f578f291c5d319b5eb034
+SIZE (gnome/rhythmbox-3.4.6.tar.xz) = 3535224
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 539b3bfa8f4c..afe3d78a3411 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -5,9 +5,12 @@ include/rhythmbox/backends/rb-player-gst-filter.h
 include/rhythmbox/backends/rb-player-gst-tee.h
 include/rhythmbox/backends/rb-player.h
 include/rhythmbox/lib/libmediaplayerid/mediaplayerid.h
+include/rhythmbox/lib/rb-async-copy.h
 include/rhythmbox/lib/rb-builder-helpers.h
+include/rhythmbox/lib/rb-chunk-loader.h
 include/rhythmbox/lib/rb-debug.h
 include/rhythmbox/lib/rb-file-helpers.h
+include/rhythmbox/lib/rb-gst-media-types.h
 include/rhythmbox/lib/rb-list-model.h
 include/rhythmbox/lib/rb-stock-icons.h
 include/rhythmbox/lib/rb-string-value-map.h
@@ -18,7 +21,6 @@ include/rhythmbox/metadata/rb-ext-db-key.h
 include/rhythmbox/metadata/rb-ext-db.h
 include/rhythmbox/metadata/rb-metadata.h
 include/rhythmbox/plugins/rb-plugin-macros.h
-include/rhythmbox/podcast/rb-podcast-entry-types.h
 include/rhythmbox/podcast/rb-podcast-manager.h
 include/rhythmbox/podcast/rb-podcast-parse.h
 include/rhythmbox/podcast/rb-podcast-search.h
@@ -26,12 +28,12 @@ include/rhythmbox/rhythmdb/rb-refstring.h
 include/rhythmbox/rhythmdb/rhythmdb-entry-type.h
 include/rhythmbox/rhythmdb/rhythmdb-entry.h
 include/rhythmbox/rhythmdb/rhythmdb-import-job.h
-include/rhythmbox/rhythmdb/rhythmdb-metadata-cache.h
 include/rhythmbox/rhythmdb/rhythmdb-property-model.h
 include/rhythmbox/rhythmdb/rhythmdb-query-model.h
 include/rhythmbox/rhythmdb/rhythmdb-query-result-list.h
 include/rhythmbox/rhythmdb/rhythmdb-query-results.h
 include/rhythmbox/rhythmdb/rhythmdb.h
+include/rhythmbox/shell/rb-application.h
 include/rhythmbox/shell/rb-history.h
 include/rhythmbox/shell/rb-play-order.h
 include/rhythmbox/shell/rb-playlist-manager.h
@@ -39,13 +41,13 @@ include/rhythmbox/shell/rb-removable-media-manager.h
 include/rhythmbox/shell/rb-shell-player.h
 include/rhythmbox/shell/rb-shell-preferences.h
 include/rhythmbox/shell/rb-shell.h
+include/rhythmbox/shell/rb-task-list.h
 include/rhythmbox/shell/rb-track-transfer-batch.h
 include/rhythmbox/shell/rb-track-transfer-queue.h
 include/rhythmbox/sources/rb-auto-playlist-source.h
 include/rhythmbox/sources/rb-browser-source.h
 include/rhythmbox/sources/rb-device-source.h
 include/rhythmbox/sources/rb-display-page-group.h
-include/rhythmbox/sources/rb-display-page-menu.h
 include/rhythmbox/sources/rb-display-page-model.h
 include/rhythmbox/sources/rb-display-page-tree.h
 include/rhythmbox/sources/rb-display-page.h
@@ -58,44 +60,25 @@ include/rhythmbox/sources/rb-source.h
 include/rhythmbox/sources/rb-static-playlist-source.h
 include/rhythmbox/sources/rb-streaming-source.h
 include/rhythmbox/sources/rb-transfer-target.h
-include/rhythmbox/widgets/nautilus-floating-bar.h
-include/rhythmbox/widgets/rb-alert-dialog.h
 include/rhythmbox/widgets/rb-button-bar.h
 include/rhythmbox/widgets/rb-cell-renderer-pixbuf.h
 include/rhythmbox/widgets/rb-cell-renderer-rating.h
 include/rhythmbox/widgets/rb-dialog.h
-include/rhythmbox/widgets/rb-encoding-settings.h
 include/rhythmbox/widgets/rb-entry-view.h
 include/rhythmbox/widgets/rb-fading-image.h
-include/rhythmbox/widgets/rb-import-dialog.h
 include/rhythmbox/widgets/rb-library-browser.h
-include/rhythmbox/widgets/rb-object-property-editor.h
 include/rhythmbox/widgets/rb-property-view.h
 include/rhythmbox/widgets/rb-rating.h
+include/rhythmbox/widgets/rb-search-entry.h
 include/rhythmbox/widgets/rb-segmented-bar.h
 include/rhythmbox/widgets/rb-song-info.h
 include/rhythmbox/widgets/rb-source-toolbar.h
-include/rhythmbox/widgets/rb-task-list-display.h
 include/rhythmbox/widgets/rb-uri-dialog.h
 lib/girepository-1.0/MPID-3.0.typelib
 lib/girepository-1.0/RB-3.0.typelib
 lib/librhythmbox-core.so
 lib/librhythmbox-core.so.10
 lib/librhythmbox-core.so.10.0.0
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/artsearch.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/embedded.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/lastfm.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/local.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/musicbrainz.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/oldcache.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artsearch/__pycache__/songinfo.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artsearch/artsearch.plugin
 %%PYTHON%%lib/rhythmbox/plugins/artsearch/artsearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artsearch/embedded.py
@@ -112,27 +95,6 @@ lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
 lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
 %%BRASERO%%lib/rhythmbox/plugins/cd-recorder/cd-recorder.plugin
 %%BRASERO%%lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
-%%PYTHON%%lib/rhythmbox/plugins/context/AlbumTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/ArtistTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/ContextView.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LastFM.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LinksTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/LyricsTab.py
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/context/context.py
 %%DAAP%%lib/rhythmbox/plugins/daap/daap.plugin
 %%DAAP%%lib/rhythmbox/plugins/daap/libdaap.so
 lib/rhythmbox/plugins/dbus-media-server/dbus-media-server.plugin
@@ -143,8 +105,6 @@ lib/rhythmbox/plugins/generic-player/generic-player.plugin
 lib/rhythmbox/plugins/generic-player/libgeneric-player.so
 %%GRILO%%lib/rhythmbox/plugins/grilo/grilo.plugin
 %%GRILO%%lib/rhythmbox/plugins/grilo/libgrilo.so
-%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/im-status/__pycache__/im-status.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.plugin
 %%PYTHON%%lib/rhythmbox/plugins/im-status/im-status.py
 %%IPOD%%lib/rhythmbox/plugins/ipod/ipod.plugin
@@ -161,48 +121,14 @@ lib/rhythmbox/plugins/iradio/libiradio.so
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsSites.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/TerraParser.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/WinampcnParser.py
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/AstrawebParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/DarkLyricsParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JetlyricsParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/JlyricParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricWikiParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsConfigureDialog.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsParse.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/LyricsSites.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/TerraParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/WinampcnParser.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/lyrics/__pycache__/lyrics.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.plugin
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/lyrics.py
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/DownloadAlbumHandler.py
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneAccount.py
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/MagnatuneSource.py
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/TrackListHandler.py
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/DownloadAlbumHandler.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneAccount.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/MagnatuneSource.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/TrackListHandler.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/__pycache__/magnatune.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.plugin
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.py
-lib/rhythmbox/plugins/mmkeys/libmmkeys.so
-lib/rhythmbox/plugins/mmkeys/mmkeys.plugin
 lib/rhythmbox/plugins/mpris/libmpris.so
 lib/rhythmbox/plugins/mpris/mpris.plugin
 %%MTP%%lib/rhythmbox/plugins/mtpdevice/libmtpdevice.so
@@ -211,165 +137,38 @@ lib/rhythmbox/plugins/mpris/mpris.plugin
 %%NOTIFY%%lib/rhythmbox/plugins/notification/notification.plugin
 lib/rhythmbox/plugins/power-manager/libpower-manager.so
 lib/rhythmbox/plugins/power-manager/power-manager.plugin
-%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/python-console/__pycache__/pythonconsole.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.plugin
 %%PYTHON%%lib/rhythmbox/plugins/python-console/pythonconsole.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/Coroutine.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/Loader.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/URLCache.py
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Coroutine.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/Loader.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/URLCache.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rb.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/rbconfig.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/rb/rb.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rb/rb.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/rbconfig.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.py
-%%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so
-%%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/player.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/replaygain/__pycache__/replaygain.cpython-%%PYTHON_SUFFIX%%.pyc
+@comment %%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so
+@comment %%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.py
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/__pycache__/soundcloud.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.plugin
-%%PYTHON%%lib/rhythmbox/plugins/soundcloud/soundcloud.py
-%%PYTHON%%lib/rhythmbox/plugins/webremote/__pycache__/siphash.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/webremote/__pycache__/siphash.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/webremote/__pycache__/webremote.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/webremote/__pycache__/webremote.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/webremote/siphash.py
 %%PYTHON%%lib/rhythmbox/plugins/webremote/webremote.plugin
 %%PYTHON%%lib/rhythmbox/plugins/webremote/webremote.py
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/__pycache__/sample-python.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.plugin
-%%PYTHON%%lib/rhythmbox/sample-plugins/sample-python/sample-python.py
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/client.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/listenbrainz.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/listenbrainz.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/queue.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/queue.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/listenbrainz/__pycache__/settings.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/listenbrainz/client.py
 %%PYTHON%%lib/rhythmbox/plugins/listenbrainz/listenbrainz.plugin
 %%PYTHON%%lib/rhythmbox/plugins/listenbrainz/listenbrainz.py
 %%PYTHON%%lib/rhythmbox/plugins/listenbrainz/queue.py
 %%PYTHON%%lib/rhythmbox/plugins/listenbrainz/settings.py
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.py
-lib/rhythmbox/sample-plugins/sample-vala/libsample-vala.so
-lib/rhythmbox/sample-plugins/sample-vala/sample-vala.plugin
-lib/rhythmbox/sample-plugins/sample/libsample.so
-lib/rhythmbox/sample-plugins/sample/sample.plugin
 libdata/pkgconfig/rhythmbox.pc
 libexec/rhythmbox-metadata
 man/man1/rhythmbox-client.1.gz
 man/man1/rhythmbox.1.gz
-share/applications/rhythmbox-device.desktop
-share/applications/rhythmbox.desktop
+share/applications/org.gnome.Rhythmbox3.desktop
+share/applications/org.gnome.Rhythmbox3.device.desktop
 share/dbus-1/services/org.gnome.Rhythmbox3.service
-%%PORTDOCS%%%%DOCSDIR%%/RBApplication.html
-%%PORTDOCS%%%%DOCSDIR%%/RBAutoPlaylistSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBBrowserSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBCellRendererPixbuf.html
-%%PORTDOCS%%%%DOCSDIR%%/RBCellRendererRating.html
-%%PORTDOCS%%%%DOCSDIR%%/RBDisplayPage.html
-%%PORTDOCS%%%%DOCSDIR%%/RBDisplayPageGroup.html
-%%PORTDOCS%%%%DOCSDIR%%/RBDisplayPageModel.html
-%%PORTDOCS%%%%DOCSDIR%%/RBDisplayPageTree.html
-%%PORTDOCS%%%%DOCSDIR%%/RBEntryView.html
-%%PORTDOCS%%%%DOCSDIR%%/RBHeader.html
-%%PORTDOCS%%%%DOCSDIR%%/RBHistory.html
-%%PORTDOCS%%%%DOCSDIR%%/RBImportErrorsSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBLibraryBrowser.html
-%%PORTDOCS%%%%DOCSDIR%%/RBLibrarySource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBMediaPlayerSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBMetaData.html
-%%PORTDOCS%%%%DOCSDIR%%/RBMissingFilesSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlayOrder.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlayQueueSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlayer.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlayerGstFilter.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlayerGstTee.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlaylistManager.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPlaylistSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBPropertyView.html
-%%PORTDOCS%%%%DOCSDIR%%/RBQueryCreator.html
-%%PORTDOCS%%%%DOCSDIR%%/RBRandomPlayOrder.html
-%%PORTDOCS%%%%DOCSDIR%%/RBRating.html
-%%PORTDOCS%%%%DOCSDIR%%/RBRemovableMediaManager.html
-%%PORTDOCS%%%%DOCSDIR%%/RBSearchEntry.html
-%%PORTDOCS%%%%DOCSDIR%%/RBShell.html
-%%PORTDOCS%%%%DOCSDIR%%/RBShellClipboard.html
-%%PORTDOCS%%%%DOCSDIR%%/RBShellPlayer.html
-%%PORTDOCS%%%%DOCSDIR%%/RBShellPreferences.html
-%%PORTDOCS%%%%DOCSDIR%%/RBSongInfo.html
-%%PORTDOCS%%%%DOCSDIR%%/RBSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBStaticPlaylistSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBStreamingSource.html
-%%PORTDOCS%%%%DOCSDIR%%/RBStringValueMap.html
-%%PORTDOCS%%%%DOCSDIR%%/RBTrackTransferBatch.html
-%%PORTDOCS%%%%DOCSDIR%%/RBTrackTransferQueue.html
-%%PORTDOCS%%%%DOCSDIR%%/RBURIDialog.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDB.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDBEntryType.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDBImportJob.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDBPropertyModel.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDBQueryModel.html
-%%PORTDOCS%%%%DOCSDIR%%/RhythmDBQueryResults.html
-%%PORTDOCS%%%%DOCSDIR%%/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/ch05.html
-%%PORTDOCS%%%%DOCSDIR%%/ch06.html
-%%PORTDOCS%%%%DOCSDIR%%/ch07.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/left-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-RBDeviceSource.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-RBEncoder.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-RBExtDB.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-RBTransferTarget.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-async-queue-watch.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-builder-helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-debug.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-dialog.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-ext-db-key.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-file-helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-gst-media-types.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-rating-helper.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-text-helpers.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-tree-dnd.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox-rb-util.html
-%%PORTDOCS%%%%DOCSDIR%%/rhythmbox.devhelp2
-%%PORTDOCS%%%%DOCSDIR%%/right-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up-insensitive.png
-%%PORTDOCS%%%%DOCSDIR%%/up.png
 share/gir-1.0/MPID-3.0.gir
 share/gir-1.0/RB-3.0.gir
 share/help/C/rhythmbox/figures/rb-iradio-main.png
@@ -582,8 +381,8 @@ share/help/zh_CN/rhythmbox/figures/rb-volume-changer.png
 share/help/zh_CN/rhythmbox/figures/rb-window.png
 share/help/zh_CN/rhythmbox/index.docbook
 share/help/zh_CN/rhythmbox/legal.xml
-share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox-symbolic.svg
-share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox.svg
+share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox3-symbolic.svg
+share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox3.svg
 %%NLS%%share/locale/af/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/am/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/rhythmbox.mo
@@ -666,21 +465,10 @@ share/icons/hicolor/scalable/apps/org.gnome.Rhythmbox.svg
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
-share/metainfo/rhythmbox.appdata.xml
+share/metainfo/org.gnome.Rhythmbox3.appdata.xml
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-preferences.ui
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-profile.ui
 %%DATADIR%%/plugins/audioscrobbler/icons/hicolor/scalable/places/Last.fm-symbolic.svg
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Allmusic16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Discogs16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/Wikipedia16x16.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/lastfm.png
-%%PYTHON%%%%DATADIR%%/plugins/context/img/spinner.gif
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/album-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/artist-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/links-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/loading.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/lyrics-tmpl.html
-%%PYTHON%%%%DATADIR%%/plugins/context/tmpl/main.css
 %%PYTHON%%%%DATADIR%%/plugins/lyrics/lyrics-prefs.ui
 %%PYTHON%%%%DATADIR%%/plugins/magnatune/icons/hicolor/scalable/places/magnatune-symbolic.svg
 %%PYTHON%%%%DATADIR%%/plugins/magnatune/magnatune-loading.ui
@@ -690,9 +478,6 @@ share/metainfo/rhythmbox.appdata.xml
 %%PYTHON%%%%DATADIR%%/plugins/magnatune/magnatune_logo_color_small.png
 %%PYTHON%%%%DATADIR%%/plugins/magnatune/magnatune_logo_color_tiny.png
 %%PYTHON%%%%DATADIR%%/plugins/replaygain/replaygain-prefs.ui
-%%PYTHON%%%%DATADIR%%/plugins/soundcloud/icons/hicolor/scalable/places/soundcloud-symbolic.svg
-%%PYTHON%%%%DATADIR%%/plugins/soundcloud/powered-by-soundcloud.png
-%%PYTHON%%%%DATADIR%%/plugins/soundcloud/soundcloud.ui
 %%PYTHON%%%%DATADIR%%/plugins/webremote/css/grids-responsive-min.css
 %%PYTHON%%%%DATADIR%%/plugins/webremote/css/pure-min.css
 %%PYTHON%%%%DATADIR%%/plugins/webremote/css/webremote.css
@@ -701,4 +486,6 @@ share/metainfo/rhythmbox.appdata.xml
 %%PYTHON%%%%DATADIR%%/plugins/webremote/webremote.html
 %%PYTHON%%%%DATADIR%%/plugins/listenbrainz/settings.ui
 %%DATADIR%%/rhythmbox.gep
-%%LIRC%%%%DATADIR%%/plugins/rblirc/rhythmbox_lirc_default
+share/vala/vapi/rb.vapi
+share/vala/vapi/rhythmdb.vapi
+@comment %%LIRC%%%%DATADIR%%/plugins/rblirc/rhythmbox_lirc_default