17 files changed, 583 insertions, 118 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 15cb77e4645f..f131d0de6766 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
new file mode 100644
index 000000000000..a5f74d23df07
--- /dev/null
+++ b/media-sound/amarok/Manifest
@@ -0,0 +1,4 @@
+AUX amarok-3.2.2-gpodder-qt6.patch 6346 BLAKE2B c8f9b0a417c224c9448c5d9054f84f76a47a5ac98ef0d494e34c3af35901db282d01c0c30e7f4149f7d1ee29999274244ffd2b19d021c9a186a84e6da7a85170 SHA512 496953ee0740a8773030ee263aab2d3a899ce100b5e40152f3b919a712953019d9f850db4d0825932ede935f06b68ea43e67653cacefc0e0ce46cbe76ea8c9cf
+DIST amarok-3.2.2.tar.xz 47693388 BLAKE2B 011a925163ebd113de15826bdc4165ed001896ce99c8fa49496b208318bb24c339069f99f7d7097d506e0caf437909c8cd0e0babc52b28bceff2a6def07d0fe0 SHA512 918b4fd03a2de717cb1f5968e4ba3eda391c881de384ebabeec423303e84ac6f5a8dbbb8816668d3de52c77d57f1ab9fef6580a8111a9507c9082a8ca25097aa
+EBUILD amarok-3.2.2.ebuild 5120 BLAKE2B 8955e0b75c3c9ed7dfb3fbde748e8ae1dbf692383328a43694ba9585d31863dfed18c6947fc69d9b5a4915415ef4288c6fe71812cc5ee2810b0f181fc6bfed0c SHA512 f985078707ffa255431a7520f1a5d248745e0de27875f6c3055076f686cb5b5677d1cd0efff349c206f4f9e10c07d7976801215d063e5254bdc1c8fbba83e3ed
+MISC metadata.xml 939 BLAKE2B 27c31fe95dbc89d1c80a0b63189f7676190f894c31c2c44496625eb499a57bcae6c6ae0b8cdbd722f08d69f8216d58a7ee2f360c3b862e344681f4c424897d26 SHA512 da3ae21f0a1baf4690208f63069890a2557c6f3eac384e0f43967076d2348d31bcd4cc67cee905bb3bb4844eac1931d66212da3ed69e7a0ee077516ab1bf0ce3
diff --git a/media-sound/amarok/amarok-3.2.2.ebuild b/media-sound/amarok/amarok-3.2.2.ebuild
new file mode 100644
index 000000000000..d9dce07d1baf
--- /dev/null
+++ b/media-sound/amarok/amarok-3.2.2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+KFMIN=6.9.0
+QTMIN=6.7.2
+PYTHON_COMPAT=( python3_{10..13} )
+inherit ecm kde.org optfeature python-any-r1 xdg
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Advanced audio player based on KDE Frameworks"
+HOMEPAGE="https://amarok.kde.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ipod lastfm mariadb mtp podcast webengine X"
+
+# ipod requires gdk enabled and also gtk compiled in libgpod
+DEPEND="
+	>=app-crypt/qca-2.3.9:2[qt6(+)]
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=dev-qt/qttools-${QTMIN}:6[designer]
+	>=kde-frameworks/attica-${KFMIN}:6
+	>=kde-frameworks/karchive-${KFMIN}:6
+	>=kde-frameworks/kcmutils-${KFMIN}:6
+	>=kde-frameworks/kcodecs-${KFMIN}:6
+	>=kde-frameworks/kcolorscheme-${KFMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/kdeclarative-${KFMIN}:6
+	>=kde-frameworks/kdnssd-${KFMIN}:6
+	>=kde-frameworks/kglobalaccel-${KFMIN}:6
+	>=kde-frameworks/kguiaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/knewstuff-${KFMIN}:6
+	>=kde-frameworks/knotifications-${KFMIN}:6
+	>=kde-frameworks/kpackage-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/kstatusnotifieritem-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6[X?]
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	>=kde-frameworks/solid-${KFMIN}:6
+	>=kde-frameworks/threadweaver-${KFMIN}:6
+	>=media-libs/phonon-4.12.0[qt6(+)]
+	>=media-libs/taglib-1.12:=
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	virtual/opengl
+	ipod? (
+		dev-libs/glib:2
+		media-libs/libgpod[gtk]
+	)
+	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20241124 )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	!mariadb? ( dev-db/mysql-connector-c:= )
+	mtp? ( media-libs/libmtp )
+	podcast? ( >=media-libs/libmygpo-qt-1.1.0_pre20240811 )
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+"
+RDEPEND="${DEPEND}
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	media-video/ffmpeg
+"
+BDEPEND="${PYTHON_DEPS}
+	>=dev-qt/qttools-${QTMIN}:6[linguist]
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-gpodder-qt6.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_QT6=ON
+		-DWITH_MP3Tunes=OFF
+		-DWITH_PLAYER=ON
+		-DWITH_UTILITIES=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Googlemock=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_LibOFA=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_MySQLe=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Taglib-Extras=ON
+		-DWITH_IPOD=$(usex ipod)
+		$(cmake_use_find_package lastfm LibLastFm)
+		$(cmake_use_find_package !mariadb MySQL)
+		$(cmake_use_find_package mtp Mtp)
+		$(cmake_use_find_package podcast Mygpo-qt6)
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+		-DWITH_X11=$(usex X)
+	)
+	use ipod && mycmakeargs+=( -DWITH_GDKPixBuf=ON )
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	db_name() {
+		use mariadb && echo "MariaDB" || echo "MySQL"
+	}
+
+	optfeature "Audio CD support" "kde-apps/audiocd-kio:6"
+
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "You must configure ${PN} to use an external database server."
+		elog " 1. Make sure either MySQL or MariaDB is installed and configured"
+		elog "    Checking local system:"
+		elog "      $(pkg_is_installed dev-db/mariadb)"
+		elog "      $(pkg_is_installed dev-db/mysql)"
+		elog "    For preliminary configuration of $(db_name) Server refer to"
+		elog "    https://wiki.gentoo.org/wiki/$(db_name)#Configuration"
+		elog " 2. Ensure 'mysql' service is started and run:"
+		elog "    # emerge --config amarok"
+		elog " 3. Run ${PN} and go to 'Configure Amarok - Database' menu page"
+		elog "    Check 'Use external MySQL database' and press OK"
+		elog
+		elog "For more information please read:"
+		elog "  https://community.kde.org/Amarok/Community/MySQL"
+	fi
+}
+
+pkg_config() {
+	# Create external mysql database with amarok default user/password
+	local AMAROK_DB_NAME="amarokdb"
+	local AMAROK_DB_USER_NAME="amarokuser"
+	local AMAROK_DB_USER_PWD="password"
+
+	einfo "Initializing ${PN} MySQL database 'amarokdb':"
+	einfo "If prompted for a password, please enter your MySQL root password."
+	einfo
+
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p -e "CREATE DATABASE IF NOT EXISTS ${AMAROK_DB_NAME}; GRANT ALL PRIVILEGES ON ${AMAROK_DB_NAME}.* TO '${AMAROK_DB_USER_NAME}' IDENTIFIED BY '${AMAROK_DB_USER_PWD}'; FLUSH PRIVILEGES;"
+	fi
+	einfo "${PN} MySQL database 'amarokdb' successfully initialized!"
+}
diff --git a/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch b/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch
new file mode 100644
index 000000000000..0568e2c9ee19
--- /dev/null
+++ b/media-sound/amarok/files/amarok-3.2.2-gpodder-qt6.patch
@@ -0,0 +1,163 @@
+From 973ab984b6c289dd2c88abbdf1b29c48abb4dbc7 Mon Sep 17 00:00:00 2001
+From: Tuomas Nurmi <tuomas@norsumanageri.org>
+Date: Sat, 22 Feb 2025 10:56:38 +0200
+Subject: [PATCH] Make lastfm and gpodder parts compile with strict flags, too
+
+---
+ .../applets/similarartists/plugin/SimilarArtistModel.cpp    | 6 +++---
+ src/services/gpodder/GpodderPodcastMeta.h                   | 2 +-
+ src/services/gpodder/GpodderPodcastRequestHandler.h         | 2 +-
+ src/services/gpodder/GpodderPodcastTreeItem.h               | 2 +-
+ src/services/gpodder/GpodderProvider.h                      | 4 ++--
+ src/services/gpodder/GpodderService.cpp                     | 4 ++--
+ src/services/gpodder/GpodderServiceModel.h                  | 4 ++--
+ src/services/gpodder/GpodderTagTreeItem.h                   | 2 +-
+ src/services/gpodder/GpodderTreeItem.h                      | 4 ++--
+ 9 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp b/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
+index 333cc85e45..eec964b8c1 100644
+--- a/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
++++ b/src/context/applets/similarartists/plugin/SimilarArtistModel.cpp
+@@ -185,7 +185,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+     QString plays;
+     QString ownPlays;
+     QString tags;
+-    QString bio=" ";
++    QString bio=QLatin1String(" ");
+ 
+     while( xml.name() != QLatin1String("name") )
+         xml.readNextStartElement();
+@@ -242,7 +242,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+                 {
+                     bio = xml.readElementText().replace( QStringLiteral("\n"), QStringLiteral("<br>") );
+                     if(bio == QString())
+-                        bio = " ";
++                        bio = QLatin1String(" ");
+                 }
+                 else
+                     xml.skipCurrentElement();
+@@ -256,7 +256,7 @@ SimilarArtistModel::fillArtistInfoFromXml( QXmlStreamReader &xml )
+     {
+         if( auto artist = dynamic_cast< SimilarArtistItem *>( i ) )
+         {
+-            artist->m_bioText = bio.isNull() ? " " : bio;
++            artist->m_bioText = bio.isNull() ? QLatin1String(" ") : bio;
+             artist->m_listenerCount = listeners;
+             artist->m_playCount = plays;
+             artist->m_ownPlayCount = ownPlays;
+diff --git a/src/services/gpodder/GpodderPodcastMeta.h b/src/services/gpodder/GpodderPodcastMeta.h
+index abe2c9f2b6..b929173a24 100644
+--- a/src/services/gpodder/GpodderPodcastMeta.h
++++ b/src/services/gpodder/GpodderPodcastMeta.h
+@@ -22,7 +22,7 @@
+ 
+ #include "core/playlists/PlaylistProvider.h"
+ #include "core/podcasts/PodcastMeta.h"
+-#include <mygpo-qt5/ApiRequest.h>
++#include <mygpo-qt6/ApiRequest.h>
+ 
+ namespace Podcasts {
+ 
+diff --git a/src/services/gpodder/GpodderPodcastRequestHandler.h b/src/services/gpodder/GpodderPodcastRequestHandler.h
+index c56ec1942f..ce787f4cb3 100644
+--- a/src/services/gpodder/GpodderPodcastRequestHandler.h
++++ b/src/services/gpodder/GpodderPodcastRequestHandler.h
+@@ -20,7 +20,7 @@
+ #define GPODDERPODCASTREQUESTHANDLER_H_
+ 
+ #include "GpodderServiceModel.h"
+-#include <mygpo-qt5/PodcastList.h>
++#include <mygpo-qt6/PodcastList.h>
+ 
+ #include <QModelIndex>
+ 
+diff --git a/src/services/gpodder/GpodderPodcastTreeItem.h b/src/services/gpodder/GpodderPodcastTreeItem.h
+index 91323fb770..16b0f8c6b2 100644
+--- a/src/services/gpodder/GpodderPodcastTreeItem.h
++++ b/src/services/gpodder/GpodderPodcastTreeItem.h
+@@ -20,7 +20,7 @@
+ #define GPODDERPODCASTTREEITEM_H_
+ 
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/Podcast.h>
++#include <mygpo-qt6/Podcast.h>
+ 
+ class GpodderPodcastTreeItem: public GpodderTreeItem
+ {
+diff --git a/src/services/gpodder/GpodderProvider.h b/src/services/gpodder/GpodderProvider.h
+index 9551a97a69..61e6642b01 100644
+--- a/src/services/gpodder/GpodderProvider.h
++++ b/src/services/gpodder/GpodderProvider.h
+@@ -23,8 +23,8 @@
+ #include "core/podcasts/PodcastProvider.h"
+ #include "core/podcasts/PodcastReader.h"
+ #include "GpodderPodcastMeta.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/EpisodeActionList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/EpisodeActionList.h>
+ #include "playlistmanager/file/KConfigSyncRelStore.h"
+ #include "playlistmanager/PlaylistManager.h"
+ 
+diff --git a/src/services/gpodder/GpodderService.cpp b/src/services/gpodder/GpodderService.cpp
+index b2d51ea807..4c43ea7b4a 100644
+--- a/src/services/gpodder/GpodderService.cpp
++++ b/src/services/gpodder/GpodderService.cpp
+@@ -27,8 +27,8 @@
+ #include "GpodderServiceModel.h"
+ #include "GpodderServiceView.h"
+ #include "GpodderSortFilterProxyModel.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/Podcast.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/Podcast.h>
+ #include "playlistmanager/PlaylistManager.h"
+ #include "widgets/SearchWidget.h"
+ 
+diff --git a/src/services/gpodder/GpodderServiceModel.h b/src/services/gpodder/GpodderServiceModel.h
+index 6eb979ca07..59c67d2fde 100644
+--- a/src/services/gpodder/GpodderServiceModel.h
++++ b/src/services/gpodder/GpodderServiceModel.h
+@@ -20,8 +20,8 @@
+ #define GPODDERSERVICEMODEL_H_
+ 
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/TagList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/TagList.h>
+ #include "NetworkAccessManagerProxy.h"
+ 
+ #include <QAbstractItemModel>
+diff --git a/src/services/gpodder/GpodderTagTreeItem.h b/src/services/gpodder/GpodderTagTreeItem.h
+index 63cc965d89..16a8b95cf3 100644
+--- a/src/services/gpodder/GpodderTagTreeItem.h
++++ b/src/services/gpodder/GpodderTagTreeItem.h
+@@ -20,7 +20,7 @@
+ #define GPODDERTAGTREEITEM_H_
+ 
+ #include "GpodderTreeItem.h"
+-#include <mygpo-qt5/Tag.h>
++#include <mygpo-qt6/Tag.h>
+ 
+ #include <QObject>
+ 
+diff --git a/src/services/gpodder/GpodderTreeItem.h b/src/services/gpodder/GpodderTreeItem.h
+index 642e1cb371..7b311b659e 100644
+--- a/src/services/gpodder/GpodderTreeItem.h
++++ b/src/services/gpodder/GpodderTreeItem.h
+@@ -19,8 +19,8 @@
+ #ifndef GPODDERTREEITEM_H_
+ #define GPODDERTREEITEM_H_
+ 
+-#include <mygpo-qt5/ApiRequest.h>
+-#include <mygpo-qt5/TagList.h>
++#include <mygpo-qt6/ApiRequest.h>
++#include <mygpo-qt6/TagList.h>
+ 
+ #include <QList>
+ #include <QModelIndex>
+-- 
+GitLab
+
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
new file mode 100644
index 000000000000..27433610de3b
--- /dev/null
+++ b/media-sound/amarok/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/enter_bug.cgi?product=amarok</bugs-to>
+		<remote-id type="kde-invent">multimedia/amarok</remote-id>
+	</upstream>
+	<use>
+		<flag name="lastfm">Enable Last.fm streaming services support through <pkg>media-libs/liblastfm</pkg></flag>
+		<flag name="mariadb">Prefer <pkg>dev-db/mariadb-connector-c</pkg> over <pkg>dev-db/mysql-connector-c</pkg></flag>
+		<flag name="mtp">Enable support for libMTP (Plays4Sure) devices access through libmtp</flag>
+		<flag name="podcast">Enable gpodder.net podcast support via <pkg>media-libs/libmygpo-qt</pkg></flag>
+		<flag name="webengine">Enable wikipedia widget using <pkg>dev-qt/qtwebengine</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index 648854d533f1..849c56c043a8 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -1,4 +1,4 @@
 DIST clementine-1.4.1_p28.tar.xz 5554308 BLAKE2B 213c5719ce987700739d625de07861143a85690c91908d458cb40db9b932f4a33caca727f2a2db942d96ee3e5f356841c09dfd293fa676ad134d1283937ef4fc SHA512 c5b06540909127e8b3bc774f2bee54584c0993e1ddebce4572cd8402bba5524babdcc3b74a1b6a8335c525ce64ee1347766b6698df05bdcf21209583b8d1dc9d
-EBUILD clementine-1.4.1_p28.ebuild 4525 BLAKE2B d26dff88134c919942ee369d19805a8a204e2d4ba3532d99054f42c3299ec6131490968d6a57336d47de474dbc5b64279c5b54f5bffd3ffc1f117ddac4974be1 SHA512 44afeed31c557247754d3e5df549ba5f77ded3da3916a54e1191f9ef6003d0701c71c6c3043da4ffeb05ca8f3bb9f71f7500a3aa33b57abc6945a8dad5c1f500
-EBUILD clementine-9999.ebuild 4527 BLAKE2B 6cc1d2d197e514d14612f02504a64d26a32f794b780294c29f7a6d731b1493a8a7f382b63098f7c5fdf8fd803614c3fe431b382306cba3afcb2a99591aaa86b6 SHA512 1cd7ba8eee884ca80d6d6afacb96c0ad560ece87989836308196ed99cda016b6bc7e6b4232b925d73ea73de3ca8ae3d361b88c2460dbbc04c89aa24245469ec0
+EBUILD clementine-1.4.1_p28-r1.ebuild 4519 BLAKE2B 3fd50052a20c3e3cc521ceedb6e31d756af8df2307e7a1e2ba92b6d00834f53fda2f19902f126a4df6e1e5cf7893832700e9ef35952ddfeffbd7e8a82c62ccdf SHA512 8a30bf066ba0bf5c70d26a3d964f90a19476d0a54a7ecb4af20159180a959d5ede62912d16d9146ce0e0b446519f7972afd2fee8732184ebaa09cccdd61055c4
+EBUILD clementine-9999.ebuild 4521 BLAKE2B 37f9be274767ef1b4b9d1b0eb5143f85482b7bdbf772abdaac9510505c4b10d31f150a5c7ca5512fc3155a124d9b442ec7e3048f65d467fd3ab4c44909fe289f SHA512 25f4b39af35eeea32c64a9b098beeb93baa8e7db953074032283d4f1d76c891a10c5929978f7268eda7da12a0b08e35a9142a91ef4e87b7826047e57803ab1ec
 MISC metadata.xml 1205 BLAKE2B 385d0f742772f036d1d0e03913aa1e38fe165dfeec7a6773fa5685992f9bbc348437bd759c24c54686d19f8dfbadc8bf208909788bc1e0dd957e47bb659fb832 SHA512 58d908699a52724401f167ae20fa05327aa4fd5b705856a43292c98e898b2f13d11c9db6fac6def35eede0c356071ff38e22883ca233a1005173ded18e69ca92
diff --git a/media-sound/clementine/clementine-1.4.1_p28.ebuild b/media-sound/clementine/clementine-1.4.1_p28-r1.ebuild
index 96e10ca26947..8906fce0f9fc 100644
--- a/media-sound/clementine/clementine-1.4.1_p28.ebuild
+++ b/media-sound/clementine/clementine-1.4.1_p28-r1.ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	<media-libs/libmygpo-qt-1.1.0-r10
 	media-libs/taglib:=
 	sys-libs/zlib
 	x11-libs/libX11
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	lastfm? ( <media-libs/liblastfm-1.1.0_pre20241124 )
 	moodbar? ( sci-libs/fftw:3.0= )
 	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 823a70ac7fe8..7b8fab104c6c 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -45,7 +45,7 @@ COMMON_DEPEND="
 	media-libs/chromaprint:=
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
+	<media-libs/libmygpo-qt-1.1.0-r10
 	media-libs/taglib:=
 	sys-libs/zlib
 	x11-libs/libX11
@@ -53,7 +53,7 @@ COMMON_DEPEND="
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
 	ipod? ( >=media-libs/libgpod-0.8.0 )
-	lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
+	lastfm? ( <media-libs/liblastfm-1.1.0_pre20241124 )
 	moodbar? ( sci-libs/fftw:3.0= )
 	mtp? ( >=media-libs/libmtp-1.0.0:= )
 	projectm? (
diff --git a/media-sound/liblc3/Manifest b/media-sound/liblc3/Manifest
index bfe279b84761..1cf2de6f5ffc 100644
--- a/media-sound/liblc3/Manifest
+++ b/media-sound/liblc3/Manifest
@@ -1,5 +1,7 @@
 DIST liblc3-1.0.4.tar.gz 263276 BLAKE2B 8c4b5e23b3dafe2fa22812c688f1f57167369cebe565b097e554be693d49b0c196fb5e454f3db8e724410f8c04d4bb66bd7594ab46b2a1b91c277300e5c48dc2 SHA512 bc047aa26059f2b2a7f5275b580f39a9237ffdd6da03645c7e95957447ba7410768ae5c08fcf1e0ac16fac873be4cbf62695b2298ef72f54f09e577664c27255
 DIST liblc3-1.1.1.tar.gz 1658742 BLAKE2B a38f1bede375fb57ee64b6e8ee7b639b01a58049815585a4528b2d0dfd5bf118455708f90e964b4a7b0599eb72dd6ba21b98a8c80588e64111ad9669f2c7fc3d SHA512 cd424a46fe8bad3cd2d633ef957305538afeb86f211d8824cf21e5c47c7ed174674a33a4e1906b73ab478cac7ed747c730f2d71d0021a7027c1c28b63ba3e588
+DIST liblc3-1.1.3.tar.gz 1659909 BLAKE2B 83bc34c360fda5f8f7d518e9dd1f9e6a4e019168e76265e0b66712a4c081cd31a37c72c35d7de26c607484ab541b99d37c47990ecbb37857762c8bab5460bad7 SHA512 0f06367651b2ebd5e5e8f8e6256fd818646f6674e5bd278ba224c2fdbce7e4b6985d8ef1c5e69aee2fdbeeb4f790fb1e80529d3f8da9fc2dff98e9b8f90d4bdb
 EBUILD liblc3-1.0.4.ebuild 565 BLAKE2B 88ac4c6f4ac5315c90c1b23f19f279f38107d6aafb4146bc108519d2ab57ff3c38d8e853c08d0935eaa6c3fb2cae82c0e72e92152f4e623fb1195204823d5db6 SHA512 6c7b3c34ae7c80d9c0aecada7c0d3bed518803305375542fbe5beafdffc2687f253898ec54c47253a9a829fd285ee6c20fa3a706079d12731093825fb25197ec
 EBUILD liblc3-1.1.1-r1.ebuild 1378 BLAKE2B d8c9a3e90bb86cc9881c9b7e7b87613534fc39174803fe65195f9f8bfa1aa4d83fbb2737b49bf1ca0036d03bea77c5efcec40bb2af981cdadba01123312853c8 SHA512 bbd0ef3d73e2e987a330754918305fedf5deffdc010db6955427d638f2f6f516aeabf4852281a84f083ba6dad0328a2be76450619ac4000cff3b1bde0fb832da
+EBUILD liblc3-1.1.3.ebuild 1463 BLAKE2B 9ae9c6cc74456a65bf7663f49cb2fc286069f2b9a1c708ad15828e0c8ce091a33f4de02b6690b031992712adc88b85cd87aad9c94098e896a931de92d24adb60 SHA512 1473fc58d4ebabe088f77bd8c86af8802fb5f416b8698542364e92aa3ec21254e06c9c127a466c77d6507b17076ff0fe59806639ec674e2e4d669f7fb8b37945
 MISC metadata.xml 683 BLAKE2B 22a4df555d0a41a1ca34a0467e853f7e2db471b807f7fdc3d31abc9de7aeeba665ef87dc3f9ab470d37aca5ba404df58e8c3e048367e1ceb50683c66b7486854 SHA512 2a6f52b2d8e9769e19c33c3fb59d0b9cfe0bb414b03c181074707503cfd60995465a325d9f09b864e248c5121044421e351635a4ec650e42d423e84165d2b81c
diff --git a/media-sound/liblc3/liblc3-1.1.3.ebuild b/media-sound/liblc3/liblc3-1.1.3.ebuild
new file mode 100644
index 000000000000..c4def90a0a47
--- /dev/null
+++ b/media-sound/liblc3/liblc3-1.1.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} pypy3 )
+inherit python-any-r1 toolchain-funcs meson-multilib
+
+DESCRIPTION="LC3 is an efficient low latency audio codec"
+HOMEPAGE="https://github.com/google/liblc3"
+SRC_URI="https://github.com/google/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test tools"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_any_dep '
+			dev-python/numpy[${PYTHON_USEDEP}]
+			dev-python/scipy[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/scipy[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+multilib_src_prepare() {
+	if ! use arm ; then
+		rm -r "test/arm" || die
+	fi
+
+	if ! use arm64 ; then
+		rm -r "test/neon" || die
+	fi
+
+	default
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dpython=false
+		$(meson_native_use_bool tools)
+	)
+	meson_src_configure
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		# Makefile misuses V=, so V=1 fails (e.g. "1cd ...")
+		emake V= -C "${S}" test CC="$(tc-getCC)" \
+			CFLAGS:="${CPPFLAGS} ${CFLAGS} -I"$("${EPYTHON}" -c "import numpy;print(numpy.get_include())")""
+	else
+		ewarn "Skipping test for non-native ABI: ${ABI}"
+	fi
+}
diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
index 0a3dfc8922e6..cf16741578d5 100644
--- a/media-sound/yarock/Manifest
+++ b/media-sound/yarock/Manifest
@@ -1,4 +1,5 @@
-AUX yarock-1.4.0-fix-build-taglib2.patch 1863 BLAKE2B d52fc6407b663d362e516013b3d011e47240bfc3e8856951a9d2ee12864ca4d9ff2d83d100b24b4b3039422da981ba3fa5891abe3edeeff0e0548ae59c205c12 SHA512 71907f11188558935d180661500da26bc9b815330915a50e1929234f194c8200efd15cb516b58442edb173a08e1a797d25eb217ba319425d12fa252109a7eda4
-DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00
-EBUILD yarock-1.4.0-r4.ebuild 1281 BLAKE2B 09d4ee71860e48ac6c78ab651f3d55eb61fd2ec66e345c40aa7d0ef90a6feb58b7f4194c74d94a273b3dccffbd147f4ddfb67deb7d0153c64130ddb7a7c98e15 SHA512 48682ff3113006065854d36db3b942769c169d1ae12d0b778e833b34bd2da5df0739c3139ede4d1ccde2d627903ff4384909d68f60946838edb9d0010204f13b
-MISC metadata.xml 478 BLAKE2B 61705b6938687fabef20be9ca0733531a8e50dc2a1853e27c62e695ac2a506a3f8b6d456aa21b428544bd31a1c7346317f5905bfa4188c63755e2aad3d5864b6 SHA512 3afed127784c1f952f2c49dd80c527a5816e080f3b1edb83575e4fd325221512c1a5767eb3a0f331db3eaf1c51268d577d8c0524afffa9c2814714aeeb12e1a3
+AUX yarock-1.4.0-taglib2-include.patch 346 BLAKE2B 20768b192668d6581eeb6f51ca1a85981333cd6089864bec1332f63dd31ed3029ded246f7f2818c2bd3714c650aa4664a15a74830f22f4726f62da9356724def SHA512 5a2d1fabdb0ee9ac4c353834234ca187e947a9c6a071778b87f7f35bedcfe7bf1195ed62b6f1818bd2500f542552dde77f2d98e480466df6c7d7d923cdea5206
+AUX yarock-1.5.0-assorted-fixes.patch 3890 BLAKE2B f641709692ecf7a067d0cb5d4f76a6ca0b5a1dc3b26f8502d67f7a330f5b21968a2921e546f98ef8227f2b8e29e055ad53d5ccf70554e283d9114f98e9094c4f SHA512 db9404d4c8494f77377030c91bcf91782a1be65a09f10f73d761c6f543054e66eb43a4c54e664db39e80dd5bb1fadd5b2f824faf583651e0de0556c23064797e
+DIST yarock-1.5.0.tar.gz 1134974 BLAKE2B 802e99f664a29a4879ecc820a6421284e9b28ead82e9a517a974db5818523e53b22d7fbf73b6bcdd88b7f0b5b55aad1f001fd4102e69532ce2c4ef23b8c7ad2a SHA512 f56dacbfe15117c3ca4c3ad52394e6d4832410a8e6c71b9247d6b9449fec00b3aae6daede2562f4b8cd96f26c574c1a98b62b68457fc4c3a5f95f7f602b53e1f
+EBUILD yarock-1.5.0.ebuild 1245 BLAKE2B fd6831876dfe153e78db3a68edc45e24880957082f0d0575104364f5ae142c80cff689f43024e75a7afe3c33e953ccd899d62dbb73229787b2fc87c4ba06e43a SHA512 da1a04466ac4c32efc3748dfe08770ccbcb9171ddb12740b691edd12ce8359337624ad3d80128e702c47b74d2baf36393b4933665a9007bca1ac757fe74e74d9
+MISC metadata.xml 544 BLAKE2B ac2092a02f79814e287c33acca047c7269a29e9d1f6eaac1eaec94c16135ef669984f67c84c7cd313d278f64903ee38766939a64a0a02cca3430dfa31c62a800 SHA512 abc359d5c0f7cd2b317caa32c0e9005f74aa79f044f1b98b9a99648e2c67560f5e16167597eb16639b385788cd178c72bdef41f6a30a53b8a5e8e8dd3d63ae90
diff --git a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch
deleted file mode 100644
index d234866ea26d..000000000000
--- a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/sebaro/Yarock/commit/3cdc8910a6dec9054913dcdd8e804bb79b53b861.patch
---- a/src/core/mediaitem/tag.cpp
-+++ b/src/core/mediaitem/tag.cpp
-@@ -28,6 +28,7 @@
-
- #include <taglib/mpegfile.h>
- #include <taglib/asffile.h>
-+#include <taglib/attachedpictureframe.h>
- #include <taglib/vorbisfile.h>
- #include <taglib/oggfile.h>
- #include <taglib/oggflacfile.h>
-@@ -289,10 +290,10 @@
- /*----------------------------------------------------------------------------*/
- static void readMP4Tags(TagLib::MP4::Tag *tag, MEDIA::TrackPtr track, QString& s_disc )
- {
--    const TagLib::MP4::ItemListMap& items = tag->itemListMap();
-+    const TagLib::MP4::ItemMap& items = tag->itemMap();
- 
-     /* album artists tags */
--    TagLib::MP4::ItemListMap::ConstIterator it = items.find("aART");
-+    TagLib::MP4::ItemMap::ConstIterator it = items.find("aART");
-     if ( it != items.end() ) 
-     {
-         TagLib::StringList album_artists = it->second.toStringList();
-@@ -665,7 +666,7 @@
-     else if (TagLib::MP4::File* file = dynamic_cast<TagLib::MP4::File*>(fileref.file())) 
-     {
-       TagLib::MP4::Tag* tag = file->tag();
--      tag->itemListMap()[kMP4_FMPS_Rating_ID] = TagLib::StringList(QStringToTaglibString(QString::number( rating )));
-+      tag->setItem(kMP4_FMPS_Rating_ID, TagLib::StringList(QStringToTaglibString(QString::number( rating ))));
-     }
-     else 
-     {
-@@ -772,8 +773,8 @@
-     if (aac_file) 
-     {
-       TagLib::MP4::Tag* tag = aac_file->tag();
--      const TagLib::MP4::ItemListMap& items = tag->itemListMap();
--      TagLib::MP4::ItemListMap::ConstIterator it = items.find("covr");
-+      const TagLib::MP4::ItemMap& items = tag->itemMap();
-+      TagLib::MP4::ItemMap::ConstIterator it = items.find("covr");
-       if (it != items.end()) 
-       {
-         const TagLib::MP4::CoverArtList& art_list = it->second.toCoverArtList();
diff --git a/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch
new file mode 100644
index 000000000000..3ddf7256a42a
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.4.0-taglib2-include.patch
@@ -0,0 +1,11 @@
+https://github.com/sebaro/Yarock/issues/1#issuecomment-2402327268
+--- a/src/core/mediaitem/tag.cpp
++++ b/src/core/mediaitem/tag.cpp
+@@ -28,6 +28,7 @@
+
+ #include <taglib/mpegfile.h>
+ #include <taglib/asffile.h>
++#include <taglib/attachedpictureframe.h>
+ #include <taglib/vorbisfile.h>
+ #include <taglib/oggfile.h>
+ #include <taglib/oggflacfile.h>
diff --git a/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch b/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch
new file mode 100644
index 000000000000..af061ade0e1e
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.5.0-assorted-fixes.patch
@@ -0,0 +1,91 @@
+From 71e0b434a9c9eaa4879cd71e203b02dbfde28553 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 23 Feb 2025 18:02:34 +0100
+Subject: [PATCH 1/4] Fix "yarock-player.org" organisation breaking appid,
+ de-duplicate desktop files
+
+This (resulting in "org.yarock-player.yarock") did not match both
+org.yarock.desktop and yarock.desktop, resulting in the wayland
+placeholder icon used instead of Yarock's, among other potential
+XDG/DBus adjacent issues.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt          |  2 +-
+ src/main.cpp            |  4 --
+ 2 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6dd3952..69654c6 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -203,7 +203,7 @@ install(TARGETS yarock DESTINATION ${CMAKE_INSTALL_BIN})
+ install(FILES ${YAROCK_QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/yarock/translations")
+ 
+ # -- install destop file
+-install(FILES data/org.yarock.desktop  DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
++install(FILES data/yarock.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+ 
+ # -- install appdata file
+ install(FILES data/org.yarock.metainfo.xml  DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
+diff --git a/src/main.cpp b/src/main.cpp
+index 03eeafa..276d8de 100755
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -24,8 +24,6 @@ int main(int argc, char *argv[]) {
+     //! core application settings
+     QCoreApplication::setApplicationName(APP_NAME);
+     QCoreApplication::setApplicationVersion(VERSION);
+-    QCoreApplication::setOrganizationName(ORG_NAME);
+-    QCoreApplication::setOrganizationDomain("yarock-player.org");
+ 
+     //! taken from amarok
+     // This call is needed to prevent a crash on exit with Phonon-VLC and LibPulse
+@@ -40,8 +38,6 @@ int main(int argc, char *argv[]) {
+     QApplication application(argc, argv);
+     application.setApplicationName(APP_NAME);
+     application.setApplicationVersion(VERSION);
+-    application.setOrganizationName(ORG_NAME);
+-    application.setOrganizationDomain("yarock-player.org");
+     application.setAttribute(Qt::AA_DontShowIconsInMenus, false);
+ 
+     //! Qt Type registration
+-- 
+2.48.1
+
+
+From d0b1157c61cfe520d03b656f35ac3c914dbb9f04 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 23 Feb 2025 18:09:11 +0100
+Subject: [PATCH 2/4] Use organisationless metainfo.xml file
+
+Follow-up to 71e0b434a9c9eaa4879cd71e203b02dbfde28553, incidentally
+running dos2unix over it.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                                |   2 +-
+ ...arock.metainfo.xml => yarock.metainfo.xml} | 102 +++++++++---------
+ 2 files changed, 52 insertions(+), 52 deletions(-)
+ rename data/{org.yarock.metainfo.xml => yarock.metainfo.xml} (98%)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69654c6..995c337 100755
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -206,7 +206,7 @@ install(FILES ${YAROCK_QM_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/yaro
+ install(FILES data/yarock.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+ 
+ # -- install appdata file
+-install(FILES data/org.yarock.metainfo.xml  DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
++install(FILES data/yarock.metainfo.xml  DESTINATION "${CMAKE_INSTALL_PREFIX}/share/metainfo")
+ 
+ # -- install icons files
+ install(FILES ${CMAKE_SOURCE_DIR}/icon/yarock_16x16.png DESTINATION "${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps" RENAME application-x-yarock.png)
+diff --git a/data/org.yarock.metainfo.xml b/data/yarock.metainfo.xml
+similarity index 98%
+rename from data/org.yarock.metainfo.xml
+rename to data/yarock.metainfo.xml
+index 224713a..3afa371 100755
+-- 
+2.48.1
diff --git a/media-sound/yarock/metadata.xml b/media-sound/yarock/metadata.xml
index d49e848cea41..5f3fecebc200 100644
--- a/media-sound/yarock/metadata.xml
+++ b/media-sound/yarock/metadata.xml
@@ -5,9 +5,12 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/sebaro/Yarock/issues</bugs-to>
+		<remote-id type="github">sebaro/Yarock</remote-id>
+	</upstream>
 	<use>
 		<flag name="mpv">Enable <pkg>media-video/mpv</pkg> backend</flag>
-		<flag name="phonon">Enable <pkg>media-libs/phonon</pkg> backend</flag>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> backend</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/yarock/yarock-1.4.0-r4.ebuild b/media-sound/yarock/yarock-1.4.0-r4.ebuild
deleted file mode 100644
index e12b562a93b8..000000000000
--- a/media-sound/yarock/yarock-1.4.0-r4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="Yarock_${PV}_Sources"
-inherit cmake
-
-DESCRIPTION="Qt-based music player"
-HOMEPAGE="https://code.launchpad.net/yarock"
-SRC_URI="https://launchpad.net/${PN}/1.x/${PV}/+download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="mpv phonon vlc"
-
-RDEPEND="
-	dev-cpp/htmlcxx
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/taglib:=
-	x11-libs/libX11
-	mpv? ( media-video/mpv:=[libmpv] )
-	phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] )
-	vlc? ( media-video/vlc:= )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/qtx11extras:5
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.4.0-fix-build-taglib2.patch )
-
-DOCS=( CHANGES.md README.md )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*org.yarock.appdata.xml/s:share/appdata:share/metadata:" \
-		-i CMakeLists.txt || die
-	sed -e "/^Version/d" \
-		-i data/org.yarock.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT5=ON
-		-DENABLE_MPV=$(usex mpv)
-		-DENABLE_PHONON=$(usex phonon)
-		-DENABLE_VLC=$(usex vlc)
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/yarock/yarock-1.5.0.ebuild b/media-sound/yarock/yarock-1.5.0.ebuild
new file mode 100644
index 000000000000..dfe38ca2841b
--- /dev/null
+++ b/media-sound/yarock/yarock-1.5.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Qt-based music player"
+HOMEPAGE="https://github.com/sebaro/Yarock"
+SRC_URI="https://github.com/sebaro/Yarock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN^}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mpv vlc"
+
+RDEPEND="
+	dev-cpp/htmlcxx
+	dev-qt/qtbase:6[dbus,gui,network,sql,sqlite,widgets,xml]
+	media-libs/taglib:=
+	x11-libs/libX11
+	mpv? ( media-video/mpv:=[libmpv] )
+	vlc? ( media-video/vlc:= )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtbase:6[concurrent]
+"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+DOCS=( CHANGES.md README.md )
+
+PATCHES=(
+	# TODO(?): https://github.com/sebaro/Yarock/issues/1#issuecomment-2398941145
+	"${FILESDIR}"/${PN}-1.4.0-taglib2-include.patch
+	# Pending: https://github.com/sebaro/Yarock/pull/3
+	"${FILESDIR}"/${P}-assorted-fixes.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^Version/d" \
+		-i data/org.yarock.desktop || die
+	mv data/{org.,}yarock.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_PHONON=OFF # questionable benefit over vlc directly
+		-DENABLE_MPV=$(usex mpv)
+		-DENABLE_VLC=$(usex vlc)
+	)
+
+	cmake_src_configure
+}