--- games/gcompris-qt/Makefile	(revision 492542)
+++ games/gcompris-qt/Makefile	(working copy)
@@ -14,7 +14,7 @@ 
 
 LIB_DEPENDS=	libBox2D.so:x11-toolkits/qml-box2d
 
-USES=		cmake kde:5 qt:5 tar:xz
+USES=		cmake compiler:c++11-lang kde:5 qt:5 tar:xz
 USE_KDE=	doctools
 USE_QT=		core declarative graphicaleffects gui multimedia network quickcontrols \
 		sensors svg widgets xml xmlpatterns \
--- multimedia/kamoso/Makefile	(revision 492542)
+++ multimedia/kamoso/Makefile	(working copy)
@@ -9,7 +9,7 @@ 
 
 LICENSE=	GPLv2
 
-USES=		cmake gettext kde:5 pkgconfig qt:5 tar:xz
+USES=		cmake compiler:c++11-lang gettext kde:5 pkgconfig qt:5 tar:xz
 USE_GNOME=	glib20
 USE_GSTREAMER1=	yes
 USE_KDE=	auth bookmarks codecs completion config configwidgets \
--- audio/amarok/Makefile	(revision 492542)
+++ audio/amarok/Makefile	(working copy)
@@ -25,7 +25,7 @@ 
 		kde:5 mysql:client,embedded pkgconfig qt:5 shebangfix ssl
 
 USE_QT=		core concurrent declarative dbus gui location network phonon4 \
-		quickcontrols2 script scripttools sql svg webchannel webengine \
+		quickcontrols2 script scripttools sql svg webchannel \
 		webkit widgets xml \
 		buildtools_build qmake_build
 
@@ -49,8 +49,10 @@ 
 
 BROKEN_sparc64=	does not build (GCC-related error)
 
-OPTIONS_DEFINE=		IPOD MP3TUNES MTP
+OPTIONS_DEFINE=		IPOD MP3TUNES MTP QTWEBENGINE
 OPTIONS_DEFAULT=	IPOD MP3TUNES MTP
+OPTIONS_DEFAULT_amd64=	QTWEBENGINE
+OPTIONS_DEFAULT_i386=	QTWEBENGINE
 OPTIONS_SUB=		yes
 
 IPOD_DESC=		Apple iPod support
@@ -73,6 +75,10 @@ 
 MTP_LIB_DEPENDS=	libmtp.so:multimedia/libmtp
 MTP_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Mtp
 
+QTWEBENGINE_DESC=	Add dependency on qt5-webengine
+QTWEBENGINE_USE=	qt=webengine
+QTWEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngine=true
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/modules/FindMySQL.cmake
--- audio/amarok/pkg-plist	(revision 492542)
+++ audio/amarok/pkg-plist	(working copy)
@@ -56,12 +56,12 @@ 
 %%QT_QMLDIR%%/org/kde/amarok/qml/AppletHeader.qml
 %%QT_QMLDIR%%/org/kde/amarok/qml/libqml_plugin.so
 %%QT_QMLDIR%%/org/kde/amarok/qml/qmldir
-%%QT_QMLDIR%%/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so
-%%QT_QMLDIR%%/org/kde/amarok/wikipedia/qmldir
+%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/libamarok_context_applet_wikipedia.so
+%%QTWEBENGINE%%%%QT_QMLDIR%%/org/kde/amarok/wikipedia/qmldir
 %%DATADIR%%/data/DefaultPlaylistLayouts.xml
 %%DATADIR%%/data/InfoParserLoading.html
-%%DATADIR%%/data/WikipediaCustomStyle.css
-%%DATADIR%%/data/bullet.gif
+%%QTWEBENGINE%%%%DATADIR%%/data/WikipediaCustomStyle.css
+%%QTWEBENGINE%%%%DATADIR%%/data/bullet.gif
 %%DATADIR%%/data/first_run_jingle.ogg
 %%DATADIR%%/data/hover_info_template.html
 %%DATADIR%%/data/podcast_directory.opml
@@ -433,8 +433,8 @@ 
 share/kpackage/amarok/org.kde.amarok.lyrics/metadata.json
 share/kpackage/amarok/org.kde.amarok.photos/contents.rcc
 share/kpackage/amarok/org.kde.amarok.photos/metadata.json
-share/kpackage/amarok/org.kde.amarok.wikipedia/contents.rcc
-share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json
+%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/contents.rcc
+%%QTWEBENGINE%%share/kpackage/amarok/org.kde.amarok.wikipedia/metadata.json
 share/kpackage/genericqml/org.kde.amarok.context/contents.rcc
 share/kpackage/genericqml/org.kde.amarok.context/metadata.json
 share/kservices5/ServiceMenus/amarok_append.desktop