gentoo auto-resync : 07:01:2025 - 06:41:06

5 files changed, 172 insertions, 37 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 199e06d943e7..4308974d4653 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,5 +1,6 @@
-AUX qmmp-1.6.0-udisks_plugin.patch 321 BLAKE2B a3a0e6ca792a9399eef189e319113b63094cbc32a2d8912c7d7174589f34729be4ce0638323f449320cd34df0b1e3780ff43ae3c211cc6c96ba823cb0fed53bd SHA512 d88eadf6e725617cc50ef809532a5eaa0272745c74697953850c52dca3586809bd83f3804925e65607379e7156210686fe906da729371ba251ebfa1168e59b97
 DIST qmmp-1.6.4.tar.bz2 1379335 BLAKE2B e17ec8f84f94cfbc6a0a1d30d6d954f3e6b3448909c0e3344614340b41974d69aa5bd3dbb149fcc88c6ede289ec7900050eb0de81307dfeb8ebfc360255d1ea6 SHA512 da8eae4ca4e10cca8a177064a422fdc196e76bb5e3e06c3029040e1120da0d2e5666824a8effd51f82c94b999e1243ae3bc6c71c8c05e334276bf40a5767c17f
+DIST qmmp-2.1.9.tar.bz2 1373111 BLAKE2B a7420c50b4a3e9d41d6e483dce3a0446a202823f673aab2def308b5473563d5ea77730aec771a96a63ef860284bdcaa378dafe9d03c20919cba70b046681bc4c SHA512 87370dfdb856953ff9f89c1308c21133eaef880c3ace1e57ea1e0fde6deea4988c491836139a8d89c41670730838c0b8786fd4208429c709bab3b976efac53a8
 EBUILD qmmp-1.6.4-r1.ebuild 4083 BLAKE2B 192923fe82f5585ee3dec25bbbb4f58820c4b84e21ec0f1c05a8ef28311dac2c8b6888dd010471e6d3b9e0707751d2bab9f2f6e61da94d46ca2751f71e8e0007 SHA512 8ccd111773454bedaa34edfb626f26f6b546fd9d5126b877bc31237b6aaa497f4a8774a8f87aaf62d9f955a7690713e8a415a560a2fc96e3d57ff65b59011622
-EBUILD qmmp-9999.ebuild 4145 BLAKE2B 34c1fd3b55a7f11b6c71c4575e28e952b2097b288a0d7c0c02391e5677c149b8cfb08208042a1189f8c06ad6614541e0f4bf852b66fd699cbf3a9e84f521e08c SHA512 6131fc6abb2ce9189d1c68c05db9e7302160c2de5b7c7f61df1fe6f939a03132a458e5702393242c16b7e37f85e4d4dd7a32cd210b267c26830beb96c3109f48
-MISC metadata.xml 1968 BLAKE2B 0508c5799d28580937911ca77c1787889b96e48a7a2bd3c60b8b180f39c7ff5f2faec6a7ad9d1fd5b5bc4dfba8c8495eb58893eb1e9ce90fe10c7a6111f546ae SHA512 ca044d6199e5f0b14fd667cbc10c95c93bb03b616a3e492c5ea933751890cd708b2bf61bec667b84f8aa01ddfccb9eff324203a9487da43ee47aa018e527300c
+EBUILD qmmp-2.1.9.ebuild 4052 BLAKE2B b521fe4044114d05082ef94b0a5d1882a6e8382b65d6c1f86c8dc8e6c82e2499b93e1a3612858cbf201c2df50588abb7dd5d8eb4efa421041d9dfcc78dec954f SHA512 4ebbed7a7a0f43b37c695fc50552722017b811571989f92f19a600f1dd941ba387e040e747172cea23a6e0eb5b1b01866e74e620248ee920b5d0373b142aa373
+EBUILD qmmp-9999.ebuild 4052 BLAKE2B b521fe4044114d05082ef94b0a5d1882a6e8382b65d6c1f86c8dc8e6c82e2499b93e1a3612858cbf201c2df50588abb7dd5d8eb4efa421041d9dfcc78dec954f SHA512 4ebbed7a7a0f43b37c695fc50552722017b811571989f92f19a600f1dd941ba387e040e747172cea23a6e0eb5b1b01866e74e620248ee920b5d0373b142aa373
+MISC metadata.xml 2308 BLAKE2B c2cb743e9b3f34aaa422a51ce6d6a89d8645a8de40744d67f23144d6b890290ceddad66ade57f9b2d33e6460a4f9151bbbc42b20750ce3699b5a9231d83d53a0 SHA512 ae5211ba03348245018585ea09b9c0802fb6e6c22addc1f72b21fc09d4cc108d755ae20a0e2dfb29884ecaf4c0d62afe37f27a17ff28e7e4b777cdc86038153c
diff --git a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch b/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
deleted file mode 100644
index 45512099ffeb..000000000000
--- a/media-sound/qmmp/files/qmmp-1.6.0-udisks_plugin.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qmmp-1.6.0/src/plugins/General/CMakeLists.txt
-+++ qmmp-1.6.0/src/plugins/General/CMakeLists.txt
-@@ -51,7 +51,7 @@
- ENDIF(USE_HAL AND Qt5DBus_FOUND)
- 
- IF(USE_UDISKS2 AND Qt5DBus_FOUND)
--add_subdirectory(udisks2)
-+add_subdirectory(udisks)
- ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
- 
- IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 6f150fbd17d6..a6bb8b917981 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -15,7 +15,8 @@
 		<flag name="dbus">Enable DBus notifiications and MPRIS support</flag>
 		<flag name="enca">Detects the character encoding automatically</flag>
 		<flag name="game">Enable Game music support</flag>
-		<flag name="gnome">Enable Gnome hotkey support (requires Qt5DBus)</flag>
+		<flag name="gnome">Enable Gnome hotkey support (requires QtDBus)</flag>
+		<flag name="libxmp">Enable module files renderer (modplug replacement) via <pkg>media-libs/libxmp</pkg></flag>
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
@@ -32,6 +33,9 @@
 		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 	<upstream>
+		<bugs-to>https://sourceforge.net/p/qmmp-dev/tickets/</bugs-to>
+		<changelog>https://sourceforge.net/p/qmmp-dev/code/HEAD/tree/trunk/qmmp/ChangeLog</changelog>
+		<doc>https://sourceforge.net/p/qmmp-dev/wiki/browse_pages/</doc>
 		<remote-id type="sourceforge">qmmp-dev</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/qmmp/qmmp-2.1.9.ebuild b/media-sound/qmmp/qmmp-2.1.9.ebuild
new file mode 100644
index 000000000000..4628e3c5aa07
--- /dev/null
+++ b/media-sound/qmmp/qmmp-2.1.9.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg
+
+DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
+HOMEPAGE="https://qmmp.ylsoftware.com"
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
+		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit subversion
+	QMMP_DEV_BRANCH="1.3"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
+	media-libs/taglib:=
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtbase:6[dbus] )
+	enca? ( app-i18n/enca )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		virtual/jack
+	)
+	ladspa? ( media-plugins/cmt-plugins )
+	libxmp? ( media-libs/libxmp )
+	mad? (
+		media-libs/libmad:=
+		media-sound/mpg123:=
+	)
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
+	projectm? (
+		dev-qt/qtbase:6[-gles2-only,opengl]
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( media-libs/libpulse )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-qt/qttools:6[linguist]"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia ; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+		-DUSE_XMP="$(usex libxmp)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 98bde86c0905..4628e3c5aa07 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 inherit cmake xdg
 
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
 HOMEPAGE="https://qmmp.ylsoftware.com"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://qmmp.ylsoftware.com/files/${P}.tar.bz2
+	SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
 		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
@@ -21,9 +21,9 @@ LICENSE="GPL-2"
 SLOT="0"
 # KEYWORDS further up
 IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
-ffmpeg flac game gnome jack ladspa lyrics +mad midi mms mplayer musepack
+ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack
 notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack xmp"
+sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -32,12 +32,7 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
+	dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
 	media-libs/taglib:=
 	x11-libs/libX11
 	aac? ( media-libs/faad2 )
@@ -49,7 +44,7 @@ RDEPEND="
 		dev-libs/libcdio-paranoia
 	)
 	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
+	dbus? ( dev-qt/qtbase:6[dbus] )
 	enca? ( app-i18n/enca )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac:= )
@@ -59,6 +54,7 @@ RDEPEND="
 		virtual/jack
 	)
 	ladspa? ( media-plugins/cmt-plugins )
+	libxmp? ( media-libs/libxmp )
 	mad? (
 		media-libs/libmad:=
 		media-sound/mpg123:=
@@ -70,12 +66,11 @@ RDEPEND="
 	opus? ( media-libs/opusfile )
 	pipewire? ( media-video/pipewire )
 	projectm? (
-		dev-qt/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
+		dev-qt/qtbase:6[-gles2-only,opengl]
 		media-libs/libprojectm:=
 	)
 	pulseaudio? ( media-libs/libpulse )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
+	qtmedia? ( dev-qt/qtmultimedia:6 )
 	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
 	sid? ( >=media-libs/libsidplayfp-1.1.0 )
@@ -87,17 +82,12 @@ RDEPEND="
 		media-libs/libvorbis
 	)
 	wavpack? ( media-sound/wavpack )
-	xmp? ( media-libs/libxmp )
 "
 DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
+BDEPEND="dev-qt/qttools:6[linguist]"
 
 DOCS=( AUTHORS ChangeLog README )
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.0-udisks_plugin.patch"
-)
-
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia ; then
 		sed -i \
@@ -154,7 +144,7 @@ src_configure() {
 		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
-		-DUSE_XMP="$(usex xmp)"
+		-DUSE_XMP="$(usex libxmp)"
 	)
 
 	cmake_src_configure