gentoo resync : 15.01.2020

6 files changed, 234 insertions, 113 deletions

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 90bef7128fbe..f5afbd09d7eb 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,11 +1,10 @@
+AUX 5583.patch 8876 BLAKE2B 5a338bed4da06311561dc2ff8bf41317d9e8d2a9218ab570e4396840637a7a4aef3d52b15eb87d388fb9ed76f8a9685036e2c758640c69cd65f910c2408bf4e8 SHA512 464e8dd526f39c2f253d2f3b5a6f932c50a17c7774df0ae076e7b8ae5379e3e5588359fe15ca73825ea56156b5a663178e48ef0d950dcef53ce60808c324ca72
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
 DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
-DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605 SHA512 ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
 DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
-EBUILD musescore-3.3.3.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
-EBUILD musescore-3.3.4.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
-EBUILD musescore-3.3.ebuild 2454 BLAKE2B 3c8ab351b7e781448b3ee732c31e70f37e1f01bcc8ac418fa233f9d12c66a50b748971bef2c427d5dee5c9fd42d1a2a047fcd1a296f8148d721defbaf8fc97af SHA512 d2be78de11ec4756bb35466476d01a33b87d209a647f93542df6142c44e6c9c7bdc54f6e5876b8ffb7c04c0462b38b9b445af90e1ccc98b7210c10622a5a70ab
-EBUILD musescore-9999.ebuild 2448 BLAKE2B 477b9897f891b5c885f8485eac6d545b6c5c5e2e6d4ac59108b4ba77df3f36a0169078732ced3f55ede4792b7597480a1c1d7d979e35e824d68f8e244975f66d SHA512 2c7bd0523e4b14f601437ec0fa2d1bbb090da1702137d8ca7ff74aff27da817b63b57a6070e1171c03fac418fea34a6eb45980da5eae5e483e409311fe2b6ba6
+EBUILD musescore-3.3.4.ebuild 2449 BLAKE2B 93b00e73bb9e230a1fa5be81fb504fa18b092960136b6921bfc85bfe693a41c39061c72286b5367911a922faf84fd1c8dd3ebeea255f690e4e41be78cb4b281b SHA512 c72fc45cb8999c50a07fec94d953526948f9ed8e2ce2a2286e0ee9543c80cc8d8dee02b2c55c98c943c1b606f0eb598ad4875467c9bc70ccd702fa2713e378a1
+EBUILD musescore-3.3.ebuild 2421 BLAKE2B 71b05ee46489698fa8b8e723360f886f372d900a8bf18a7a8a1deaf9e0c91bc14c6b8a377b00f0122a426e057e070fd35678b492040e6dc57e0cabd17a5514cd SHA512 ae93fd993c1315310f08536a4a822a1fb755332ca09d867cd0053536c98403954832e420168159c8888e69c0a75aa60ce32f5027a08140b6a893ddbb7351e77b
+EBUILD musescore-9999.ebuild 2415 BLAKE2B 01288251aa9647b9eba9a23bee1679ce016611691b487ce57ccf5445e687711844a8ce7d943749226b9306adeb32645776010c5411e7eb16ee2b88d165c6a554 SHA512 05b779c77f3253c2f4ccdeb6682615899e17ca1ba8bd9039e896c3aa220af068798bbdc99af3e1be123b727147828ffeca5788c7dceac981c37c360981e22f8a
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/5583.patch b/media-sound/musescore/files/5583.patch
new file mode 100644
index 000000000000..da4d0c52d041
--- /dev/null
+++ b/media-sound/musescore/files/5583.patch
@@ -0,0 +1,212 @@
+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/musescore-3.3.3.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
deleted file mode 100644
index 3055267da6e9..000000000000
--- a/media-sound/musescore/musescore-3.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 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-utils 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 vorbis 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 )
-	vorbis? ( 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-utils_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 vorbis)"
-		-DBUILD_WEBENGINE="$(usex webengine)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
index 3055267da6e9..e0e03cdcb56f 100644
--- a/media-sound/musescore/musescore-3.3.4.ebuild
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -54,12 +54,13 @@ RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+	"${FILESDIR}/5583.patch"
 )
 
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +82,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
index 0533ecb9ffba..f697f3706776 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg check-reqs
+inherit cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -59,7 +59,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -81,11 +81,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index f55fab5973b2..5d3ba673cd37 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# 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 git-r3 cmake-utils xdg check-reqs
+inherit git-r3 cmake xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -62,7 +62,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 
 	# Move soundfonts to the correct directory
 	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
@@ -84,11 +84,11 @@ src_configure() {
 		-DSOUNDFONT3="$(usex vorbis)"
 		-DBUILD_WEBENGINE="$(usex webengine)"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_compile() {
 	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
+	cmake_build -j1 lrelease manpages
+	cmake_src_compile
 }