| 1 |
commit: 5226c8c9815ba2e4cf385adaf978d397c034fc24 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 3 14:48:25 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 3 14:48:56 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5226c8c9 |
| 7 |
|
| 8 |
media-sound/musescore-{3.0.1-r1,9999}: fixes |
| 9 |
|
| 10 |
1) fixed cmake restriction implementation |
| 11 |
2) src_prepare: replaced default with cmake-utils_src_prepare |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/677080 |
| 14 |
Closes: https://bugs.gentoo.org/677156 |
| 15 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
| 16 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 17 |
|
| 18 |
media-sound/musescore/musescore-3.0.1-r1.ebuild | 4 ++-- |
| 19 |
media-sound/musescore/musescore-9999.ebuild | 4 ++-- |
| 20 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild |
| 23 |
index 5da73687b8b..a433e8b6636 100644 |
| 24 |
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild |
| 25 |
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild |
| 26 |
@@ -3,6 +3,7 @@ |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
|
| 30 |
+CMAKE_MIN_VERSION="3.11" |
| 31 |
inherit cmake-utils xdg-utils gnome2-utils |
| 32 |
|
| 33 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
| 34 |
@@ -45,7 +46,6 @@ RDEPEND=" |
| 35 |
" |
| 36 |
DEPEND="${RDEPEND} |
| 37 |
dev-qt/linguist-tools:5 |
| 38 |
- >=dev-util/cmake-3.11 |
| 39 |
virtual/pkgconfig |
| 40 |
" |
| 41 |
|
| 42 |
@@ -57,7 +57,7 @@ PATCHES=( |
| 43 |
S="${WORKDIR}/MuseScore-${PV}" |
| 44 |
|
| 45 |
src_prepare() { |
| 46 |
- default |
| 47 |
+ cmake-utils_src_prepare |
| 48 |
|
| 49 |
# Move soundfonts to the correct directory |
| 50 |
mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" |
| 51 |
|
| 52 |
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild |
| 53 |
index 0a701e5405a..cd2dec78e2d 100644 |
| 54 |
--- a/media-sound/musescore/musescore-9999.ebuild |
| 55 |
+++ b/media-sound/musescore/musescore-9999.ebuild |
| 56 |
@@ -3,6 +3,7 @@ |
| 57 |
|
| 58 |
EAPI=6 |
| 59 |
|
| 60 |
+CMAKE_MIN_VERSION="3.11" |
| 61 |
inherit git-r3 cmake-utils xdg-utils gnome2-utils |
| 62 |
|
| 63 |
DESCRIPTION="WYSIWYG Music Score Typesetter" |
| 64 |
@@ -45,7 +46,6 @@ RDEPEND=" |
| 65 |
" |
| 66 |
DEPEND="${RDEPEND} |
| 67 |
dev-qt/linguist-tools:5 |
| 68 |
- >=dev-util/cmake-3.11 |
| 69 |
virtual/pkgconfig |
| 70 |
" |
| 71 |
|
| 72 |
@@ -60,7 +60,7 @@ src_unpack() { |
| 73 |
} |
| 74 |
|
| 75 |
src_prepare() { |
| 76 |
- default |
| 77 |
+ cmake-utils_src_prepare |
| 78 |
|
| 79 |
# Move soundfonts to the correct directory |
| 80 |
mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files" |
Archives