gentoo auto-resync : 27:07:2022 - 09:01:23

11 files changed, 78 insertions, 501 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 86e33a19a4a3..4e596eb003b6 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index bc9b0908abf3..d54ababf92dc 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-0.9.1-fix-clang.patch 424 BLAKE2B 181975de4d015393cfe9406e3e94c3d984a342b9d3d80aa0caa2151ec3825430a9f1210f3c2f3b104a8d90f83f27483b3a4b8bec10ae5107a2846fb629d57695 SHA512 544eb77db3715a9c2990375aaf77515896ba43f67dbb1572428444a1386ed5aa0cdebd6e24fb3f6f20b8ebc0dfd6982709f39178c39759dce1cfe381116db719
 DIST cadence-0.9.2.tar.gz 2202164 BLAKE2B a5422e4d74618e2e45d9c6f275393a6e918783fc37d60a54142725aa54e691435c41f76dd0346fae7684c452988b07a18d817902abd917dbceaff5fb4aaa6c47 SHA512 d8a1b52c361e3e18a193d1c283bb69abe18ce667b554fc53cb9b752d92747269145144ae512895ffbb5df76efe8671cfc0782f29e59d0d7cd3d97c97240bdecf
-EBUILD cadence-0.9.2.ebuild 2434 BLAKE2B 0ae7d58942830a368ec7102708adad2bf729b24b0b737a298528d878de91af3323aba5a604d9c6be68d7fc71cd2b9609cd75f945f91bb8146335fd2941292606 SHA512 2c11f655b1c4a36058446490f1fdb72f4e6e651f59adf0b5dc5085ee1115cf9d47fbcb530a8c9eec50c1cd896955ddbc4234d7c4ea773c38c6894e3cc3fe7237
-EBUILD cadence-9999.ebuild 2435 BLAKE2B 69f1d663fd990ff5bc56233d40178674711e769c29962723706b2dacfc0761a59d1af76b771639fb9a5c6e0bc5797166b117349797d164f355507a8883405320 SHA512 77f12ae78c79de7d3ada83208c1b069ec2d0161a38a0f3d06ff0eb8a793a29f5b86a84147da1940cc2d854b4ebbde8944e55ce4504df5c668f16be7ed7797207
+EBUILD cadence-0.9.2-r1.ebuild 2478 BLAKE2B 464fe50efe511c2a55def5fd639fbda7c3cdd567533070f7c39b5d38a740c548938efb353ff0a50faba676e5e9579b56440753db1968174be05792995f55ea0b SHA512 fcc44c66e6bb2e708cabd2d9922184c1d7a247cf489e9679043013fb7103a6fc354489b2c20c6b9bff9abc621a66f726643a3011847bf0d5d982b23e8d972e27
+EBUILD cadence-9999.ebuild 2479 BLAKE2B 5944ca8f19717467515ae044e624b3af3e0072d75535c84c7b22fb803d474c0d73480a72611819fb2536d3c1d8baeaeeb422a4dc0aac64297c7a19e98b8fa9fc SHA512 2e26d653a658d8e14cf9c205121fd5fd0679cd03cb33d72921090603e5909355ceb28188bcc713990cf51f11bfad5f27b7cd6a9dc3c796c036a8719304ea413c
 MISC metadata.xml 480 BLAKE2B 249a8627c9afd2ce1bbb84e967b30cd1226c5cc8a27fa6ad354effe873a0d9d05a6704782bf9226698c3bfeb3f4cfcee5e6f055d19bcca8767518cfa526a2df0 SHA512 b44afd279ba116b4c1111b9503d35ef44611f693cea1a69abd6510d6f2381e0500ef7c243bb49657d80da403e6a641a7573f25fb5cccccf4774569426671e6b2
diff --git a/media-sound/cadence/cadence-0.9.2.ebuild b/media-sound/cadence/cadence-0.9.2-r1.ebuild
index 9d733c2e63b2..f67d9bb389fa 100644
--- a/media-sound/cadence/cadence-0.9.2.ebuild
+++ b/media-sound/cadence/cadence-0.9.2-r1.ebuild
@@ -34,8 +34,13 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-"
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[jack]
+			media-video/pipewire[jack-sdk]
+			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+		)
+	)"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index 826035d06617..98dadcb280cd 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -34,8 +34,13 @@ CDEPEND="
 	media-sound/jack_capture
 	virtual/jack
 	a2jmidid? ( media-sound/a2jmidid[dbus] )
-	pulseaudio? ( || ( media-sound/pulseaudio-daemon[jack] <media-sound/pulseaudio-15.99.1[daemon(+),jack] ) )
-"
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio-daemon[jack]
+			media-video/pipewire[jack-sdk]
+			<media-sound/pulseaudio-15.99.1[daemon(+),jack]
+		)
+	)"
 RDEPEND="${CDEPEND}"
 DEPEND="${CDEPEND}"
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 7b2d64773d0b..1f45f681b3ce 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,7 +2,6 @@ AUX mixxx-2.3.0-cmake.patch 556 BLAKE2B 2757a1c72f4ad052aacd17fba1934a106c34971a
 AUX mixxx-2.3.0-docs.patch 626 BLAKE2B 73eca9849d69112edd254bd28329b360c31434eb1a4bcb626ca9fcfc0b00dee2c9f9d81d83302fbe0718be9e5a47a1748835013f20398eeb4e50c5e81b78a172 SHA512 2de279b48463d214ef7c9da58c58fb10d0fb300afe80b01e1981f4df15a5f7da1079b53ca1422dc0d69da8a367fe4693ba002a351e57f95fa1b24d5ec7fb12a4
 AUX mixxx-2.3.1-benchmark_compile_fix.patch 220 BLAKE2B 28c5a7fe5e6e465bd7d9445e741d366341fadcb8d142961cf25d6b57aabcc453f74cbb0d3f63b01df5e65e7151a9e59545c50b52e732234ae6a734eb171cef82 SHA512 d301a87760a0162a9e09e08dd544183219776c61d2810d75c37d39a9ac9fcf8a329681e53ca922864ccafeb98231cbeea565db2196e56bf62417a09b40bae4b8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
-DIST mixxx-2.3.2.tar.gz 40138947 BLAKE2B 9ec1d871d3051f081152f07fdafd6c5e2bb41224e723dc260afe27755fdcd87befd2cb5ecaa2d0fb6d7ee9fb1b97c12db4b8d0a29e695a3ff1a7fb51b94ebfa4 SHA512 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
 DIST mixxx-2.3.3.tar.gz 41011867 BLAKE2B 1b3d863341afbdce86c61c4689494a334a689d02aaf5a700aa74d3291843f028d77ef7d62e545d05377ffb1f9a5077529c3a77a2b4a5e8ce20823728a8fe8d80 SHA512 6bd3809802f2f66af7d840db6ce006d7e46a824cf460ea9ae1bcff81f17483debd2ef47fd68d0da82671afaf01b6c3bc2522e02b41d992e08bc98f4d3d68120f
 DIST mixxx-manual-2.3-ca.pdf 34083768 BLAKE2B 0572da067016d6fd1a0e955cfa9daad319e633357532bad1143333a277d3dee1876709447ecfb954b5294f5fd176af229884e11a8e2fd40d03c12a6cf80bf01c SHA512 965f2f344bfa57531974362de889a92bb8b3024e527158f6c1819e285f70078762e958f7805ff1f833e7310646925cb8120eb3010f8600aa2cd21b2266a9333b
 DIST mixxx-manual-2.3-cs.pdf 8358958 BLAKE2B de00e08468fed15670751b0997759af0eca71b041d0366ad0e8cf2297fe27368eb6340a3f109b3f992a6f01a99f0d04ba7962c983756cdca2121bf9ca025aa76 SHA512 648eedde674155094b4fa9605422032e71427c95580ffe3f01c8d41a26495bd9bd2d8d7dff38e99bdfbba3a46aee9ca6a6e1c9327b8d1d503310e4c669755068
@@ -27,7 +26,6 @@ DIST mixxx-manual-2.3-sr.pdf 34079603 BLAKE2B 83ed178b8b095928138c853b5300176316
 DIST mixxx-manual-2.3-tr.pdf 34062405 BLAKE2B 69b5f76b4e74aa0d48636ae3914a6f40e0104d509f76c0569f99348d17131926a564d7e43a73d34036c5a94be4b61a37645e7933b1dea2513c6d72d5d25334fc SHA512 b05f297f3000767e2a8a2319e56f0db73981418943a96d0822f4f3f51f29bbb5667cc0b487ef328f1d6d115013af705371668ef3081321b6980ea95834a40895
 DIST mixxx-manual-2.3-zh-CN.pdf 34165133 BLAKE2B 58e717082ace6824532392a282cd1452c279410c547fabc333b6adccaf47fb8e4bbac0c612f9679c8d85317e9b706e5fe10b7c1fc11a4325a14c5b3faafdda46 SHA512 995fb6c9bf1f729eaa08cd5b2003f21c76274f8f3046bd85b771cb86c429fa65cc50f0f4a36396e654a4378125157777b2f0f04a9343b20aa3aef76281395aec
 DIST mixxx-manual-2.3-zh-TW.pdf 34135938 BLAKE2B b5747b2156d686bb84166beb2c1552e0d998f3c402793444631c1f146c93fd8f6addb5fc34c0f59b16b2866994b8f64ee5670ab26c683d51b0c36d3f247dcf70 SHA512 55a5c3d5064c021f73a48dab5fb93094bc0f9220a1790518b043a21900dc6792a2fc01ee5c6def6338a3df09bcbb7441e1c8b2f23aac2aad2b2a5974babb8a9f
-EBUILD mixxx-2.3.2.ebuild 3859 BLAKE2B f16bb13d68f53b6d5bfb32a6d70a554e1cdf8319ba1b119bb6cefc9f21af6e0c6e6557d334231eaf76161fab76e125121f6c4ad6425479a7df4b319944dfa990 SHA512 3636ffdb17755ddfd2da4fae0165dfa2c975bec20dbe91b8881b5cee6866ac682bd60be1bbbb1aec3b11a09bac6ff2b50a51a83c764529a3668a8728165c731f
 EBUILD mixxx-2.3.3.ebuild 3859 BLAKE2B 86b190d0b43fe573bb07a4126a93f2232123769cb1343dce64f728abe41ab3b6fbc8336e16b89eb87961d5058500d751709b27dbe6440682872822a33e75891e SHA512 c21c3e7e8f49f033079ec4d2a81f9b0af5befd68cd8ea19d6935ada67145bb86882a1a5272f39e54a4ccc0f93dabde837873c97bc33e0c624d5efd9757a531cb
 EBUILD mixxx-2.3.9999.ebuild 3767 BLAKE2B 9d4019cfb3ed76d1aa389d36f3280094a6cd6096b6a68bf7403a63821c1ae2a5372060861dd73089ea8e8956d82b63ff0ffd3cf7b81cbde491bfa3252a934111 SHA512 0d6b5a23a461b397039ae539aa85f28354c1489b5bde9b0d47a489644f2a40610044c45da264144567855f4276c96afe2f2daed2bfe9959f7bcef7f2d543e881
 EBUILD mixxx-9999.ebuild 2838 BLAKE2B 7b3371f5562b4c546547eb7aa0ad038045d19239d6e39bb9ac57498badc53ae6eb94f3dd1e48727412d27ba4b699e6b704c871761169aa609d75ecabb7430354 SHA512 46fb3746bbe94aa837654304c86651b8b27f9bee806ad292ba7957ca4c07efffe3d6aab40ce513b2b25e2bcf31a3afd18ec7550875c0e5fab2ba5794c2d24467
diff --git a/media-sound/mixxx/mixxx-2.3.2.ebuild b/media-sound/mixxx/mixxx-2.3.2.ebuild
deleted file mode 100644
index 8261053464b3..000000000000
--- a/media-sound/mixxx/mixxx-2.3.2.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg udev
-
-DESCRIPTION="Advanced Digital DJ tool based on Qt"
-HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == *9999 ]] ; then
-	inherit git-r3
-	if [[ "${PV}" == ?.?.9999 ]] ; then
-		EGIT_BRANCH=${PV%.9999}
-	fi
-	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
-else
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	#S="${WORKDIR}/${PN}-release-${PV}"
-	KEYWORDS="amd64 x86"
-fi
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
-
-RDEPEND="
-	dev-db/sqlite
-	dev-libs/glib:2
-	dev-libs/protobuf:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtscript:5[scripttools]
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	media-libs/chromaprint
-	media-libs/flac
-	media-libs/libebur128
-	media-libs/libid3tag:=
-	media-libs/libogg
-	media-libs/libsndfile
-	media-libs/libsoundtouch
-	media-libs/libvorbis
-	media-libs/portaudio[alsa]
-	media-libs/portmidi
-	media-libs/rubberband
-	media-libs/taglib
-	media-libs/vamp-plugin-sdk
-	media-sound/lame
-	sci-libs/fftw:3.0=
-	sys-power/upower
-	virtual/glu
-	virtual/libusb:1
-	virtual/opengl
-	virtual/udev
-	x11-libs/libX11
-	aac? (
-		media-libs/faad2
-		media-libs/libmp4v2:0
-	)
-	ffmpeg? ( media-video/ffmpeg:0= )
-	hid? ( dev-libs/hidapi )
-	keyfinder? ( media-libs/libkeyfinder )
-	lv2? ( media-libs/lilv )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	mp4? ( media-libs/libmp4v2:= )
-	opus? (	media-libs/opusfile )
-	qtkeychain? ( dev-libs/qtkeychain )
-	wavpack? ( media-sound/wavpack )
-	"
-	# libshout-idjc-2.4.6 is required. Please check and re-add once it's
-	# available in ::gentoo
-	# Meanwhile we're using the bundled libshout-idjc. See bug #775443
-	#shout? ( >=media-libs/libshout-idjc-2.4.6 )
-
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-"
-BDEPEND="virtual/pkgconfig
-	dev-qt/qttest:5
-	dev-qt/qtxmlpatterns:5"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-docs.patch
-	"${FILESDIR}"/${PN}-2.3.0-cmake.patch
-	"${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch
-)
-
-PLOCALES="
-	ca cs de en es fi fr gl id it ja kn nl pl pt ro ru sl sq sr tr zh-CN zh-TW
-"
-
-mixxx_set_globals() {
-	local lang
-	local MANUAL_URI_BASE="https://downloads.mixxx.org/manual/$(ver_cut 1-2)"
-	for lang in ${PLOCALES} ; do
-		SRC_URI+=" l10n_${lang}? ( ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-${lang/ja/ja-JP}.pdf )"
-		IUSE+=" l10n_${lang/ en/ +en}"
-	done
-	SRC_URI+=" ${MANUAL_URI_BASE}/${PN}-manual-$(ver_cut 1-2)-en.pdf"
-}
-mixxx_set_globals
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Not available on Linux yet and requires additional deps
-		-DBATTERY="off"
-		-DBROADCAST="$(usex shout on off)"
-		-DCCACHE_SUPPORT="off"
-		-DFAAD="$(usex aac on off)"
-		-DFFMPEG="$(usex ffmpeg on off)"
-		-DHID="$(usex hid on off)"
-		-DINSTALL_USER_UDEV_RULES=OFF
-		-DKEYFINDER="$(usex keyfinder on off)"
-		-DLILV="$(usex lv2 on off)"
-		-DMAD="$(usex mp3 on off)"
-		-DMODPLUG="$(usex modplug on off)"
-		-DOPTIMIZE="off"
-		-DOPUS="$(usex opus on off)"
-		-DQTKEYCHAIN="$(usex qtkeychain on off)"
-		-DVINYLCONTROL="on"
-		-DWAVPACK="$(usex wavpack on off)"
-	)
-
-	if [[ "${PV}" == 9999 ]] ; then
-		mycmakeargs+=(
-			-DENGINEPRIME="OFF"
-
-		)
-	fi
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-}
-
-src_install() {
-	cmake_src_install
-	udev_newrules "${S}"/res/linux/mixxx-usb-uaccess.rules 69-mixxx-usb-uaccess.rules
-	dodoc README.md CHANGELOG.md
-	local locale
-	for locale in ${PLOCALES} ; do
-		if use l10n_${locale} ; then
-			dodoc "${DISTDIR}"/${PN}-manual-$(ver_cut 1-2)-${locale/ja/ja-JP}.pdf
-		fi
-	done
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	udev_reload
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	udev_reload
-}
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index c8adfed0113f..f4ac205c2f84 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,9 +1,5 @@
 AUX qmmp-1.6.0-udisks_plugin.patch 321 BLAKE2B a3a0e6ca792a9399eef189e319113b63094cbc32a2d8912c7d7174589f34729be4ce0638323f449320cd34df0b1e3780ff43ae3c211cc6c96ba823cb0fed53bd SHA512 d88eadf6e725617cc50ef809532a5eaa0272745c74697953850c52dca3586809bd83f3804925e65607379e7156210686fe906da729371ba251ebfa1168e59b97
-DIST qmmp-1.5.4.tar.bz2 1388941 BLAKE2B e1a205b6315cd841c7d7a94ed85dca7fcbc74416dcc09458637ccadab96c3a2614039007cdbab404098d2818f4b5cdb7a0bc5cf27e1bfdd0f146d73e2834f230 SHA512 5dcc543f75f3baa6115c7c692acaca00b1ad6b62c773ac18ad97447fc17978f067d85b132d1fdb65467474417b7d7e8d8b43e0284196978ca63dd5d431a23bf5
-DIST qmmp-1.6.0.tar.bz2 1364512 BLAKE2B 3af905fa8af1a23f04d3df30856f881184a5150de571ffb82efc98179c2fe67a232207ad1233c57fde9000facc1df07317b10658e5f462f79083e99deeb7bb9f SHA512 a96242b4eb46fce84f7eefb1dd90cf4c51809c7f8471a405462d95cb3ba5c373e217c50ed48b4ad6b94e1a7e0948839433d4085c41a35991bffd08699a4826f1
 DIST qmmp-1.6.1.tar.bz2 1353769 BLAKE2B d12f91166cec051caf604ec27dc563d4cf2a52511eabfc0dee0b0679373e7c5fa0f0faac2b4d25420f33485caf90545c7f0098f1e3814f92d46d82b253410afd SHA512 efaf44002c21544514301b5ec1210507fe3cdeb4c6b8d14fb8a573d32db5bb73a9d6d36d00d9d61592261b69fa4260417e3c65183f13299234bd82dda43536c5
-EBUILD qmmp-1.5.4.ebuild 4110 BLAKE2B 7b193d02974a783fe90f39c8a698420517a64bfd616092873ad64799427c83deb633d128477fd62c7478afd6ed156f47888e57b3d8f6b050c0e198474c361fe8 SHA512 a58932662dbe4b47de5def1597b8d717ee428830248b1d394451660c873978bf880fa0199e43a717c1332020cdb18a2b5126131fae016b18ebb67cb354d7861e
-EBUILD qmmp-1.6.0.ebuild 4143 BLAKE2B df7217bd71bb94f256b23cd2f07cf2bb35f6c1b6d75d8ab032e6c5aadf9a5ca51a97edf84e512e0b2e66c20b6dafcf86617ec92e34d26c0a44578a2bd3aec47f SHA512 2fc2ec9fe2c4ed6221e3efd3083f5b0efff67f64bdf1f7a579bb991a9eb6414437da5b36e9e902f1689ae1373978ed23b60bce109989b139a0af39bfb8770547
 EBUILD qmmp-1.6.1-r1.ebuild 4065 BLAKE2B 9caeb186a81c63b4bbc78c537c3ce98869a72f5bb7f1a166b36b24cd8c9f787c95018592e89bbde09436306ad715d181e427ec7e094865c25f719190f5b43153 SHA512 755627a5258962c586a26605268a80b7729b90b13cca4bffca8ac1dbc8f1e992951e9f607ae53f751bdf341da673c16a32bce093a8ea37ddaeb9a85761202e60
 EBUILD qmmp-9999.ebuild 4127 BLAKE2B 43dea953fb1b740053fd4a20a5fc145a5c117a36a6f6b49284ea5f8e0cb5d041fc4585877ce37f749c7511be405ef83306b985b62189d38e35e22a5e56a6a959 SHA512 862f30e26cfc586f473e5d8068f8cf96d35ca70b39d25df0ba1dcf2b68b6e92ed1cf203cf6707a8f3b63c989f92dd46ca304f8a2d4389e25332d1b38c7fe6edd
 MISC metadata.xml 1960 BLAKE2B e0e190870cdb4c77e5ea4fb604af1afd571406488baa04daa760db1316cba922533f7e37b184e4e7df7c91e82dc716ea33deeb21102596ad512a9aef70a523a8 SHA512 5e8da850cdce11da134a03e9dda51d52ced62dee1fc80873695fe69f0fa53ba9ff7b9ad38931753819e4522103f3fe2ec49ae3b8d973d914e41d0e942557898d
diff --git a/media-sound/qmmp/qmmp-1.5.4.ebuild b/media-sound/qmmp/qmmp-1.5.4.ebuild
deleted file mode 100644
index 14e58416acd2..000000000000
--- a/media-sound/qmmp/qmmp-1.5.4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-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
-	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 modplug 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/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 )
-	pipewire? ( media-video/pipewire )
-	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_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_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/qmmp/qmmp-1.6.0.ebuild b/media-sound/qmmp/qmmp-1.6.0.ebuild
deleted file mode 100644
index 52888ecc3204..000000000000
--- a/media-sound/qmmp/qmmp-1.6.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-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
-	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-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 )
-	xmp? ( media-libs/libxmp )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-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 \
-			-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_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_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-		-DUSE_XMP="$(usex xmp)"
-	)
-
-	cmake_src_configure
-}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 32d7493c3084..92102b363932 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,5 @@
 DIST yoshimi-2.2.0.tar.gz 8021191 BLAKE2B 9ed0976f70c1eea6a17be12e55bc3e01bb304614d0cf91d26f90ad676306baf46967406f7adf576e9758ae7ff103fee4d02584141d3afe99e4b67ff71ef01b18 SHA512 b2d21732d1dd476b0217c10012d654f038250a822517fd4cd4abd85d931c62f3a416cc39438c119bbd1b11b5f40a55735ff8316cc513204abb380b33fbc37231
+DIST yoshimi-2.2.1.tar.gz 8039881 BLAKE2B 8ef8851b6e0808190f8bf97fc6502448d703cd910726f44c8c1f839299badcd858872291f54d4d219d12e11acc31ec1d342f5df5009d71b0fc1d8eae2f6cb7d1 SHA512 9f1895273b8e6ecedf503d59f351f568c189a03d5111d3bc7de8cc0c025f89f48383540f462184b9fad9487ea3cc18c0cc6cb6b1ba7ccd2619ddb2c28c4c66f0
 EBUILD yoshimi-2.2.0.ebuild 1193 BLAKE2B 423cb8e0224ad1beafe1a7f5ecb11a5a731342737e0fdd8ce9c78e9d4efaf8dd6516a5f3a20409d21f07e499adee505bf81bb539b9bb010eb2a569428aff107e SHA512 df0a44b3bcf0d780910fd2dabfc8237d3690093115bc8065dd238f4188afb77c39a66a877d5e2642de6db6dc48028af09130df1fdb43e5a983920fd43f9fe173
+EBUILD yoshimi-2.2.1.ebuild 1195 BLAKE2B 702beff33095cc515d4a7513f14c47391c34e18a89eee23916f19a807ffbfabc65851ff5cf5ea9cfb4e5666ed25ce60fc317ed4d49103bbd78609647589c2fe6 SHA512 6d0462e93e9bc1aba1c521aeb4f7d2f3bc1171baff37341e3a65ab6c95723bd9cbf2486ceb54d0e57cc86be070e7ae8f253153cf4ec8041a0370ddbf76d2c0be
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.2.1.ebuild b/media-sound/yoshimi/yoshimi-2.2.1.ebuild
new file mode 100644
index 000000000000..07ae2d6616da
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-2.2.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic xdg
+
+DESCRIPTION="Software synthesizer based on ZynAddSubFX"
+HOMEPAGE="https://yoshimi.github.io/"
+SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+lv2"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/mxml
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/libsndfile
+	sci-libs/fftw:3.0=
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	sys-libs/zlib
+	virtual/jack
+	x11-libs/cairo[X]
+	x11-libs/fltk:1[opengl]
+	lv2? ( media-libs/lv2 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P}/src"
+
+DOCS=( ../Changelog ../README.txt )
+
+src_prepare() {
+	cmake_src_prepare
+	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLV2Plugin=$(usex lv2)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# unpack Histories.tar.bz2 to avoid QA issues
+	pushd "${ED}/usr/share/doc/${PF}" || die
+	tar xvf Histories.tar.bz2 || die
+	rm Histories.tar.bz2
+	popd
+}