gentoo resync : 06.12.2017

22 files changed, 220 insertions, 261 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 518acc1df961..94648665fbb2 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index aae28f63a0d8..4ecd4818c58f 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -7,4 +7,5 @@ AUX amarok-2.8.90-no-webkit.patch 1126 BLAKE2B 14b1fc1b3a5c20437896256a669243093
 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-r5.ebuild b/media-sound/amarok/amarok-2.8.90-r5.ebuild
new file mode 100644
index 000000000000..6243ec7ac44f
--- /dev/null
+++ b/media-sound/amarok/amarok-2.8.90-r5.ebuild
@@ -0,0 +1,140 @@
+# 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
+
+	sed -i -e "/macro_log_feature.*QT_QTOPENGL_FOUND/d" \
+		CMakeLists.txt \
+		|| die "failed to remove QT_QTOPENGL detection"
+
+	sed -i -e "/if/ s/QT_QTOPENGL_FOUND/FALSE/" \
+		src/context/applets/CMakeLists.txt \
+		|| die "failed to sed out QT_QTOPENGL_FOUND"
+}
+
+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_NepomukCore=OFF
+		-DWITH_Soprano=OFF
+		-DWITH_MYSQL_EMBEDDED=$(usex embedded)
+		-DWITH_IPOD=$(usex ipod)
+		-DWITH_LibLastFm=$(usex lastfm)
+		-DWITH_MP3Tunes=$(usex mp3tunes)
+		-DWITH_Mtp=$(usex mtp)
+		-DWITH_LibOFA=$(usex ofa)
+		-DWITH_UTILITIES=$(usex utils)
+	)
+
+	use ipod && mycmakeargs+=( DWITH_GDKPixBuf=ON )
+	use mp3tunes && mycmakeargs+=( -DWITH_Libgcrypt=OFF )
+
+	# 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/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index f536af0cf548..f5f301992bfa 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,11 +1,3 @@
-DIST frescobaldi-2.0.16.tar.gz 3861027 SHA256 d8e89a662da45ae6c514365a4eb6895419f8058014f5393041988a55f05eea8a SHA512 7f04b84ec73ee84094ef8c11ef546a111b3c795dff9611a0627180b6509103c7505e5799a3ad0dd8d4d54dca2596f34835dca0018f78fe55966665c5eb14f3ab WHIRLPOOL 3c1d2f9d79ab04536664176d834014d5daab73d115961913b40c247dfe142cbf95761e44043ccfd914dc6cf64eb307d29fba0cb128afd44c3c345e1cb6edcd9a
-DIST frescobaldi-2.18.1.tar.gz 4172189 SHA256 475bbb9aeed8009fdb7b0c53e4da78ce7a204b548d0af6d909b699c99e61d4c1 SHA512 cc00012f6f3d5cef44e50258093a27c4627843f41ca3724983fbd424f2da4a2911e300edd12d35082c514381b660c421fbc405fe858ff3680d2a5605a8c4bb6a WHIRLPOOL d02eda7702bf6fbcd3c94255f97f57777b105a9e13dca0acb5abe950b5344fdfe9e02f153c2f20c7492e65fdad69ef92dda6b46ded9a18d1499115a12b7ac1fd
-DIST frescobaldi-2.18.2.tar.gz 4200915 SHA256 e54a674bc4f8fad368969822829d913dc4c6de0ae2ca4e762e1f0a25b03ddafa SHA512 464599e36f045abece32db3040635a3c356d6e17e2ead61a326c0f92007da83491beb958cc6f26b583af29376a2efe7f8ff940e9774e6c7f9b190be453c951f9 WHIRLPOOL 79cab3e1927503bf93017c98d0b81941e38f66a6f114a4b8ad0aee9123065ae473d89d798303a79280f208b7f23c27d9408fa08ff79720f8dff22d75ce961394
-DIST frescobaldi-2.19.0.tar.gz 4244785 SHA256 b426bd53d54fdc4dfc16fcfbff957fdccfa319d6ac63614de81f6ada5044d3e6 SHA512 3d6d34809acc8ed8756fc89893bceda79fe0a81e717083a5e7391cf13449e5e4ed675cb9ace63ec9191a9e34f27fd3540494195f74073b872ce1b0f5b7ccdd8d WHIRLPOOL e598da0f0a2ff6813c5f5ceafdb67beeb7921136d1abf804dd0836cf857de2e5db85dbdfd7b1b45970476d75054aa8b0c7bd17f0cbe4f1551d0e5abea98045b1
 DIST frescobaldi-2.20.0.tar.gz 4478977 SHA256 c3d7faab7b21ddbab98749751a94d0a848138a800b0ae744f0ec94000b459ae4 SHA512 a875e8d574e77db5e87555aa091b4b0966e4b8df16dc1f7fbcfe100f67d9ccafdd9a26c8f4b8cea13410faaa298185c1ec0e9b5e722b3d37c32d0b573511a3e3 WHIRLPOOL 96043a2af66f40b26210a2d0ff70e0212e3ab0919a918f30754d004dbc893d23a9827d61838a84a2f29b0acf3cc6b61cb3a4a9572f3072676144b7b7c6d069ef
-EBUILD frescobaldi-2.0.16.ebuild 782 BLAKE2B 17a169fb0fcea84922870e6d45430cf4dbe5752807c162456d87e9fc7d95d9b6041795a6e70ac4f8cb81b6bfa307a8a79f19983c505a55430b9d922c8a0af34d SHA512 7e17705238e28170183c1c587ffc48230e9326322515fafb2b4ef7f8c04fcf6f633caa9cd80785ae3679c379dd73ffb26f950ae080d5a266031bfb1f2a5e063c
-EBUILD frescobaldi-2.18.1.ebuild 846 BLAKE2B 20ae3144c5255ab22afd0fc046d569a661a6a7e2a3f70c4a10e5e64ec68ccc492f0cb32631a2ec1bb7144a7cbf6b8a77d21e3af76131b31276bf0043301412e4 SHA512 a09d4c8d2156dfc5db083f1fde7b642efd296236b7ff993cb5112b087d3629fdcfa505481efa80c94d81f15b3aa8730514927c8dff1fc538327e52dab8910854
-EBUILD frescobaldi-2.18.2.ebuild 848 BLAKE2B a9ceb16ed344e980f2081760f9e9ec81f0453168fc9df73412d8f328697285f4e97024c509f991b9ea3c43e6bc3420b2a8955f1c01c8a018b2e3b13e25b3d50a SHA512 fdbe180490a9ab97f0bea61ab32a8e9b028b9549076139c7ad73e8995cc917dd7d88aff62f5845158d735c9fd6e1a708035dfb2936c2796836190e736294fd5d
-EBUILD frescobaldi-2.19.0.ebuild 852 BLAKE2B 6f2c0dad8075a86bef0359b9a534e8eda167398cef4a44b13ef0929f3a05fa274e12d848315420ab340d083243dd1d2dfb54a04aad94eb878dfd127b3e0b04fc SHA512 386136b88d9049469cb2e93fc2bb4468f7def1ff776507199fc6417fbf081c86d551603f213901a399290e9b2188e896d5ec12c38bb3e8ced024d271eff02478
 EBUILD frescobaldi-2.20.0.ebuild 855 BLAKE2B 2157ee4fd660676ee6bbdda7316693318fecb0c662f8d92b71dc5260cdc1a11074ea22dd57060c19f40c46cd2fa20235119e393231b8834990f3ef6511258ac5 SHA512 bc829bdbb726b0f1e2c5c35342e830f81e23867191cc37ed43ef06228d1a4f0a25043561af6ecd978a4e5b97c3bfc88e5bacb25de84a66f2154ce1a4ad05cf5d
 MISC metadata.xml 442 BLAKE2B 71b3500edaf46be59e6f9125c45a8aa9e30a5fd3187b0b58e834991b473650600aa9a53a30abac3b423f32aa37a9df4032c37a6b50888a0fae44fb0dead4b5c0 SHA512 cf86623fdde3cd003175081ac264d109511036d6c0e09a80e7f88dde98ed52568a8412f4b32dadb75c6986dd1d59e7e83c95546aefb17ffc9e349386a94e54ef
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
deleted file mode 100644
index 9fdc9d8b1475..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.0.16.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
deleted file mode 100644
index f7d688c927a7..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.18.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild b/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild
deleted file mode 100644
index ab39172aade4..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.18.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[X,${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.3[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild b/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild
deleted file mode 100644
index ed0e5121f4ab..000000000000
--- a/media-sound/frescobaldi/frescobaldi-2.19.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="A LilyPond sheet music text editor"
-HOMEPAGE="http://www.frescobaldi.org/"
-SRC_URI="https://github.com/wbsoft/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 public-domain" # public-domain is for bundled Tango icons
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="portmidi"
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyQt4[svg,X,${PYTHON_USEDEP}]
-	>=dev-python/python-ly-0.9.4[${PYTHON_USEDEP}]
-	>=media-sound/lilypond-2.14.2
-	portmidi? ( media-libs/portmidi[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/lxmusic/Manifest b/media-sound/lxmusic/Manifest
index e27c852f0345..66ba1e4cd999 100644
--- a/media-sound/lxmusic/Manifest
+++ b/media-sound/lxmusic/Manifest
@@ -1,6 +1,3 @@
-AUX lxmusic-0.4.4-libnotify-0.7.patch 909 BLAKE2B b3b1e9e69e86f6fc3400aa9d1f8c1e9393d29d4e0e62b002a9de97f6052d4f64557cfb371e1fb5a841ba6e30173690dbdd4bd78c80ebb81c14a3dbc4c70aa6cf SHA512 2f7413222e8b0ed922073dcf10a33d51c5b8440fb3610f0eb4effaceaa267146baa93a5c4dd7229238611371777e5bbf5d99083c012202a438291b873fab85db
-DIST lxmusic-0.4.5.tar.gz 288873 SHA256 08a508e1df800f142fef567ff9d3d0e845bfdd70e2edb796b3b7ad0e92dce064 SHA512 2467096190fd8e1d628e234e4646fbbf96683eca6244990353cade732d91487783e4462d7619d57ce4bc9b9bda9cdacd8c857abcf73c94296f9863546f95a11f WHIRLPOOL 31fca06cc38412549bcfc126c602c4cceee3b35d3a470ddb91dc75698ebaab559232a9686e07bacb949433a51791fb01f6b763365af8b3b28e588576d6d3f401
 DIST lxmusic-0.4.7.tar.xz 180300 SHA256 4933987338eb6e8c77d63b14cea5a8886146e75acbc38a21438c6c3f47bc06ba SHA512 e1e6a7e2306b24dfd5864df88db47c07656d43a1901212b1d6b6edec8addf866b31ebae46bca572e88801620016c6fab9860f5ed44d6086f24494e2eb2737216 WHIRLPOOL 43133bbae048efac3fd0684e730d4bab8902299519e55ae1978d831fedae30af2cc0db73042208f60e110fb64b357f3d6f8bd3333b22cc0715cb1f1780c84d4f
-EBUILD lxmusic-0.4.5.ebuild 514 BLAKE2B b2f0bfe25d27b3ade9c2c5c9eb3bab668266a5f89be78a7f158f8fd7396bc59eb8336d7bd469a4b81f46a64446f2b7cf5f03a1bf2eeef7def0a348ae6f5091a9 SHA512 85d7cd52364a794d755ae373f9f893a8082be99d1a9943212c53e7f478c8f010100a1bf3c3db44152084ed3718946376d650cdd1a52ef893cd3f6344a88292b6
 EBUILD lxmusic-0.4.7.ebuild 437 BLAKE2B 58abbbd8c3cbf56dd674d470cd2284e25f62682be9a9c1911de28192edaeaf2860c90a74f907cd7c55cd7cffa07ddcdd60f6f287b2bdaf50060236e192fa76d4 SHA512 f032e61061fc2101b7148d32b4c51a5f52113ac5f1d9e457d12c822015086a90350f1747de3a7ede41fc0192f241f37aeb45c9fa94a3fd873e7a784526e3c4e2
 MISC metadata.xml 475 BLAKE2B 4a670375f0f0a075a538f366284484beddb58c046ed798c5e27cb8388dbe9257f5de40a289971634686eeb872a9842bf7903d21ac744982dc86b3856abe72ab2 SHA512 865b540d371034b95368f62edb2f2b302b594b621bc23f4e66a50cb3d8e518c59fe4846af0379d4f0387a0d725654bdd77396e7e06810ac472d4b6c165faa5f1
diff --git a/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch b/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch
deleted file mode 100644
index 62868c909856..000000000000
--- a/media-sound/lxmusic/files/lxmusic-0.4.4-libnotify-0.7.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/lxmusic-notify.c
-+++ src/lxmusic-notify.c
-@@ -56,12 +56,26 @@
- 	g_return_if_fail (message != NULL);
- 
- 	lxmusic_clear_notify (n);
--
--	notify = notify_notification_new (summary, message,
--	                                  "lxmusic", NULL);
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	notify = notify_notification_new (summary, message, "lxmusic");
-+#else
-+	notify = notify_notification_new (summary, message, "lxmusic", NULL);
-+#endif
-+#else
-+	notify = notify_notification_new (summary, message, "lxmusic", NULL);
-+#endif
- 	n->notification = notify;
- 
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+/* lazy */
-+#else
-+/* lazy */
-+#endif
-+#else
- 	notify_notification_attach_to_status_icon (notify, n->status_icon);
-+#endif
- 	notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL);
- 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
- 
diff --git a/media-sound/lxmusic/lxmusic-0.4.5.ebuild b/media-sound/lxmusic/lxmusic-0.4.5.ebuild
deleted file mode 100644
index 777603e2bbab..000000000000
--- a/media-sound/lxmusic/lxmusic-0.4.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-DESCRIPTION="A simple GUI XMMS2 client with minimal functionality"
-HOMEPAGE="http://lxde.sourceforge.net/"
-SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/gtk+:2
-	media-sound/xmms2
-	x11-libs/libnotify"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-}
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index f37477a5b54b..0c6621d53476 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,15 +1,16 @@
 AUX rosegarden-12.12.25-debug.patch 762 BLAKE2B 420e3eb7d50b6edafb3b5c4bc3e045c0bd9fce9054a0674663fb8d73dfea984344a1c843566e37b952ee609c52d6760954acf692402c65e305d05fca22f4d004 SHA512 20897f94f366c1f8cf0df503a7949fc7b77f84cd893bbf24819e84a061e8b9fd0d179e3d95bbb13edfbd413e8c9bf8db1f92178781566c30a66a56b61bec83ca
 AUX rosegarden-13.10-segfault_at_export_to_lilypond.patch 1714 BLAKE2B 0697fe5e849efdbaafa7d4de698f503c6748958f7891731f56bfe40f1b8aeee8513a781513de5216931022570aca76958fac6f94546a1327bd81e8a45bba2150 SHA512 aee47dd62b49d7ae1edb02b8bc585a81f4277adf812b6a252fe315392a1ae744416fdbe1fb14e1867b8b4c1d755ef83085032694f05c96cfbeda92a15422c911
+AUX rosegarden-17.04-cmake-3.9.1.patch 934 BLAKE2B a59bb497c2fa23f5161ff2953b2338c69d49bd5a5c8d73eefe542dc74c657079ca96d45a2f4db830206d5b71cce66667cf1257a9914da04658136993ce72d8ed SHA512 f3f285597be964aeb9625be9df2443c98ca902f7fe3f7db82ea84f96f0ab461be4762912a6cad30e2c085125394ba37cb0048fca3f8543e1ff41d7776eb671a8
 DIST rosegarden-13.04.tar.bz2 5858085 SHA256 4d8dabb08a7b807cad46d64d808752a82e26dc6d0144e5849392c51421936c7d SHA512 a01bf391be92c564d20d53c03556552cf5e9cd8f1b1eda49de18432dbcb97ed8c65795efb2275ae9a2f91c7701ea71d3497bbf062606331dbe3487a41c33cdfa WHIRLPOOL 5b4fe5a149350a64cabbde04b5c16cdda92f848c1aa45adbf4136c3f55da75dc07434f8d126404334a477e36922e5fd1c5efe66fa46e9b38d42b661b3c158ecd
 DIST rosegarden-13.10.tar.bz2 6355164 SHA256 6c3a1961b75ded3ded634e9c24f194fd483b11bc797a2603cf5a61fec674e6d5 SHA512 f65bf1c2098b2e2266131e6c430c598ee881e43a5daf77d6ef843be0e2543a07264af4442335573f4408568dde74357c596d8b99cf77b311fb9a55ca3584d18a WHIRLPOOL c39fbe2939411ee10ba8370bce41578e6e683839645c935ee9dfd341d2d0be4d18866893e9cbc10d15245c5d6bc5a8cf5ca90279dde53a979a3d9f7750f0a916
 DIST rosegarden-14.02.tar.bz2 6402898 SHA256 f5d1d78424582326dcde4bb46b521eb25c2b3fd05b98ce3aaf7f2ffd2e9f7cd6 SHA512 ed11482dbb65823186cae4b1532b9e38c75a29e209a97a965521091cc7b6d4fdc32571b30a2be38dee06fd2f516fc924ab1a8e72acaa7212b12dd28d61e224f3 WHIRLPOOL 780edec4c442788e85563d9dc10d36dd2eceadf31b7a865d1e03c3f92623506b354795318e28518dab9335e287d4da3e9a085be80923641588ea4f0c2ab940ee
 DIST rosegarden-14.12.tar.bz2 6235233 SHA256 f876fbb818326da7f012a01a4d6baf45022dcbb98626e0ce40c67b6943ee147e SHA512 7820197d97025365c781f95811a9725058b86375654df9915599957f743f5ea335eb468d0b52100e7be5096e9d10bc6fdad4252db48dc5c49d9ed6d8e7db6660 WHIRLPOOL 9d34eaa60707b3b18007a939c4b5da282e459699a898cc0a1c8016c35c4052f565ff0f7f8bcade4ba986ba501a4d28b3d2fb48c4caba769a270dedb5f124e52e
 DIST rosegarden-16.06.tar.bz2 6362923 SHA256 1044334f2c1a2ac7560d80910e0721c8913bd924f8185a393f630c89020340db SHA512 b95c1c9c49967b15cd100fe45c06db9f389adc17161c16c46f1b4c989d6e93373c90f9f2e622b960f83d2fb9fec9f12458b19840b22cb8c233e66d6e25f2d0de WHIRLPOOL 5b6304a12f3cabbfbaba6a15a7a358f1adbb840cf1dfb9c7edacb64df63fd2b5bf9bb0cfc3f16944e694df364c77a8c3de3df091e003698d96f5646f44645a5c
-DIST rosegarden-17.04.tar.bz2 6454603 SHA256 988a6141c5b0a8e85c029f650de78bf57100c4d778c22d0194b0692584640ece SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b WHIRLPOOL 91b7d8d74578e8666de607f55cecdfc57dde9b9b4e2367d7b5a2f1d3ae76eaf3d0ef6b62d78ae4f9f080448019caf8e0580d5c1e30f56708c9b2dcc2c3113aa9
-EBUILD rosegarden-13.04.ebuild 1377 BLAKE2B a89e8dd8a3d1d81f6657ec9358dd5a886bb04ad8cfe7daa9e0d614cb6c2e17a54860b0fbf1b07d3333063dcc6f495eaa6bd76120dcf5be5f9bedac0830bea5fa SHA512 f98f4a363d29e49f9cbac0747d85965c728a1a813f0c51678822092e121c24c51789d0faf912e780291a25b92ab2a23678406e11c191ec63c36f9d8ff28bc8fc
-EBUILD rosegarden-13.10-r1.ebuild 1409 BLAKE2B 5054becf876a0bb5906565ea99a18f14dd584565812a44370049ff5de98989a38fe7164f4e61a65a277dd7da5f389c4e36923dac061e29f6375f0d9f3be2b910 SHA512 98eb179338d92006bbdc5864c38359e57a96f989d97cba990c8dc033052d636c0696be42c9e25dfdbecafe9475bbb71595ae7577bb1eed3b6dff9f4afd528040
-EBUILD rosegarden-14.02.ebuild 1344 BLAKE2B 98c852b288b592509e2f8580ee964d64adcba09c663305aad94f1009e7928e1b04ce0f71ff9dcd152c5954e37d7ade53dba1346f68ab296d024a78301be64f09 SHA512 a172a1af9468882d81ccc71d4ca348160d564985e435479f61d3fd06c0e24d97c2cca4110b4edbc0af725bb63e7521afc5524e9ad96dd8b96dfaee5be2a24d04
-EBUILD rosegarden-14.12.ebuild 1344 BLAKE2B 45c8de34b7e2d398d37f493d51eb9925a96b05a152909de6230744725f802b8ca86cfd71c8fcb2dd3d1faa898c3b3837ccd705047958d0f1285cc0d64c1c4d68 SHA512 548f0f77b9b0b3f472dadf2990bd5b5b03111aa5d676ddd5801a6df2e3b8dc074d345501bf3b4385d095c2989eafeae8519d2fc01b7c875c4590fdd5b9b9d61c
-EBUILD rosegarden-16.06.ebuild 1229 BLAKE2B 57a624a2904ece186045937878e3870df90f99d3aaf2de8edc72648dd8774814a3949aadeb7595e97a31bb662f99a57caab623145814ec494586e6def0b24bcd SHA512 68f53340b772abd4b4753c8e464fb171e1ffef0b08e4014cfef496e19180d34ec95dae8ad3cba103b4c9d2a93b9f14f1a3639a10865f6129db5f651af4d1ca5c
-EBUILD rosegarden-17.04.ebuild 1229 BLAKE2B 480f8795d39563ae115e43cb044ad69eaf39ddd0b466d1dfdbc6c03d6f77e828ab0e06401eda1b9bb091422bcd44802eeb858ef463b41750f31928e28bbc27e5 SHA512 9bb6476c74bc574beb5e1e3ad3966117bcb5d6216a2925acab557e20fddd04470f4610a8bc1d7f190fb57088aad148eb6b9e1a8f4b980c01de2c8ad0e1978f94
+DIST rosegarden-17.04.tar.bz2 6454603 BLAKE2B cc028a4108f4c51c9f3559bb454a8344d03f31280db6fd51e98a0b39bdc10e29add97272e7dace848dc4b4ac384ba787ade6664d991aed14fa3101b4fdce2743 SHA512 23240522cba8cc3b5d0e3b29ee5b871c911c7634d74f65d04b353f59747bdf6a1bfd9985f16ab331ea2399a797e66b2ebd110e192bb52ba4df453d42d7b8f73b
+EBUILD rosegarden-13.04.ebuild 1366 BLAKE2B 9784f47e8ab97c5d1421de4add8e59b1e4a34a48e109a975f883bae4347ee110c18c8d283d881c7f0cb25977eeb0cb77f0796f84a591f344e87fcce5577e9d2d SHA512 7f8d72f39a9fcfe85b214399fb982ac0e3bdc6b2d36ee12a12637df1746389ab48930a2881258fe5eae38d291865d5cffe5dadd529adec9e89743f48dd3236e2
+EBUILD rosegarden-13.10-r1.ebuild 1398 BLAKE2B 24dbbd029eaa2a2f1530921efcbcf1a20641b73add78461abc1008b3097426133ec723375c048b6abf9817c5045e1b9f2908ba5f7f934dbccb4d7344d747241c SHA512 bd3bb85186146b56a320a7b309bcf1679fd6118c30ef3684a25fc4a125ffce84c1c92aafed469b88f64496d7bd33cbf53e50493f9d5a4cd2394607dce718a723
+EBUILD rosegarden-14.02.ebuild 1333 BLAKE2B 30fdb7ea58db26667382eb5cad5d7c131c9b6bacccd2011dbfa22d59bce666558cdf777f402fae6bee1a1e368df639230431e90d793e33c2890e4974910cf5a1 SHA512 19f3e8e433a94ef403529babecc5573b460bceea60c14605dd29c964d28dfdf32c2e30283176bb5106878fbd0afc272e8ca3c0a1a61c818e233d682523f9e4ca
+EBUILD rosegarden-14.12.ebuild 1333 BLAKE2B 88f20935c25d4917c484c3d39d8beadb09eeee4105db705da6fe01f4502d481d911c144887e4afe390d2c58bc19bf6871bc6c6a901079aaeb8c30721987a7da5 SHA512 1252a5fce78f73b33d046d61db0244a4d5841b498e7625eea5bd853b98158861cb1bf33d71571b65ceb2119f27b72d0badff3148957980e258dfc6a7289a34c4
+EBUILD rosegarden-16.06.ebuild 1218 BLAKE2B 03b80d795f2cbfb942ebf9e2106145cf1e03b083993bd8c8a452c8ebea63a3ff212961637783bcb2ab66776ac3a03cbd33d6a1350e0f2d64483135526eb67d34 SHA512 aecec13cb34f420a9675a940889bf03fd2aa7dba67609f2458fe66617cfb16dd3c11b4a38a8a3204532373de423a98427446d4f6d8358d867781a06acb538f75
+EBUILD rosegarden-17.04.ebuild 1237 BLAKE2B a73a5f3d663ff5ca07db0ded88e2bf52d829b3da55fd40109a30c1bac4a323a08061755ef0ab688e01b8353c73c390e5c4a46bf7f4f52c4bce415c27bf10c391 SHA512 ec6c38d87d4e3703f236865193c68d60f492c1a6a22ba94ea04b099e69a7a0d49ead3ce551efd4338312f1e01b2990ed10d73559b5df552c2839a3e1d4a2feab
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
new file mode 100644
index 000000000000..bc587a729773
--- /dev/null
+++ b/media-sound/rosegarden/files/rosegarden-17.04-cmake-3.9.1.patch
@@ -0,0 +1,18 @@
+Description: fix svnversion.h dependency to permit parallel building
+ With CMake 3.9.1 and parallel building enabled, the incorrect specification
+ of the output filename when creating svnversion.h can lead to a race condition
+ such that the package fails to build.
+Author: Stuart Prescott <stuart@debian.org>
+Bug: https://sourceforge.net/p/rosegarden/bugs/1552/
+Bug-Debian: https://bugs.debian.org/871213
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -810,7 +810,7 @@
+ add_custom_target(svnheader ALL DEPENDS svn_header) # svn_header never gets created, it's just a unique string
+ 
+ # creates svnheader.h using cmake script
+-add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnheader.h
++add_custom_command(OUTPUT svn_header ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
+     COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}
+                          -P ${CMAKE_CURRENT_SOURCE_DIR}/buildkey.cmake)
+ 
diff --git a/media-sound/rosegarden/rosegarden-13.04.ebuild b/media-sound/rosegarden/rosegarden-13.04.ebuild
index 2559e060c757..348496abe461 100644
--- a/media-sound/rosegarden/rosegarden-13.04.ebuild
+++ b/media-sound/rosegarden/rosegarden-13.04.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib
+inherit autotools eutils xdg-utils gnome2-utils multilib
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -56,12 +56,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
index 2abf3d68fe0e..f59d8da6135a 100644
--- a/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
+++ b/media-sound/rosegarden/rosegarden-13.10-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib
+inherit autotools eutils xdg-utils gnome2-utils multilib
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -54,12 +54,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-14.02.ebuild b/media-sound/rosegarden/rosegarden-14.02.ebuild
index 2aec54b130e6..234d3a9bc260 100644
--- a/media-sound/rosegarden/rosegarden-14.02.ebuild
+++ b/media-sound/rosegarden/rosegarden-14.02.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib
+inherit autotools eutils xdg-utils gnome2-utils multilib
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -51,12 +51,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-14.12.ebuild b/media-sound/rosegarden/rosegarden-14.12.ebuild
index eb5098019f71..d8bc17976ac0 100644
--- a/media-sound/rosegarden/rosegarden-14.12.ebuild
+++ b/media-sound/rosegarden/rosegarden-14.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils multilib
+inherit autotools eutils xdg-utils gnome2-utils multilib
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -51,12 +51,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-16.06.ebuild b/media-sound/rosegarden/rosegarden-16.06.ebuild
index 95b8daa1f8a0..34320d5bae27 100644
--- a/media-sound/rosegarden/rosegarden-16.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-16.06.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit cmake-utils eutils fdo-mime gnome2-utils
+inherit cmake-utils eutils xdg-utils gnome2-utils
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -49,12 +49,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/rosegarden/rosegarden-17.04.ebuild b/media-sound/rosegarden/rosegarden-17.04.ebuild
index 17a8df025a95..32462a981e29 100644
--- a/media-sound/rosegarden/rosegarden-17.04.ebuild
+++ b/media-sound/rosegarden/rosegarden-17.04.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit cmake-utils eutils fdo-mime gnome2-utils
+EAPI=6
+
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="http://www.rosegardenmusic.com/"
@@ -14,27 +15,31 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="lirc"
 
 RDEPEND="
-	dev-qt/qtgui:5
 	dev-qt/qtcore:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
-	media-libs/ladspa-sdk:=
-	x11-libs/libSM:=
-	media-sound/jack-audio-connection-kit:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/alsa-lib:=
 	>=media-libs/dssi-1.0.0:=
+	media-libs/ladspa-sdk:=
 	media-libs/liblo:=
 	media-libs/liblrdf:=
-	sci-libs/fftw:3.0
 	media-libs/libsamplerate:=
 	media-libs/libsndfile:=
+	sci-libs/fftw:3.0
 	sys-libs/zlib:=
-	lirc? ( app-misc/lirc:= )"
+	virtual/jack
+	x11-libs/libSM:=
+	lirc? ( app-misc/lirc:= )
+"
 DEPEND="${RDEPEND}
 	dev-qt/qttest:5
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-3.9.1.patch" )
 
 src_configure() {
 	local mycmakeargs=(
@@ -49,12 +54,12 @@ pkg_preinst() {
 
 pkg_postinst() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
 }
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 57ca5f2a88c0..b5e6338d07ff 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -2,6 +2,6 @@ AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d2
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
 DIST sonic-visualiser-2.5.tar.gz 4112133 SHA256 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6 WHIRLPOOL 0038c197a731e503c01d4f69b3b1aa6d347df95e84bc4ed75b7cd670bb50eeeb615e1ae9bfb357d6414fbc338fdfce6179635e8390cf835c37f7c5029767df9f
 DIST sonic-visualiser-3.0.2.tar.gz 5123229 SHA256 9ca9c37e1da5e6197bb61e5b05b29544cbf8389523467efbd465527f1dd6d8b3 SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825 WHIRLPOOL 15ce603c4d34ffb0783138d7408ab903a3b1d1d776a997bf69c3d1de02f916f4d96e980e15b431450c6177d1d4ba85031b927dc7bdc9577bf6bceba2d3b37635
-EBUILD sonic-visualiser-2.5.ebuild 2319 BLAKE2B d5679562a9f0ed8807fef26d7d9ec21814f7717cc655ca1eecaae607ae286c152c10fca0b41749d4389f826c548c14ec3bb676ed0769cc9f69b501e88d3dd0e5 SHA512 1954864a4e49983bdc94300dc1cc090d3e723e43b7e3273237326066cec4eff4ef1e1c6f49b8cf45d276d2c019d96485fd656b22741f82d0c7afb7fa39d37803
-EBUILD sonic-visualiser-3.0.2.ebuild 2642 BLAKE2B 2be987971184db7988dc98616382aed1f52789093c99f272199fbecccd29206130dfcb95baf73b80ad2734ca80872620a2f939548cf73cf5aa26f49633b9ae24 SHA512 d25058c13a00475426d09c8c80cdf88c97d4ed0c010e9407e4718ad8aacd1797a1b859fbc783555a6b680b0c23e9c218a2cabe754cb32737728ffb8e8fb3f6d0
+EBUILD sonic-visualiser-2.5.ebuild 2310 BLAKE2B db9b7491beb10d59eb36db2091d7b1b06af68fb3cf22b5cff7fe729bdcf6c6f8a61c325ca58007dd13a6e88b19f50ed5ff0a76ef5b993655a7e5f8a069884cfa SHA512 93a3dc3e5e37024a4afb9110824060b8982a9db36d77159341170e204e11be2e4481683fbcad01e9f1ff65206618f9f694f9765aece784f8368c119c0480ffa8
+EBUILD sonic-visualiser-3.0.2.ebuild 2633 BLAKE2B 5c58a8930a26e55c5f698ca3e945392099d0338183d5b01c66e13089e8d9ac421a49c9ef3e0a0de9e74f4b6c034a7aef138c9233e0508672bbe8cadf07f6a4b8 SHA512 034e9791bf605ecb12e1613f3eecf33c6d8b40798d99a9e061e393d758ad6909c48d0b4e730a98d26f12add39cb17b68fbf72167ce32a2ba075fca05ab05c285
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
index b433f5baa1c5..00ec1a1077fc 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
-inherit eutils qmake-utils autotools fdo-mime
+inherit eutils qmake-utils autotools xdg-utils
 
 DESCRIPTION="Music audio files viewer and analiser"
 HOMEPAGE="http://www.sonicvisualiser.org/"
@@ -97,9 +97,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
index b15eff6a3675..925c45cb4a65 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils qmake-utils autotools fdo-mime
+inherit eutils qmake-utils autotools xdg-utils
 
 DESCRIPTION="Music audio files viewer and analiser"
 HOMEPAGE="http://www.sonicvisualiser.org/"
@@ -101,9 +101,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 }