gentoo resync : 10.12.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-12-10 09:09:16 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-12-10 09:09:16 +0000
commit: f45955e60d4da9b7f4a1088c98042f9c06669039 (patch)
tree: 25ff171e8813c8b99f79a424124ed214a9520850 /media-sound
parent: b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (diff)
16 files changed, 88 insertions, 2070 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 4acc7418846b..325318167334 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index 4ecd4818c58f..8220f3471100 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -6,6 +6,5 @@ AUX amarok-2.8.90-mysqld-rpath.patch 573 BLAKE2B d56b77592e73d624269b8611751f759
 AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a6692430934f351754c33b07c8eb61073c75577e70853834dc995474beb8b57464e04a66b143fafb405a451950a5add61f98f8620 SHA512 1c45e9d3f4d8cd9fe6adc1a10b78f7b439a0dddb09ccff399bc3ded62207d6862d61dd5bfaccceb7044f4740f59824a6c8eae34d2e9b2de9a400ffb3305a0707
 AUX amarok-2.8.90-scriptconsole.patch 1272 BLAKE2B 7483f7d7cbe3351d0ccca3c593ec49641076755f38d3cfcabd426c321957fddae7855016d2ff0ecfccb03b6b8e21017c769bd1717bdcb961b3789877538942cc SHA512 3bc31284faa45c717342917f220f7ae078e1f6b0afd313bf8f2ba28b97badb4d56dafcc1a319655b2ae01dee37e09ff34978af95d1743105be8f118be2c61c9d
 DIST amarok-2.8.90.tar.xz 48890580 BLAKE2B 81367b491237abd7a6201d94ea39412a7a69867553c688d9c691749102ac8eb6e59ab5ff17d3b74718211e4975e1daacb15ef3bc1bc35d82954de890213eb544 SHA512 1ff5f43100dbe027c8676946a4e82e914927b03ac0bb9e95bfc7e9e03fcc1cad81d9ea2a343bc4f644a025242e224ea9ae3cae7423d68b0b3c68f346922537fc
-EBUILD amarok-2.8.90-r4.ebuild 3352 BLAKE2B cc0d968babc2bcb1fc440caa30438a1e86c25d5443a068aaba1cca653cf19330d3940c2aa3396894e1a9cedee29425b6f8003d20bfda03c3d48f775d2ce60e02 SHA512 dce046da09c14af58a7f63505516e9618a46577f861dd8c62a7144c42ef455123f032bc97742bbcdb2319deb5965f6f697e0b1b6899695cae6c6214c571721a9
 EBUILD amarok-2.8.90-r5.ebuild 3630 BLAKE2B 879dea94b525af7b0cd79c481d27075c49f78c4ee4e0c94cd777a33e42af812e4ca74e040b207b8c34546a981a733275bf03e441d2c4307143a5232747846d9c SHA512 2de9336bb2956d3d4506afa1df2ba52034a3c5ed7088db76714bfa4a8920ef63956bfb9ed54edcf8a3b0b6ce28649ceb8dfdea06ccb4a4111f72bc111a0a5e40
 MISC metadata.xml 1159 BLAKE2B b986025a8d81ead2cc821ebc5a9bc6f447d4356615127b1795b337068f0457c1a5ee15b380822ef7fcf5eea6f24ef9e48d93329df0947c500a519978db6b1b31 SHA512 0b4a4a1f388183923ce0d9f31bd622194165421c6db388fa4091b41aec8a343d6fb19c3bbac9dd288102bebf66c74df5ce81b14270dc954d8a68f7e0f76d318e
diff --git a/media-sound/amarok/amarok-2.8.90-r4.ebuild b/media-sound/amarok/amarok-2.8.90-r4.ebuild
deleted file mode 100644
index 4ea07c89b53e..000000000000
--- a/media-sound/amarok/amarok-2.8.90-r4.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="never"
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit flag-o-matic kde4-base pax-utils
-
-DESCRIPTION="Advanced audio player based on KDE framework"
-HOMEPAGE="https://amarok.kde.org/"
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="debug +embedded ipod lastfm mp3tunes mtp ofa test +utils"
-
-if [[ ${KDE_BUILD_TYPE} == live ]]; then
-	RESTRICT+=" test"
-fi
-
-# ipod requires gdk enabled and also gtk compiled in libgpod
-COMMONDEPEND="
-	$(add_kdeapps_dep kdebase-kioslaves)
-	app-crypt/qca:2[qt4]
-	>=dev-qt/qtcore-4.8:4
-	>=dev-qt/qtdbus-4.8:4
-	>=dev-qt/qtscript-4.8:4
-	>=kde-frameworks/kdelibs-4.14.37:4[plasma]
-	>=media-libs/taglib-1.7[asf(+),mp4(+)]
-	>=media-libs/taglib-extras-1.0.1
-	sys-libs/zlib
-	>=virtual/mysql-5.1[embedded?]
-	>=x11-libs/qtscriptgenerator-0.1.0
-	ipod? ( >=media-libs/libgpod-0.7.0[gtk] )
-	lastfm? ( >=media-libs/liblastfm-1.0.3[qt4] )
-	mp3tunes? (
-		dev-libs/glib:2
-		dev-libs/libxml2
-		dev-libs/openssl:0
-		>=dev-qt/qtcore-4.8.4:4[glib]
-		net-libs/loudmouth
-		net-misc/curl
-	)
-	mtp? ( >=media-libs/libmtp-1.0.0 )
-	ofa? ( >=media-libs/libofa-0.9.0 )
-"
-DEPEND="${COMMONDEPEND}
-	dev-util/automoc
-	virtual/pkgconfig
-	test? ( dev-cpp/gmock )
-"
-RDEPEND="${COMMONDEPEND}
-	!media-sound/amarok-utils
-	$(add_kdeapps_dep phonon-kde)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
-	"${FILESDIR}/${P}-mysql-embedded.patch"
-	"${FILESDIR}/${P}-mysqld-rpath.patch"
-	"${FILESDIR}/${P}-scriptconsole.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-	"${FILESDIR}/${P}-no-webkit.patch"
-)
-
-src_prepare() {
-	kde4-base_src_prepare
-
-	# requires qtwebkit
-	sed -i -e "s/wikipedia,//" data/amarok_homerc || die
-}
-
-src_configure() {
-	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
-	use ppc64 && append-flags -mminimal-toc
-
-	local mycmakeargs=(
-		-DWITH_PLAYER=ON
-		-DWITH_Libgcrypt=OFF
-		-DWITH_SPECTRUM_ANALYZER=OFF
-		-DWITH_NepomukCore=OFF
-		-DWITH_Soprano=OFF
-		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
-		-DWITH_IPOD=$(usex ipod)
-		-DWITH_GDKPixBuf=$(usex ipod)
-		-DWITH_LibLastFm=$(usex lastfm)
-		-DWITH_MP3Tunes=$(usex mp3tunes)
-		-DWITH_Mtp=$(usex mtp)
-		-DWITH_LibOFA=$(usex ofa)
-		-DWITH_UTILITIES=$(usex utils)
-	)
-
-	# bug 581554: add libmysqld location for rpath patch
-	use embedded && mycmakeargs+=( -DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
-
-	kde4-base_src_configure
-}
-
-src_install() {
-	kde4-base_src_install
-
-	# bug 481592
-	pax-mark m "${ED}"/usr/bin/amarok
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! use embedded; then
-		echo
-		elog "You've disabled the amarok support for embedded mysql DBs."
-		elog "You'll have to configure amarok to use an external db server."
-		echo
-		elog "Please read http://amarok.kde.org/wiki/MySQL_Server for details on how"
-		elog "to configure the external db and migrate your data from the embedded database."
-		echo
-
-		if has_version "virtual/mysql[minimal]"; then
-			elog "You built mysql with the minimal use flag, so it doesn't include the server."
-			elog "You won't be able to use the local mysql installation to store your amarok collection."
-			echo
-		fi
-	fi
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 954ed81e1c95..147e3a4d4a85 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,12 +1,12 @@
-AUX musescore-2.0.2-fix-buildsystem.patch 15382 BLAKE2B 0350444e4df00c3bc1819b9cb5d85099755993d1264f4a4c2add4817ca42c32172a4e9ba82e5ced075c19c6ac2b3ac9ed67a6897c06222c7e95b1018e7303597 SHA512 2e61e67777654c421870a4ea098508939f636030f3721e721c089b6d039d67f6e4018223448f0b77b4a46f02b2f46636a0318698b80614e6592f43afdb6bd700
-AUX musescore-2.0.3-fix-buildsystem.patch 18357 BLAKE2B 827a15815a33c58a35e60e1d22236bd46603c703a560b0e4d456c2447a74b234188a26eff99ddcb91a7c0f7b43b7d5cf0d40ecf8afa63903e9f3078f962b1d59 SHA512 dca5c8614b7bec4d4f3ec7d3b0ff32742e8a1ba9edc9e88637b38edab5f34115a75ac862501610a52850d05a352b675b61e73b04d8b02c494542c219ac625098
-AUX musescore-2.1.0-fix-buildsystem.patch 19498 BLAKE2B ec2c0c68b541bac6fe1f046ad2f1d0d228fd0c14e9525f355e7fdfe8b2705f1142c4242a4eb1b899e7ebb84267d31f461fce19e48e7d1acf6a267a828d17fa82 SHA512 7efdfbde60d79ab39900c01291fa4dee48ba619c2fad72d1edf9453825db4245de45c5bfb70c35d108b21a3d442228e023e8ef3e8b960a9bf433d46207b3ad26
-AUX musescore-9999-fix-buildsystem.patch 21600 BLAKE2B 18659da30f877879ed2e2274e0d32695d39f1490b34af5a55b379a8c3c114b2a7667725d98efdf0419caf9cd7fa5e6632ca7c4a8a87a9ee8e96d3fa24e5fe036 SHA512 97d37144e393a1f0faa839790b2bd15ae38a3ca7a838d924f35a7c67f0581a6444e6efaed5f65ee31fa017cfd3bb142a9aa95d2ede47659455315592b8c43e90
-DIST musescore-2.0.2.tar.gz 44528670 SHA256 92f35403d1cb87bdb080a18bc37b2023a998ed9a26e7f50a5b6d30dbc3c1db45 SHA512 aeb5f0c696a3c0796604c687cb3ea7303dd3536da71cf1b1e71f909cd5caa0864a879ffb19931f6ab0dc6fff854c9f2e05a64905e186b417fa954b73e3e9f08c WHIRLPOOL 87c5e64f721deec1389fcb5ae3d21536586a4ec8d3419d0f88cd2dca7cb6bab0e5df283de1253fd7407f7d6f0a8cf8a95bdd6c1877923193f7d3ea24167631a6
-DIST musescore-2.0.3.tar.gz 49958474 SHA256 66c613f27fcc07252e856a51ed1162a9921f3d11ac130260763e2178b7098b01 SHA512 4cd1301036781a54fba06870cc6a3235919ca702ccbe45dcfd74b1d3a1173fa124cca7bcec2fdfb080fb7e3eaf870ba1879ea6738c764836b2f7cae6f7c2d3c1 WHIRLPOOL bf31de08858404e7ccd5cf78c3433bb4e799a3bc020582953bbc83b7abe6075847352fb8f30f9be795cfc69c57dc856d05d1602bbd194c4dbed90d2ba2254ad2
-DIST musescore-2.1.0.tar.gz 51131549 SHA256 0581b8dd4e9bef51f863baf5b7f03b518f9784c79c0d92d6f0e33b180dd63c47 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2 WHIRLPOOL 1814cf937f1f1f9898f8aa62a60ed3dbfec4cb9af2ded6d03ccfde6c372bba6b3ddc8c6ba83677fc770363975c7c36a144adb17f16195e8b30706d6bcfea9c69
-EBUILD musescore-2.0.2-r1.ebuild 1499 BLAKE2B 32d6a1eaa3508ff925f258505dc2b6e962562888058d812a150531fc26c2848c496aa8248932c0f7b67e3175ac4e2f0bf253fc75f1b8024637218fc7d0d6c4ae SHA512 a9fcc1039397e092cb3eb9fd7f35d30932b7425df6ecd21d1372eb09a351f135b4e7186f59f049c7aa5a5e65df9afceb32c8b2047267539f92f392100f9b4c74
-EBUILD musescore-2.0.3.ebuild 1383 BLAKE2B 8ab4a29d84fa489faa43b5799a94611083dd54ad0de098dcd1a256c06ab361acb86473be2ca0b358b7f45db503d3b9f4539498b61ed96df2969f665146c8f31a SHA512 ad8e8c366b0a7c40e2f6b0ea5bcb45bf4abbc1dbc7e6cf73bbf693e255e19d06068fe8891f8147cb4f3c6f01172dae5f68a3e4742f9eef8468194d43fcc868a1
-EBUILD musescore-2.1.0.ebuild 1482 BLAKE2B c63cd9bce3b1505d64b14a9d900c8048c66baae6a073e8a4061d47ec9f20e386f162af88cf202e24aba08b5f229b0cc053eb0ea6e24f801c5ccbf86aef56ee8c SHA512 0861f3d4b5e0031d60537db3ca4551c2e341501be388c156e3256f12b01b0a5e2892cee71b03371f7e52f560e00b9a5fe59d8ced83dbbfef5ff84017bc09713f
-EBUILD musescore-9999.ebuild 1345 BLAKE2B 22efc586ed155cfe9535df9762318595cedef4e3d6497bd3a4c0edc24255952652c09c8eb6d8856cb0e9326311a56e0391dd55adda4313a97853e0302af04544 SHA512 dc86b9ffb42f797c4ea507aff7351982213ece2f6a36042649beee6e02018135ebf3a1c267cfba297f8a91f156d39195a0193162f619bf6940e6c4535e1258e4
+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
+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 1421 BLAKE2B 1e509d69a40584c51b0aa5a3066584aab5082bc6743aea72ebc22f34c098512d9c78467377bc96c52583c07938ba0f662664fe1c8eab10b7b83511fd850a1361 SHA512 65c6242b516b2d70aecc66e66e6ccdeb5e3ac0704d6b01c51370c8aeda1992a845a93c72e83f43667b4533e09bc1a8395d3bcf17dc4c9d509fb112dc1e572ae3
 MISC metadata.xml 501 BLAKE2B 034cfd36ef8d38888df28696f2bb46b9840d1cd59d14d3cc87b0e3984b46b86b86620e84e7df0e816ec23455b87083fea17ddfd228457f326f9ffb4c34b4f441 SHA512 a0a5a3ca86ce04c7ac3b4c0f68914123feacfe5586c1c97813a8f6dde67383e661e2a992c955c49f3e1edaf1193eb24fcc2c14b8c0806faa93b41b5ea94c709c
diff --git a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
deleted file mode 100644
index aa2749cad58d..000000000000
--- a/media-sound/musescore/files/musescore-2.0.2-fix-buildsystem.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-* Remove hardcoded CXXFLAGS, set only necessary options
-* Turn off RPATH linking
-* Fix QA issues caused by wrong "Version" setting in desktop file
-
---- MuseScore-2.0.2/aeolus/CMakeLists.txt
-+++ MuseScore-2.0.2/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@
- set_target_properties (
-       aeolus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- install(DIRECTORY
---- MuseScore-2.0.2/audiofile/CMakeLists.txt
-+++ MuseScore-2.0.2/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@
- set_target_properties (
-       audiofile
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(audiofile all)
---- MuseScore-2.0.2/awl/CMakeLists.txt
-+++ MuseScore-2.0.2/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@
- set_target_properties (
-       awl
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(awl all)
---- MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
-+++ MuseScore-2.0.2/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@
-             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
-             add_custom_command(
-              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
--             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
-              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-              VERBATIM
---- MuseScore-2.0.2/bww2mxml/CMakeLists.txt
-+++ MuseScore-2.0.2/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@
-    set_target_properties (
-          bww2mxml
-          PROPERTIES
--            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
-          )
- 
-    target_link_libraries(bww2mxml
---- MuseScore-2.0.2/CMakeLists.txt
-+++ MuseScore-2.0.2/CMakeLists.txt
-@@ -115,22 +115,10 @@
-       endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
- 
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- 
- # The Mscore version number.
-@@ -398,7 +386,6 @@
-     #     set library search path for runtime linker to load the same
-     #     qt libraries as we used at compile time
-     #
--    set (CMAKE_EXE_LINKER_FLAGS "-Wl,-rpath=${_qt5Core_install_prefix}/lib")
-     # install desktop file
-     install( FILES build/mscore.desktop DESTINATION share/applications)
-     # compress man pages if gzip is installed (don't on OpenBSD)
-@@ -449,11 +436,7 @@
-     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-     )
--if (MINGW)
--  set(BUILD_PCH false)
--else (MINGW)
--  set(BUILD_PCH true)
--endif(MINGW)
-+set(BUILD_PCH false)
- 
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
- 
---- MuseScore-2.0.2/effects/CMakeLists.txt
-+++ MuseScore-2.0.2/effects/CMakeLists.txt
-@@ -37,7 +37,7 @@
- set_target_properties (
-       effects
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(effects all)
---- MuseScore-2.0.2/fluid/CMakeLists.txt
-+++ MuseScore-2.0.2/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@
- set_target_properties (
-       fluid
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(fluid all)
---- MuseScore-2.0.2/fonttools/CMakeLists.txt
-+++ MuseScore-2.0.2/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@
-       )
- 
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
-+set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
- 
---- MuseScore-2.0.2/libmscore/CMakeLists.txt
-+++ MuseScore-2.0.2/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@
- set_target_properties (
-       libmscore
-       PROPERTIES
--         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-       )
- 
- xcode_pch(libmscore all)
---- MuseScore-2.0.2/manual/CMakeLists.txt
-+++ MuseScore-2.0.2/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif(APPLE)
- 
---- MuseScore-2.0.2/midi/CMakeLists.txt
-+++ MuseScore-2.0.2/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@
- set_target_properties (
-       midi
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(midi all)
---- MuseScore-2.0.2/miditools/CMakeLists.txt
-+++ MuseScore-2.0.2/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
- 
- set_target_properties(smf2xml
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(smf2xml
-       ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@
- 
- set_target_properties (
-       xml2smf
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(xml2smf
-       ${QT_LIBRARIES}
---- MuseScore-2.0.2/mscore/CMakeLists.txt
-+++ MuseScore-2.0.2/mscore/CMakeLists.txt
-@@ -367,7 +367,7 @@
-    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-      set_target_properties( mscore
-         PROPERTIES
--           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-+           COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
-         )
-    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -488,7 +488,7 @@
-    set_target_properties (
-       mscore
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
-       )
- 
-    if (OMR)
---- MuseScore-2.0.2/mstyle/CMakeLists.txt
-+++ MuseScore-2.0.2/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@
- set_target_properties (
-       mstyle
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(mstyle all)
---- MuseScore-2.0.2/mtest/cmake.inc
-+++ MuseScore-2.0.2/mtest/cmake.inc
-@@ -56,16 +56,16 @@
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g -stdlib=libc++"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-+      LINK_FLAGS    "-stdlib=libc++"
-       )
- else(APPLE)
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+      LINK_FLAGS    ""
-       )
- endif(APPLE)
- 
---- MuseScore-2.0.2/mtest/CMakeLists.txt
-+++ MuseScore-2.0.2/mtest/CMakeLists.txt
-@@ -112,20 +112,7 @@
- 
- set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
- 
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
- 
-@@ -133,17 +120,17 @@
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else (APPLE)
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif(APPLE)
- 
--#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- 
- add_custom_target(report
-       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
---- MuseScore-2.0.2/omr/CMakeLists.txt
-+++ MuseScore-2.0.2/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@
- set_target_properties (
-       omr
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(omr all)
---- MuseScore-2.0.2/synthesizer/CMakeLists.txt
-+++ MuseScore-2.0.2/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
-       synthesizer
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(synthesizer all)
---- MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@
- 
- set_target_properties( beatroot
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(beatroot all)
---- MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@
- set_target_properties (
-       diff_match_patch
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(diff_match_patch all)
---- MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@
- set_target_properties (
-       kqoauth
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(kqoauth all)
---- MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@
- set_target_properties (
-       ofqf
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(ofqf all)
---- MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
-       qzip
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(qzip all)
---- MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@
- 
- set_target_properties( rtf2html
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(rtf2html all)
---- MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@
- set_target_properties (
-   qtsingleapp
-   PROPERTIES
--  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-   )
- 
- xcode_pch(qtsingleapp all)
---- MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
-+++ MuseScore-2.0.2/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@
- set_target_properties (
-       xmlstream
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(xmlstream all)
---- MuseScore-2.0.2/zerberus/CMakeLists.txt
-+++ MuseScore-2.0.2/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@
- set_target_properties (
-       zerberus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(zerberus all)
---- MuseScore-2.0.2/build/mscore.desktop
-+++ MuseScore-2.0.2/build/mscore.desktop
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Version=2.0
-+Version=1.0
- Comment=Create, play and print sheet music
- Comment[ru]=Визуальный редактор нотных партитур
- Comment[fr]=Gravure de partitions musicales
diff --git a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
deleted file mode 100644
index 0fb52db915ca..000000000000
--- a/media-sound/musescore/files/musescore-2.0.3-fix-buildsystem.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c4fe57..b7a5cde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,23 +147,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-       endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
- 
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- 
- # The Mscore version number.
-@@ -450,7 +440,6 @@ if (NOT MINGW AND NOT APPLE)
-     #     set library search path for runtime linker to load the same
-     #     qt libraries as we used at compile time
-     #
--    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
-     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
-     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
-       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -554,11 +543,7 @@ add_custom_command(
-     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-     )
--if (MINGW)
--  set(BUILD_PCH false)
--else (MINGW)
--  set(BUILD_PCH true)
--endif(MINGW)
-+set(BUILD_PCH false)
- 
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
- 
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e87..a23aef3 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
-       aeolus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48..0d28df8 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
-       audiofile
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index 9589cce..f4172ed 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
-       awl
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 6cb671a..3d4aae3 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
-             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
-             add_custom_command(
-              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
--             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
-              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-              VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b7794..acec8b5 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
-    set_target_properties (
-          bww2mxml
-          PROPERTIES
--            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
-          )
- 
-    target_link_libraries(bww2mxml
-diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d..cf94cae 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
-       effects
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f..3fede66 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
-       fluid
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525b..f318f4c 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
-       )
- 
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
-+set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
- 
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 446d413..5d871a8 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@ add_library (
- set_target_properties (
-       libmscore
-       PROPERTIES
--         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-       )
- 
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edca..ceffd73 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif(APPLE)
- 
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83..ea95480 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
-       midi
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c4..f8145e0 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
- 
- set_target_properties(smf2xml
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(smf2xml
-       ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
- 
- set_target_properties (
-       xml2smf
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(xml2smf
-       ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index 3592012..b50e2bc 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -370,7 +370,7 @@ if (MINGW)
-    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-      set_target_properties( mscore
-         PROPERTIES
--           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-+           COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
-         )
-    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -493,7 +493,7 @@ else (MINGW)
-    set_target_properties (
-       mscore
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
-       )
- 
-    if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index e60d901..d3ba643 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
-       mstyle
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index 55072b0..cab1a18 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
- 
- set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
- 
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
- 
-@@ -134,17 +124,17 @@ if (APPLE)
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else (APPLE)
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif(APPLE)
- 
--#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- 
- add_custom_target(report
-       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 0fa9aa8..9ef0177 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -57,16 +57,16 @@ set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g -stdlib=libc++"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-+      LINK_FLAGS    "-stdlib=libc++"
-       )
- else(APPLE)
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+      LINK_FLAGS    ""
-       )
- endif(APPLE)
- 
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 88615e5..d719e89 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
-       omr
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920..e9bd15b 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
-       synthesizer
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c7..9b039e8 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
- 
- set_target_properties( beatroot
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b2..35bd6ac 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
-       diff_match_patch
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1..f7ec1c5 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
-       kqoauth
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0a..8c11f07 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
-       ofqf
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(ofqf all)
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b1997..417017e 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
-       qzip
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339b..6c94a06 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
- 
- set_target_properties( rtf2html
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b01..936fa3f 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
-   qtsingleapp
-   PROPERTIES
--  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-   )
- 
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09..7f1268e 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
-       xmlstream
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db571..58d8ddf 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
-       zerberus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch b/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
deleted file mode 100644
index 9667c4fadc1a..000000000000
--- a/media-sound/musescore/files/musescore-2.1.0-fix-buildsystem.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 079504708..026e8289a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -153,23 +153,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-       endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
- 
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- 
- # The Mscore version number.
-@@ -473,7 +463,6 @@ if (NOT MINGW AND NOT APPLE)
-     #     set library search path for runtime linker to load the same
-     #     qt libraries as we used at compile time
-     #
--    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # ignored if CMAKE_SKIP_RPATH="TRUE"
-     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
-     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
-       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -577,9 +566,6 @@ add_custom_command(
-     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-     )
--if (NOT MINGW)
--  set(BUILD_PCH true)
--endif(NOT MINGW)
- 
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
- 
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e8781..a23aef396 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
-       aeolus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48ee..0d28df8ea 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
-       audiofile
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index 9589cceb2..f4172ed6d 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
-       awl
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 6cb671afc..3d4aae3c2 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
-             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
-             add_custom_command(
-              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
--             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
-              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-              VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b779465..acec8b5e9 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
-    set_target_properties (
-          bww2mxml
-          PROPERTIES
--            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -Wall -Wextra -Winvalid-pch"
-          )
- 
-    target_link_libraries(bww2mxml
-diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d5e..cf94caed9 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
-       effects
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f8d..3fede6647 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
-       fluid
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525ba3..f318f4c04 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
-       )
- 
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
-+set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -Wall -Wextra -Winvalid-pch")
- 
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 446d413ee..5d871a813 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -71,8 +71,8 @@ add_library (
- set_target_properties (
-       libmscore
-       PROPERTIES
--         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
--#         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-+#         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-       )
- 
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edcaed..ceffd7330 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif(APPLE)
- 
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83d5..ea95480c9 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
-       midi
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c41b..f8145e04a 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
- 
- set_target_properties(smf2xml
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(smf2xml
-       ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
- 
- set_target_properties (
-       xml2smf
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-Wall -Wextra"
-       )
- target_link_libraries(xml2smf
-       ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index 36196e1c8..cb4a889cd 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -379,7 +379,7 @@ if (MINGW)
-       if (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-             set_target_properties(mscore
-                   PROPERTIES
--                  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-+                  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-                   LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
-                   )
-       else (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -507,7 +507,7 @@ else (MINGW)
-         if (APPLE)
-             set(PORTMIDI_LIB portmidi)
-         else (APPLE)
--            set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
-+            set(PORTMIDI_LIB -lportmidi) # -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
-         endif (APPLE)
-         target_link_libraries(mscore ${PORTMIDI_LIB})
-     endif (USE_PORTMIDI)
-@@ -526,7 +526,7 @@ else (MINGW)
- 
-       set_target_properties(mscore
-             PROPERTIES
--            COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+            COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wno-overloaded-virtual -Winvalid-pch"
-             )
- 
-       if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index e60d901fa..d3ba64316 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
-       mstyle
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index 0831c0810..3e37b2d34 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
- 
- set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
--   endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -fPIE -DNDEBUG -DQT_NO_DEBUG")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS OFF)
- 
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
- 
-@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-       )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- 
--#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
- 
- add_custom_target(report
-       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 9de4518a5..275da35b1 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -57,16 +57,16 @@ set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g -stdlib=libc++"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+      LINK_FLAGS    "-stdlib=libc++"
-       )
- else(APPLE)
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -Wall -Wextra"
-+      LINK_FLAGS    ""
-       )
- endif(APPLE)
- 
-@@ -74,7 +74,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -Wall -Wextra"
-       )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- 
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 88615e5fe..d719e895e 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
-       omr
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920cf..e9bd15b4e 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
-       synthesizer
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c735..9b039e8d2 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
- 
- set_target_properties( beatroot
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b214..35bd6ac4b 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
-       diff_match_patch
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1f2..f7ec1c5ba 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
-       kqoauth
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0aa1..8c11f0710 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
-       ofqf
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(ofqf all)
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b19979e..417017e12 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
-       qzip
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339bde..6c94a06ea 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
- 
- set_target_properties( rtf2html
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b017e..936fa3f09 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
-   qtsingleapp
-   PROPERTIES
--  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+  COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-   )
- 
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09e5..7f1268e62 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
-       xmlstream
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db57150..58d8ddf9f 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
-       zerberus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch b/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
deleted file mode 100644
index 74ba5113874d..000000000000
--- a/media-sound/musescore/files/musescore-9999-fix-buildsystem.patch
+++ /dev/null
@@ -1,514 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e2e91f3fe..7feb7a9e5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,27 +142,13 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-       endif()
- endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--   # This is necessary for genManual to be executed during the build phase,
--   # it needs to be able to get the Qt libs.
--   SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--   SET(CMAKE_INSTALL_RPATH "${QT_INSTALL_PREFIX}/lib")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--      set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++11 -fPIC -g -Wall -Wextra -Woverloaded-virtual")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
--   endif (MINGW)
--endif(APPLE)
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS ON)
- 
- set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
--set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) # Call CMake with option -DCMAKE_SKIP_RPATH to not set RPATH (Debian packaging requirement)
- set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
- 
- # The MuseScore version number.
-@@ -415,7 +401,6 @@ if (NOT MINGW AND NOT APPLE)
-     #     set library search path for runtime linker to load the same
-     #     qt libraries as we used at compile time
-     #
--    SET(CMAKE_INSTALL_RPATH "${_qt5Core_install_prefix}/lib") # Ignored if CMAKE_SKIP_RPATH="TRUE"
-     string(TOUPPER "mscore${MSCORE_INSTALL_SUFFIX}" MAN_MSCORE_UPPER) # Command name shown in uppercase in man pages by convention
-     if (${MSCORE_INSTALL_SUFFIX} MATCHES "portable") # Note: "-portable-anything" would match
-       # Build portable AppImage as per https://github.com/probonopd/AppImageKit
-@@ -519,9 +504,6 @@ add_custom_command(
-     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-     )
--if (NOT MINGW)
--  set(BUILD_PCH true)
--endif(NOT MINGW)
- 
- precompiled_header(QT_INCLUDES all ${BUILD_PCH})
- 
-diff --git a/aeolus/CMakeLists.txt b/aeolus/CMakeLists.txt
-index 7962e8781..bdcb08dae 100644
---- a/aeolus/CMakeLists.txt
-+++ b/aeolus/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (aeolus STATIC
- set_target_properties (
-       aeolus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- install(DIRECTORY
-diff --git a/audiofile/CMakeLists.txt b/audiofile/CMakeLists.txt
-index 5b1dd48ee..264a14a17 100644
---- a/audiofile/CMakeLists.txt
-+++ b/audiofile/CMakeLists.txt
-@@ -26,7 +26,7 @@ add_library (audiofile STATIC
- set_target_properties (
-       audiofile
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(audiofile all)
-diff --git a/awl/CMakeLists.txt b/awl/CMakeLists.txt
-index bcf5427b7..fec81d8b3 100644
---- a/awl/CMakeLists.txt
-+++ b/awl/CMakeLists.txt
-@@ -43,7 +43,7 @@ add_library (
- set_target_properties (
-       awl
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(awl all)
-diff --git a/build/CreatePrecompiledHeader.cmake b/build/CreatePrecompiledHeader.cmake
-index 72faba0de..8f9d2636c 100644
---- a/build/CreatePrecompiledHeader.cmake
-+++ b/build/CreatePrecompiledHeader.cmake
-@@ -36,7 +36,7 @@ macro( precompiled_header includes header_name build_pch)
-             set (PCH ${PROJECT_BINARY_DIR}/${header_name}.h.gch)
-             add_custom_command(
-              OUTPUT ${PROJECT_BINARY_DIR}/${header_name}.h.gch
--             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header -g  ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-+             COMMAND ${CMAKE_CXX_COMPILER} -x c++-header ${compile_flags} -o ${header_name}.h.gch ${header_name}.h
-              DEPENDS ${PROJECT_BINARY_DIR}/${header_name}.h
-              WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-              VERBATIM
-diff --git a/bww2mxml/CMakeLists.txt b/bww2mxml/CMakeLists.txt
-index d6b779465..ad7815358 100644
---- a/bww2mxml/CMakeLists.txt
-+++ b/bww2mxml/CMakeLists.txt
-@@ -49,7 +49,7 @@ if (NOT MINGW AND NOT APPLE)
-    set_target_properties (
-          bww2mxml
-          PROPERTIES
--            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -g -Wall -Wextra -Winvalid-pch"
-+            COMPILE_FLAGS "-x c++ -include ${PROJECT_BINARY_DIR}/all.h -fPIC -Wall -Wextra -Winvalid-pch"
-          )
- 
-    target_link_libraries(bww2mxml
-diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
-index a695f1d5e..1f34fafce 100644
---- a/effects/CMakeLists.txt
-+++ b/effects/CMakeLists.txt
-@@ -44,7 +44,7 @@ add_library (effects STATIC
- set_target_properties (
-       effects
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(effects all)
-diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
-index 1dc8d2f8d..99f8f574e 100644
---- a/fluid/CMakeLists.txt
-+++ b/fluid/CMakeLists.txt
-@@ -45,7 +45,7 @@ add_library (fluid STATIC
- set_target_properties (
-       fluid
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(fluid all)
-diff --git a/fonttools/CMakeLists.txt b/fonttools/CMakeLists.txt
-index 74a525ba3..2cc008495 100644
---- a/fonttools/CMakeLists.txt
-+++ b/fonttools/CMakeLists.txt
-@@ -19,5 +19,5 @@ add_executable(
-       )
- 
- target_link_libraries(genft ${QT_LIBRARIES} -lfreetype)
--set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -g -Wall -Wextra -Winvalid-pch")
-+set_target_properties(genft PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2 -fPIC -Wall -Wextra -Winvalid-pch")
- 
-diff --git a/libmscore/CMakeLists.txt b/libmscore/CMakeLists.txt
-index 6c7e07a3a..000c9c929 100644
---- a/libmscore/CMakeLists.txt
-+++ b/libmscore/CMakeLists.txt
-@@ -73,7 +73,7 @@ add_library (
- set_target_properties (
-       libmscore
-       PROPERTIES
--         COMPILE_FLAGS "-g ${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Woverloaded-virtual"
-       )
- 
- xcode_pch(libmscore all)
-diff --git a/manual/CMakeLists.txt b/manual/CMakeLists.txt
-index cf6edcaed..9eb84926c 100644
---- a/manual/CMakeLists.txt
-+++ b/manual/CMakeLists.txt
-@@ -36,13 +36,13 @@ if(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
-       )
- else(APPLE)
- set_target_properties (
-       genManual
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-       )
- endif(APPLE)
- 
-diff --git a/midi/CMakeLists.txt b/midi/CMakeLists.txt
-index 05fbb83d5..bf79c9e3f 100644
---- a/midi/CMakeLists.txt
-+++ b/midi/CMakeLists.txt
-@@ -27,7 +27,7 @@ add_library (midi STATIC
- set_target_properties (
-       midi
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(midi all)
-diff --git a/miditools/CMakeLists.txt b/miditools/CMakeLists.txt
-index 6df79c41b..e3bdb90b8 100644
---- a/miditools/CMakeLists.txt
-+++ b/miditools/CMakeLists.txt
-@@ -13,7 +13,7 @@
- add_executable (smf2xml smf2xml.cpp xmlwriter.cpp midifile.cpp)
- 
- set_target_properties(smf2xml
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
-       )
- target_link_libraries(smf2xml
-       ${QT_LIBRARIES}
-@@ -23,7 +23,7 @@ add_executable (xml2smf xml2smf.cpp xmlreader.cpp midifile.cpp)
- 
- set_target_properties (
-       xml2smf
--      PROPERTIES COMPILE_FLAGS "-g -Wall -Wextra"
-+      PROPERTIES COMPILE_FLAGS "-fPIC -Wall -Wextra"
-       )
- target_link_libraries(xml2smf
-       ${QT_LIBRARIES}
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index cd1045aa9..1b2c3a0eb 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -381,13 +381,13 @@ if (MINGW)
-    if(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-      set_target_properties( mscore
-         PROPERTIES
--           COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-+           COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-            LINK_FLAGS "${PROJECT_BINARY_DIR}/resfile.o -mwindows -mconsole -L ${CROSSQT}/lib"
-         )
-    else(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-      set_target_properties( mscore
-           PROPERTIES
--             COMPILE_FLAGS "${PCH_INCLUDE} -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-+             COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch ${QT_DEFINITIONS} -DQT_SVG_LIB -DQT_GUI_LIB -DQT_XML_LIB -DQT_CORE_LIB"
-              LINK_FLAGS "-Wl,-S ${PROJECT_BINARY_DIR}/resfile.o -mwindows -L ${CROSSQT}/lib"
-           )
-    endif(CMAKE_BUILD_TYPE MATCHES "DEBUG")
-@@ -507,7 +507,7 @@ else (MINGW)
-    set_target_properties (
-       mscore
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wno-overloaded-virtual -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wno-overloaded-virtual -Winvalid-pch"
-       )
- 
-    if (OMR)
-diff --git a/mstyle/CMakeLists.txt b/mstyle/CMakeLists.txt
-index 2bc43c4bd..3fb96fcfa 100644
---- a/mstyle/CMakeLists.txt
-+++ b/mstyle/CMakeLists.txt
-@@ -49,7 +49,7 @@ add_library (
- set_target_properties (
-       mstyle
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-overloaded-virtual"
-       )
- 
- xcode_pch(mstyle all)
-diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
-index c0486679a..42f14301d 100644
---- a/mtest/CMakeLists.txt
-+++ b/mtest/CMakeLists.txt
-@@ -113,20 +113,10 @@ target_link_libraries(
- 
- set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
- 
--if (APPLE)
--   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
--   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
--else (APPLE)
--   if (MINGW)
--      # -mno-ms-bitfields see #22048
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
--   else (MINGW)
--      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -g")
--      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
--   endif (MINGW)
--endif(APPLE)
--
-+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -DNDEBUG -DQT_NO_DEBUG -DQT_NO_DEBUG_OUTPUT")
-+set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD_REQUIRED ON)
-+set(CMAKE_CXX_EXTENSIONS ON)
- 
- string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
- 
-@@ -134,17 +124,17 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
-       )
- else (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       testutils
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-       )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- 
--#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
-+#      COMPILE_FLAGS "-include all.h -I ${INC} -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
- 
- add_custom_target(report
-       COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
-diff --git a/mtest/cmake.inc b/mtest/cmake.inc
-index 943b85e5f..35b04f51e 100644
---- a/mtest/cmake.inc
-+++ b/mtest/cmake.inc
-@@ -60,16 +60,16 @@ set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g -stdlib=libc++"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-+      LINK_FLAGS    "-stdlib=libc++"
-       )
- else(APPLE)
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
-       AUTOMOC true
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
--      LINK_FLAGS    "-g"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -fPIC -Wall -Wextra"
-+      LINK_FLAGS    ""
-       )
- endif(APPLE)
- 
-@@ -77,7 +77,7 @@ if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- set_target_properties (
-       ${TARGET}
-       PROPERTIES
--      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -g -Wall -Wextra"
-+      COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\\\"${PROJECT_SOURCE_DIR}\\\\\" -fPIC -Wall -Wextra"
-       )
- endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
- 
-diff --git a/omr/CMakeLists.txt b/omr/CMakeLists.txt
-index 9ad57b930..caf9a3624 100644
---- a/omr/CMakeLists.txt
-+++ b/omr/CMakeLists.txt
-@@ -42,7 +42,7 @@ add_library (
- set_target_properties (
-       omr
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch -Wno-unused-private-field"
-       )
- 
- xcode_pch(omr all)
-diff --git a/synthesizer/CMakeLists.txt b/synthesizer/CMakeLists.txt
-index 0520920cf..e0a1aa7a1 100644
---- a/synthesizer/CMakeLists.txt
-+++ b/synthesizer/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library (synthesizer STATIC
- set_target_properties (
-       synthesizer
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(synthesizer all)
-diff --git a/thirdparty/beatroot/CMakeLists.txt b/thirdparty/beatroot/CMakeLists.txt
-index ae905c735..f0fb50a40 100644
---- a/thirdparty/beatroot/CMakeLists.txt
-+++ b/thirdparty/beatroot/CMakeLists.txt
-@@ -14,7 +14,7 @@ add_library (
- 
- set_target_properties( beatroot
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(beatroot all)
-diff --git a/thirdparty/diff/CMakeLists.txt b/thirdparty/diff/CMakeLists.txt
-index d0155b214..3985868bb 100644
---- a/thirdparty/diff/CMakeLists.txt
-+++ b/thirdparty/diff/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(diff_match_patch STATIC
- set_target_properties (
-       diff_match_patch
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(diff_match_patch all)
-diff --git a/thirdparty/kQOAuth/CMakeLists.txt b/thirdparty/kQOAuth/CMakeLists.txt
-index 9beb6b1f2..f452df5de 100644
---- a/thirdparty/kQOAuth/CMakeLists.txt
-+++ b/thirdparty/kQOAuth/CMakeLists.txt
-@@ -40,7 +40,7 @@ add_library(kqoauth STATIC
- set_target_properties (
-       kqoauth
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -I ${PROJECT_SOURCE_DIR}/thirdparty/openssl/include -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(kqoauth all)
-diff --git a/thirdparty/ofqf/CMakeLists.txt b/thirdparty/ofqf/CMakeLists.txt
-index fc39a0aa1..9200dd312 100644
---- a/thirdparty/ofqf/CMakeLists.txt
-+++ b/thirdparty/ofqf/CMakeLists.txt
-@@ -36,7 +36,7 @@ add_library(ofqf STATIC
- set_target_properties (
-       ofqf
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(ofqf all)
-diff --git a/thirdparty/poppler/CMakeLists.txt b/thirdparty/poppler/CMakeLists.txt
-index 943cca72e..20f336087 100644
---- a/thirdparty/poppler/CMakeLists.txt
-+++ b/thirdparty/poppler/CMakeLists.txt
-@@ -134,12 +134,12 @@ add_library(poppler STATIC
-    )
- 
- if (APPLE)
--   set ( POPPLER_COMPILE_FLAGS "-O2 -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
-+   set ( POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-unknown-warning-option -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-private-field -Wno-return-stack-address -Wno-shift-negative-value -std=c++11")
- else (APPLE)
-    if (MINGW)
--      set (POPPLER_COMPILE_FLAGS "-O2 -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
-+      set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wall -Wextra -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -Wno-format -std=c++11")
-    else (MINGW)
--      set (POPPLER_COMPILE_FLAGS "-O2 -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
-+      set (POPPLER_COMPILE_FLAGS "-O2 -fPIC -Wno-write-strings -ansi -Wnon-virtual-dtor -Woverloaded-virtual -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-but-set-variable -std=c++11")
-    endif(MINGW)
- endif(APPLE)
- 
-diff --git a/thirdparty/qzip/CMakeLists.txt b/thirdparty/qzip/CMakeLists.txt
-index 77b19979e..b1b4cb841 100644
---- a/thirdparty/qzip/CMakeLists.txt
-+++ b/thirdparty/qzip/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(qzip STATIC
- set_target_properties (
-       qzip
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(qzip all)
-diff --git a/thirdparty/rtf2html/CMakeLists.txt b/thirdparty/rtf2html/CMakeLists.txt
-index 230339bde..c052605e2 100644
---- a/thirdparty/rtf2html/CMakeLists.txt
-+++ b/thirdparty/rtf2html/CMakeLists.txt
-@@ -37,7 +37,7 @@ add_library (
- 
- set_target_properties( rtf2html
-    PROPERTIES
--      COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+      COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-    )
- 
- xcode_pch(rtf2html all)
-diff --git a/thirdparty/singleapp/src/CMakeLists.txt b/thirdparty/singleapp/src/CMakeLists.txt
-index 2504b017e..722e5d553 100644
---- a/thirdparty/singleapp/src/CMakeLists.txt
-+++ b/thirdparty/singleapp/src/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (
- set_target_properties (
-   qtsingleapp
-   PROPERTIES
--  COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+  COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-   )
- 
- xcode_pch(qtsingleapp all)
-diff --git a/thirdparty/xmlstream/CMakeLists.txt b/thirdparty/xmlstream/CMakeLists.txt
-index 5991e09e5..7e6db93ed 100644
---- a/thirdparty/xmlstream/CMakeLists.txt
-+++ b/thirdparty/xmlstream/CMakeLists.txt
-@@ -29,7 +29,7 @@ add_library(xmlstream STATIC
- set_target_properties (
-       xmlstream
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(xmlstream all)
-diff --git a/zerberus/CMakeLists.txt b/zerberus/CMakeLists.txt
-index c0db57150..52090bd57 100644
---- a/zerberus/CMakeLists.txt
-+++ b/zerberus/CMakeLists.txt
-@@ -31,7 +31,7 @@ add_library (zerberus STATIC
- set_target_properties (
-       zerberus
-       PROPERTIES
--         COMPILE_FLAGS "${PCH_INCLUDE} -g -Wall -Wextra -Winvalid-pch"
-+         COMPILE_FLAGS "${PCH_INCLUDE} -fPIC -Wall -Wextra -Winvalid-pch"
-       )
- 
- xcode_pch(zerberus all)
diff --git a/media-sound/musescore/musescore-2.0.2-r1.ebuild b/media-sound/musescore/musescore-2.0.2-r1.ebuild
index 83c725c42826..84ac9cadf90a 100644
--- a/media-sound/musescore/musescore-2.0.2-r1.ebuild
+++ b/media-sound/musescore/musescore-2.0.2-r1.ebuild
@@ -7,7 +7,8 @@ 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"
+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"
@@ -42,7 +43,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 PATCHES=(
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${WORKDIR}/${P}-fix-buildsystem.patch"
 )
 S="${WORKDIR}/MuseScore-${PV}"
 
diff --git a/media-sound/musescore/musescore-2.0.3.ebuild b/media-sound/musescore/musescore-2.0.3.ebuild
index a574e62b731d..27aff7756bea 100644
--- a/media-sound/musescore/musescore-2.0.3.ebuild
+++ b/media-sound/musescore/musescore-2.0.3.ebuild
@@ -7,7 +7,8 @@ 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"
+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"
@@ -39,7 +40,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 PATCHES=(
-	"${FILESDIR}/${PN}-2.0.3-fix-buildsystem.patch"
+	"${WORKDIR}/${PN}-2.0.3-fix-buildsystem.patch"
 )
 S="${WORKDIR}/MuseScore-${PV}"
 
diff --git a/media-sound/musescore/musescore-2.1.0.ebuild b/media-sound/musescore/musescore-2.1.0.ebuild
index 4f547ddc3dbd..c5eb58ccd824 100644
--- a/media-sound/musescore/musescore-2.1.0.ebuild
+++ b/media-sound/musescore/musescore-2.1.0.ebuild
@@ -7,7 +7,8 @@ inherit cmake-utils
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="http://musescore.org/"
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+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"
@@ -41,7 +42,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 PATCHES=(
-	"${FILESDIR}/${PN}-2.1.0-fix-buildsystem.patch"
+	"${WORKDIR}/${PN}-2.1.0-fix-buildsystem.patch"
 )
 S="${WORKDIR}/MuseScore-${PV}"
 
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index a04d054d3d85..8fb501377442 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -8,6 +8,7 @@ inherit cmake-utils git-r3
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
 EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
+SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -40,7 +41,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	"
 PATCHES=(
-	"${FILESDIR}/${P}-fix-buildsystem.patch"
+	"${WORKDIR}/${P}-fix-buildsystem.patch"
 )
 
 src_configure() {
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index f290a052e57f..1490ea7955dc 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 DIST pulseeffects-3.0.8.tar.gz 604530 BLAKE2B e55b08a861f8a9b45191727d000b28b6468d1d46328726ef30f63733bf6b3dd6b745d3f4c38f54c5924950c489c70bb87b57ada4735ce68420d678e93019da65 SHA512 2610b19c0a61510ab9ab29d2fb038a76dcdaf6c168f57d13df8baf32493cf2fe56cfad73f862144117ce511864b405c9d78f294afcab6bc4336ffc234e18110b
 DIST pulseeffects-3.0.9.tar.gz 614347 BLAKE2B ab24d1af31b359348de8de235694100be20cf961c358b63a043670f82efa17afe25b0cf9e723c6be228bd70af2ce0bc91176f6371a549799a4c7921f2fcf7368 SHA512 aad31f042ff1f1e15c50f2a7a63f73b3878fad56101e0fabb51ed2e48500451b401ece8db56c23049ac4455deb481ba0c0586aa9a753581acdb3749a219046f4
+DIST pulseeffects-3.1.1.tar.gz 603601 BLAKE2B cca83dfb70723016ae96e0a2a82b93dd8c1db3f4b9fa838098e0539ba26b48d4bc1f3aeed52de0e9d9a9d6c78ce7df2273e7287f26bae7cb0f2f9ef62dc47683 SHA512 a6091a890c244a0b67a187a3668dd746755a21c0eec6ba90f809061c6c4e1e5ecffe61d940d5dc1203c02c4b9c9f43ad29dc28859795863ef9418abefcfacd59
 EBUILD pulseeffects-3.0.8.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
 EBUILD pulseeffects-3.0.9.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
+EBUILD pulseeffects-3.1.1.ebuild 1399 BLAKE2B dfde05d414a4f6e2f7acadc51e8a32f674175790ad90b1bf6d9d85dbc0b17469457e03e4902635b457e8c1491f0b42a9aff31fac44efa317aed62221796e329e SHA512 f7b416e1d28389e6c9a3d2f009b3a39d94d46124c2b5ebb8369a9da345efe05ba9913167b3ca64f05c39e62547da358e99d867141d2921b3749f7880be904afa
 EBUILD pulseeffects-9999.ebuild 1382 BLAKE2B ad31d639425ff10f8498e9691a5986e75baa5bd588d1b052355e90d29cd6bd3ab49af8ee59f8a82d43c9421ca7ad3f741e6f5e3ea67e2149f99cd1f2f9335750 SHA512 4c42030986e7830ef22986a5544966d6ac8cd9ae14f882351703dcf5707c101fd31a4b96d956ce71c51e85836d6779ff7f45d01aaeb02d85d1e4f97a25fee449
 MISC metadata.xml 607 BLAKE2B b9f1bd8b2afd83f2e07b1d5a3c1a82fd1ff7de67182316d868890375b1144edf292181c702fa274da87bd0cc43a5e967ed6f379d0e85764a31834a4ddb3c8c8e SHA512 fa5780c3149aad1d3c5edf76356d521942a85271576f868598c54a7010cf3d31366ad08aa80402479addf8f69111973e7e814abc2df17ea7d0273a5e2a749ac2
diff --git a/media-sound/pulseeffects/pulseeffects-3.1.1.ebuild b/media-sound/pulseeffects/pulseeffects-3.1.1.ebuild
new file mode 100644
index 000000000000..f07913972f3c
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-3.1.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome2-utils meson python-r1
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+	KEYWORDS=""
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~x86 ~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/gst-python-1.12.0:1.0[${PYTHON_USEDEP}]
+	media-plugins/swh-plugins
+	>=x11-libs/gtk+-3.18:3
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-0.18[${PYTHON_USEDEP}]
+	media-libs/lilv
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+"
+RDEPEND="${DEPEND}
+	media-sound/pulseaudio[equalizer]
+"
+
+pkg_preinst(){
+	gnome2_schemas_savelist
+}
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+}
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index 50b15a2dad60..ef8c1aa10a7f 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
-DIST rhythmbox-3.4.1.tar.xz 6914220 SHA256 039f86661cba495f9429df6572fa79e68279635809e52fa0d19f57e8db8341b6 SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6 WHIRLPOOL 08997a533857a3545d926730be9f9f8f0b420da976011598919520b18546959658765eb7bfdfe7fce430706b9b1a882c46ea6cba1d9b968b6433c8ec2791adf2
-EBUILD rhythmbox-3.4.1-r1.ebuild 3630 BLAKE2B 670be9dbcd237f4ccf710a9a3ff57700ca60bd298e07625e9d40329873aa77eb2c6a7762d82070778027f49b22176051b9a42ba8ea053a638f61d91e4b9206c4 SHA512 342ebb0f18fa31627e80fef7a354125f20a0abb98524ff5d41883d1eb7f3394cadfc5e0e7258097e71d93d80299afbe866aab53b8f1ccafb44f911c44236044e
+DIST rhythmbox-3.4.1.tar.xz 6914220 BLAKE2B f98aa43ca6929cf99bc5cfdcfcc8893e35610c04f1357579d64d3cd85cd66672dbfcb4a4a9a55ff6ae79ae54bc3034deff6a955b7bf59d7ff313de9a5747360c SHA512 b00034e9369222f64d5d9c5e246b99f5d738336d3faf2d303c444f84c316688871e0a09992e96012f38e2e90e8efc936ad231bed5057a5aaf31ee66963f59ae6
+EBUILD rhythmbox-3.4.1-r1.ebuild 3632 BLAKE2B d65e51c78483b78ce55b9c24b16a56f0a6522f2f1552728eabf8ec6a35de3b5feb94d3d38efe0727fe6455f768f45409b9f8ad780bbc46eb74470f42ff4ec82e SHA512 687930f1fafe1a50bf205dd8a1ff9469fb76a6c2462f07ae11d78c48bbe73838881f409f7fe4b7ab45b8866d733c277a0b3be5113c545bdff25418cc0b3d3ade
 MISC metadata.xml 771 BLAKE2B 04593464007c48b275fc9ee76a99f8ecbcf74a63e2442e583e472794e50e4733d9e62c4d8d8bcb0cc664161e4dc5eefb0379c74d1468de1b4ff560a4c78cb186 SHA512 b50f990bbbdd508a2592f1d52b95caa2e0d78d0b670f207e5520a26847efe51199f3242c1327e144a8b087954c1ac82289eb5ebff6d207b8edc7caf687ecbd23
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
index 0c79c310ec2b..b01e8579f2db 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
author	V3n3RiX <venerix@redcorelinux.org>	2017-12-10 09:09:16 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-12-10 09:09:16 +0000
commit	f45955e60d4da9b7f4a1088c98042f9c06669039 (patch)
tree	25ff171e8813c8b99f79a424124ed214a9520850 /media-sound
parent	b9ef7cab6264f1838672efbbcb4ba3b3abd5323f (diff)