gentoo auto-resync : 06:09:2024 - 12:28:42

13 files changed, 172 insertions, 56 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 84a772345c89..c4d6803f4efc 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index af7e5bb22347..bc5f675e2787 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,4 +1,7 @@
 AUX alsaplayer-0.99.81-autotools.patch 943 BLAKE2B 0f51ca345e6ccadd25f28ae1961af3ea70055297ad020aa232b9604ffb80c68de79ce42b231a3f8e3bf66ba0c92cd9759b604eab3aae09c9e7b61ab96b0da047 SHA512 a0c55913e8f52578f441229ed3cab999416732b45dc5019965fc32635cb5b9f7fb603ef23eacc5b22da9d423d751a12a448f1f9293e929a303673d28a33d0ae5
+AUX alsaplayer-0.99.82-autotools.patch 457 BLAKE2B ba1bdd117233b38a13c87895ff4059df29203714b680165d7c8d470a43fb5b1016bec3c7eca611f51a8ba00c71b14a705b2afb8d7de656287e125840bafdaad4 SHA512 56b08e8bd2a34c7d1aac80c9466442454b85d17a83d7ed44692837a1a1721e3ec68ea6f25e2c2985cf50ec82523a53a0d78745aeeab661b595518bd1b596a099
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
+DIST alsaplayer-0.99.82.tar.gz 1087776 BLAKE2B 34a197799da90c2dfe08b4a85baa3ac47d1b21e919908981c6ff3993a16fa1b97814cab54aae84be9e1da8fa3395952ef8fef85fe153a528ea3a6d6cd0f20658 SHA512 749fb8581d766df28a1ec42af9888fda0665ffcc0bb85a489365ae02611bc90a6cfc42d9c2cb19a3eeb385fb2c401b9d16e864a22887d8d6b6de3a55ebc140e2
 EBUILD alsaplayer-0.99.81-r4.ebuild 2008 BLAKE2B bb86f71224b47bc1a92937bd897f81bd747e39bfd7cf79ffe21be35e76fbef03791e72e7fd665f5077dcce5a72a9cb415c0d971748056b7e9fea11e440f85953 SHA512 6b192ea34042150730d0a1b2ab6109cacfac7679c8b06fa35d27fcde2dcc716d29381a7a1784b758a27ec713f85f2eb299fda3441c7168fe23acb3c4df857894
+EBUILD alsaplayer-0.99.82.ebuild 1972 BLAKE2B 05854131a597fbe87b1471f0e9d5523a12164f4db23798fb40a5345295dff357946f6575a831b5c206a094ff4229353a9bcba0e30f0493a45c2436be1454cdf0 SHA512 7430d392c9eacd795eed6a529cb4445067ba9b4782aaf544a7b011662830f8328a19321b42fb33cbfbf7e5dbd03e898967a9ff5ac15c82801a773f580dfdab26
 MISC metadata.xml 479 BLAKE2B 8424c58b84638f044863d20256f981d9ff3e2d2c9730876dff3992bae3d16402dbbe1bdc9c6fae1d9d20155129492ce91936366daf767c3d99ca144e3440f036 SHA512 a137fa32fb8119b394f5ddc9d1975b91f221e6e8c92a18ea0a4b74ed0090f9a2cb81e359355cfc13f7024a8e381aba0084f49c519b664c5418802a087f3f573b
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
new file mode 100644
index 000000000000..ec4c2f7e0031
--- /dev/null
+++ b/media-sound/alsaplayer/alsaplayer-0.99.82.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="A heavily multi-threaded pluggable audio player"
+HOMEPAGE="https://alsaplayer.sourceforge.net/"
+SRC_URI="https://github.com/alsaplayer/alsaplayer/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~riscv ~sparc ~x86"
+IUSE="+alsa doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
+REQUIRED_USE="|| ( alsa jack nas oss )"
+
+RDEPEND="
+	media-libs/libsndfile:=
+	sys-libs/zlib:=
+	alsa? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac:= )
+	gtk? ( >=x11-libs/gtk+-2.10:2 )
+	id3tag? ( media-libs/libid3tag:= )
+	jack? ( virtual/jack )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod:0 )
+	nas? ( media-libs/nas )
+	ogg? ( media-libs/libogg )
+	opengl? ( virtual/opengl )
+	vorbis? ( media-libs/libvorbis )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-text/doxygen )"
+
+PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
+
+src_prepare() {
+	default
+	cp "${BROOT}"/usr/share/gettext/config.rpath . || die
+	eautoreconf
+}
+
+src_configure() {
+	# -Werror=odr
+	# https://bugs.gentoo.org/860423
+	# https://github.com/alsaplayer/alsaplayer/issues/28
+	filter-lto
+
+	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
+	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
+
+	econf \
+		--disable-esd \
+		$(use_enable nls) \
+		$(use_enable opengl) \
+		$(use_enable mikmod) \
+		$(use_enable vorbis oggvorbis) \
+		$(use_enable flac) \
+		$(use_enable mad) \
+		$(use_enable id3tag) \
+		$(use_enable gtk systray) \
+		$(use_enable jack) \
+		$(use_enable alsa) \
+		$(use_enable oss) \
+		$(use_enable gtk gtk2) \
+		$(use_enable nas)
+}
+
+src_install() {
+	default
+	dodoc docs/*.txt
+
+	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
new file mode 100644
index 000000000000..202d2e8ccf12
--- /dev/null
+++ b/media-sound/alsaplayer/files/alsaplayer-0.99.82-autotools.patch
@@ -0,0 +1,24 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -82,11 +82,6 @@
+ dnl PKGCONFIG preparations
+ dnl ======================
+ 
+-if test -z $PKG_CONFIG_PATH; then
+-	PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
+-fi
+-
+-export PKG_CONFIG_PATH
+ 
+ 
+ dnl ===============
+--- a/output/jack/Makefile.am
++++ b/output/jack/Makefile.am
+@@ -24,7 +24,6 @@
+ 
+ AM_CXXFLAGS = $(COMMON_FLAGS) $(JACK_CFLAGS)
+ 
+-AM_CFLAGS = $(AM_CXXFLAGS)
+ 
+ libdir = $(ADDON_DIR)/output
+ 
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index a1c76a5a6bb8..ff2dff577d59 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -4,16 +4,18 @@ AUX musescore-4.2.0-dynamic_cast-crash.patch 342 BLAKE2B 1f36cc2648c10e8a79ad832
 AUX musescore-4.2.0-uncompressed-man-pages.patch 1556 BLAKE2B b2c032449faff891343af795dc7914c9a8f3774dee50565d1bdf7aed803b49ecf6623cc565c13a18dd021f82ed68ae7829522bd4efa5a81945a01d48ac3cb224 SHA512 9c67e752c7526106f6c0e2c6d39db2ad7844495596b519017cd609995fe76ea72ae9d93272ed1af4af43f63a0aee32915c96b73d8c07915358ce1c3adf636562
 AUX musescore-4.2.1-missing-headers.patch 1579 BLAKE2B d62776063fa580da011abee3461de770f7039d4e5f2633d2c4093896c7b46a45c2781997772394efaf050fa9a2555717ff2a25326a352f5a4f235b4ff111d9a7 SHA512 48f47706581fb57054fb5db6883218befcda45fdeda9ba894d62cef5a3b758df76f8994e23ca627feb0fbfcda4071b5cfae033f2cdb375737465ca5c60a9e9de
 AUX musescore-4.3.2-unbundle-deps.patch 1391 BLAKE2B 42d0d3d93080116f3351b6252532efd3d4d3968643847d2fc3b7495766c22a019dd373baa5dfbb69b50fc010b3ae846dc06654653d5420964272863ea1a165e2 SHA512 a9c314253138faeb6845dffc530fe521458f2169b3d93c7d48e7ea5d7e6d22a0475aba1f28e52ab78e3cce56c227c5c64dfdf22c4d6f80c3b27cf7ff85e1ec00
+AUX musescore-4.4.0-fix-main-toolbar-and-menubar.patch 1441 BLAKE2B f3a3e5d34fe6562df1e95e1ec2b9f145c1e0b4d6d326d462421eb49f64ca49d462fc833049d515762644d0a45b2ab9ae17d7b5ccc8676ba0e44e6d24dbdda2dd SHA512 8ccc57f172077dfb94b90c87ea183b64987cf7e38aa1764a2b09cbf6f3193cd9a6c596e3b99d0b0f871beff8df2ab2d6bdd0b01255945cbb0c2f76caf08a68d9
 AUX musescore-4.4.0-include.patch 345 BLAKE2B 1660b215ca97008b8ca97c0b457aeae5fde24cb51c626f398259cfdf54ee3104413cc001c3312c576ae221aeaaff009ae01f2826ae2e013e1f1856a73eec90da SHA512 c72a106c9758a600cd75ca1f858d48a27c91fae7376859960351276057e4ae8406bf0d5fd0e2bcaa74cdde9816d67ded929caf30611f81b66fde18336c1c5490
 AUX musescore-4.4.0-unbundle-deps.patch 713 BLAKE2B e400b26901dcb435ab0b5f382de57ed0183cc16e94cb5656764355998d80ae33e40410fa4ffbaaec06b3fcac8da656e025bfd6e751ba67756dca1f7d10d77f36 SHA512 87b9976f6a470632fc52b2c01d81ae36e57bc545223c67ecbdedace4b8953ca6417986d2c3cdccf8f37306a48678e6e7c0ff1db1d2e59e9f4e7c19a7796ed5de
 AUX musescore-4.4.0-unbundle-harfbuzz.patch 937 BLAKE2B 219c5041fb5021801cb543fccbc9cc7e741dfa891e16f208380c17324d533613b6c89f429ee7d17d64a17a141e38b1da6576841dcef8402d41a5a66cb3926f84 SHA512 ee140c3733ca846139db199ec4498c70a99d8f6542075130d9cd372a990f191e18a74942b73089f0d51fe5849e91fbc1b9dfcfd4f250bb1045b3ac2098640c5c
 AUX musescore-4.4.0-uncompressed-man-pages.patch 1598 BLAKE2B 79b4c6c2a84f1a02db2664b358cd54716979684ebcb7f335c56f0fe64f82850e83fea9916f20a547452ff44dac45d2bd1600a4b75785882ef90c72f31e2ea2d0 SHA512 30eb90e083d87a304d55942e3de2252fe890fc30c08cd0f5b2d64b8969323a1c7f098791d70f8c61ff90cfb9277576e2b957db0876f443b040edf9525acfb858
+AUX musescore-4.5.0-missing-include.patch 252 BLAKE2B b9dd5895827612421c3abee85ecac305d758a9771825163d29ffe9b795f7655313cfa6ecaae0b6b1bd3ceebfa821c31c8bc20afa995b76f33363e3edc895b749 SHA512 c5664e857caf88dda15d4c0cc5f462c262413e0eb273413aea077dc302fc961dddcd5de1c0677a08da3a334d173bcbaec867f90f9421184deff4bc3a1aa96a6d
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
 DIST musescore-4.3.2.tar.gz 138083648 BLAKE2B 02c1fe9de387fd7783ecb26643f76694d7b4c29541318799c9c35f0f222d7a89ccd3164ec6109bb265245d836a2eb73f29ef687bebc2fb189eacf30c7e5ca970 SHA512 9cffbc25c748970980ec6013c4489178b143ec9ac78fbfcb995b1fbc02512cb6ff3ce912224ded9b526811c6b86a1810307c888e354d9ef09febdffa525f94c5
-DIST musescore-4.4.0.tar.gz 144645529 BLAKE2B 477c6799fd253b1cf888ac3695fb60edf9e7612250ce66abad6a84dac44c088de96ba9af5c4c656e5fb6b247f57ba4c5156ebb6f9078ddb8ab928a1999e0c67b SHA512 70413d50bb00cfc1a5399dfab185aacca42b087ac6097d74da80129052e9e1489fc659a167e2e282edd08ae77b6fdbea2f4765ad1a575a50df26618f4a70ec5a
+DIST musescore-4.4.1.tar.gz 144734281 BLAKE2B 97ba6dab964e5eb87984aa60381134dbd8dc687700b90001df6943a86b5bdf7df63fe026854800dfa16b329c71afd13f86569b494174a8dc22bac5bfc7162acc SHA512 54cd782be642e1da7e7c3bf2362a207c44aa103cf3cc2d33f63e25fea914753c886a691dfb823737f29c100fb592e91741524bc564abc1c975722174951ddf38
 EBUILD musescore-3.6.2-r1.ebuild 3193 BLAKE2B dc44dcc6cb9d6003efcdb1174ccf7f2a66527e4ce5db525780560aa9b3731b908414c369e6384048758663ce14beff11544b32a9675ea970ede394b48da207eb SHA512 041af2ab74dfdefe5714eb92f30bd90340b47af39fbde2a5c95bb993c0c32e8b6d0cc79e704836d55cc10511c0fc8f9f7f8b0a4f0f38dcb2dffc02d695644e17
 EBUILD musescore-4.3.2.ebuild 3512 BLAKE2B 26f40f19afce67c6a110ba22a188cd28a9bded91ced5aa73805b9a73480e449e0d2f93e824b50d28f20790131a40c7a383aaabe65e0f9ea1675045151d53acb2 SHA512 e3eec4cf8bc414b585ac9cd9232f1776060baee02f9e7dfbc9e78fc39f8f5c76d6ee60eb59f8964952458a8f7e42c19618c3d4da9fc16787ac3ef7ab9d32d4ba
-EBUILD musescore-4.4.0.ebuild 3272 BLAKE2B 72260b328779262e35c99eeeb38d1dfb0c2faace8fd2cd71a9764e8199e6c67b22ad3e6aa8fcc7888a6623c360b150c14f03e830911f281039ef17ad736dad52 SHA512 042c099dfe0a4c2b3ff6c6a48a90a60ab3099efb88469422751eab0e9e67b5c55f41353efc4a79966aef2a4f2f24666ad09b71ad9ae89016a5d97647c022e048
-EBUILD musescore-9999.ebuild 3272 BLAKE2B 72260b328779262e35c99eeeb38d1dfb0c2faace8fd2cd71a9764e8199e6c67b22ad3e6aa8fcc7888a6623c360b150c14f03e830911f281039ef17ad736dad52 SHA512 042c099dfe0a4c2b3ff6c6a48a90a60ab3099efb88469422751eab0e9e67b5c55f41353efc4a79966aef2a4f2f24666ad09b71ad9ae89016a5d97647c022e048
+EBUILD musescore-4.4.1.ebuild 3382 BLAKE2B 5819fd9b403cc5bf2736b57438e8f146ac45715894d460bda42bd59c1697c28bc4d745b73c9fa1ddc601dab40234acf2d1a71b8b07442705dc7f268628925bb3 SHA512 4a599d38c3a190e8687bf405e7f68b1d211eec884fec8bdbc1813024b61700aa80e7ca545cd218c8e8294dab0da395d11771bc404c9744dd6f96358124154b4d
+EBUILD musescore-9999.ebuild 3431 BLAKE2B 6714671bcba67ac776d88ef64d087d9ff5b41edef65bb7a9a74ac2a086879890716f7d61d52bef75ed9038ab36745f07ef21910970a9fab3a8d50956a7c54708 SHA512 d8ebd7c13a8158c1be0dbea55071b91981c57a9c2d8ceed9a18fef6b497d7dca8cca46f1d66d2861c466a9ab6bf68eef0115ef4bd6f45bbb4d05290e129e7a67
 MISC metadata.xml 968 BLAKE2B 40353ff933140a132cf852f6131123d9817b8f5918efcf66c9ee0f6eb79f3945972dc26428d324c05307e9889aaf6ffcab5ea96cafd5c0b019188924165e49a9 SHA512 11cb6ef3bbfde4b84b8cd6a3620360c981feddb93cfe6f5fc3c73a371bd31ed61564b8a8a4b7489fa9dd87616c2e29e87d1a48a7151464dcd6da20d936ae5d34
diff --git a/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
new file mode 100644
index 000000000000..6abc9e4fbd95
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.4.0-fix-main-toolbar-and-menubar.patch
@@ -0,0 +1,38 @@
+From b274f13311ad0b2bce339634a006ba22fbd3379e Mon Sep 17 00:00:00 2001
+From: Ken Bloom <kbloom@gmail.com>
+Date: Fri, 30 Aug 2024 09:17:27 -0400
+Subject: [PATCH] Fix MainToolbar, and AppMenuBar in Qt 6.5+
+
+The problem was that a ListView lazily creates delegates as needed to
+actually display them. If the size of the ListView is 0, then it doesn't
+need to display anything, so it may not create any of the delegates. If
+it doesn't create any delegates, then we can't make it size itself to
+fit its contents. By setting a minimum size of 1, we force the ListView
+to create a delegate that we can then use to determine the ListView's
+actual size.
+
+Fixes: #24097
+--- a/src/appshell/qml/MainToolBar.qml
++++ b/src/appshell/qml/MainToolBar.qml
+@@ -70,8 +70,8 @@ Item {
+ 
+         model: toolBarModel
+ 
+-        width: contentItem.childrenRect.width
+-        height: contentItem.childrenRect.height
++        width: Math.max(1, contentItem.childrenRect.width)
++        height: Math.max(1, contentItem.childrenRect.height)
+ 
+         delegate: PageTabButton {
+             id: radioButtonDelegate
+--- a/src/appshell/qml/platform/AppMenuBar.qml
++++ b/src/appshell/qml/platform/AppMenuBar.qml
+@@ -28,7 +28,7 @@ import MuseScore.AppShell 1.0
+ ListView {
+     id: root
+ 
+-    height: contentItem.childrenRect.height
++    height: Math.max(1,contentItem.childrenRect.height)
+     width: contentWidth
+ 
+     property alias appWindow: appMenuModel.appWindow
diff --git a/media-sound/musescore/files/musescore-4.5.0-missing-include.patch b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
new file mode 100644
index 000000000000..b4a510dddd5b
--- /dev/null
+++ b/media-sound/musescore/files/musescore-4.5.0-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/framework/extensions/devtools/apidumpmodel.cpp
++++ b/src/framework/extensions/devtools/apidumpmodel.cpp
+@@ -22,6 +22,7 @@
+ #include "apidumpmodel.h"
+ 
+ #include <QClipboard>
++#include <QGuiApplication>
+ 
+ #include "extensions/api/extapi.h"
+ 
diff --git a/media-sound/musescore/musescore-4.4.0.ebuild b/media-sound/musescore/musescore-4.4.1.ebuild
index 7dc814a8631c..288ff6994663 100644
--- a/media-sound/musescore/musescore-4.4.0.ebuild
+++ b/media-sound/musescore/musescore-4.4.1.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/tinyxml2:=
 	dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
+	dev-qt/qt5compat:6[qml]
 	dev-qt/qtdeclarative:6
 	dev-qt/qtnetworkauth:6
 	dev-qt/qtscxml:6
@@ -59,9 +60,9 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 	"${FILESDIR}/${PN}-4.4.0-include.patch"
+	"${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch"
 )
 
 src_unpack() {
@@ -97,8 +98,10 @@ src_configure() {
 		-DMUE_COMPILE_USE_CCACHE=OFF
 		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
 		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_COMPILE_USE_SYSTEM_OPUS=ON
 		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
 		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
+		-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
 		-DMUSE_APP_BUILD_MODE="release"
 		-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 7dc814a8631c..a301de148da8 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -36,6 +36,7 @@ BDEPEND="
 RDEPEND="
 	dev-libs/tinyxml2:=
 	dev-qt/qtbase[concurrent,dbus,gui,network,opengl,widgets,xml]
+	dev-qt/qt5compat:6[qml]
 	dev-qt/qtdeclarative:6
 	dev-qt/qtnetworkauth:6
 	dev-qt/qtscxml:6
@@ -59,9 +60,10 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.0-uncompressed-man-pages.patch"
 	"${FILESDIR}/${PN}-4.4.0-unbundle-deps.patch"
-	"${FILESDIR}/${PN}-4.4.0-unbundle-harfbuzz.patch"
 	"${FILESDIR}/${PN}-4.2.0-dynamic_cast-crash.patch"
 	"${FILESDIR}/${PN}-4.4.0-include.patch"
+	"${FILESDIR}/${PN}-4.4.0-fix-main-toolbar-and-menubar.patch"
+	"${FILESDIR}/${PN}-4.5.0-missing-include.patch"
 )
 
 src_unpack() {
@@ -97,8 +99,10 @@ src_configure() {
 		-DMUE_COMPILE_USE_CCACHE=OFF
 		-DMUE_COMPILE_USE_SYSTEM_FLAC=ON
 		-DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON
+		-DMUE_COMPILE_USE_SYSTEM_OPUS=ON
 		-DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON
 		-DMUE_COMPILE_USE_SYSTEM_TINYXML=ON
+		-DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON
 		-DMUE_DOWNLOAD_SOUNDFONT=OFF
 		-DMUSE_APP_BUILD_MODE="release"
 		-DMUSE_MODULE_AUDIO_JACK="$(usex jack)"
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 4e3093249745..868a228bd1ce 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,7 +1,5 @@
 AUX qjackctl-0.9.13-disable-git.patch 503 BLAKE2B d46a307dd6fcf62b51b4172a7e88ff71cf632646e28fd26857cb0bc4b9cdcd5c11260a197b10ffc4362d77bd319524bac2985bef2faf03e97d0c899dd24fcd16 SHA512 0bdc675bd9c82a45f3633342a1669bfa4d545e31122c915ff21256e7653bb1b5f33fc77341c1a9ca568912327e7f5380b27278f63914e123484d80935a27f3d9
-DIST qjackctl-1.0.0.tar.gz 1314301 BLAKE2B f27422bb98a4a7b1ec905df63989a51edfd6ccebdbae0da000f98a1dcaf93757f3aab9ec971ad3f395c668c85fc838ff62017545072028e5ccd0d435e4a9ac15 SHA512 2ca2691112d35d959ab0d0abc86e79b7526c6b5a5ef6d36581bc712ad6926b13cc559767b81c817bbfb7a5203e2cfaad396451ad749b553d6882d2c963a3f197
 DIST qjackctl-1.0.1.tar.gz 1318578 BLAKE2B c2741cfed5244e9c0b837b7bb7ac31dd6fad74226cad9401014565928e59c6fc448fda6e4e335e4acdc92d55b05f330a2101b1f9cbbce6918b7749c62f0e9379 SHA512 ac0442c0fe8f29ca27dfe149db3bc20a968ff7b2abb764bbb7b7cd1f57e26edac70b834c4f6fa6578fa07afad9de3e8f846d131517e9b5862333634715933b08
-EBUILD qjackctl-1.0.0.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
 EBUILD qjackctl-1.0.1.ebuild 1008 BLAKE2B 1ec2ffb41f8547db96bb48b4d76b852d1113f1412a6da07f97caf2dce6087999ad51e4b369716362c98cbcb506e5c16b5c9853b06d0df8cacfdd48fa83739ead SHA512 462f339e40a8302f9838e51d8f1241ca6d8d82185d8f0f2171fb73d87822b852f25dafd3f26deaff618ae2d5682565ee274d0d158552eff44f46b39304200d2e
 EBUILD qjackctl-9999.ebuild 926 BLAKE2B e7d605b036d205a43319d6559c0a918e347436e3e932d8002f3dffe6e56ef8563ca32efb6bd731802e8c1c066716f3e21a0896ac8b107f6c9361656f7ac3b556 SHA512 eceec774ffc46b565ad7398844febfee6c6c3ba65bc523072d81de91f84065f9507c93b4b18f9e63abc794a2814aa0f2bfab2a70f48afbaec07484d9530892e9
 MISC metadata.xml 338 BLAKE2B 74efc1853779388695ea14b6ccbe8e22d88941b8fcb845f553c02bd9e052f5638b2f4629dd238272a20b76db17f0d1f30a454a4b9a27333eb1e80b8d826c0dfd SHA512 bf18f336710191bc34b33b34f3f39435a9f3c9d7c45cef4e5b0ad39c19f4a9b27ee032dd2dbf6c57daaa90ad5f9adce40c49230850b6c1d746d0691eaf5ebb10
diff --git a/media-sound/qjackctl/qjackctl-1.0.0.ebuild b/media-sound/qjackctl/qjackctl-1.0.0.ebuild
deleted file mode 100644
index 8b1ca524e452..000000000000
--- a/media-sound/qjackctl/qjackctl-1.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg cmake
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="https://downloads.sourceforge.net/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa dbus debug portaudio"
-
-BDEPEND="dev-qt/linguist-tools:5"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}
-	dev-qt/qtsvg:5
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.9.13-disable-git.patch"
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCONFIG_ALSA_SEQ=$(usex alsa 1 0)
-		-DCONFIG_DBUS=$(usex dbus 1 0)
-		-DCONFIG_DEBUG=$(usex debug 1 0)
-		-DCONFIG_PORTAUDIO=$(usex portaudio 1 0)
-		-DCONFIG_QT6=no
-	)
-	cmake_src_configure
-}
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 99d68d1dafc6..dd981b4735ea 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -2,6 +2,6 @@ DIST qtractor-1.0.0.tar.gz 2635806 BLAKE2B eb77f02b9fa60a6603ac1f7d17e7fe1140af1
 DIST qtractor-1.1.1.tar.gz 2650631 BLAKE2B bb8641bd3f2bc227b8f1e9945720ddf7982b03802c998c9c7ea06afd2ee61d997ee4093e9094439e38ff2af063a32f94258f06e9e3b9f1a1a05902ad889e3908 SHA512 e007a654b7e320530ff5d5f41c8c823eb25eec84396dbb8a8c28ac62a058899d79666fcc927c1c0274386f59db28319317dbeac0d478fcf30254daa8a14e51d0
 DIST qtractor-1.2.0.tar.gz 2650100 BLAKE2B 18afad9da8ed526747d89448fd371d9b76f79c0e2f4cb9aa6d672692aa8862f5d362e0334254e71c89eee3f85a096f873343968116e4d6ef169be9043db603c1 SHA512 0a5e3ee9675bbb0603ce1833ee44e49144fbd501a4c7d937cfe5e3e2556fef8cf5917a5d20f10181d464dbf603f7701d1ff5fc25465dbfcaca85f5411370418f
 EBUILD qtractor-1.0.0.ebuild 2568 BLAKE2B 3ff74dfde42f08bcccf2fceb8dbe8c69bbdabcfdcbd5025e93043c0dadfb614973679a1c86b99cd77b8f07e21f290b10e7948f65870ed6975241223f3789d5ad SHA512 bb1575ef98d41108910439e1f6d81e5693a11181b6710f9fe0dccb55f804b2f8f053af3a63459a7b2b59b52747f3a03bcb8dc4d2d7c48f0a0d4786075a3e20b9
-EBUILD qtractor-1.1.1.ebuild 2570 BLAKE2B 20c3c81d6ff3e79c8f6d32483992ec3ca09020a0cb2ffba5e154aa6aeea9440e9e1f7ee286c88a9970f86862d52cec2ea2e2e10cc8566ad2743af57422fab21f SHA512 8e09cf71c1eb30440184d40ead24e740797cda034dcfa456a0f74140205925968e9dfbde8d202b5e09b15e5a16551283f15a65097826d5b3bace5fcee8dc1b86
+EBUILD qtractor-1.1.1.ebuild 2568 BLAKE2B 3ff74dfde42f08bcccf2fceb8dbe8c69bbdabcfdcbd5025e93043c0dadfb614973679a1c86b99cd77b8f07e21f290b10e7948f65870ed6975241223f3789d5ad SHA512 bb1575ef98d41108910439e1f6d81e5693a11181b6710f9fe0dccb55f804b2f8f053af3a63459a7b2b59b52747f3a03bcb8dc4d2d7c48f0a0d4786075a3e20b9
 EBUILD qtractor-1.2.0.ebuild 2570 BLAKE2B 20c3c81d6ff3e79c8f6d32483992ec3ca09020a0cb2ffba5e154aa6aeea9440e9e1f7ee286c88a9970f86862d52cec2ea2e2e10cc8566ad2743af57422fab21f SHA512 8e09cf71c1eb30440184d40ead24e740797cda034dcfa456a0f74140205925968e9dfbde8d202b5e09b15e5a16551283f15a65097826d5b3bace5fcee8dc1b86
 MISC metadata.xml 945 BLAKE2B 4f88a28c83ce8b2874664ad8bf6a08d5a575a609fab948c47471ed226e284453f87da5b1ae034678295e30e5e1dce357ced317ef5d3ab793e04fb17120ce55b4 SHA512 5ab11543fa297253f5cb15515c16caf967fc69e9cccccb9ac6a6ba26fffce1f8539414edf3b065a61ddce0ff8ce3f04b90a68fd5bb79e0a498ca14c275753947
diff --git a/media-sound/qtractor/qtractor-1.1.1.ebuild b/media-sound/qtractor/qtractor-1.1.1.ebuild
index 15185bd5c831..27cb23754511 100644
--- a/media-sound/qtractor/qtractor-1.1.1.ebuild
+++ b/media-sound/qtractor/qtractor-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi ladspa libsamplerate mad osc rubberband vorbis zlib"
 REQUIRED_USE="dssi? ( ladspa )"