gentoo Easter resync : 12.04.2020

7 files changed, 20 insertions, 416 deletions

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index c35e039787e6..d3207043a51c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,11 +1,7 @@
-AUX 5583.patch 8876 BLAKE2B 5a338bed4da06311561dc2ff8bf41317d9e8d2a9218ab570e4396840637a7a4aef3d52b15eb87d388fb9ed76f8a9685036e2c758640c69cd65f910c2408bf4e8 SHA512 464e8dd526f39c2f253d2f3b5a6f932c50a17c7774df0ae076e7b8ae5379e3e5588359fe15ca73825ea56156b5a663178e48ef0d950dcef53ce60808c324ca72
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
+AUX musescore-9999-lambda-capture-this.patch 566 BLAKE2B e07244640ca103698d877c839a89a04b63953c99b5c5d2d809a378a155a9dafece85ddeb2bd8c31b42bdf66be3b7da06ed9e8d263258122ecab2ac32e496b3ea SHA512 2abcddcf39a327ba1a62cddc3f10fe713c8031dc03657ead73161ed1f0050d3ed12a95b3d1a1df6e6d7f604f079f0cc41ec39c2dda5e94b29485f5d8dbafa990
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
-DIST musescore-3.4.1.tar.gz 62951880 BLAKE2B fd15545a6bd5632650654a86063a8152b3ade7148ec4c4986ed501397f74e4a9f7db6574f1cd0ee1d512b0cb4e5b90e890ef028f3acf7a9a55989bda05bfe178 SHA512 4d76d6990595a77db55801d7ec3c4790718e8633e173daa34a2b2e8477384cbbce84257a797b2e9652ba8d8a8705a41d9e33a2882225415964061e57a1a82861
 DIST musescore-3.4.2.tar.gz 62960426 BLAKE2B be25c73ee51b56a5115fbb3585c13bd3a04543554af57c79202f5fe49a23d559df6d231dc716eb675a40b3f0420be002d088b832b9a1eaa1a62e64fd3653a76f SHA512 d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
-EBUILD musescore-3.3.4.ebuild 2439 BLAKE2B fdc912a5a998915acf50550c7b27b2b6340c0e39fbff62c3fa76f2a9bb465b03b4f3001a9f258971b5ae3de8cc0e4334b1222f6c6311e527d44b94ba042088c0 SHA512 d7e09536d4054b6655e86942c7eaa017698bdfd89e2ce00ad29189d8036391d8a04b3c53eae647445b51d7e07e06f7a204012007e2e6bb24c399aa781498cf44
-EBUILD musescore-3.4.1.ebuild 2686 BLAKE2B 2e05fdaea69cd0afc4275272f9c125cf409dca4f3aec36189cc051a6505e93974887c6a8ff54da6074001c1c53cb408251b8800717b6fa0e3810ae4a75e70ecc SHA512 2dc3514c8aaca961ef7e748df718a626ca6f5dc241eb736f6c155e59650f8a548f6dd470a29e0b94fa2719fd657c1d4395c780a56236686b86b3d47934cedf1f
-EBUILD musescore-3.4.2.ebuild 2686 BLAKE2B 2e05fdaea69cd0afc4275272f9c125cf409dca4f3aec36189cc051a6505e93974887c6a8ff54da6074001c1c53cb408251b8800717b6fa0e3810ae4a75e70ecc SHA512 2dc3514c8aaca961ef7e748df718a626ca6f5dc241eb736f6c155e59650f8a548f6dd470a29e0b94fa2719fd657c1d4395c780a56236686b86b3d47934cedf1f
-EBUILD musescore-9999.ebuild 2678 BLAKE2B f52b7a6305e4f6d8866da7af899a13044b924f0a7aca26832042d6afbc14f3fef741c5ba11532db21763ad3c2a1b43fc3d10e134b65e7a6949fc1c35ae5bfcd2 SHA512 be0d219e8b6ae945aaa99c92afa8e1e04f82a30179c3eb2e34699224421b192e5d8a66338697e9affeb59a28013af30be6a612fae3784b10c357f756966b55af
+EBUILD musescore-3.4.2.ebuild 2687 BLAKE2B 9a8286431e2694bb88c0d91a7d761244049087cadf09562210539c9ddb80b7a6a8982d0db2bcfd1d9ebed5a98ff726481773b4cb3694fd80e2fd78397198a80f SHA512 e6bb0486a2de0d0c293c5c1afe730a09ed2b6676b1e038f811b6d0bdcda1712d2a68cf4dce8dbd5e7f38457270b35fa0d410a993f48247b19c86fdb1d7acfb87
+EBUILD musescore-9999.ebuild 2727 BLAKE2B 1b69766b774dde1b2a83b14555c02f0d2151c6b7668f2a21d09d713eb70fa9d21fd57bc4c094fa9bad4c5168e940c9772d818df2c618949db2413921631f43f3 SHA512 bd6efc3d80f001cd10ae9a9518d2150da8b86d4b29ead3b94a44857d2303d662c6e8a81ea72003d9cfa484d4e9b2a83ebc050d587acfb7bb5de791d56441ef19
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/files/5583.patch b/media-sound/musescore/files/5583.patch
deleted file mode 100644
index da4d0c52d041..000000000000
--- a/media-sound/musescore/files/5583.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 09d138946aad53962ce23298093747f0ce52304f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:39:34 +0100
-Subject: [PATCH 1/2] Specializes template routines.
-
-Qt 5.14 introduces serialisation/deserialisation for enum classes,
-this results in ambiguous templates between qdatastream.h and preferences.h.
-we specialize everything to workaround this.
----
- mscore/preferences.h | 41 ++++++++++++++++++++++++++++++++++++-----
- 1 file changed, 36 insertions(+), 5 deletions(-)
-
-diff --git a/mscore/preferences.h b/mscore/preferences.h
-index bef3df8536..8c3ac9b0ed 100644
---- a/mscore/preferences.h
-+++ b/mscore/preferences.h
-@@ -233,21 +233,52 @@ extern Preferences preferences;
- 
- // Stream operators for enum classes
- // enum classes don't play well with QSettings without custom serialization
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator<<(QDataStream &out, const T &val)
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MuseScoreStyleType &val)
- {
-     return out << static_cast<int>(val);
- }
- 
--template<typename T, typename std::enable_if<std::is_enum<T>::value>::type* = nullptr>
--inline QDataStream &operator>>(QDataStream &in, T &val)
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MuseScoreStyleType &val)
- {
-     int tmp;
-     in >> tmp;
--    val = static_cast<T>(tmp);
-+    val = static_cast<Ms::MuseScoreStyleType>(tmp);
-     return in;
- }
- 
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::SessionStart &val)
-+{
-+    return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::SessionStart &val)
-+{
-+    int tmp;
-+    in >> tmp;
-+    val = static_cast<Ms::SessionStart>(tmp);
-+    return in;
-+}
-+
-+inline QDataStream&
-+operator<<(QDataStream &out, const Ms::MusicxmlExportBreaks &val)
-+{
-+    return out << static_cast<int>(val);
-+}
-+
-+inline QDataStream&
-+operator>>(QDataStream &in, Ms::MusicxmlExportBreaks &val)
-+{
-+    int tmp;
-+    in >> tmp;
-+    val = static_cast<Ms::MusicxmlExportBreaks>(tmp);
-+    return in;
-+}
-+
-+
- class PreferenceVisitor {
-    public:
-       virtual void visit(QString key, IntPreference*) = 0;
-
-From 6b759bb5ee7b83fd8a82429e4cdb74279c5d33b6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <jerome.duval@gmail.com>
-Date: Tue, 31 Dec 2019 17:42:04 +0100
-Subject: [PATCH 2/2] fix warnings: replace QString::null, with QString()
-
----
- mscore/capella.cpp               |  2 +-
- mscore/importmidi/importmidi.cpp |  2 +-
- mscore/instrdialog.cpp           |  2 +-
- mscore/musescore.cpp             | 12 ++++++------
- mscore/musescore.h               |  2 +-
- mscore/network/loginmanager.cpp  |  2 +-
- 6 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/mscore/capella.cpp b/mscore/capella.cpp
-index 7144414e32..6243c8cca6 100644
---- a/mscore/capella.cpp
-+++ b/mscore/capella.cpp
-@@ -2708,7 +2708,7 @@ Score::FileError importCapella(MasterScore* score, const QString& name)
-                   QMessageBox::warning(0,
-                      QWidget::tr("Import Capella"),
-                      QWidget::tr("Load failed: %1").arg(cf.error(errNo)),
--                     QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+                     QString(), QWidget::tr("Quit"), QString(), 0, 1);
-                   }
-             fp.close();
-             // avoid another error message box
-diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
-index a5d8894686..8091a83369 100644
---- a/mscore/importmidi/importmidi.cpp
-+++ b/mscore/importmidi/importmidi.cpp
-@@ -1200,7 +1200,7 @@ Score::FileError importMidi(MasterScore *score, const QString &name)
-                         QMessageBox::warning(0,
-                            QWidget::tr("Load MIDI"),
-                            QWidget::tr("Load failed: %1").arg(errorText),
--                           QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+                           QString(), QWidget::tr("Quit"), QString(), 0, 1);
-                         }
-                   fp.close();
-                   qDebug("importMidi: bad file format");
-diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
-index fa7bacd622..8d81fe9e20 100644
---- a/mscore/instrdialog.cpp
-+++ b/mscore/instrdialog.cpp
-@@ -138,7 +138,7 @@ void InstrumentsDialog::on_loadButton_clicked()
-             QMessageBox::warning(0,
-                QWidget::tr("Load Style Failed"),
-                QString(strerror(errno)),
--               QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+               QString(), QWidget::tr("Quit"), QString(), 0, 1);
-             return;
-             }
-       instrumentsWidget->buildTemplateList();
-diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
-index dd4a4b95ca..07cb596abe 100644
---- a/mscore/musescore.cpp
-+++ b/mscore/musescore.cpp
-@@ -4013,7 +4013,7 @@ bool MuseScore::readLanguages(const QString& path)
-                 QMessageBox::warning(0,
-                    QWidget::tr("Load Languages Failed:"),
-                    error,
--                   QString::null, QWidget::tr("Quit"), QString::null, 0, 1);
-+                   QString(), QWidget::tr("Quit"), QString(), 0, 1);
-                 return false;
-                 }
- 
-@@ -6753,7 +6753,7 @@ bool MuseScore::saveMp3(Score* score, const QString& name)
-                   QMessageBox::warning(0,
-                                        tr("Encoding Error"),
-                                        tr("Unable to open target file for writing"),
--                                       QString::null, QString::null);
-+                                       QString(), QString());
-                   }
-             return false;
-             }
-@@ -6792,7 +6792,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
-                   QMessageBox::warning(0,
-                                tr("Error Opening LAME library"),
-                                tr("Could not open MP3 encoding library!"),
--                               QString::null, QString::null);
-+                               QString(), QString());
-             qDebug("Could not open MP3 encoding library!");
-             return false;
-             }
-@@ -6804,7 +6804,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
-                   QMessageBox::warning(0,
-                                tr("Error Opening LAME library"),
-                                tr("Not a valid or supported MP3 encoding library!"),
--                               QString::null, QString::null);
-+                               QString(), QString());
-             qDebug("Not a valid or supported MP3 encoding library!");
-             return false;
-             }
-@@ -6829,7 +6829,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
-             if (!MScore::noGui) {
-                   QMessageBox::warning(0, tr("Encoding Error"),
-                      tr("Unable to initialize MP3 stream"),
--                     QString::null, QString::null);
-+                     QString(), QString());
-                   }
-             qDebug("Unable to initialize MP3 stream");
-             MScore::sampleRate = oldSampleRate;
-@@ -6996,7 +6996,7 @@ bool MuseScore::saveMp3(Score* score, QIODevice* device, bool& wasCanceled)
-                                     QMessageBox::warning(0,
-                                        tr("Encoding Error"),
-                                        tr("Error %1 returned from MP3 encoder").arg(bytes),
--                                       QString::null, QString::null);
-+                                       QString(), QString());
-                               break;
-                               }
-                         else
-diff --git a/mscore/musescore.h b/mscore/musescore.h
-index 434072a12f..d8089a345c 100644
---- a/mscore/musescore.h
-+++ b/mscore/musescore.h
-@@ -142,7 +142,7 @@ struct LanguageItem {
-       LanguageItem(const QString k, const QString n) {
-             key = k;
-             name = n;
--            handbook = QString::null;
-+            handbook = QString();
-             }
-       LanguageItem(const QString k, const QString n, const QString h) {
-             key = k;
-diff --git a/mscore/network/loginmanager.cpp b/mscore/network/loginmanager.cpp
-index 7bcfd892e0..4abf7e3e4e 100644
---- a/mscore/network/loginmanager.cpp
-+++ b/mscore/network/loginmanager.cpp
-@@ -680,7 +680,7 @@ void LoginManager::mediaUploadFinished()
-             QMessageBox::warning(0,
-                      tr("Upload Error"),
-                      tr("Sorry, MuseScore couldn't upload the audio file. Error %1").arg(e),
--                     QString::null, QString::null);
-+                     QString(), QString());
-             }
-       }
- 
diff --git a/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
new file mode 100644
index 000000000000..c0bb7083324d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-9999-lambda-capture-this.patch
@@ -0,0 +1,13 @@
+diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
+index 9804e1f32..83e0c0e47 100644
+--- a/mscore/scoreview.cpp
++++ b/mscore/scoreview.cpp
+@@ -2405,7 +2405,7 @@ void ScoreView::cmd(const char* s)
+                   cv->updateGrips();
+                   }},
+       #ifdef OMR
+-            {{"show-omr"}, [](ScoreView* cv, const QByteArray&) {
++            {{"show-omr"}, [&](ScoreView* cv, const QByteArray&) {
+                   if (cv->score()->masterScore()->omr())
+                         showOmr(!_score->masterScore()->showOmr());
+                   }},
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
deleted file mode 100644
index d2084f031d14..000000000000
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio +sf3 webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/5583.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex sf3)"
-		-DBUILD_WEBENGINE="$(usex webengine)"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.4.1.ebuild b/media-sound/musescore/musescore-3.4.1.ebuild
deleted file mode 100644
index fb4ff90af180..000000000000
--- a/media-sound/musescore/musescore-3.4.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
-# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.4.2.ebuild b/media-sound/musescore/musescore-3.4.2.ebuild
index fb4ff90af180..cadf43ff2d63 100644
--- a/media-sound/musescore/musescore-3.4.2.ebuild
+++ b/media-sound/musescore/musescore-3.4.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
@@ -34,7 +34,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 6157b14ce4af..d6ea4938d868 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -34,7 +34,7 @@ DEPEND="
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
 	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
@@ -55,6 +55,7 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/${P}-lambda-capture-this.patch"
 )
 
 src_unpack() {