2 files changed, 15 insertions, 43 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index ce8559b6a122..df41e04827eb 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	rhythmbox
 PORTVERSION=	3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -35,6 +35,7 @@ GNU_CONFIGURE=	yes
 USE_GSTREAMER1=	flac lame jpeg cdparanoia vorbis
 CONFIGURE_ARGS=	--enable-vala \
 		--disable-gudev \
+		--without-webkit \
 		--enable-visualizer=no \
 		--disable-browser-plugin \
 		--with-libsecret=yes
@@ -49,8 +50,8 @@ PLIST_SUB+=	PYTVER=${PYTHON_VER:S/.//}
 GLIB_SCHEMAS=	org.gnome.rhythmbox.gschema.xml
 
 OPTIONS_SUB=	yes
-OPTIONS_DEFINE=	BRASERO DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP WEBKIT
-OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON WEBKIT
+OPTIONS_DEFINE=	BRASERO DAAP GRILO IPOD NOTIFY PYTHON LIRC MTP
+OPTIONS_DEFAULT=BRASERO NOTIFY PYTHON
 BRASERO_DESC=	Brasero disc burning support
 BRASERO_CONFIGURE_ENABLE=brasero
 BRASERO_LIB_DEPENDS=	libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
@@ -74,12 +75,20 @@ MTP_LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp \
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_USES=		python:3
 PYTHON_USE=		PYTVER=${PYTHON_VER:S/.//}
-WEBKIT_DESC=	HTML view support
-WEBKIT_CONFIGURE_WITH=	webkit
-WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}libpeas>=0:${PREFIX}/devel/py3-libpeas
+# context plugin
+# webkit is for the context plugin, which is broken because
+# it needs textproc/py3-mako
+#WEBKIT_DESC=	HTML view support
+#WEBKIT_CONFIGURE_WITH=	webkit
+#WEBKIT_LIB_DEPENDS=	libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|{MOZILLA_PLUGINDIR|{MOZILLA_PLUGINDIR}|g' \
 		${WRKSRC}/configure
 
+# rbzeitgeist plugin needs py3-zeitgeist
+post-install:
+	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/rhythmbox/plugins/rbzeitgeist
+
 .include <bsd.port.mk>
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index 2636785d4cb1..2b680d39639f 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -106,28 +106,6 @@ lib/rhythmbox/plugins/audiocd/audiocd.plugin
 lib/rhythmbox/plugins/audiocd/libaudiocd.so
 lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.plugin
 lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/AlbumTab.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/ArtistTab.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/ContextView.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LastFM.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LinksTab.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/LyricsTab.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/context.plugin
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/context.py
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/AlbumTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ArtistTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/ContextView.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LastFM.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LinksTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/LyricsTab.cpython-%%PYTVER%%.pyo
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyc
-%%PYTHON%%%%WEBKIT%%lib/rhythmbox/plugins/context/__pycache__/context.cpython-%%PYTVER%%.pyo
 %%BRASERO%%lib/rhythmbox/plugins/cd-recorder/cd-recorder.plugin
 %%BRASERO%%lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
 %%DAAP%%lib/rhythmbox/plugins/daap/daap.plugin
@@ -233,10 +211,6 @@ lib/rhythmbox/plugins/power-manager/power-manager.plugin
 %%PYTHON%%lib/rhythmbox/plugins/rb/__pycache__/stringmatch.cpython-%%PYTVER%%.pyo
 %%LIRC%%lib/rhythmbox/plugins/rblirc/librblirc.so
 %%LIRC%%lib/rhythmbox/plugins/rblirc/rblirc.plugin
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.plugin
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/rbzeitgeist.py
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTVER%%.pyc
-%%PYTHON%%lib/rhythmbox/plugins/rbzeitgeist/__pycache__/rbzeitgeist.cpython-%%PYTVER%%.pyo
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py
 %%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.plugin
@@ -809,17 +783,6 @@ share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-preferences.ui
 %%DATADIR%%/plugins/audioscrobbler/audioscrobbler-profile.ui
 %%DATADIR%%/plugins/audioscrobbler/icons/hicolor/scalable/places/Last.fm-symbolic.svg
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Allmusic16x16.png
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Discogs16x16.png
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/Wikipedia16x16.png
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/lastfm.png
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/img/spinner.gif
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/album-tmpl.html
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/artist-tmpl.html
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/links-tmpl.html
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/loading.html
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/lyrics-tmpl.html
-%%PYTHON%%%%WEBKIT%%%%DATADIR%%/plugins/context/tmpl/main.css
 %%DAAP%%%%DATADIR%%/plugins/daap/daap-prefs.ui
 %%DAAP%%%%DATADIR%%/plugins/daap/daap-toolbar.ui
 %%DAAP%%%%DATADIR%%/plugins/daap/remote-icon.png