gentoo resync : 25.08.2018

9 files changed, 148 insertions, 153 deletions

diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 0755bfc34dc7..f04969c424cf 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,12 +1,9 @@
-DIST musescore-2.0.2-fix-buildsystem.patch.bz2 2829 BLAKE2B 873265c9527f0df94a9ded5c9a34e1be5e677a00567bf09787228ee5195d49c77ea489166965c2b3defa7b8ddd38547d34be6ead4a1cbd18d575272690efed28 SHA512 2790352aa29215d02085a85fb2bae782fb8dd0db1c81b0d1d09d2d663843269cb32fa077663421bd2867779d1248ec36a34edb896e3e050f88f37c01111fe70b
-DIST musescore-2.0.2.tar.gz 44528670 BLAKE2B 18bc664c8b1d36b8b3d649b68bb3a6edd7eeb30744552fd7d4211eed8f995a71da0f61992f92886080882c4d8ad4184876745ce405dafeb2f017bab7eb761ef6 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c
-DIST musescore-2.0.3-fix-buildsystem.patch.bz2 3446 BLAKE2B a6c1f000248e3ccbf993633901dee92c32930c46c73e485c273069328f14911bb7edec1d3ea6e41cb0709e328d3c46ef902f9dbd4859cb63a962978d490d98c1 SHA512 9b1bdd2b6ef68baebcb5209ada409fcf2648d999d997d490b15c2a40185f6b0a04ecb8690978707872d02a30d99ac2f80ebb72f6f19e15ec3404f996f89602b2
-DIST musescore-2.0.3.tar.gz 49958474 BLAKE2B f8b490eea470b2f72b13d6a62481a75a8132af0267d10a3a4f77e1069d7bc8b03b96a54ca287465e12c3862b3837adcbc4a181ffeac5a2c46b1b7d8ac9a051f2 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1
+AUX musescore-2.1.0-pch.patch 1044 BLAKE2B 884fd6a532ace31f878c0a0e17323792871e7f297a340b605edf3a8cbc1591669c73d58610ba24b2104dc030e7a2599b60df6c553ab2e9a69a12a33dd97a87ed SHA512 daf676955df4947c119904e93452a2fa81e877951d6e509e250e7cb88b406a5533fb7b3463613c1b27bf4708586484ce65786572aaade3a616197c2dfc76115d
+AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
+AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
 DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
 DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-9999-fix-buildsystem.patch.bz2 4019 BLAKE2B 0a80141d36fe8cf1bb4ac92f330c0b401a8686fa661b02842f49ee67d5fdeef339ae6909091637e22c81dddfa128b884c9bdaecdc540274896251424b40b78ae SHA512 6ac113314e3dc93856002df5b89f86728873869075db5e2b99f29f6b69c5ddbd178f89305656370b09d8180eb44b7a56623f06a8e674a522390c8dc59e32ad89
-EBUILD musescore-2.0.2-r1.ebuild 1566 BLAKE2B 94e3fecca8df157015e02d6f57f0d2fb9c1748ba60618390429c81d4f2adf21db38806e5534e3082ef4a7d96b0c2e14250023f18b53f7829c653c362d527f42c SHA512 339d5d928a23418d7755bd65cb959bd66a71dc56a53c79216ec1701f214973c6ee1f6a8b756ad63a1e63cbd09acaa5f98cc63aeb093206b3266d9fc18194210b
-EBUILD musescore-2.0.3.ebuild 1450 BLAKE2B e6f15e39839681401dd250c958133d14b0a1eeeb8980bcb31112eab5c2e082eaefc63a579575c75e35ff88066fe0379bb61bd152201a476892f387154e5c1300 SHA512 8f92f73a4f7d46e187aecd5be64050b95f90665863599a93231d6c32f62fca1e15b3d66737403d3b62766873886a9415099175e911711bb9901a3cf03959b64b
-EBUILD musescore-2.1.0.ebuild 1549 BLAKE2B 924e739b56a1fde247bda4de66f375a5544136432a230309389a692249c426aea7ad12dab94a28d1f7f5fba7c5d3a62b2dce86230d539bbbfdb5843e187f2a77 SHA512 be3cdb9f062633f6bc593e398278888c58a57c24c74133603fde10e3e6316ca7012377ee919f22c15e19211b6c9c1e458e946bea582f405f1e0b4dd60992e64a
-EBUILD musescore-9999.ebuild 1543 BLAKE2B 85e57aeef58d70051254bd7055813f99fc7228e22b36c3f1e908d971af61fa7e7d34e6cad2806c89cb5d45a89a0d0a6804cf3ed9ce43bb5d00549d7d737c7e68 SHA512 402933f1866594ae1d1902cbf553f80bdac1296451d8321b803e363b9bb54832af75f10428a58f7f64e202f5e5195c946561f406bb0b6bc91b74b84bdbf7e63c
-MISC metadata.xml 501 BLAKE2B 034cfd36ef8d38888df28696f2bb46b9840d1cd59d14d3cc87b0e3984b46b86b86620e84e7df0e816ec23455b87083fea17ddfd228457f326f9ffb4c34b4f441 SHA512 a0a5a3ca86ce04c7ac3b4c0f68914123feacfe5586c1c97813a8f6dde67383e661e2a992c955c49f3e1edaf1193eb24fcc2c14b8c0806faa93b41b5ea94c709c
+EBUILD musescore-2.1.0-r1.ebuild 2058 BLAKE2B 6d0dc4398e40241cd2a4eb8a1931e01bef710e506142c1fb88dc75e459c8b46139f2f4619dd4256301fcb56c91cf5302e9849f403aa3513d5e470f91725bf91d SHA512 92e3574b1e6b1754598e3831326586554a574af543569d85fbe6c21251076bb5d04ca57d44fdd8d4cca11bbc7182813b49dd19aa5e1b2087d21abd3805e7a497
+EBUILD musescore-9999.ebuild 2050 BLAKE2B 8c7c0f41b3c956c6a960b791db44b8c9d39f7ba6d3fb12b2b18253c5160e272fd3f6e75abf421fdbe2caf34628c8f55775d4b18b28b92d7717ca5fdcd5c8be06 SHA512 550226b2ea764ee2f03c8ca71ff601adeb5822dd629e94fc52435879a069128e886ccdd1e9f42feba482f193129113e0b16173d07379709c5cd123e79177c29d
+MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
new file mode 100644
index 000000000000..d69d1cd2f654
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-pch.patch
@@ -0,0 +1,31 @@
+From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
+From: mirabilos <tg@debian.org>
+Date: Sun, 4 Mar 2018 16:38:21 +0100
+Subject: [PATCH] Fix numerous reports of missing all.h during compilation
+
+When disabling PCH, the all.h copying code is no longer run before
+AUTOMOC=caused *_autogen targets, so we must run it earlier.
+
+From Debian
+---
+ CMakeLists.txt | 7 ++-----
+ 1 file changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66b0ddfce8..7fdfffcc9b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE)
+ #
+ 
+ # all.h is expected in PROJECT_BINARY_DIR by subdirs
+-add_custom_command(
+-    OUTPUT ${PROJECT_BINARY_DIR}/all.h
+-    COMMAND ${CMAKE_COMMAND}
+-    ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+-    DEPENDS ${PROJECT_SOURCE_DIR}/all.h
++execute_process(
++    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+     )
+ 
\ No newline at end of file
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
new file mode 100644
index 000000000000..2fa6afd9395d
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
@@ -0,0 +1,21 @@
+From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
+From: Orcan Ogetbil <orcan@localhost.localdomain>
+Date: Thu, 31 May 2018 21:04:51 -0400
+Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
+
+---
+ all.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/all.h b/all.h
+index 72db72b0ec..2ee0e8e807 100644
+--- a/all.h
++++ b/all.h
+@@ -131,6 +131,7 @@
+ #include <QProgressBar>
+ #include <QProgressDialog>
+ #include <QRadioButton>
++#include <QButtonGroup>
+ #include <QSplashScreen>
+ #include <QFontComboBox>
+ #include <QApplication>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
new file mode 100644
index 000000000000..1e362dd3298a
--- /dev/null
+++ b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
@@ -0,0 +1,28 @@
+From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
+From: Joachim Schmitz <jojo@schmitz-digital.de>
+Date: Wed, 8 Aug 2018 09:16:54 +0200
+Subject: [PATCH] Fix #52106: fails to compile with
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3a30c03d63..be6a50578a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -537,8 +537,13 @@ endif(APPLE)
+ ##
+ 
+ if (USE_SYSTEM_QTSINGLEAPPLICATION)
++    if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
++      find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
++      find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
++    else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+       find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+       find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
++    endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
+ else(USE_SYSTEM_QTSINGLEAPPLICATION)
+       subdirs (thirdparty/singleapp)
+       set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 73e8e2334c09..f0d90452cf33 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -11,5 +11,7 @@
 	</upstream>
 	<use>
 		<flag name="portmidi">Enable support for building against <pkg>media-libs/portmidi</pkg></flag>
+		<flag name="vorbis">Enable SoundFont support using  <pkg>media-libs/libvorbis</pkg></flag>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for embedded web browser</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
deleted file mode 100644
index 84ac9cadf90a..000000000000
--- a/media-sound/musescore/musescore-2.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="audiofile debug jack mp3 portaudio pulseaudio"
-
-RDEPEND="
-	>=dev-qt/qtconcurrent-5.3.0:5
-	>=dev-qt/qtcore-5.3.0:5
-	>=dev-qt/qtdeclarative-5.3.0:5
-	>=dev-qt/qtgui-5.3.0:5
-	>=dev-qt/qthelp-5.3.0:5
-	>=dev-qt/qtprintsupport-5.3.0:5
-	>=dev-qt/qtsvg-5.3.0:5
-	>=dev-qt/qtwebkit-5.3.0:5
-	>=dev-qt/qtxmlpatterns-5.3.0:5
-	>=media-libs/alsa-lib-1.0.0
-	>=media-libs/freetype-2.5.2
-	sys-libs/zlib
-	audiofile? (
-		media-libs/audiofile
-		media-libs/libsndfile
-	)
-	jack? ( media-sound/jack-audio-connection-kit )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	"
-DEPEND="${RDEPEND}
-	dev-util/cmake
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	"
-PATCHES=(
-	"${WORKDIR}/${P}-fix-buildsystem.patch"
-)
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DHAVE_audiofile="$(usex audiofile)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DUSE_portaudio="$(usex portaudio)"
-		-DUSE_pulseaudio="$(usex pulseaudio)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
deleted file mode 100644
index 27aff7756bea..000000000000
--- a/media-sound/musescore/musescore-2.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/${PN}/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio pulseaudio"
-
-RDEPEND="
-	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/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit: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? ( media-sound/jack-audio-connection-kit )
-	mp3? ( media-sound/lame )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	"
-PATCHES=(
-	"${WORKDIR}/${PN}-2.0.3-fix-buildsystem.patch"
-)
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
index c5eb58ccd824..56805b5d0079 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0-r1.ebuild
@@ -1,19 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils xdg-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="http://musescore.org/"
+HOMEPAGE="https://musescore.org/"
 SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 RDEPEND="
@@ -23,37 +23,50 @@ RDEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
 	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
-	sys-libs/zlib
+	media-sound/lame
+	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	"
+	vorbis? ( media-libs/libvorbis )
+"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	"
+"
+
 PATCHES=(
-	"${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+	"${WORKDIR}/${P}-fix-buildsystem.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+	"${FILESDIR}/${P}-qtsingleapplication.patch"
+	"${FILESDIR}/${P}-pch.patch"
 )
+
 S="${WORKDIR}/MuseScore-${PV}"
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_LAME=ON
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
 	)
 	cmake-utils_src_configure
 }
@@ -63,3 +76,13 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 09988cf9c632..051ffdcc6ae9 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 xdg-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 RDEPEND="
@@ -23,24 +23,29 @@ RDEPEND="
 	dev-qt/qtdeclarative:5
 	dev-qt/qtgui:5
 	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
+	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
-	sys-libs/zlib
+	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
 	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	"
+	vorbis? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	"
+"
+
 PATCHES=(
 	"${WORKDIR}/${P}-fix-buildsystem.patch"
 )
@@ -52,12 +57,17 @@ src_unpack() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
 		-DBUILD_LAME="$(usex mp3)"
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
+		-DBUILD_WEBEBENGINE="$(usex webengine)"
 	)
 	cmake-utils_src_configure
 }
@@ -67,3 +77,13 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}