2 files changed, 79 insertions, 63 deletions

diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile
index 6fafa544d007..532ad1117e17 100644
--- a/multimedia/phonon-vlc/Makefile
+++ b/multimedia/phonon-vlc/Makefile
@@ -1,8 +1,9 @@
 PORTNAME=	phonon
 DISTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTNAME}-backend-${PHONON_PLUGIN}/${DISTVERSION}
-PKGNAMESUFFIX=	-${PHONON_PLUGIN}
+PKGNAMESUFFIX=	-${PHONON_PLUGIN}-${FLAVOR}
 DISTNAME=	${PORTNAME}-backend-${PHONON_PLUGIN}-${DISTVERSION}
 DIST_SUBDIR=	KDE/phonon
 
@@ -13,16 +14,31 @@ WWW=		https://userbase.kde.org/Phonon
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
-LIB_DEPENDS=	libvlc.so:multimedia/vlc
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
 
-USES=		cmake pkgconfig tar:xz
+LIB_DEPENDS=	libvlc.so:multimedia/vlc
 
-USES+=		compiler:c++11-lang kde:5 qt:5
+USES=		cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} pkgconfig \
+		qt:${FLAVOR:S/qt//} tar:xz
 USE_KDE=	ecm:build
-USE_QT=		core gui phonon4 widgets \
-		buildtools:build qmake:build
-CMAKE_ON=	PHONON_BUILD_QT5
-CMAKE_OFF=	PHONON_BUILD_QT6
+USE_QT=		${_USE_QT_${FLAVOR}} phonon4
+
+CMAKE_ON=	${_CMAKE_ON_${FLAVOR}}
+CMAKE_OFF=	${_CMAKE_OFF_${FLAVOR}}
+
+_CMAKE_ON_qt5=	PHONON_BUILD_QT5
+_CMAKE_ON_qt6=	PHONON_BUILD_QT6
+_CMAKE_OFF_qt5=	PHONON_BUILD_QT6
+_CMAKE_OFF_qt6=	PHONON_BUILD_QT5
+
+_USE_QT_qt5=	core gui widgets buildtools:build qmake:build
+_USE_QT_qt6=	base 5compat tools
+
+_QT5_ONLY_qt5=	#
+_QT5_ONLY_qt6=	"@comment "
+PLIST_SUB=	QT5_ONLY=${_QT5_ONLY_${FLAVOR}} \
+		QT_VER=${FLAVOR:S/qt//} \
 
 PHONON_PLUGIN=	vlc
 
diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist
index 6e940c831257..24ca1b52dc7e 100644
--- a/multimedia/phonon-vlc/pkg-plist
+++ b/multimedia/phonon-vlc/pkg-plist
@@ -1,55 +1,55 @@
-%%QT_PLUGINDIR%%/phonon4qt5_backend/phonon_vlc_qt5.so
-share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
-share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT_PLUGINDIR%%/phonon4qt%%QT_VER%%_backend/phonon_vlc_qt%%QT_VER%%.so
+%%QT5_ONLY%%share/locale/az/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/bg/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/bs/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ca/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ca@valencia/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/cs/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/da/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/de/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/el/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/en_GB/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/eo/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/es/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/et/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/eu/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/fi/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/fr/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ga/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/gl/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/hi/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/hu/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ia/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/id/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/is/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/it/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ja/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ka/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/kk/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ko/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/lt/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/mr/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/nb/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/nds/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/nl/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/nn/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/pa/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/pl/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/pt/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/pt_BR/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ro/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ru/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sk/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sl/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sr/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sr@ijekavian/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sr@ijekavianlatin/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sr@latin/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/sv/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/tg/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/tr/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/ug/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/uk/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/vi/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/zh_CN/LC_MESSAGES/phonon_vlc_qt.qm
+%%QT5_ONLY%%share/locale/zh_TW/LC_MESSAGES/phonon_vlc_qt.qm