audio/kid3: Update to 3.9.5

Drop legacy qt5 flavor, add kf6 flavor, and make qt6 the default.

Changes:
- added keyboard shortcuts for the audio player
- added preference option to fix the audio output used
- code has been modernized for C++17
- added support for TagLib 2.0 [1]

PR:		276677 [1]

4 files changed, 46 insertions, 43 deletions

diff --git a/MOVED b/MOVED
index e45a8db0072a..999188f35ba3 100644
--- a/MOVED
+++ b/MOVED
@@ -1651,7 +1651,7 @@ science/R-cran-AMORE||2022-09-12|Has expired: Upstream no longer maintained
 www/moodle310|www/moodle311|2022-09-12|Has expired: Upstream no longer maintained, upgrade to next LTS
 security/s2n|security/s2n-tls|2022-09-13|Renamed to match upstream naming
 audio/kid3-kf5|audio/kid3@kf5|2022-09-13|Merged into flavorized version
-audio/kid3-qt5|audio/kid3@qt5|2022-09-13|Merged into flavorized version
+audio/kid3-qt5|audio/kid3@qt6|2022-09-13|Merged into flavorized version
 audio/phaserotate-lv2|audio/x42-plugins-lv2|2022-09-13|phaserotate-lv2 LV2 plugin is included in the x42-plugins-lv2 plugin collection
 graphics/darktable40|graphics/darktable|2022-09-22|Obsolete. Use graphics/darktable, which is the same version
 java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to bootstrap the now deleted java/openjdk7 port
@@ -2993,3 +2993,4 @@ graphics/qcustomplot-qt5|graphics/qcustomplot|2024-02-19|Renamed to support flav
 audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2000
 graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream
 databases/xtrabackup8|databases/xtrabackup80|2024-02-22|Rename port to avoid confusion
+audio/kid3@qt5|audio/kid3@qt6|2024-02-25|The legacy qt5 flavor has been replaced by the qt6 flavor
diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile
index 3bd6832d5168..ba5bd4dc2983 100644
--- a/audio/kid3/Makefile
+++ b/audio/kid3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	kid3
-PORTVERSION=	3.9.4
-PORTREVISION=	2
+PORTVERSION=	3.9.5
 CATEGORIES=	audio kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 PKGNAMESUFFIX=	-${FLAVOR}
@@ -15,10 +14,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl
 LIB_DEPENDS=	libtag.so:audio/taglib
 
-FLAVORS=	qt5 qt6 kf5
+FLAVORS=	qt6 kf5 kf6
 FLAVOR?=	${FLAVORS:[1]}
 
-USES=		cmake compiler:c++11-lang desktop-file-utils gnome pkgconfig \
+USES=		cmake compiler:c++17-lang desktop-file-utils gnome pkgconfig \
 		tar:xz
 USE_GNOME=	libxslt:build
 USE_LDCONFIG=	yes
@@ -33,23 +32,15 @@ CMAKE_OFF=	WITH_ID3LIB \
 		WITH_MP4V2 \
 		WITH_QML
 CMAKE_ON=	WITH_TAGLIB
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION}
+PLIST_SUB+=	KF_SUFX=${FLAVOR:S/kf//:S/qt//} \
+		SHLIB_VER=${PORTVERSION}
 
-.if ${FLAVOR} == qt5
-USES+=		qt:5
-USE_QT=		core dbus gui multimedia network xml widgets \
-		buildtools:build linguisttools:build qmake:build
-CMAKE_OFF+=	BUILD_WITH_QT6
-PLIST_SUB+=	KF5="@comment " \
-		QT="" \
-		QT_SUFX="-qt"
-KID3_APPS+=	QT
-.elif ${FLAVOR} == qt6
+.if ${FLAVOR} == qt6
 USES+=		gl qt:6
 USE_GL=		opengl
 USE_QT=		base multimedia tools:build
 CMAKE_ON+=	BUILD_WITH_QT6
-PLIST_SUB+=	KF5="@comment " \
+PLIST_SUB+=	KF="@comment " \
 		QT="" \
 		QT_SUFX="-qt"
 KID3_APPS+=	QT
@@ -60,7 +51,18 @@ USE_KDE=	auth codecs config configwidgets coreaddons kio \
 USE_QT=		concurrent core dbus gui multimedia network xml widgets \
 		buildtools:build linguisttools:build qmake:build
 CMAKE_OFF+=	BUILD_WITH_QT6
-PLIST_SUB+=	KF5="" \
+PLIST_SUB+=	KF="" \
+		QT="@comment " \
+		QT_SUFX=""
+KID3_APPS+=	KDE
+.elif ${FLAVOR} == kf6
+USES+=		gl kde:6 qt:6
+USE_GL=		opengl
+USE_KDE=	colorscheme config configwidgets coreaddons kio \
+		widgetsaddons xmlgui doctools:build ecm:build
+USE_QT=		base multimedia tools:build
+CMAKE_ON+=	BUILD_WITH_QT6
+PLIST_SUB+=	KF="" \
 		QT="@comment " \
 		QT_SUFX=""
 KID3_APPS+=	KDE
@@ -90,7 +92,7 @@ FLAC_CMAKE_BOOL=	WITH_FLAC
 FLAC_IMPLIES=		VORBIS
 
 TEST_USE=		LOCALE=en_US.UTF-8
-.if ${FLAVOR} == qt5 || ${FLAVOR} == kf5
+.if ${FLAVOR} == kf5
 TEST_USE+=		QT=testlib:build
 .endif
 TEST_CMAKE_BOOL=	BUILD_TESTING
diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 42ba611810da..f77a763e5704 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1689017923
-SHA256 (kid3-3.9.4.tar.xz) = c410960e96225de0a1c4888c3ea1c6dc2ca245abb691474326dcdc3edbd6a520
-SIZE (kid3-3.9.4.tar.xz) = 1834140
+TIMESTAMP = 1708887915
+SHA256 (kid3-3.9.5.tar.xz) = a424fedde35c176e3b44334422aad43848418772da020751d00d0874e5ce8145
+SIZE (kid3-3.9.5.tar.xz) = 1843528
diff --git a/audio/kid3/pkg-plist b/audio/kid3/pkg-plist
index ccad2eacd0d5..333e8c9d9062 100644
--- a/audio/kid3/pkg-plist
+++ b/audio/kid3/pkg-plist
@@ -10,25 +10,25 @@ lib/kid3/libmusicbrainzimport.so
 %%VORBIS%%lib/kid3/liboggflacmetadata.so
 lib/kid3/libtaglibmetadata.so
 share/applications/org.kde.kid3%%QT_SUFX%%.desktop
-%%KF5%%share/dbus-1/interfaces/org.kde.Kid3.xml
-%%KF5%%share/doc/HTML/ca/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/ca/kid3/index.docbook
-%%KF5%%share/doc/HTML/de/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/de/kid3/index.docbook
-%%KF5%%share/doc/HTML/en/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/en/kid3/index.docbook
-%%KF5%%share/doc/HTML/it/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/it/kid3/index.docbook
-%%KF5%%share/doc/HTML/nl/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/nl/kid3/index.docbook
-%%KF5%%share/doc/HTML/pt/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/pt/kid3/index.docbook
-%%KF5%%share/doc/HTML/ru/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/ru/kid3/index.docbook
-%%KF5%%share/doc/HTML/sv/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/sv/kid3/index.docbook
-%%KF5%%share/doc/HTML/uk/kid3/index.cache.bz2
-%%KF5%%share/doc/HTML/uk/kid3/index.docbook
+%%KF%%share/dbus-1/interfaces/org.kde.Kid3.xml
+%%KF%%share/doc/HTML/ca/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/ca/kid3/index.docbook
+%%KF%%share/doc/HTML/de/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/de/kid3/index.docbook
+%%KF%%share/doc/HTML/en/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/en/kid3/index.docbook
+%%KF%%share/doc/HTML/it/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/it/kid3/index.docbook
+%%KF%%share/doc/HTML/nl/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/nl/kid3/index.docbook
+%%KF%%share/doc/HTML/pt/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/pt/kid3/index.docbook
+%%KF%%share/doc/HTML/ru/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/ru/kid3/index.docbook
+%%KF%%share/doc/HTML/sv/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/sv/kid3/index.docbook
+%%KF%%share/doc/HTML/uk/kid3/index.cache.bz2
+%%KF%%share/doc/HTML/uk/kid3/index.docbook
 %%QT%%share/doc/kid3-qt/kid3_ca.html
 %%QT%%share/doc/kid3-qt/kid3_de.html
 %%QT%%share/doc/kid3-qt/kid3_en.html
@@ -43,8 +43,8 @@ share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/48x48/apps/kid3%%QT_SUFX%%.png
 share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png
 %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg
-%%KF5%%share/icons/hicolor/scalable/apps/kid3.svgz
-%%KF5%%share/kxmlgui5/kid3/kid3ui.rc
+%%KF%%share/icons/hicolor/scalable/apps/kid3.svgz
+%%KF%%share/kxmlgui%%KF_SUFX%%/kid3/kid3ui.rc
 %%CLI%%share/man/ca/man1/kid3-cli.1.gz
 %%QT%%share/man/ca/man1/kid3-qt.1.gz
 share/man/ca/man1/kid3.1.gz