media-sound/musescore-{3.0.1-r1,9999}: fixes

1) fixed cmake restriction implementation
2) src_prepare: replaced default with cmake-utils_src_prepare

Bug: https://bugs.gentoo.org/677080
Closes: https://bugs.gentoo.org/677156
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index 5da73687b8badc695243139bad06e777d0f26854..a433e8b663626d820062911f12ef1dd82cb67b9f 100644 (file)
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+CMAKE_MIN_VERSION="3.11"
 inherit cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
@@ -45,7 +46,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5
-       >=dev-util/cmake-3.11
        virtual/pkgconfig
 "
 
@@ -57,7 +57,7 @@ PATCHES=(
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # Move soundfonts to the correct directory
        mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"

diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 0a701e5405adb865c30d13c48e413886a57af6b2..cd2dec78e2d4e84595d17f1998caa17fc682ce32 100644 (file)
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+CMAKE_MIN_VERSION="3.11"
 inherit git-r3 cmake-utils xdg-utils gnome2-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
@@ -45,7 +46,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
        dev-qt/linguist-tools:5
-       >=dev-util/cmake-3.11
        virtual/pkgconfig
 "
 
@@ -60,7 +60,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       default
+       cmake-utils_src_prepare
 
        # Move soundfonts to the correct directory
        mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"