3 files changed, 1 insertions, 161 deletions
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 41d55bfbc6ee..5e76e9bf206a 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,4 @@
-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-2.1.9.ebuild 4050 BLAKE2B bf4fca7a9103ea55c124f46294b8f3e71307892a055b48d789b361f7bd05c6dc3e9f1ec4afe9fb377d308208c0c433e1f15b8d0b0f31dc11c81b2de049dd615e SHA512 4d53006429b3da93cceca5c1c6d766b9130c131c8721692fdedaa1de7edfb48b9b38dd862544192061b6bed3ef5cde913473e5daecde86f068f7f6982cf2267e
 EBUILD qmmp-9999.ebuild 4052 BLAKE2B d49c054c589e40460523695a34e5122ece16bdee2c79c05493ee284f44e7992a905fadc9b3ca6a47776e7af1a90c0f10e6841025f03ae58c76890e1dc899b564 SHA512 11848b4ed52bc958dfce8d8e5e858549f4683f3c6dc73a0a4c78f894889ab96b75d0fa9b40430d8ee127cd04df8ddb8bfe5a248ba986b00f521711b3e2e5c984
-MISC metadata.xml 2308 BLAKE2B c2cb743e9b3f34aaa422a51ce6d6a89d8645a8de40744d67f23144d6b890290ceddad66ade57f9b2d33e6460a4f9151bbbc42b20750ce3699b5a9231d83d53a0 SHA512 ae5211ba03348245018585ea09b9c0802fb6e6c22addc1f72b21fc09d4cc108d755ae20a0e2dfb29884ecaf4c0d62afe37f27a17ff28e7e4b777cdc86038153c
+MISC metadata.xml 2231 BLAKE2B 518bb1f09bfef189f800d01c0a7ec253abaedde24fab38137f0292e9ddc833479abb8315b12c1273c147d3a2499df85c826a03e9c2c489f17b7e206bbdfac90e SHA512 edcc3bb7d19467c1044c7637013207947274066a26f3468f5d74ae373f71f47aec5db0c5637760424d26aacb667a909f687c593f424612e0783213c8b101c18c
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index a6bb8b917981..d25b6f756000 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -30,7 +30,6 @@
 		<flag name="sndfile">Enable wav playback support via <pkg>media-libs/libsndfile</pkg></flag>
 		<flag name="stereo">Enable stereo effect</flag>
 		<flag name="tray">Build tray icon</flag>
-		<flag name="xmp">Enable module files renderer (modplug replacement)</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://sourceforge.net/p/qmmp-dev/tickets/</bugs-to>
diff --git a/media-sound/qmmp/qmmp-1.6.4-r1.ebuild b/media-sound/qmmp/qmmp-1.6.4-r1.ebuild
deleted file mode 100644
index 4c0244fe4e2f..000000000000
--- a/media-sound/qmmp/qmmp-1.6.4-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2024 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"
-HOMEPAGE="https://qmmp.ylsoftware.com"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://qmmp.ylsoftware.com/files/${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 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"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-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
-	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/qtdbus:5 )
-	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 )
-	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/qtgui:5[-gles2-only]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm:=
-	)
-	pulseaudio? ( media-libs/libpulse )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	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 )
-	xmp? ( media-libs/libxmp )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-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 xmp)"
-	)
-
-	cmake_src_configure
-}