commit: 64a4d821185c9753a018610f20c613408747b767
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 17:47:06 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 17:47:42 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a4d821
media-sound/musescore-{3.3,9999}: bump + updates
1) ported changes from 3.0.1-r1 to 9999
2) dropped -CMAKE_MIN_VERSION
3) added CHECKREQS_DISK_BUILD
4) updated MuseScore_General to 0.1.6
5) fixed icon cache update
Closes: https://bugs.gentoo.org/688678
Closes: https://bugs.gentoo.org/694006
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/musescore/Manifest | 2 ++
...{musescore-9999.ebuild => musescore-3.3.ebuild} | 33 +++++++++++-----------
media-sound/musescore/musescore-9999.ebuild | 24 ++++++++--------
3 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0c4c655eec0..8add901541c 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,2 +1,4 @@
DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B
88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5
SHA512
91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
+DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B
62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d
SHA512
81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B
8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9
SHA512
d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
+DIST musescore-3.3.tar.gz 64453809 BLAKE2B
278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef
SHA512
b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
diff --git a/media-sound/musescore/musescore-9999.ebuild
b/media-sound/musescore/musescore-3.3.ebuild
similarity index 84%
copy from media-sound/musescore/musescore-9999.ebuild
copy to media-sound/musescore/musescore-3.3.ebuild
index 54404ac316e..436f8021bc1 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -1,25 +1,30 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-CMAKE_MIN_VERSION="3.11"
-inherit git-r3 cmake-utils xdg-utils gnome2-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg-utils 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://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2";
-EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
+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.6.tar.bz2";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
REQUIRED_USE="portmidi? ( portaudio )"
-RDEPEND="
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -44,19 +49,13 @@ RDEPEND="
vorbis? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
)
-src_unpack() {
- git-r3_src_unpack
- unpack ${A}
-}
+S="${WORKDIR}/MuseScore-${PV}"
src_prepare() {
cmake-utils_src_prepare
@@ -93,11 +92,11 @@ src_compile() {
pkg_postinst() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/media-sound/musescore/musescore-9999.ebuild
b/media-sound/musescore/musescore-9999.ebuild
index 54404ac316e..15619c44fed 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,16 +1,17 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-CMAKE_MIN_VERSION="3.11"
-inherit git-r3 cmake-utils xdg-utils gnome2-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit git-r3 cmake-utils xdg-utils 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://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2";
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2";
EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git";
LICENSE="GPL-2"
@@ -19,7 +20,11 @@ KEYWORDS=""
IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
REQUIRED_USE="portmidi? ( portaudio )"
-RDEPEND="
+BDEPEND="
+ dev-qt/linguist-tools:5
+ virtual/pkgconfig
+"
+DEPEND="
dev-qt/designer:5
dev-qt/qtconcurrent:5
dev-qt/qtcore:5
@@ -44,10 +49,7 @@ RDEPEND="
vorbis? ( media-libs/libvorbis )
webengine? ( dev-qt/qtwebengine:5[widgets] )
"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
- virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
@@ -93,11 +95,11 @@ src_compile() {
pkg_postinst() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
xdg_mimeinfo_database_update
xdg_desktop_database_update
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
