From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1070252-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5F65F138334
for <garchives@archives.gentoo.org>; Sun, 3 Feb 2019 14:49:14 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A93B2E0BEE;
Sun, 3 Feb 2019 14:49:13 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 81625E0BEE
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Feb 2019 14:49:13 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 1B74033BEF4
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Feb 2019 14:49:12 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 96D68523
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Feb 2019 14:49:09 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1549205336.5226c8c9815ba2e4cf385adaf978d397c034fc24.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/musescore/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/musescore/musescore-3.0.1-r1.ebuild media-sound/musescore/musescore-9999.ebuild
X-VCS-Directories: media-sound/musescore/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: 5226c8c9815ba2e4cf385adaf978d397c034fc24
X-VCS-Branch: master
Date: Sun, 3 Feb 2019 14:49:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: fdb23548-1578-470e-a898-f1ac6a077794
X-Archives-Hash: 46a67253bdf33a56930f8aec3daa362a
commit: 5226c8c9815ba2e4cf385adaf978d397c034fc24
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 3 14:48:25 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Feb 3 14:48:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5226c8c9
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 <AT> gentoo.org>
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 5da73687b8b..a433e8b6636 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 0a701e5405a..cd2dec78e2d 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"