From 5226c8c9815ba2e4cf385adaf978d397c034fc24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Miroslav=20=C5=A0ulc?= Date: Sun, 3 Feb 2019 15:48:25 +0100 Subject: [PATCH] media-sound/musescore-{3.0.1-r1,9999}: fixes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- media-sound/musescore/musescore-3.0.1-r1.ebuild | 4 ++-- media-sound/musescore/musescore-9999.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild index 5da73687b8ba..a433e8b66362 100644 --- 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 0a701e5405ad..cd2dec78e2d4 100644 --- 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" -- 2.26.2