gentoo resync : 25.08.2020

6 files changed, 170 insertions, 28 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 4f2cb113e45f..cd31c64499d9 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,10 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
 DIST qmmp-1.3.7.tar.bz2 1250192 BLAKE2B bb94234beefbe44606d8db8cc95bd712b4c766d498c1de0549414b728fd9eb88e238bcffde9a3bd74e75adf106b6bf4fcb120547a83892c0bca8da17bf18f2ee SHA512 a67185fcdc7419c8542e64fd54eea3302dcf44c5d8d0c3b739ce3115b00811733234807460d39585ee57b7e105a52285ee3aafa9f24d86d2af09e881ebf2e068
 DIST qmmp-1.4.0.tar.bz2 1293438 BLAKE2B 9da3a00a31dd0ad03f3405dbae65f55d7b4fbde2a3a030d2cbe8d11ac9b5660754e519aff19431dada792f2ebb02e40fa05e177ad6bedc37e3aa5d7e2a441642 SHA512 b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d
-EBUILD qmmp-1.3.2-r1.ebuild 4203 BLAKE2B b2ef63f7fc9f580b9acba8fbb91ceb243a701c23813cbf827a9304700fcc1c2ec2f2ac60d842d55280ee6cef61615f7ed9d19521d7494ee7703e951164f4fa62 SHA512 261846c7d2a4ec4a0d2f10b2aec542deac3ef6f6fc11b606fe880e9c2ff3c0416c6f9e44d0a8e712e7f87e0252ce09bae6f13ec60bbd5f63eb20a01055690046
-EBUILD qmmp-1.3.7.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
-EBUILD qmmp-1.4.0.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
-EBUILD qmmp-9999.ebuild 4177 BLAKE2B 6697495dc802bd80a4f754974feb9adf2a0f1caf90c9e794a5cfbe538952490113db003787e23c68ef67496acc73afe92f837447afffb092ca8dc18b7613f165 SHA512 ce5e8de71be4b72e6aad59fd859dcf85457eacfc7aa7941e607539b738c40c8e7db4737cf6f68113ba0e22960675ba955245d46348e92adf430cda18539bc185
+DIST qmmp-1.4.1.tar.bz2 1296224 BLAKE2B 4a4b72f30bbfb06d312d69c9c0d48fcaaed2d936453ab29c0bd5223819358d2894f4f016a8203c2ea15b7a193b811ae2892e700dec98e580393a9fbf5e0f767c SHA512 af971447383730328e33dc724b9d598a26404517d5aa6e8bb5a2d84bbeb1f628d363383bb5ddc571855d8416b084edd09f64174de7985788671e47317ec9f1bf
+EBUILD qmmp-1.3.2-r1.ebuild 4207 BLAKE2B 3da46dab28fbf9747f35cefae578dcc3b407abc2c5b032060e7eb8a401911ab5f4a798932e42e82fd2967e45ee4af90aa7d7d63b0455a468c2bca50a4dbffb7a SHA512 4d8eb5669edde5f39c4a0212f4bda8704606f3c995996c6660d97ca2711bd63af80e88c08e666d09b09853684ec26506b432d4242a09c38bb5c8d6e140abfb51
+EBUILD qmmp-1.3.7.ebuild 4181 BLAKE2B b3bec00895515fda32c1cafb6c261fcfc9408176e865f3629189e7bfbca5269661fab298466ce1185a41c54f29b5a1e2d9e69eed8378eee25e733d84405b6c1c SHA512 83b77d61fe775d1b4d4f475cb49a9c48eadd366a7e09b11fd8244afaecdf4b355afeed0dad9aedcbbd1472e790b212c6a1c2e2094bd171c10509485d795e68bc
+EBUILD qmmp-1.4.0.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
+EBUILD qmmp-1.4.1.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
+EBUILD qmmp-9999.ebuild 4054 BLAKE2B 3e5e482247a44b4767ddcf967a5278efd2624bb708b0bf2381d1d945546e0264f991f4c3c7fb17cfd2f60334b7356366681716397ea117e9001beceaa35bb0e8 SHA512 b8bb54f3dd7a7b7c923ad47f42249b4597f86120d9746db01115ba7933466351f79bc6cf26dfe4d2a861924de2908d701cb8ad6ee0830a72078cd30804b1c427
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
index f11837f77b72..ac37a740c308 100644
--- a/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 		media-libs/libsamplerate
 		media-sound/jack-audio-connection-kit
 	)
-	ladspa? ( media-libs/ladspa-cmt )
+	ladspa? ( media-plugins/cmt-plugins )
 	mad? ( || (
 		media-libs/libmad
 		media-sound/mpg123
diff --git a/media-sound/qmmp/qmmp-1.3.7.ebuild b/media-sound/qmmp/qmmp-1.3.7.ebuild
index 4c02d12db02d..65622fdb05ff 100644
--- a/media-sound/qmmp/qmmp-1.3.7.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.7.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-libs/libsamplerate
 		media-sound/jack-audio-connection-kit
 	)
-	ladspa? ( media-libs/ladspa-cmt )
+	ladspa? ( media-plugins/cmt-plugins )
 	mad? ( || (
 		media-libs/libmad
 		media-sound/mpg123
diff --git a/media-sound/qmmp/qmmp-1.4.0.ebuild b/media-sound/qmmp/qmmp-1.4.0.ebuild
index 4c02d12db02d..45e48d80e0dc 100644
--- a/media-sound/qmmp/qmmp-1.4.0.ebuild
+++ b/media-sound/qmmp/qmmp-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake xdg-utils
+inherit cmake xdg
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -55,9 +55,9 @@ RDEPEND="
 	game? ( media-libs/game-music-emu )
 	jack? (
 		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 	)
-	ladspa? ( media-libs/ladspa-cmt )
+	ladspa? ( media-plugins/cmt-plugins )
 	mad? ( || (
 		media-libs/libmad
 		media-sound/mpg123
@@ -154,11 +154,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.4.1.ebuild b/media-sound/qmmp/qmmp-1.4.1.ebuild
new file mode 100644
index 000000000000..45e48d80e0dc
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.4.1.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
+		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	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 modplug mplayer musepack notifier opus oss 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/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 )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2-only]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm:=
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	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 )
+"
+DEPEND="${RDEPEND}
+	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_HAL=OFF
+		-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_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-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_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 4c02d12db02d..45e48d80e0dc 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake xdg-utils
+inherit cmake xdg
 [[ ${PV} = 9999 ]] && inherit subversion
 
 DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
@@ -55,9 +55,9 @@ RDEPEND="
 	game? ( media-libs/game-music-emu )
 	jack? (
 		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
+		virtual/jack
 	)
-	ladspa? ( media-libs/ladspa-cmt )
+	ladspa? ( media-plugins/cmt-plugins )
 	mad? ( || (
 		media-libs/libmad
 		media-sound/mpg123
@@ -154,11 +154,3 @@ src_configure() {
 
 	cmake_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}