gentoo resync : 12.03.2021

3 files changed, 2 insertions, 122 deletions

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index f01054c21bac..bb907b0d1ca2 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,9 +1,7 @@
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
 AUX musescore-3.6.1-rename-audioitem.patch 491 BLAKE2B 9ecdccb1e3aec15c7233baaeb07d1b962b487dfa1c88cbb1c79616e92d36fc8e0d46635b9bda851550145086bfef2bba56a53ed033325b6bd98378a9f6928bb3 SHA512 55cb0187dfe4e590ec47c772d3c820f64324d748a2b95d0529b516cd048f2862477117dd711c335fd7abf8e3693e9e0b8b60cc270aab5a5960a173fa8bd7ad85
 DIST MuseScore_General-0.2.0.tar.bz2 35122747 BLAKE2B 7f9cafb7912ab8c977842c51df69506d4ad3d1d37498c856978a2d5ab50a1c4fe9145a4807f8c353e6f14138704abb2bbd70c948f1621b494c6e0458c2df0184 SHA512 69eeb22e8c9d1d393a2af857baeb8e49bf2a492651d18190685c74df84a5f6b424e37077e39d9d69c117c4896ea1fbb857eba25a1fbcb6f98d53f384a55713cc
-DIST musescore-3.6.1.tar.gz 68754499 BLAKE2B 81462d8c1d57af7f58c117cbeda725ab4eb8fb313fb29f95724aaba43bd9879ae7a018c8b5de932ab8b925c4362b855b06508aba28b7c5ae0ca59ec11b2803ad SHA512 8e486ea08f8ad6b8238ca400475b9108955ff200221c9ba694e42e20e373c43f7dfd89933ca3887de26cefa547d0e1d792922c685a9d16eaefc9293f72a6fe2d
 DIST musescore-3.6.2.tar.gz 69077899 BLAKE2B 4562267b2fd6498b0ba1e503a9117c2680035ccdb66f94bbd9b98ef1c37d4f9eb7d8a84cbac7726b67b9c95e4f076aaaf83087f4ded195150c42ec77462d48e8 SHA512 04ff1ddd82358c070640f81bbaa9c47c5da95aa57c56a5d1b975ad984744e0def17d5581da6bbeda1aae1c68470100d104d4f8a39ba33bf37bf8891ffcbf1d6e
-EBUILD musescore-3.6.1.ebuild 2981 BLAKE2B 6533c18a0eef953a7541a087c185eec2d069095bb60bbf8d96c528d4a788dd33d3d0677eaeb99c27a4f0a2a3fecfcdc214b2a3fdfb4bf3a42607a6c99b1e9c28 SHA512 75b5603767cd6631b247545c07c008cbf99555c13c528af34b63776946b1c48492f5bd3fb25e80c96d2d1d84f00932d85100efbbe70e6adbe94492033b0aa322
-EBUILD musescore-3.6.2.ebuild 2990 BLAKE2B 869b5cc0232c59ca95d856d9db12d20d3683f76b676f5e74d7fc692d52062e7d6b524c427cbe93eb9b94e4e70e6d3ee5b703144862387c930fc6d091c06cb634 SHA512 7b25f1b5c0c2afad39927da7220283ad8dae2552dbafefecbaf0acb3b4276844ea627939272105935d3e67de55a83a49edb3a5f8d19b8f9d6979c51ffa47a91c
+EBUILD musescore-3.6.2.ebuild 2988 BLAKE2B 066bc22bc16788b7f54d6e54547f8f633442ed2ea591f188a8bd7994ed1f40376e0ba1365e7d41f0c5764924af449254a7ec55712ee967ad6d3e3ed9b9dbc39c SHA512 667cf575170edbe8e105ba3863df978fa05e0d1216fe18b5572c8fc6bce060c2764b1ff59d6cf632076f7e5bd2d966026aeb2d7c1f163f2b40c1823ed495a65f
 EBUILD musescore-9999.ebuild 2884 BLAKE2B 733677224abc2be6cb04328339392069832574fa48e00fbeac1a0cec8f18add469d34cd9ba3cfd68bd83be88bd1fb8c6d82065d71d3378df4d71e6c89064b220 SHA512 829ed729aaedd2aff35466e4c286ac5274e39a46033ab173c2fff196a36e713a0a834cf01ea4d27d8839118f26fba0c4b8576451f0aa55cb963e189b251affe9
 MISC metadata.xml 881 BLAKE2B 99183973e67c5c36493fd08532288693650a321bd72f864eb2924066462d9a2b58dbcf41778018e1774ac46958ccfc796a71727cc47b5bd6c58926e63bbad021 SHA512 24dd5a79185ca63316656fe63011eceba157ed1d23d6875e5452906215f2151f706265d68979188005172d7e7f32a5d57eeb248c218a20036cbaf73b4983d7aa
diff --git a/media-sound/musescore/musescore-3.6.1.ebuild b/media-sound/musescore/musescore-3.6.1.ebuild
deleted file mode 100644
index db51b9d0df1d..000000000000
--- a/media-sound/musescore/musescore-3.6.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CHECKREQS_DISK_BUILD=3500M
-inherit cmake xdg check-reqs
-
-if [[ ${PV} == "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
-else
-	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-	S="${WORKDIR}/MuseScore-${PV}"
-fi
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-# MuseScore_General-*.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.2.0.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="alsa debug jack mp3 osc omr portaudio portmidi pulseaudio +sf3 sfz webengine"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtquickcontrols2:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024[X]
-	dev-qt/qtsvg:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
-	omr? ( app-text/poppler )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	sf3? ( media-libs/libvorbis )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
-	"${FILESDIR}/${P}-rename-audioitem.patch"
-)
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]]; then
-		git-r3_src_unpack
-		unpack ${A}
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Move soundfonts to the correct directory
-	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DAEOLUS=OFF # does not compile
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_CRASH_REPORTER=OFF
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PCH=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_TELEMETRY_MODULE=ON
-		-DBUILD_WEBENGINE="$(usex webengine)"
-		-DCMAKE_SKIP_RPATH=ON
-		-DDOWNLOAD_SOUNDFONT=OFF
-		-DHAS_AUDIOFILE=ON
-		-DOCR=OFF
-		-DOMR="$(usex omr)"
-		-DSOUNDFONT3=ON
-		-DZERBERUS="$(usex sfz)"
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DUSE_SYSTEM_POPPLER=ON
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake_build -j1 lrelease manpages
-	cmake_src_compile
-}
diff --git a/media-sound/musescore/musescore-3.6.2.ebuild b/media-sound/musescore/musescore-3.6.2.ebuild
index d5a19eb9bdc6..96f936a41a63 100644
--- a/media-sound/musescore/musescore-3.6.2.ebuild
+++ b/media-sound/musescore/musescore-3.6.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 else
 	SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 x86"
 	S="${WORKDIR}/MuseScore-${PV}"
 fi