gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-sound
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
81 files changed, 2130 insertions, 865 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e3a532195d89..6be9f428836c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 188646e7334c..f0d7ed6f9ca8 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,11 +1,7 @@
-DIST amSynth-1.3.2.tar.gz 635901 BLAKE2B 5b07755c1fed3358670901dc27234b905db60d9093238fbbba5a41fec6d69f67cbe977914adabaae1ffbc40e7d46b2319935d63663a341209cf30081203c18eb SHA512 c5f312fd1fa5335ccd2c1e7a81a7c0f9094faabec633fe654f04650e5604bb6d05f1348f6ce3c305e840692e2012ac9501ca83f5e5018a0218d9c35a99678e80
 DIST amsynth-1.5.1.tar.gz 1297131 BLAKE2B 175c008cd4d7bb45234fa22a31132bcd144df98a3dba34fba3a834ffc8623f52c76b412b3b784cb83ee25d12a8762f62bea8e3488b76039ae64e6a39c4404dbe SHA512 5f1551f9d1398a97738ac6f764f169d8cdd55e94464438adb226d1284fe8845e190fe5dd7a740b33972c1bbe76aa2d60467b7a663ec6717bb9fac75e5aac62d1
-DIST amsynth-1.6.4.tar.gz 1380770 BLAKE2B f054f0a7c33f30c43042b03dea659252db5835c19fdf90473e5be7da412e184bc3a2ffc9228eecf678d405c5aba7361e8ad65a1ace2a71b4671deeb1326f18e5 SHA512 63ecc54ff0b26d61aa11a6cd1f6854c6b1f87b723808293a09f1b86831c574c8f709dd7987571914d285c52d94fa794f858c299927918ffa1ddad743bc180abb
-DIST amsynth-1.7.0.tar.gz 1399493 BLAKE2B c944cef94b5381d20984e60ba2550b5e08daacaec2c0d67849a7535fc2a2f8bd51782a3d662c26476ae879d90b8e97147228fa8ed768880cf148266a8dd9eeb7 SHA512 4b9a56c7800a484b738985cf52f6956e8829c11b4fb10f72c1e3ede0aeb3fdcb424e72ac43995ea3dc988f9cb838a0f284719d274010dc52a115faa8a3beb8d9
 DIST amsynth-1.7.1.tar.gz 1409439 BLAKE2B 80fbd2c56b307cb7defce46e2dafe72ce1a56222314faaec9b2d16be9f4412869e377a8cea97d20803eb668b259f2110179607b4148acb8ba7d5e0ef1bb5b14b SHA512 ad5eff805f3ad30a7cc9f3933bbe82b99c670c669c0c405d5045a410afc75cdc0d692856e73ccf870d3ca66e0997a81a5c35baf57b33bb6012f19056cff725c9
-EBUILD amsynth-1.3.2-r1.ebuild 1002 BLAKE2B 75e058037b560c77efd1ca34e22431674dafb5ad23c26ce3bc6ab445a32e71a459c8c88bb29f3d1bb51b22a45f0122e72cb021b3a880194e8c8aaf47c710819c SHA512 05c2673480294f4b208dbf138dd9c6d654d60f8c4e733a5a788116f3b179ebf3e12b9cae417b396159c83a95b707e96e8bc499e7b7510350eb388306f5120807
-EBUILD amsynth-1.5.1-r1.ebuild 1065 BLAKE2B e3cb3b3b1f01d33bbf22814f8fe288941c52c508dde7fe45f8c16503eba129e22fbca00c80393263ce40001797235ffe08e206a52b100e37f55d52a3026a1b0d SHA512 a90ee63e289f8224ee844f1593dbced7f9fb52d319fee98c5edf0ae3aa25cb52d61a593b6785ef03c3122aca787ced5a71eb2e72e6186abaa0880e5e5918bff0
-EBUILD amsynth-1.6.4-r1.ebuild 1013 BLAKE2B 651d65d94deea97a1ad8954a7a37b92ccc0a8fc64561b4913a7bccbd23959d3bae9aebd6ac3aa2b3646936ed71924017befe5e4b9ec93ecf1198c446fc187803 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5
-EBUILD amsynth-1.7.0-r1.ebuild 1013 BLAKE2B 651d65d94deea97a1ad8954a7a37b92ccc0a8fc64561b4913a7bccbd23959d3bae9aebd6ac3aa2b3646936ed71924017befe5e4b9ec93ecf1198c446fc187803 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5
-EBUILD amsynth-1.7.1-r1.ebuild 1013 BLAKE2B 651d65d94deea97a1ad8954a7a37b92ccc0a8fc64561b4913a7bccbd23959d3bae9aebd6ac3aa2b3646936ed71924017befe5e4b9ec93ecf1198c446fc187803 SHA512 31dafb8fe8df15c58fec9a65c54e48bb0e23f454deba8e21ca0b04e86033da62acc85cfd1773b52724a2c7bd6740523a1cff20e2cbf06e78a209407d293953d5
-MISC metadata.xml 421 BLAKE2B 9c42680381cde64cf945a5de57a58ed60f1594f7124f518e96f04e771608f113a89b084134fd552c7de80a1784d4a461a4de359d5bd165f91cdccfd195388d7d SHA512 0e2133cc1f8b6c25bc60e3e580858cbf4cecbd23dfc4d771a23781d8a7499edd4251cba3105ee9ae7d7ba81935769bfc197e5f4c3f7cf12409d102e8d0b6a0cb
+DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
+EBUILD amsynth-1.5.1-r1.ebuild 1057 BLAKE2B 99ac01fa27cc572705cb80bf2432870002ea5c5dc4a92d0546a019185e4a986fef9c114ff0574e405283b4cb185442ed5d9c081ad4141527a5590f31f4738233 SHA512 57cdf9495e3dbd1250bc3090b548d95a280f3443c3b3dd6ac28eccc3530c4050f64ab75954a1f3e617275910bd3f551c44ad1bc16c6a9bf1dcb3a5e4da90349c
+EBUILD amsynth-1.7.1-r1.ebuild 1003 BLAKE2B 54955a36527911ef69dbfb92731eeed27b0f0ff8266dc886697375adc0bc84864543a7610d74884ac29cc365c687b68842414932eeac0d717e611fcf52cb13b2 SHA512 7ebff70fd04c27fd458f0c40266d239c5e6a2255c012e4db4f47d8576621fac0081c22ce62f21136b69d4bd29819300e944bd0aa2b297b5044ef416489a9e8ea
+EBUILD amsynth-1.8.0.ebuild 1042 BLAKE2B b604beb035107d81f40592c33ce38dd602de904c94271fd257d37443fb3a4b71a137396839ee3e8bf150d82fec08801c7d26e681e0077d4a7cad385223391f85 SHA512 699579bf178be7a44b6b8b8cceb567fc2f2e53e972b81ebffe067a33ee65cb8550938319c85583a4d961a777fa7df6c8cb651fe17be26a23cadf736c73aba03a
+MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
diff --git a/media-sound/amsynth/amsynth-1.3.2-r1.ebuild b/media-sound/amsynth/amsynth-1.3.2-r1.ebuild
deleted file mode 100644
index bc363155b992..000000000000
--- a/media-sound/amsynth/amsynth-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-MY_P=${P/ams/amS}
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://code.google.com/p/amsynth/"
-SRC_URI="https://amsynth.googlecode.com/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi jack lash oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1:= )
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-		)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-		>=x11-libs/gtk+-2.20:2
-		)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-DOCS="AUTHORS README"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		CFLAGS="" \
-		CXXFLAGS="${CXXFLAGS}" \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with sndfile) \
-		$(use_with dssi)
-}
diff --git a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
index 257e2bb0f5b3..e820000ed8f6 100644
--- a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
+++ b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit autotools flag-o-matic
 
 DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/nixxcode/amsynth/"
-SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/amsynth/amsynth-1.7.0-r1.ebuild b/media-sound/amsynth/amsynth-1.7.0-r1.ebuild
deleted file mode 100644
index 69a0cb904ff9..000000000000
--- a/media-sound/amsynth/amsynth-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/nixxcode/amsynth/"
-SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa dssi jack lash oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1:= )
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-		)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-		>=x11-libs/gtk+-2.20:2
-		)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with sndfile) \
-		$(use_with dssi)
-}
diff --git a/media-sound/amsynth/amsynth-1.7.1-r1.ebuild b/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
index 69a0cb904ff9..0d1d95723334 100644
--- a/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
+++ b/media-sound/amsynth/amsynth-1.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,12 +6,12 @@ EAPI=6
 inherit autotools flag-o-matic
 
 DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/nixxcode/amsynth/"
-SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa dssi jack lash oss sndfile"
 
 RDEPEND="dev-cpp/gtkmm:2.4
diff --git a/media-sound/amsynth/amsynth-1.6.4-r1.ebuild b/media-sound/amsynth/amsynth-1.8.0.ebuild
index 69a0cb904ff9..608183e92473 100644
--- a/media-sound/amsynth/amsynth-1.6.4-r1.ebuild
+++ b/media-sound/amsynth/amsynth-1.8.0.ebuild
@@ -1,50 +1,52 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools flag-o-matic
+inherit flag-o-matic
 
 DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/nixxcode/amsynth/"
-SRC_URI="https://github.com/nixxcode/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa dssi jack lash oss sndfile"
+IUSE="alsa dssi gtk jack lash lv2 oss sndfile"
 
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1:= )
+REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+RDEPEND="
 	alsa? (
 		media-libs/alsa-lib:=
 		media-sound/alsa-utils
-		)
+	)
 	dssi? (
 		media-libs/dssi:=
 		media-libs/liblo:=
-		>=x11-libs/gtk+-2.20:2
-		)
+	)
+	gtk? ( >=x11-libs/gtk+-2.20:2 )
 	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
+	lash? ( media-sound/lash )
+	lv2? ( media-libs/lv2 )
+	sndfile? ( >=media-libs/libsndfile-1:= )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
+	oss? ( virtual/os-headers )
+"
 
 src_configure() {
 	append-cxxflags -std=c++11
 	econf \
 		$(use_with oss) \
 		$(use_with alsa) \
+		$(use_with gtk gui) \
 		$(use_with jack) \
 		$(use_with lash) \
+		$(use_with lv2) \
 		$(use_with sndfile) \
 		$(use_with dssi)
 }
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 49d152f77885..6ac5d966f1b7 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/metadata.xml
@@ -7,8 +7,9 @@
 	</maintainer>
 	<use>
 		<flag name="dssi">Enable support for DSSI Soft Synth Interface</flag>
+		<flag name="lv2">Add support for Ladspa V2</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">nixxcode/amsynth</remote-id>
+		<remote-id type="github">amsynth/amsynth</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 5941ff7dd012..cbafc6d1ce5d 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -3,5 +3,5 @@ AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.2.2.ebuild 3304 BLAKE2B f58a95c6a33bdc10f9ef661203ea9b8bfecdb488b1c37e3d42e09b4f05e647950cf1b82552d0352d573765f04085c09c6efe7d495004d39057aa2ec53a4a17a5 SHA512 dd9e585bc9c24418e0879b38d70e9cb7b81f2ddaa20eeaccca84874f060378f6cb445e1218f2b3ef0239e6fd150213ef8bc5838737b9ebfa26938ae162980b57
+EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
 MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index 13149d281ebd..d9ca1cb53029 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,8 @@ RESTRICT="test"
 RDEPEND=">=app-arch/zip-2.3
 	dev-libs/expat
 	>=media-libs/libsndfile-1.0.0
-	=media-libs/portaudio-19*
+	>=media-libs/portaudio-19_pre
+	<media-libs/portaudio-19.06.00-r2
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index b3d3608ca223..315e9df69f34 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,3 +1,3 @@
-DIST audex-0.95_pre20170727.tar.xz 148352 BLAKE2B 756520a089bb7c54c021e339d1968049c04968e2fe671d0bea6a9f00757d71defe8b0eb5a765b0c892f60cd3cd07d54c92ee736bb823a8a3fbe078171ce08ca3 SHA512 ea18d819942aa463c7d87ecc59b7053eecb4698cc452bdc520f9c785aaabcc68a7333175f9e9486f33602254ffb5becabe244e365b9d03277ab33b6d1ce56ba4
-EBUILD audex-0.95_pre20170727.ebuild 1020 BLAKE2B 28a010b0c6d2b8223691cd870054ec8730be142dfaf46c783e84c09c8e9b44fb8c79a8c406548d9a4d446c7424d145eec34703763d710fcedde7034281e8d259 SHA512 1d02a84ed23ec928e0ab46983b0fcdd4287103cc0f667bc1bf35d2721f0b7840a87d7f344389786c19c749fc873344fd6cee5f919e71c80917ee294fec469ce5
+DIST audex-0.95_pre20190112.tar.gz 177973 BLAKE2B 3d0ee2d227c073f4f60fe11745fc2e6f8a9ab63a07991d2fb94257f3c804231b6c7a305afa438a4d44e5733fb5b78be87b7ad516e3adcc8aaeb0e1f09c729e80 SHA512 445b254643802da95ca653c14947e8d304826b24cdc0a222f6b023e6603c3bb8bc940ad44ac09d8d8edd24ab0ed6287ff3def79dad07d6b6a157b2baf230c811
+EBUILD audex-0.95_pre20190112.ebuild 1145 BLAKE2B e752067cb141345f1c5da5695054607406d2327e99ecee7f6a6ff4048bc18d35967f25fc9c97c1a297086408993d65c8f38f2090bc95a305274e0ce4b6339a90 SHA512 76e8c67c6890e707cc15ae2f90a45fd4e47adda66d816479ce0552861610df1f8fbd46908db0e0121729ca65ab5eb7734536ae97fe21c0effd67bf502db0fc6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-sound/audex/audex-0.95_pre20170727.ebuild b/media-sound/audex/audex-0.95_pre20190112.ebuild
index 6c7bd91bdb1d..19b551c250d7 100644
--- a/media-sound/audex/audex-0.95_pre20170727.ebuild
+++ b/media-sound/audex/audex-0.95_pre20190112.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
+COMMIT="9bb62f34878ede3104802709c154b7b244925970"
 KDE_TEST="true"
 inherit kde5
 
 DESCRIPTION="Tool for ripping compact discs"
 HOMEPAGE="https://userbase.kde.org/Audex"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~x86"
@@ -20,6 +21,7 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -40,3 +42,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!media-sound/audex:4
 "
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index fc3c89a3f054..b9b2bbfa6762 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,6 +1,6 @@
 DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b63446d0ce6d94eeac54812752039ef1b7c8c161a7694cb3381453f86759a810b81754e99cf5c8805cee61171c24a615114ab SHA512 f61f46705607eb39897fd3b27353fb233acd9da5e00a2b64d63116f74b889f2daafa72d48ed7c5ec1890e32d81331f91455861f2cb3fad3d13b7d27ec203357a
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
-EBUILD csound-6.10.0.ebuild 5927 BLAKE2B f2915b61df2e5aef642bacc0df54ee96e60b1b3c725852ee9a76e3d1640a55fdb9ebacd9e71f156ce14b083256624d0dd451437ddb016e3120461e277fd92cd9 SHA512 28207d944e58eac4ef03b9f14205928d68947b301620138b3125772d961f2b873c69697c5ab232870aa879be156d24392e79fa469ce08899557d2db9e597c30d
-EBUILD csound-9999.ebuild 5615 BLAKE2B 6701c92c773973a49c0853d6b392c634c6d524c5b5ff661a753bafeb7eae27319d608cf155ec1bbda9c220fe6a65301e71cbd66f1127f4559e0a9ac1cefcd417 SHA512 ad8ee79bde82687414237e241530b940a5b19db5faffebbff69258719cbc671ee97291588924854a238b5a168cb85c38cd12f5743bd9741dc75b79c7074dfaf5
+EBUILD csound-6.10.0.ebuild 5926 BLAKE2B 21b3a40b66bb0b9f637d8663e7575f0860129c49a20070b8d6f33f5679dc6578d227cef4d9e1fd2932024f2101cc31458dd17ab8518c6a53f390d40cbc3f8013 SHA512 e760c150af0a7c7029ee7c1ed6cc675f2d811e7486797b19ff0f2e0d9e301f11f1ae6c605212c91cea35361c0476454a7102d7c496b04d9a9f256c889404c76c
+EBUILD csound-9999.ebuild 5617 BLAKE2B 73254be6aa90bff3722cefaa25fe2b3d6706d554e1cac1e928f2928f951ff0988b0a67c09df02fcbe98f7931cbc64572c7b239aea31b315997c42b8c3c759f17 SHA512 94bcc221fa2f90f27e6497ee087c47e1ef3f44994eb53b4b556731d244558d3b3205e32a67373b22e9b8c7c00742688538240cd84286d994f980ea1fb8d5f9bc
 MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/csound-6.10.0.ebuild b/media-sound/csound/csound-6.10.0.ebuild
index 5906af36652d..185ce6f382b4 100644
--- a/media-sound/csound/csound-6.10.0.ebuild
+++ b/media-sound/csound/csound-6.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
 	image? ( media-libs/libpng:0= )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index b97419c554c2..c0694b7cd5cc 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,7 @@ RDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth )
+	fluidsynth? ( media-sound/fluidsynth:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
 	image? ( media-libs/libpng:0= )
 	jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 2b6c685b58a7..9f5248f6006b 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,7 @@
 DIST drumstick-1.1.0.tar.bz2 1012405 BLAKE2B ad1e4990cbf4954eadf8c7ae602234852e77abcf534e14090a6e158e9032288fcce6c39b742c40ac9b8c7967dbfcd04578b871088f61ce411de9c910c79e1fbb SHA512 1099b80e1d2819a8343e877742c5f01c114419b2c63a965717bcff2c220aa218f40ac3860cf9496d3586663e73a6c2c7b62aee74c51229578a5ae3044da208da
 DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb410c3563184e9acdbd9d441c53596a0bc611d4ebef2b4dc0214c0fef5324443fe0dfe4158f45521762abf4e838cf716 SHA512 f3278be71b1850bbe742ff46b65a656443a1d655c5bcc1e289d92492db985ab185ed140b88ca68f37235c07926be5b82cfe97ae2f95ca7e3a7f48a7c95c61654
+DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
 EBUILD drumstick-1.1.0.ebuild 1764 BLAKE2B 2c42c5d81f55c43ad019db34a15765ed2578541e69550c6871898a1b2568fd3b5ff3dfaeadf46e9a5803b284020463f1f7278da2fbcfd9266fe070169d84077c SHA512 26f6cbb97288f9d1b0413f5fc7545491e68b725a9633898b2147d846855bb01411ab3a28b3a39113d277048e90b53e6416104b75ec45fbc15bfa294ed3f2312d
-EBUILD drumstick-1.1.1.ebuild 1730 BLAKE2B ed1ee5f692adc0d0bc23edc6240064e24646a33bb7a7e2048665df46a951aefacfcefe9af4fa6701907fb4dbaf718b76b980cc32362cfe634ce32118efea762f SHA512 4bd7f70a09d328a13125827f5bf76f37e4fafc83c2d88cb74db9f3b28d24a955bdf0422bb3f6272d6cce3995b8fd0a9860cf8eda15b351c9a7f1cd1755c432e4
+EBUILD drumstick-1.1.1.ebuild 1467 BLAKE2B 152cc25ca806b624879653c1ba904003ea941941ceea8924f99828c8a55fa0b747550631e4179b14f8dcad46744eb16eb22792e8bcf3f8cb737e847a78454b09 SHA512 b57479c4c339a7d9ca6577787eef67fc1b4c9252b57564405dc7eaf2bd78401d8b73e2710a51e68ca0917310812a3a414c65f4c63c150570fbd2358b7be76a01
+EBUILD drumstick-1.1.2.ebuild 1468 BLAKE2B 838a09dbb365a68ed994ec6ff16c2be3d48bf70b7c2775b23db9fd46bee0d40a08587edbaca834f64ca7aa0a2fbf21651cdb08302b756919f8e928ddc0a1b6e2 SHA512 596ab9ddf2928f7858313804ec5a425efc8ca2ff20fb445def3f5a4ea8afab126b6b26b3ec47b797a3938ac555dafa597594c7b6d35b4874c97c33e8379e4485
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.1.ebuild b/media-sound/drumstick/drumstick-1.1.1.ebuild
index dec23c6a8c83..4c119fe9f8d3 100644
--- a/media-sound/drumstick/drumstick-1.1.1.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils gnome2-utils
+inherit cmake-utils xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -11,12 +11,19 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc fluidsynth pulseaudio"
 
-RESTRICT="test"
-
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
@@ -27,18 +34,12 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth )
 	pulseaudio? ( media-sound/pulseaudio )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xsl-stylesheets
-		dev-libs/libxslt
-	)
-"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog NEWS README TODO )
 
+RESTRICT="test"
+
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -65,7 +66,6 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile
-
 	use doc && cmake-utils_src_compile doxygen
 }
 
@@ -76,19 +76,3 @@ src_install() {
 		dodoc -r "${BUILD_DIR}"/doc/html
 	fi
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
new file mode 100644
index 000000000000..637a6a2cf57f
--- /dev/null
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
+HOMEPAGE="http://drumstick.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fluidsynth pulseaudio"
+
+BDEPEND="
+	virtual/pkgconfig
+	x11-misc/shared-mime-info
+	doc? (
+		app-doc/doxygen
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	fluidsynth? ( media-sound/fluidsynth )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+RESTRICT="test"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use fluidsynth ; then
+		sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
+			library/rt/CMakeLists.txt \
+			library/rt-backends/CMakeLists.txt \
+			utils/vpiano/CMakeLists.txt || die
+	fi
+
+	if ! use pulseaudio ; then
+		sed -i -e "/pkg_check_modules(PULSE/d" CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=OFF
+		$(cmake-utils_use_find_package doc Doxygen)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doxygen
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc ; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+	fi
+}
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index 77ee763556ce..d768a673e32c 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,5 +1,3 @@
-DIST exaile-3.4.5.tar.gz 3662446 BLAKE2B 13343a5468a4f7f309e173e5195d356d62e10efc20c99cc70a1f0215fafa073eeec19b4e35ae52e11a62575a72263ad11ebdf105fcdd066654f8d6c2b1ff6864 SHA512 9337b86ed2f6a13071615bd46a7a05a6564011a4e1fef4cb42925336864c07854cfe497d8defe65c4e287fd9546de6a51543180c5ce6a84525506e57209914be
 DIST exaile-4.0.0rc3.tar.gz 3627782 BLAKE2B 1c986309798d4cb78969a7443e4c29e02ca3a9c8e316264641ffafe97dd46b6a1745988230c13469ce2d9c37aadf7b07eee5bcd5836f33b1b2d25e3ebb69f574 SHA512 d3822a7d88934c90a2856074f177a346b19896ecca54f33e7506d37a0b25170983c057feaae162c2685780e7f0d1a6edc8ce7addbcc04cacf2d2b25e0c9f36de
-EBUILD exaile-3.4.5.ebuild 1273 BLAKE2B 8b3c72922d2831f2986a29e2564cc918457087f853aed9c6d062d6053064f13ca0cad51243b2f9a7b1f4a43888f8d42a6ec503d261c175c19bca4b16f31a550a SHA512 f7bf1db46bde640508dc3efa6cafc6cdedffca9b11aa9bcecdd9aeaaf5f87285966f287416a534d4def09d137bc3a89f38b35882143bf692bd80f93688fa4f73
 EBUILD exaile-4.0.0_rc3.ebuild 1862 BLAKE2B d8ba6122dffff7ce1e40d26e14aaf23515226498f6e7c2af96764da0bcc64d2b73095a3e999219764c0423ffd3a30dcdd8077955e230887ffe75a5ae12e015f4 SHA512 2eac12361e1f281e88c1473442f5810bd22e9d32685ab177884bd3d38182cb81458a6efae41e0da3cad058b6678761bb1f44aa4c606344b02027b27fbb63839d
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-3.4.5.ebuild b/media-sound/exaile/exaile-3.4.5.ebuild
deleted file mode 100644
index 0b8e7a6516e7..000000000000
--- a/media-sound/exaile/exaile-3.4.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit multilib python-r1 xdg-utils
-
-DESCRIPTION="a media player aiming to be similar to AmaroK, but for GTK+"
-HOMEPAGE="https://www.exaile.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE="cddb libnotify nls"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-python/dbus-python
-	dev-python/gst-python:0.10
-	>=dev-python/pygtk-2.17
-	>=dev-python/pygobject-2.18:2
-	media-libs/gst-plugins-good:0.10
-	>=media-libs/mutagen-1.10
-	media-plugins/gst-plugins-meta:0.10
-	cddb? ( dev-python/cddb-py )
-	libnotify? ( dev-python/notify-python )"
-DEPEND="
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)"
-
-RESTRICT="test" #315589
-
-src_compile() {
-	if use nls; then
-		emake locale
-	fi
-}
-
-src_install() {
-	emake \
-		PREFIX=/usr \
-		LIBINSTALLDIR=/$(get_libdir) \
-		DESTDIR="${D}" \
-		install$(use nls || echo _no_locale)
-
-	dodoc FUTURE
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index e7e1a181fa2d..483b61727a8a 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,3 +1,5 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
+DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
 EBUILD fluidsynth-1.1.11.ebuild 2197 BLAKE2B cde965d0f41bdbf48390819e03d8a0021465072a25f81a7942c7148d97678dbd2fc3b1accb3e52e2d19e7945d6ce0bf76a41a07fa817eb27003c006ab9fdbe23 SHA512 d825aab0d67b1e48e83ef4ec9c5c5dd075830f2cace5f5d9271c7e3412595414ae76806d68467ffd0b9699a7a7a71df797ed62ac45afb4cd1956f86c266cbf41
+EBUILD fluidsynth-2.0.4.ebuild 1977 BLAKE2B c99f1ff4f843f464d5539c8886121ff937c95c9f600cb242495525149f466bf4a215643032fefbbe9564f60f351fd7c2d1de60acbbc757ef6005229807555327 SHA512 83ff51c2c8ea1cee7f1e3376e53d2d4007975972ce0c4a831f42ebf44928def1999d8e7e7335cefb9343a99cd566feef49e93dfa2b62bb187497f00461c075ef
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
new file mode 100644
index 000000000000..6d956183e8bf
--- /dev/null
+++ b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib
+
+DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
+HOMEPAGE="http://www.fluidsynth.org/"
+SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile"
+
+BDEPEND="
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	alsa? (
+		media-libs/alsa-lib[${MULTILIB_USEDEP}]
+		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
+	)
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	ladspa? (
+		media-libs/ladspa-cmt[${MULTILIB_USEDEP}]
+		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
+	)
+	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
+	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
+	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
+	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS NEWS README.md THANKS TODO doc/{fluidsynth-v20-devdoc,xtrafluid}.txt )
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-alsa=$(usex alsa)
+		-Denable-dbus=$(usex dbus)
+		-Denable-debug=$(usex debug)
+		-Denable-ipv6=$(usex ipv6)
+		-Denable-jack=$(usex jack)
+		-Denable-ladspa=$(usex ladspa)
+		-Denable-oss=$(usex oss)
+		-Denable-libsndfile=$(usex sndfile)
+		-Denable-portaudio=$(usex portaudio)
+		-Denable-pulseaudio=$(usex pulseaudio)
+		-Denable-readline=$(usex readline)
+	)
+
+	if use alsa; then
+		mycmakeargs+=( -Denable-lash=$(usex lash) )
+	else
+		mycmakeargs+=( -Denable-lash=OFF )
+	fi
+
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+
+	docinto pdf
+	dodoc doc/*.pdf
+
+	if use examples; then
+		docinto examples
+		dodoc doc/*.c
+	fi
+}
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 27167bb0b730..4a9f9b3e88d5 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,11 @@
+AUX 3.28.2.1-appdata-test-fix.patch 1102 BLAKE2B a4af513d38152b19f4dfd1e40ded23b5ba6b270f266dd789db423527c298edba5e44ba8a68761d0421dcafbe131fd7ae0701b35a50b2e71950efc3c0f073073a SHA512 4b666a47fdde5410c15e0488e772425f572aae3d9f621180f930991db4b291d8664486afa2cd3a48bc2da73c3c8152ac6653aa68e91bd7feafb050092cb905fc
+AUX 3.28.2.1-icon-fix.patch 943 BLAKE2B 49731d14897e5ce6ca10addb90a63361eb127e64be46ec672852df7a1221c1843c174263881ff714432341dac0f56d1a09772d8a42c67da2e981b6e144f97641 SHA512 5a07e984bc6132439b5c1b20dc36fe2b8cdb42ab84bee876c750f02bf2f97a4302d16547e38da0249e4596ea5431ddc212b36d392ab8657d9eb2482a46f3772b
 DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
 DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
+DIST gnome-music-3.28.2.1.tar.xz 2990404 BLAKE2B e91f0bb569eb7d61b0b3136a2f5c22e35dab10f9a3a0412e387ee9f23b8be811eafdde0394ec66df7915ae9c6eb899d479d1462bc9e70d678842ebe3f8417fb5 SHA512 d50dc84ccee7c65391bbc3a5fa48e75be82f633bbfeb4082f7d76ea21fb53c03af00c79088f12ce43a677737265485b20a3736415f1592acfa185140d4142c59
+DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
 EBUILD gnome-music-3.24.2.ebuild 1600 BLAKE2B b557c83509fa13fe33fea28b1938fe55b898ab056cf18a06ed01cab765474b28d2e2264be63b90056516e5e9cda41e2976116ca14ecf8ae2168288edf38d46b5 SHA512 36233e11a15d7c4a26a077f146d805f9ff971851816e1bb2be624aa3ab73d3f6c02f9029da5020163b7c00e67bc509d39cc45d887dc10bd47c0c7229e18b97cd
 EBUILD gnome-music-3.26.2.ebuild 1630 BLAKE2B 061c29740c59a142be455acb0643284a533fc557b0953e2a40c61c021d1e5e7b27b0fbe12084fbc3ba0f0dd828db8246d48e572cdd6650cf2d7c48d725a9110d SHA512 bc39dc181c9d9e853c79432c11c444a73099207721e013ba52b20e752ab0b72b0ea7f746ce40a3f28da2f0bf27f48eb778e22a1ab1557163f6ffd2a3f6cee8c9
+EBUILD gnome-music-3.28.2.1.ebuild 1835 BLAKE2B 6fed6218cd01e1004b98a032311ddfdb159e572de4a63f5d5bea2747ce7c63db2dab2cc9e27fe5024fa190d7c11474293544586257fe976a2181d3113457fcbb SHA512 dc9cdb21cba8ad4ebd5d30f2fc878c510d47793c35cca7ed51347b599f8d420ae45ac0a0a5ca459fe900ef1c315f4abce144d478e8dd483188001d12d583a4a1
+EBUILD gnome-music-3.30.2.ebuild 1934 BLAKE2B 6272d666d847d9c970e5e8352afa10980a2fb2387a5d64aba830bef9c8543ed3d6d60f771d1338f488831b6da16a801ac7a7334fa1b81027eeccc9f5259b5796 SHA512 9d3ab939cdc919ab2181ceeccbc4b61d6ceb50776a712e40c08d1fad4007dd1602c44ec111f6bca4f03a87e940d9af58a72836475d8ec8abe63f83443d7cba90
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch b/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
new file mode 100644
index 000000000000..edc06b2cf2bb
--- /dev/null
+++ b/media-sound/gnome-music/files/3.28.2.1-appdata-test-fix.patch
@@ -0,0 +1,29 @@
+From 0fc9bee85ab994043e1c5365d665fe51c95cb047 Mon Sep 17 00:00:00 2001
+From: Nick Richards <nick@endlessm.com>
+Date: Tue, 31 Jul 2018 18:09:09 +0100
+Subject: [PATCH] appdata: Reword description
+
+Use the appdata description to list the available features and try to make the copy more inviting
+---
+ data/org.gnome.Music.appdata.xml.in | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.Music.appdata.xml.in.in b/data/org.gnome.Music.appdata.xml.in.in
+index 999236e0..6e8295c5 100644
+--- a/data/org.gnome.Music.appdata.xml.in
++++ b/data/org.gnome.Music.appdata.xml.in
+@@ -7,7 +7,10 @@
+   <summary>Play and organize your music collection</summary>
+   <description>
+     <p>
+-      Music is the new GNOME music playing application.
++      An easy way to play your music. Automatically discover music on your computer, the local network and internet services.
++    </p>
++    <p>
++      Find tracks in your local collection, get music from DLNA servers or try something new with the Jamendo and Magnatune services.
+     </p>
+   </description>
+   <screenshots>
+-- 
+2.17.0
+
diff --git a/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch b/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
new file mode 100644
index 000000000000..5a69a86d3d82
--- /dev/null
+++ b/media-sound/gnome-music/files/3.28.2.1-icon-fix.patch
@@ -0,0 +1,30 @@
+From 39e03f574c34e89b8ee9aa07ea5a2f7a595ecc20 Mon Sep 17 00:00:00 2001
+From: Marinus Schraal <mschraal@gnome.org>
+Date: Tue, 8 May 2018 11:51:36 +0200
+Subject: [PATCH] window: Set correct default icon name
+
+With the switch to Meson the default icon name is now org.gnome.Music.
+Fixes the icon not showing in gnome-control-center.
+
+
+(cherry picked from commit eeea5f41b9a9f7e716f9b95dddfe2d151a06f06d)
+---
+ gnomemusic/window.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gnomemusic/window.py b/gnomemusic/window.py
+index 956d7ab4..66131d72 100644
+--- a/gnomemusic/window.py
++++ b/gnomemusic/window.py
+@@ -77,7 +77,7 @@ class Window(Gtk.ApplicationWindow):
+         self.add_action(select_none)
+ 
+         self.set_size_request(200, 100)
+-        self.set_default_icon_name('gnome-music')
++        self.set_default_icon_name('org.gnome.Music')
+ 
+         self.prev_view = None
+         self.curr_view = None
+-- 
+2.17.0
+
diff --git a/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild b/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild
new file mode 100644
index 000000000000..a9035d163c44
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.19.3:3[introspection]
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	>=app-misc/tracker-1.99.1:=[introspection(+)]
+	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	>=media-libs/grilo-0.3.4:0.3[introspection]
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-misc/tracker-miners-1.99.1[gstreamer]
+		>=app-misc/tracker-miners-1.99.1[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	dev-python/requests[${PYTHON_USEDEP}]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-appdata-test-fix.patch
+	"${FILESDIR}"/${PV}-icon-fix.patch
+)
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
new file mode 100644
index 000000000000..8ce1cedf008a
--- /dev/null
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="Music management for Gnome"
+HOMEPAGE="https://wiki.gnome.org/Apps/Music"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~amd64 ~x86"
+
+# At 3.30.2 libdazzle only used from .ui file, thus introspection not needed
+COMMON_DEPEND="${PYTHON_DEPS}
+	net-libs/gnome-online-accounts[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	>=x11-libs/gtk+-3.19.3:3[introspection]
+	>=dev-libs/libdazzle-3.28.0
+	>=media-libs/libmediaart-1.9.1:2.0[introspection]
+	net-libs/libsoup:2.4[introspection]
+	>=app-misc/tracker-1.99.1:=[introspection(+)]
+	>=dev-python/pygobject-3.29.1:3[cairo,${PYTHON_USEDEP}]
+	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
+	>=media-libs/grilo-0.3.4:0.3[introspection]
+	>=media-plugins/grilo-plugins-0.3.8:0.3
+"
+# xdg-user-dirs-update needs to be there to create needed dirs
+# https://bugzilla.gnome.org/show_bug.cgi?id=731613
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		>=app-misc/tracker-miners-1.99.1[gstreamer]
+		>=app-misc/tracker-miners-1.99.1[ffmpeg]
+	)
+	x11-libs/libnotify[introspection]
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection]
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/grilo-plugins:0.3[tracker]
+	x11-misc/xdg-user-dirs
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python_setup
+}
+
+src_prepare() {
+	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
+	xdg_src_prepare
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${D}"usr/bin/gnome-music
+	python_optimize
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index 7ffd1bf0ab59..9b76c82f20e2 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -1,4 +1,4 @@
 DIST id3ed-1.10.4.tar.gz 31610 BLAKE2B 4bb013fe8205a91fe9b25012390707c25b1879ef34322ce85430dcd4fcfc4545e2d2637c113d4779a054815d90951052db4ec4c4b16f0ab7658ad5bbc70a6d4c SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56
-EBUILD id3ed-1.10.4-r1.ebuild 732 BLAKE2B b2f4fc8998ca661cf15accde3c5fcdba206b4eb716d8282ba797c659481d441835f6561d76217f46da05d207bf3051e0122108720e0971513f2506490a1c4836 SHA512 e96ef683a3d41066fd4d2b1450edca49eb99bd7e7bbf80b34a777b0d45730d87dcfd317e79869a97803cc71900ba58ec71950e3c0e18beab62c47d0c059cff7a
+EBUILD id3ed-1.10.4-r1.ebuild 729 BLAKE2B da6cc0b88940368ad5ce99cfc6f7499f181331b862a4bbdd3591dc7eb6a6318ff4ea3056211bfbcd69b153be0a445b61e8d2ecc7f34153984a7905ff0fde87bb SHA512 9473d3b4c63a79ec22c1d3ff9435bea5f21eb0449492b01c77c0088d6eeea04af1ef5fc0df4a2cf9f3a2ddfdde01aa45fa054881b5fdac85a55af13cc820836f
 EBUILD id3ed-1.10.4.ebuild 741 BLAKE2B d828a7818eea749d5129d2508f49c2f5302335de215ad833edc46ff3ff72dcb9a3adfc24b9b80d9bf44044192d7059911e5ea09f895ff2dc1dce6a302f0b13fb SHA512 b7631fb269284409b77d9c315893bc66795ee99264f0d0ae44d2d452c548b2d461712d46e803cf14d8521ca2e11c8bcfeddcea1b6b4175bca2ed9e1f9057b844
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
index f1c44b651575..021df28d3129 100644
--- a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://code.fluffytapeworm.com/projects/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ppc ppc64 ~sparc ~x86"
 
 DEPEND="sys-libs/ncurses:0=
 	sys-libs/readline:0="
diff --git a/media-sound/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
index 6cc2bcd8f41e..7ac1a43c04c0 100644
--- a/media-sound/kaudiocreator/Manifest
+++ b/media-sound/kaudiocreator/Manifest
@@ -1,3 +1,5 @@
 DIST kaudiocreator-1.3_p20170806.tar.xz 706008 BLAKE2B 62f2a3106c581e43921a1b8abcc78039b45773d618e531d77f00cbcd121722aa2bf8ef0d4f009f656400d55f414aebc69742b2fe736ec5ea08d7106e18573f6e SHA512 0e06092f8519e9a5a1341f828442de5eace4982723fcb466c23e771d4c42f0c67e91bbf59e6a924d0dc9f2cb8b7b04aaa1660ac97a0075ea6aae155f6a4b2533
+DIST kaudiocreator-1.3_p20190225.tar.gz 762053 BLAKE2B 6527d260148ee32d5cb234808ae40205370fc98dd205f32fe74ae1e0958b3f5dffd4e93c338150caa7a990a3818f35a2dc925f351bad1bea98c3b8546840b524 SHA512 63d6e24f001b3664c001581f9e1d929adc096bd563d841a10dd9966ac4e56f1d4ae80ad90e4aa5b879529e8e6710242bce69a0a71cbbf5d3cd3d1f67abaa8957
 EBUILD kaudiocreator-1.3_p20170806.ebuild 1737 BLAKE2B 72df346f68cab5e0a7c49e815feb525f2424b2b09a76379bff97d70d5d2f6d40cb30cc12f8e5a2f15a33b5a8d5b483da722f644d8a102c793b2aee1908758d98 SHA512 23b6544b34348d39102f9a4417b9534ffcb47fcddf53487f22662f981d13a08f16bd1ef56374794c87df7c2d57e8602bee1be5d8f0105a4a2d30ee20f3533372
+EBUILD kaudiocreator-1.3_p20190225.ebuild 1802 BLAKE2B 28eb8d9fc0cc36beeada2a48202f7cfb95eb67869cdb25bbaf47e3dcdaa81ddda2e8d3d53960b56584228a9f1bc8d3e5de04f91dcbc05c1c0c5d2fd2edba9f42 SHA512 2d59916641f131bc036bf475a103d314ddad19cdc3697e39d8da9daa5df2282bb890215fb13faf3cc02fabe4a04cb56f2bc5ac5b72d354ba9731db67cc10ec1b
 MISC metadata.xml 355 BLAKE2B 37b0260333559b93b9952b5a74e13010e7f2ddd57959f8bbd66ec5087ef180bcfdb6e82179ab99ad263b0cf04e1673461b4a6fa292992e74d63028d3d220e844 SHA512 c755125a1f6939ebb9f280bfaed947da3b6455dd66ba1db80eda78142386c3673b44d564922a522055d64015c2e99afd80ac523fb73ad388f6eca7f8aced2760
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild
new file mode 100644
index 000000000000..bf29fd9c775b
--- /dev/null
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="471cab933bf9e5a299d07e7cb1c0851e31e299f2"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="CD ripper and audio encoder frontend based on KDE Frameworks"
+HOMEPAGE="https://kde.org/applications/multimedia/kaudiocreator/"
+SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep libkcddb)
+	$(add_kdeapps_dep libkcompactdisc)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	media-libs/libdiscid
+	media-libs/phonon[qt5(+)]
+	>=media-libs/taglib-1.5
+"
+RDEPEND="${DEPEND}
+	$(add_kdeapps_dep audiocd-kio)
+"
+
+DOCS=( Changelog TODO )
+
+pkg_postinst() {
+	local stcnt=0
+
+	has_version media-libs/flac && stcnt=$((stcnt+1))
+	has_version media-sound/lame && stcnt=$((stcnt+1))
+	has_version media-sound/vorbis-tools && stcnt=$((stcnt+1))
+
+	if [[ ${stcnt} -lt 1 ]] ; then
+		elog "You should emerge at least one of the following packages"
+		elog "for ${PN} to do anything useful."
+	fi
+	elog "Optional runtime dependencies:"
+	elog "FLAC - media-libs/flac"
+	elog "MP3  - media-sound/lame"
+	elog "OGG  - media-sound/vorbis-tools"
+
+	kde5_pkg_postinst
+}
+
+S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 2eba4972c078..39249b10ebb0 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,5 +1,7 @@
 AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
+DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
 EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
-EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
+EBUILD lmms-1.2.0_rc8.ebuild 2405 BLAKE2B 0cb97dcf05570649b51705d618334f58eaeccb382a7c88e9fa7f7931585595effba13c92f5d18b61fbd5ca45919bb43db2aabca9f56321b426afe20af4450739 SHA512 245a43d4c2fd4bacc99e3226c97a4b1298ebe52c34a8b62c248d89e0f5d4a273134a68a9348217372d48d075d260d2730e933f554ec3cbd4c6108090599226da
+EBUILD lmms-9999.ebuild 2313 BLAKE2B 58c0b08d3fa447b6f24abaf71bbd56db669200e3ca0dcae426014b3fdd4f0ad982d32ef95b09ffe41df62d46e919a0aff69793fc26475d4c6a410dbef68435b2 SHA512 56be7987ad80263ea4f5f5d52c53b6fe724d5205b92036b60c96126c9e9ee2876d11564a40eafc5f4c0bdd1b8f8a16ea0a466b762a8317742c211e0f1b878915
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
new file mode 100644
index 000000000000..b0055f08f80d
--- /dev/null
+++ b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The order is important here! Both, cmake-utils and xdg define src_prepare.
+# We need the one from cmake-utils
+inherit xdg cmake-utils
+
+DESCRIPTION="Cross-platform music production software"
+HOMEPAGE="https://lmms.io"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
+	inherit git-r3
+else
+	# Upstream again fsckd-up their release process
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${PN}_${PV/_*}.rc7.1.tar.xz -> ${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+	#S="${WORKDIR}/${P/_/-}"
+	S="${WORKDIR}/${P/_*}~rc7.1"
+fi
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+
+IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio stk vst"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=media-libs/libsamplerate-0.1.8
+	>=media-libs/libsndfile-1.0.11
+	sci-libs/fftw:3.0
+	sys-libs/zlib
+	>=x11-libs/fltk-1.3.0_rc3:1
+	alsa? ( media-libs/alsa-lib )
+	fluidsynth? ( media-sound/fluidsynth )
+	jack? ( virtual/jack )
+	libgig? ( media-libs/libgig )
+	mp3? ( media-sound/lame )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	portaudio? ( >=media-libs/portaudio-19_pre )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? (
+		media-libs/libsdl
+		>=media-libs/sdl-sound-1.0.1
+	)
+	soundio? ( media-libs/libsoundio )
+	stk? ( media-libs/stk )
+	vst? ( virtual/wine )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/ladspa-cmt
+	media-plugins/calf
+	media-plugins/caps-plugins
+	media-plugins/swh-plugins
+	media-plugins/tap-plugins
+"
+
+DOCS=( README.md doc/AUTHORS )
+
+src_configure() {
+	local mycmakeargs+=(
+		-DUSE_WERROR=FALSE
+		-DWANT_SYSTEM_SR=TRUE
+		-DWANT_CAPS=FALSE
+		-DWANT_TAP=FALSE
+		-DWANT_SWH=FALSE
+		-DWANT_CMT=FALSE
+		-DWANT_CALF=FALSE
+		-DWANT_QT5=TRUE
+		-DWANT_ALSA=$(usex alsa)
+		-DWANT_JACK=$(usex jack)
+		-DWANT_GIG=$(usex libgig)
+		-DWANT_MP3LAME=$(usex mp3)
+		-DWANT_OGGVORBIS=$(usex ogg)
+		-DWANT_PORTAUDIO=$(usex portaudio)
+		-DWANT_PULSEAUDIO=$(usex pulseaudio)
+		-DWANT_SDL=$(usex sdl)
+		-DWANT_SOUNDIO=$(usex soundio)
+		-DWANT_STK=$(usex stk)
+		-DWANT_VST=$(usex vst)
+		-DWANT_SF2=$(usex fluidsynth)
+	)
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 85c5734ae478..44670637ff58 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils xdg-utils
+# The order is important here! Both, cmake-utils and xdg define src_prepare.
+# We need the one from cmake-utils
+inherit xdg cmake-utils
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -11,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/LMMS/lmms.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/LMMS/lmms/releases/download/v${PV/_/-}/${P/_/-}.tar.xz -> ${P}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/${P/_/-}"
 fi
@@ -24,6 +26,8 @@ IUSE="alsa debug fluidsynth jack libgig mp3 ogg portaudio pulseaudio sdl soundio
 COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	>=media-libs/libsamplerate-0.1.8
 	>=media-libs/libsndfile-1.0.11
 	sci-libs/fftw:3.0
@@ -48,9 +52,9 @@ COMMON_DEPEND="
 	stk? ( media-libs/stk )
 	vst? ( virtual/wine )
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
-	>=dev-util/cmake-2.4.5
 "
 RDEPEND="${COMMON_DEPEND}
 	media-libs/ladspa-cmt
@@ -72,7 +76,6 @@ src_configure() {
 		-DWANT_CMT=FALSE
 		-DWANT_CALF=FALSE
 		-DWANT_QT5=TRUE
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
 		-DWANT_ALSA=$(usex alsa)
 		-DWANT_JACK=$(usex jack)
 		-DWANT_GIG=$(usex libgig)
@@ -89,12 +92,14 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index 984f4aab1cf0..daaa7f1807b1 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,4 +1,4 @@
 AUX milkytracker-1.0.0-docdir.patch 2319 BLAKE2B 256f8f2eba611e2a6f19df117e2b4ccf6057f4de380a2098f48b0cbf4a136f7b5d45eb203990b8de36407765b6f4a9547f1801d50dec7400a55917bf286a9193 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173
 DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
-EBUILD milkytracker-1.0.0.ebuild 1064 BLAKE2B 7584eb14aaadd4872ca01998042bb10cac08ae604041841598d7e14b044ed126183c84c613502ac20535871fba7fe94dafefaa9f2d27c9bee95e4762922154a9 SHA512 d276577ede1dd9959bda135e560fdfcc1dc76170e19f6a243c2be1cdf58eec8a3245e68603053ab5ab347dff399413b759d0b04f2fdf0d4da2b6221858328c45
+EBUILD milkytracker-1.0.0.ebuild 1085 BLAKE2B 2a06770c8a9420bee964ded3acf7cfaf700698385d97d09a5cbbda648c01c81d1e5581ca16e9c398b18e85b3ede9459b968f8812030380e5235745d500c1cf51 SHA512 b0341d628a83ad235c0b8ac1a9c92125bb5e18c2f8dd78ad8a0212b09a0e9adfb2475cea6598829755e09a6e9cf826eab64a9a68a313bf3fd1cd220701851ac8
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
index a98d267250fa..cf204b74101f 100644
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils eutils vcs-snapshot
+inherit cmake-utils desktop
 
 DESCRIPTION="FastTracker 2 inspired music tracker"
-HOMEPAGE="http://milkytracker.titandemo.org/"
+HOMEPAGE="https://milkytracker.titandemo.org/"
 SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
 
+S="${WORKDIR}/MilkyTracker-${PV}"
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b8d27774267a..5a116e3103c7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -2,9 +2,11 @@ AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e3
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.1.tar.gz 34458368 BLAKE2B cf718cfea64fe71e2ccd5f299454fc9d396266052cc2516fa4494216a9d8ae9cea62858bf02e026d5072705df780d6243616d1d1705e3f251bc2392b4dc3d166 SHA512 c0047a238bf39e464f2bc25646ba03138d0b8d27cde667ca7b12bfba5f40d339ce4b426853e048d695b2c59c847e88322e27b91bead467899d7bf1cb43358f20
 DIST mixxx-2.1.5.tar.gz 34474975 BLAKE2B 3daf5598cc7efe162157004116ba7fed2d53a2f97b513abd03d7ce55731a9de1e85ae5c8d82e1cc1369201f3694b1a295223f70509540ca471e6e785070acbd4 SHA512 f46f528fdbd39a14a16ebce3e53c9bae12299cfd405d69e812d87c66e9f3728542f73f1156a352c0637b194f4bb35ecdd599e4bbbfbaa7ebdddcf9a1eb792854
+DIST mixxx-2.1.7.tar.gz 34534265 BLAKE2B 63bd7b0002b2b595e8e7b3be6b282e55465221dcdf1a0dbafc454663e87061059dbac66b764c3c3f59446d3794f2d43f9dd0f087ffa6cb7215361d8d0e51dca6 SHA512 976bb76b360ec8a81a6e497d193e7e450afadb66be4c2648a198884a3bafee7efed3b2fa57d0c5cb9bfa216e69e51db588cdc274aaca8dc0f22486949732167a
 DIST mixxx-2.2.0.tar.gz 34639153 BLAKE2B b99d05508f3f59debf026fdc5102f213eaa10a747c234e3f8f1782af9c07fb30c4641ca3c15fc634e2e8081966f8897751fb7bc72928f8b07a3c9c6d9d728530 SHA512 8174b504d236cde36c636985e0e224915f0be69b13691bf0d88c21087c20c1100ff55561b6e395d97fe5b21a0229fe9ecdac2493cb44fa99a42549c368fa2134
 EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4798514327fee5b90d8f9d397a1b59ca5ec6423d1949ebc3863b24beeb6f8f154cf6610dd1ae3e7fcb527a329b1 SHA512 db6c3550d8453e36e0b469a283317235e27fae69f2ec7c40b893e4e2345a7a4c5295d6ab7fe4572c91867311067697a602cd8173e771f2b10319fcfc453d3bd9
 EBUILD mixxx-2.1.5.ebuild 3003 BLAKE2B a7f2261d2a470e77b7b7d227bf68cd15e32572bca684662c66480cb8adef3878c8b25d7e85b19496ce6e977d45cd72e7e9063a405d1603bfcaef30f4637fe022 SHA512 3d59474452d549a5c2c72028067a554ec4b4b5e11e57cbed1ca445c00578026bb87b5377066335d438245597bf120e11425e0fd0a5dd0164ba1e09378e6d56a4
+EBUILD mixxx-2.1.7.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
 EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 EBUILD mixxx-9999.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.1.7.ebuild b/media-sound/mixxx/mixxx-2.1.7.ebuild
new file mode 100644
index 000000000000..ab11da0490bc
--- /dev/null
+++ b/media-sound/mixxx/mixxx-2.1.7.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic scons-utils toolchain-funcs
+
+DESCRIPTION="Advanced Digital DJ tool based on Qt"
+HOMEPAGE="https://www.mixxx.org/"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
+else
+	#SRC_URI="https://downloads.mixxx.org/${P}/${P}-src.tar.gz"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac doc ffmpeg hid mp3 mp4 opus shout wavpack"
+
+# fails to compile system-fidlib. Add ">media-libs/fidlib-0.9.10-r1" once this
+# got fixed
+RDEPEND="
+	dev-db/sqlite
+	dev-libs/glib:2
+	dev-libs/protobuf:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtscript:5[scripttools]
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/chromaprint
+	media-libs/flac
+	media-libs/libid3tag
+	media-libs/libogg
+	media-libs/libsndfile
+	>=media-libs/libsoundtouch-1.5
+	media-libs/libvorbis
+	>=media-libs/portaudio-19_pre
+	media-libs/portmidi
+	media-libs/rubberband
+	media-libs/taglib
+	media-libs/vamp-plugin-sdk
+	sci-libs/fftw:3.0=
+	sys-power/upower
+	virtual/libusb:1
+	virtual/opengl
+	x11-libs/libX11
+	aac? (
+		media-libs/faad2
+		media-libs/libmp4v2:0
+	)
+	hid? ( dev-libs/hidapi )
+	mp3? ( media-libs/libmad )
+	mp4? ( media-libs/libmp4v2:= )
+	opus? (	media-libs/opusfile )
+	shout? ( media-libs/libshout )
+	wavpack? ( media-sound/wavpack )
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+# media-libs/rubberband RDEPENDs on sci-libs/fftw:3.0
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-qt/qttest:5
+	dev-qt/qtxmlpatterns:5
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
+)
+
+src_prepare() {
+	# use multilib compatible directory for plugins
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+
+	default
+}
+
+src_configure() {
+	local myoptimize=0
+
+	# Required for >=qt-5.7.0 (bug #590690)
+	append-cxxflags -std=c++11
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #591968
+	for i in $(get-flag mcpu) $(get-flag march) ; do
+		if [[ ${i} = native ]] ; then
+			myoptimize="native"
+			break
+		fi
+	done
+
+	myesconsargs=(
+		prefix="${EPREFIX}/usr"
+		qtdir="${EPREFIX}/usr/$(get_libdir)/qt5"
+		faad="$(usex aac 1 0)"
+		ffmpeg="$(usex ffmpeg 1 0)"
+		hid="$(usex hid 1 0)"
+		hifieq=1
+		m4a="$(usex mp4 1 0)"
+		mad="$(usex mp3 1 0)"
+		optimize="${myoptimize}"
+		opus="$(usex opus 1 0)"
+		qt5=1
+		shoutcast="$(usex shout 1 0)"
+		vinylcontrol=1
+		wv="$(usex wavpack 1 0)"
+	)
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]}
+}
+
+src_install() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LINKFLAGS="${LDFLAGS}" \
+	LIBDIR="${EPREFIX}/usr/$(get_libdir)" escons ${myesconsargs[@]} \
+		install_root="${ED%/}"/usr install
+
+	dodoc README Mixxx-Manual.pdf
+}
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 0d1d60bda82b..1f9222f45734 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -2,5 +2,5 @@ AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
-EBUILD mpc-0.31-r1.ebuild 1232 BLAKE2B 551c3857f75a5e804c570123cbd2561d65b5b8e70d093703057d5b79485a274048b73581bf00d908f26c4ce7928b0cca9c5253f26a09220d7729ea1547af3343 SHA512 da9c9f3d72c55176ca08df1004da05e460d01cea51540f04a44bc1ae28ae7660fcbc4c698ec852cab8b97d7d38e9ce663009751ebd2f3ffdf0ad566e35610359
+EBUILD mpc-0.31-r1.ebuild 1230 BLAKE2B 8d02b8ea0e981d176afef99720f01c41f6840a2a98c5a670abc88a3239bb0e16c71f33af1082736eeed5b2f524970921c83ae20ff8fec4eb3b4c1bffeefca089 SHA512 10ac37d0f8aae691029961586e8c42ee3ae39386fd823a91d26549efbb9b3ee82284764c5960b84fb22b394d5b16229f079db05e803e53953ef98e063f340653
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.31-r1.ebuild b/media-sound/mpc/mpc-0.31-r1.ebuild
index 3c4b0209bd3b..40abf248a9e8 100644
--- a/media-sound/mpc/mpc-0.31-r1.ebuild
+++ b/media-sound/mpc/mpc-0.31-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="doc iconv test"
 
 BDEPEND="
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index eed4e7c2473f..380197325c72 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,4 @@
-EBUILD mumble-9999.ebuild 3023 BLAKE2B 16048b08d26ee51dcccacd19c9e6adfc0038e6d50d83a79b4f87f47ca8fa642fbf78cbb46f96c5553d1a6fbd44dc6af3de43a96cb149009cb58a6f8d4693d6fe SHA512 97b35ab609a8b7e7757633a8f80dd4d36697d52d58d5e1aa4ac3e55396ec4aef4df8fbe0a43bad3173ae1975eabb0825778dac127639bdabb06ccee641a1725b
+DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
+EBUILD mumble-1.3.0_pre20190313.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
+EBUILD mumble-9999.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0_pre20190313.ebuild b/media-sound/mumble/mumble-1.3.0_pre20190313.ebuild
new file mode 100644
index 000000000000..1b3d0c7ac3ac
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.0_pre20190313.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_P="${PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_P}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir=release
+	if use debug; then
+		dir=debug
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+
+	dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index e75beaeaaecf..1b3d0c7ac3ac 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -1,21 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit desktop gnome2-utils qmake-utils xdg-utils
+inherit desktop qmake-utils xdg
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" = 9999 ]] ; then
+if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
 	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
 else
-	MY_P="${PN}-${PV/_/~}"
-	SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_P="${PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_P}"
+	fi
 	KEYWORDS="~amd64 ~arm64 ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD MIT"
@@ -51,9 +55,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig
-	x11-base/xorg-proto
 "
 
 src_configure() {
@@ -115,9 +121,12 @@ src_install() {
 	dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 	echo
 	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
 	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
@@ -125,6 +134,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 6afa0057445f..43d8d82d6e42 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,5 +4,7 @@ AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc3
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
-EBUILD murmur-9999.ebuild 3102 BLAKE2B bb0f7e6afda49ada86cc9af65b48e34dec8f32d40a7ea9223a810956e87d41669280e1ea6dd7ec0464c0b0f4c1002d160e61db19934141ef34f860b585532b1d SHA512 4d33855e55ce7cc2fe611eb3b4a19873d723390339faa18fdf241c570a6111d04bc86afc168c335a71e31636e930336500c5ff47b2afeede2913c0e32fd574dc
+DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
+EBUILD murmur-1.3.0_pre20190313.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
+EBUILD murmur-9999.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_pre20190313.ebuild b/media-sound/murmur/murmur-1.3.0_pre20190313.ebuild
new file mode 100644
index 000000000000..9795d40d3832
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.0_pre20190313.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd user readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+	else
+		MY_P="${MY_PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	virtual/pkgconfig"
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini} || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir=release
+	if use debug; then
+		dir=debug
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	doins scripts/murmur.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	if use dbus; then
+		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	else
+		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+	fi
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur /etc/murmur/murmur.ini
+	fperms 640 /etc/murmur/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index fa867bd67036..9795d40d3832 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit qmake-utils systemd user readme.gentoo-r1
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" = 9999 ]] ; then
+if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
 	EGIT_SUBMODULES=( '-*' )
 else
-	MY_P="mumble-${PV/_/~}"
-	SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+	else
+		MY_P="${MY_PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	fi
 	KEYWORDS="~amd64 ~arm ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -41,6 +47,8 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
 	virtual/pkgconfig"
 
 DOC_CONTENTS="
diff --git a/media-sound/ogmtools/Manifest b/media-sound/ogmtools/Manifest
index 1ba4c5bfdd86..2ceb40339244 100644
--- a/media-sound/ogmtools/Manifest
+++ b/media-sound/ogmtools/Manifest
@@ -3,5 +3,5 @@ AUX ogmtools-1.5-endian-fix.patch 333 BLAKE2B c1d544bc210eeb464467b7a324f048af23
 AUX ogmtools-1.5-summary_length.patch 330 BLAKE2B b59fa0606b2a1bf60c355c4d2ecb2ee58c6f5419aee1471cd27bbbf365bad32d123f57c6f40deb02139a453efca50daa15f255ec56173e9e49803f434c56f063 SHA512 00212dd740d2de3702b717089949ae6961c0faeffe857bef61f1b3f019b8fc88c510302f5802d28d88d07e051d6859612a46b06f603cfbeb3a72afca565e5cae
 AUX ogmtools-1.5-vorbis_verbosity.patch 365 BLAKE2B 57b1ca8a076f8ccc5a09e77a869e784fd7dfc79240b9b14315918d95fab45cc91ce92f8a8914d5c7efdad9981389f4c1e4f41f61bb55ec4507b120159fcda549 SHA512 8d5fe06c22404198f3956c18bf91c986d212fda1987f33b8c247f6af8cd7f3ab690c105278d0f1ba188130bcfdf8dca3659a9da1c42fe19fac0692e7a853064e
 DIST ogmtools-1.5.tar.bz2 214934 BLAKE2B d9d3aa3afe0a64a6dd8201c030120a2ec9cc752037c48c1ff58b3334a5006bbd5974ff2eacb4c7e8a17c722f8fbc5ac033a64840edb179da9d66bda6743eb71d SHA512 1ed573531f9783c491a01e419667229b28540ad48c08b46131ae09ce3a4d771e3a54cde5dd09c585c0b85952e82abb3d1353864dc5223736f6eb6480158badee
-EBUILD ogmtools-1.5-r2.ebuild 813 BLAKE2B d74853852e5c94afcc1c8c6dda27b43e838d9e792729c4f44ffb0cdfe60d7177ffa0a29ae0f30fa9198f324110e76aba63086fb2c34cc2b99e845e1dee351d04 SHA512 f3cbce5dcd9eebbc5286b54b69567cc88d4f0786a29f88b723ce7d8614100d543dca0abd4ead68038108e284c4835e4c7b38de069c5eaa89b0adc20fecfd899c
+EBUILD ogmtools-1.5-r2.ebuild 812 BLAKE2B bb3700c249c13b3e3ef8a400f2f0e1d05ccb5c11eaa9507278dcf683d9cf08d3171699556562880257156bfdf7330851cb7490fd736a47f8e4c91aa86f03480b SHA512 83652a42d0ee41524421ab8071762020e20184be2ecb2be4f3915cd45d6bea49c6fac50d2405f62ff228c0c22387e116440f62236627a55f7b7d53c79d15ead5
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
index 2615313a813f..7e1a4b01a91a 100644
--- a/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
+++ b/media-sound/ogmtools/ogmtools-1.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="Information, extraction or creation for OGG media streams"
-HOMEPAGE="http://www.bunkus.org/videotools/ogmtools/"
-SRC_URI="http://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://www.bunkus.org/videotools/ogmtools/"
+SRC_URI="https://www.bunkus.org/videotools/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/pasystray/Manifest b/media-sound/pasystray/Manifest
index 67f82e4e6568..a03e91664344 100644
--- a/media-sound/pasystray/Manifest
+++ b/media-sound/pasystray/Manifest
@@ -4,5 +4,5 @@ DIST pasystray-0.7.0.tar.gz 56014 BLAKE2B cba947895fc71a18a43c314486ec3513e844b1
 DIST pasystray-0.7.1.tar.gz 56041 BLAKE2B 5f7cae7a55580bf3dfe294e95bbda372c3a679bec000d222964b4027ced2462dfb4a8446d0683f8910e96ab98e1541b3fa9fafc36da530c92d2285f00a1beb65 SHA512 2af5176e6a5bf6d74baf0a0b52b731b7a3b54f787c4e89d945357aab4e186a35e0f77288d69d66743bf4e21f758e0d961cc1f9b339ce513eb4eb2bcab0d754bb
 EBUILD pasystray-0.6.0-r2.ebuild 1098 BLAKE2B db682d8aeb9c5897bd8cfc636d48c08a9836c6a36c9a04dd7ef1c5b05829ddfdec7b122c2021acf0a8999e9c3c0451aae9f47c5385b06243ff6a69fbda86eeb7 SHA512 6a11e33c0ce6cd4f4272978d2371b219e697c554b32a3596519eb9be7b621d3e5aff01ff308b8e912d53be4d767fc2f9e4ded71bf47244ca2d5379fc43e3c4b7
 EBUILD pasystray-0.7.0.ebuild 1003 BLAKE2B 693733b47c7195d7318c89d38873d1895c674c75246ea67ea2cb82a4da21ec694afe08d062a20f2db710144bca3956ef4236911545fa16c01029ccc264c04621 SHA512 3d2c727b59605700b57e5c13cdb8ac1823b871c3efe57a8bf9ad0284c41dfc11aba99b4fc3aecc22842f612551cc07d1a113585688e9f983a9f75830ce6e0fea
-EBUILD pasystray-0.7.1.ebuild 1003 BLAKE2B 7014b29997fa4af405d08531bf062d4c6d853b6e42f0f60a6b4b4c62eca8b757733f76dcf103b825a8c3692187eb0d1e9aa9b3ae5481e93af1cb7da8b53df194 SHA512 d046d55450f7a29b6f5ac2ce8ac578a76d5cbc10cba3f629ea0d99a5dde57ef8f6f6610389a01db504654094f03a623f2b52ea26901f549776ccc90c0355f681
+EBUILD pasystray-0.7.1.ebuild 999 BLAKE2B 311f499a2c1eb72326a348893098836166330425c323a9cd6ed117f0619eb7a8179d1c883344143d0d858f7037193451c5b3c0486f47dec52bb192aad557e5c0 SHA512 74b5e0e8fc57f0bcc6c6285dffb7c60a1a9cb32f9d96d05b64a429a6f79bf0c638434529cf36323387fff1338cc5f6bbffe3362efe1d6a0179f4e093d7bc635f
 MISC metadata.xml 635 BLAKE2B 54e8f3a6f865a0caafaf253e37c517e84c5a41414c2456d34780522c25b8998cd50b2306e24d55e9c6c45e4e62bf6fc60e2f5098f63fd23e42778b0b067cb922 SHA512 97fb650bc38171c10b3678940a72b5100874aa84820b962e1b892d82555c8527bf19976076fa0017c400d7955716e7eb4747bcd8cc372198b5c84f6ec4086495
diff --git a/media-sound/pasystray/pasystray-0.7.1.ebuild b/media-sound/pasystray/pasystray-0.7.1.ebuild
index b1c33c69dc35..b9732e0f3ecd 100644
--- a/media-sound/pasystray/pasystray-0.7.1.ebuild
+++ b/media-sound/pasystray/pasystray-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/christophgysin/${PN}/archive/${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="libnotify zeroconf"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index bdd57b3c2c99..3d3b4708624f 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,5 @@
+DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
 DIST pavucontrol-qt-0.4.0.tar.xz 34916 BLAKE2B f42f560b125e292ae3a8ab76e2020d1a899019e8ed40d6f4d3e90fe1baa0cc044093310fe9ac11c6529f9cc1abc41d475aa2d445de8f19e6f89ed456525aa7d9 SHA512 62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb
+EBUILD pavucontrol-qt-0.14.1.ebuild 712 BLAKE2B 50c243cba4eaf2e4288c6565ddbf0f16cf49b4829690788ce75ac117126c235d7c2b6c6035ab18065a4451c3093a114754f05fcb0b00a98b8e15c673cd5cbc7c SHA512 c92ab284966a11118b53cf0c62a78089d0812d1634fb74706fb692dfc4f433a3a6cc9a4b3980587867dba8e497b0e27fbda929b9a286431924668a565ee82468
 EBUILD pavucontrol-qt-0.4.0.ebuild 775 BLAKE2B 6e5b47111723959f49917ff2251d3a617025f0565147648c31d7d4bb35f366a1e8b3670760c22d97cb13c0770971ac30d045286e51b0f7b4d38b571c51340235 SHA512 a777547bb37805a559a89e4aaa488949643f770a6f5ea843d183df50ba2d250dbd5fa4a6449916e9c021099c7287d093a99335f43fcf670dc9f2fb3b7b2b2faf
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
new file mode 100644
index 000000000000..834f17c16d20
--- /dev/null
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="A Pulseaudio mixer in Qt (port of pavucontrol)"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.6.0
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtwidgets:5
+	media-sound/pulseaudio[glib]
+"
+RDEPEND="${DEPEND}
+	!lxqt-base/lxqt-l10n
+"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index c00d3a435629..768195cb50fc 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,6 +1,5 @@
-AUX pavucontrol-2.0-fix-startup-crashes.patch 7437 BLAKE2B 9ca2b024ffa606259ffab7181ab330b18390fcd95b65c4f25dfe64d7e067db781b74ab2c4c2dba70d2660d9ca6709377d3b37032ee89c68550f927eac45e282d SHA512 f5cfdc8731867bcda61a38ccd30a91b2dc3e28106bae7300254957e6e1f8fd8806322c9bd90b7bd2f269aa6190203c1b9f545c18bd5b3f11c3f2d6983f114aac
-DIST pavucontrol-2.0.tar.xz 151560 BLAKE2B 3d06663124c513de9a1f85fa720f51378d1fe57f8b23792a65bf7150c4895387bde4db0cbfab357a2a1bbb05a0d5c47b69ed5acaad83dcca002079eb5d640b70 SHA512 2b5f83f79cf6d7ce94bd836278274acb09824af389f5a7ad7d3977db743d8f9c5def78d8e9dea901a7e05355cfebb060f513cf01997baf546fd2dd2ada0513b1
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
-EBUILD pavucontrol-2.0-r1.ebuild 942 BLAKE2B 7e3277029a29b923a888937910906dd86d4e7c00e32d501c429b0a819571d60f077c677beb3201a9ba08d588de2b865271430168d318ca92db9f497ca197d241 SHA512 ed88a58947b6097d1aa2ea15ff121ea4cc3fb57a66e8ebdec9fa159bfe5c30c3711e763f47ea24aecf67b72cb578cbaea7e01714100049913699d22493b7f377
+DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
+EBUILD pavucontrol-4.0.ebuild 890 BLAKE2B f40bf933b2e8112336080c2d4b284c8c80e09b686fef19d5281e9f94dcac620bd07c9a434ac74e9793880e2cf82eef497c63576dcb0c123f612afab9e7115f04 SHA512 d7a36766f88e6a34307f903aee17cadc28a6693036c78c94b3f3135684c8a19cf004b19181de49a423a8603195f2d82de7ef9cdb1cfcc828982e1514e42903b0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch b/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch
deleted file mode 100644
index 0689290b6229..000000000000
--- a/media-sound/pavucontrol/files/pavucontrol-2.0-fix-startup-crashes.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-From b2362f2223b1ecc0c92fac9d261d5684f33af06f Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 28 Aug 2014 12:58:05 +0200
-Subject: Reference the widget before returning it from ::create methods
-
-Widgets (unlike Windows and Dialogs) returned by Gtk::Builder::get_widget*
-start owned by the GtkBuilder object, the idea being that they will get
-added to a container before the scope of the GtkBuilder object ends, and it
-thus automatically gets destroyed.
-
-But in the various ::create methods in pavucontrol, a pointer to the widget
-gets returned, so that it can be added to a cointainer by the caller.
-However as soon as the ::create method exits the GtkBuilder object owning
-the widget, and thus also the widget gets destroyed, and we end up returning
-free-ed memory.
-
-This commit fixes this by making all ::create methods take a reference on
-the widget before returning it, and having all the callers unreference the
-widget after adding it to a container.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=83144
-https://bugzilla.redhat.com/show_bug.cgi?id=1133339
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-
-diff --git a/src/cardwidget.cc b/src/cardwidget.cc
-index c79ac6c..28c558d 100644
---- a/src/cardwidget.cc
-+++ b/src/cardwidget.cc
-@@ -45,6 +45,7 @@ CardWidget* CardWidget::create() {
-     CardWidget* w;
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "cardWidget");
-     x->get_widget_derived("cardWidget", w);
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/channelwidget.cc b/src/channelwidget.cc
-index 6f59de2..fe94c11 100644
---- a/src/channelwidget.cc
-+++ b/src/channelwidget.cc
-@@ -53,6 +53,7 @@ ChannelWidget* ChannelWidget::create() {
-     x->add_from_file(GLADE_FILE, "adjustment1");
-     x->add_from_file(GLADE_FILE, "channelWidget");
-     x->get_widget_derived("channelWidget", w);
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/devicewidget.cc b/src/devicewidget.cc
-index 1a148ee..813780f 100644
---- a/src/devicewidget.cc
-+++ b/src/devicewidget.cc
-@@ -89,6 +89,7 @@ void DeviceWidget::setChannelMap(const pa_channel_map &m, bool can_decibel) {
-         snprintf(text, sizeof(text), "<b>%s</b>", pa_channel_position_to_pretty_string(m.map[i]));
-         cw->channelLabel->set_markup(text);
-         channelsVBox->pack_start(*cw, false, false, 0);
-+        cw->unreference();
-     }
-     channelWidgets[m.channels-1]->last = true;
- 
-diff --git a/src/mainwindow.cc b/src/mainwindow.cc
-index 5a42318..5d205fb 100644
---- a/src/mainwindow.cc
-+++ b/src/mainwindow.cc
-@@ -300,6 +300,7 @@ void MainWindow::updateCard(const pa_card_info &info) {
-     else {
-         cardWidgets[info.index] = w = CardWidget::create();
-         cardsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         is_new = true;
-     }
-@@ -416,6 +417,7 @@ bool MainWindow::updateSink(const pa_sink_info &info) {
-         sinkWidgets[info.index] = w = SinkWidget::create(this);
-         w->setChannelMap(info.channel_map, !!(info.flags & PA_SINK_DECIBEL_VOLUME));
-         sinksVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->monitor_index = info.monitor_source;
-         is_new = true;
-@@ -570,6 +572,7 @@ void MainWindow::updateSource(const pa_source_info &info) {
-         sourceWidgets[info.index] = w = SourceWidget::create(this);
-         w->setChannelMap(info.channel_map, !!(info.flags & PA_SOURCE_DECIBEL_VOLUME));
-         sourcesVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         is_new = true;
- 
-@@ -686,6 +689,7 @@ void MainWindow::updateSinkInput(const pa_sink_input_info &info) {
-         sinkInputWidgets[info.index] = w = SinkInputWidget::create(this);
-         w->setChannelMap(info.channel_map, true);
-         streamsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->clientIndex = info.client;
-         is_new = true;
-@@ -743,6 +747,7 @@ void MainWindow::updateSourceOutput(const pa_source_output_info &info) {
-         w->setChannelMap(info.channel_map, true);
- #endif
-         recsVBox->pack_start(*w, false, false, 0);
-+        w->unreference();
-         w->index = info.index;
-         w->clientIndex = info.client;
-         is_new = true;
-@@ -838,6 +843,7 @@ bool MainWindow::createEventRoleWidget() {
- 
-     eventRoleWidget = RoleWidget::create();
-     streamsVBox->pack_start(*eventRoleWidget, false, false, 0);
-+    eventRoleWidget->unreference();
-     eventRoleWidget->role = "sink-input-by-media-role:event";
-     eventRoleWidget->setChannelMap(cm, true);
- 
-diff --git a/src/rolewidget.cc b/src/rolewidget.cc
-index fd3196c..db07f92 100644
---- a/src/rolewidget.cc
-+++ b/src/rolewidget.cc
-@@ -40,6 +40,7 @@ RoleWidget* RoleWidget::create() {
-     RoleWidget* w;
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/sinkinputwidget.cc b/src/sinkinputwidget.cc
-index b88b718..5a0ba39 100644
---- a/src/sinkinputwidget.cc
-+++ b/src/sinkinputwidget.cc
-@@ -43,6 +43,7 @@ SinkInputWidget* SinkInputWidget::create(MainWindow* mainWindow) {
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-     w->init(mainWindow);
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/sinkwidget.cc b/src/sinkwidget.cc
-index 7f4902c..f682cf2 100644
---- a/src/sinkwidget.cc
-+++ b/src/sinkwidget.cc
-@@ -82,6 +82,7 @@ SinkWidget* SinkWidget::create(MainWindow* mainWindow) {
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
-     x->get_widget_derived("deviceWidget", w);
-     w->init(mainWindow, "sink");
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/sourceoutputwidget.cc b/src/sourceoutputwidget.cc
-index 827c5a8..4d915b0 100644
---- a/src/sourceoutputwidget.cc
-+++ b/src/sourceoutputwidget.cc
-@@ -49,6 +49,7 @@ SourceOutputWidget* SourceOutputWidget::create(MainWindow* mainWindow) {
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "streamWidget");
-     x->get_widget_derived("streamWidget", w);
-     w->init(mainWindow);
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/sourcewidget.cc b/src/sourcewidget.cc
-index 5e4ecf0..fde5333 100644
---- a/src/sourcewidget.cc
-+++ b/src/sourcewidget.cc
-@@ -35,6 +35,7 @@ SourceWidget* SourceWidget::create(MainWindow* mainWindow) {
-     Glib::RefPtr<Gtk::Builder> x = Gtk::Builder::create_from_file(GLADE_FILE, "deviceWidget");
-     x->get_widget_derived("deviceWidget", w);
-     w->init(mainWindow, "source");
-+    w->reference();
-     return w;
- }
- 
-diff --git a/src/streamwidget.cc b/src/streamwidget.cc
-index 94363ec..e602cce 100644
---- a/src/streamwidget.cc
-+++ b/src/streamwidget.cc
-@@ -77,6 +77,7 @@ void StreamWidget::setChannelMap(const pa_channel_map &m, bool can_decibel) {
-         snprintf(text, sizeof(text), "<b>%s</b>", pa_channel_position_to_pretty_string(m.map[i]));
-         cw->channelLabel->set_markup(text);
-         channelsVBox->pack_start(*cw, false, false, 0);
-+        cw->unreference();
-     }
-     channelWidgets[m.channels-1]->last = true;
-     channelWidgets[m.channels-1]->setBaseVolume(PA_VOLUME_NORM);
--- 
-cgit v0.10.2
-
diff --git a/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index de1f512e73de..8291e6f1a184 100644
--- a/media-sound/pavucontrol/pavucontrol-2.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
+inherit flag-o-matic
 
 DESCRIPTION="Pulseaudio Volume Control, GTK based mixer for Pulseaudio"
 HOMEPAGE="https://freedesktop.org/software/pulseaudio/pavucontrol/"
@@ -11,33 +10,31 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
 	>=dev-cpp/gtkmm-3.0:3.0
 	>=dev-libs/libsigc++-2.2:2
 	>=media-libs/libcanberra-0.16[gtk3]
-	>=media-sound/pulseaudio-3[glib]
+	>=media-sound/pulseaudio-5[glib]
 	virtual/freedesktop-icon-theme
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? (
 		dev-util/intltool
 		sys-devel/gettext
-		)
+	)
 "
 
-src_prepare() {
-	# Fix statup crashes (bug #530170)
-	epatch "${FILESDIR}"/${P}-fix-startup-crashes.patch
-}
-
 src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--disable-lynx \
+	append-cxxflags -std=c++11 #567216
+	local myeconfargs=(
+		--disable-lynx
+		--docdir=/usr/share/doc/${PF}
 		$(use_enable nls)
+	)
+	econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
index 08a8e24c9b1f..f77483617e59 100644
--- a/media-sound/peercast/Manifest
+++ b/media-sound/peercast/Manifest
@@ -4,5 +4,5 @@ AUX peercast-0.1218-CVE-2008-2040.patch 4545 BLAKE2B 5b19e15f2d1daa9b727e6121e8e
 AUX peercast-0.1218-glibc-2.10.patch 3332 BLAKE2B 63743c672e5f58a43d0e23f81f0384546ad1f7dbdba98079d2eab138e6e8b5d3a9e13c4e5b422d98adfc9ba11dfb2916071b9336e434165b5de7ade2ee30aac5 SHA512 26fa888300a4e4f9934bf3bfbeaad35cf05ff677b7e417fbb0e1ca0163af5091b883264de151c46f9acf01f70ec5cf6f0faba886462d0593e05dbb314fbda27b
 AUX peercast.initd 591 BLAKE2B 3a612afed70c268e79b6c865400df98acd633f8971300b80326d22d65230c167edcea3da3d17f2c8b55752a620c906d1b2d4f98f5495f8becabc60ca127f31dc SHA512 85352d87c40d468f324e179078b30412a96c0fac39f012f74c32a6509c3066729145b5df27da06eb1bce80306eb62800d0f6b0d8307021e3cadd67158760e1f2
 DIST peercast-0.1218-src.tgz 557909 BLAKE2B 5d449f56a97df8b6adce320c6517c6ee66a30e68cd1fe9f2e6dc73953ac0a81b1bd8d245135966f463bd061ff15140449e7fff782906a31f6496310fbd985640 SHA512 b9233fd12b8f2e7a89faa1df0e61a4cdeddede23fb56b03ff0d92614a6b43300fe683636d92ca97f200e1b066c2eda79d8d7e56597d81fe2f3766ccd6e199253
-EBUILD peercast-0.1218-r2.ebuild 1187 BLAKE2B df5c34c7a64f74f919ac8d69d4d43bb9d9024f5287cdddb65c8f989102fe1b7c878afab51d8187da0825650adc6ea3a50e8c59565a90f8d40285f54afda695bf SHA512 781c5b00566e0a411436788fce2de9a97ffea25597f80a4e282caf1feb23e73d89c694b5f8d360590efd10d323e82904c659625fe70ba00205a2e6d8fa7066af
+EBUILD peercast-0.1218-r2.ebuild 1162 BLAKE2B 4b90f529101878b43a8199fa31aa3488d4b311e9536a117f2c9a42490ac2c9a480e6b8c1c718ba28846e5f558e09266b566cb1644056fedd64a305f549f96846 SHA512 03d692b4d6194e1fa56a3d7f63d4be663aa87ec804304c3fb21bde501d2412c5a0d718ce18fd22dcb3963acd1b4a5cf1b63c0f769e204ce25c66da40fc3d3cbb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/peercast/peercast-0.1218-r2.ebuild b/media-sound/peercast/peercast-0.1218-r2.ebuild
index 105d18390306..8034fe6aef9d 100644
--- a/media-sound/peercast/peercast-0.1218-r2.ebuild
+++ b/media-sound/peercast/peercast-0.1218-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="A client and server for Peercast P2P-radio network"
 HOMEPAGE="http://www.peercast.org"
@@ -18,12 +19,12 @@ DEPEND=""
 
 S=${WORKDIR}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-CVE-2008-2040.patch \
-		"${FILESDIR}"/${PN}-0.1216-makefile.patch \
-		"${FILESDIR}"/${PN}-0.1216-amd64.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
-}
+PATCHES=(
+	"${FILESDIR}/${P}-CVE-2008-2040.patch" \
+	"${FILESDIR}/${PN}-0.1216-makefile.patch" \
+	"${FILESDIR}/${PN}-0.1216-amd64.patch" \
+	"${FILESDIR}/${P}-glibc-2.10.patch"
+)
 
 src_compile() {
 	append-ldflags -pthread
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index ca6e460f35d3..556375680b62 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,5 +1,7 @@
 DIST pragha-1.3.3.tar.bz2 679754 BLAKE2B e9e785998d5ae805aa8427d18d1cbdcdd1e23224ce18b3927933c0986fd8793dec9457eedcb005be498b37940cc3c7e36e68940ccaa675f4b350931315c3d997 SHA512 3dc87d4e75cd9f145c3921af4c09140a705611d72176fd80db2d89048bc22c8edda5f87bce75f26e0cce4f6934c927e814e5c54fec7820116485cf4e04e876a9
+DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
 DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.3.ebuild 2288 BLAKE2B 0cad8db3ec862e8e731135eb2e53c2e6fadcc397476512153b1d72531eb74521b4f97c99c3a929f8968046ec98581a41719e75c0c8bee5dd15e2d77a9c7c0215 SHA512 90a7562ed5be7146fb86ea61befd6d145230235020d88f99a0762d2749b05640591343e680b3580654840ebb34ff1c9b1174ee28f73e28fe79c030ab739c6f73
+EBUILD pragha-1.3.4.ebuild 2312 BLAKE2B b025ebc1ab90b559ed821357b1a36248efef8cb992cef738a4f2daea79785ef7f4d834191c4a4973721625f5ee6bb014587b815b58f152b0d3e46c11c91ca766 SHA512 b58a3846c8555384609756df47d118c12692ef0f631c6e6f86668eb5a630fc63e9e8893e3b2906e7754bacfa2b93242988252dcda65de5a9e083b65d3b1ffb42
 EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.4.ebuild b/media-sound/pragha/pragha-1.3.4.ebuild
new file mode 100644
index 000000000000..7bd78608d370
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.36:=
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.8:3=
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3=[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.20:= )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		--disable-grilo-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index ab0e69f5ed67..9385518bcf3c 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,10 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
-DIST pulseeffects-4.5.3.tar.gz 1776724 BLAKE2B df77c45405c33a6c33e21e34eb205a75bb372ab5bfac11c572bc8ff47ebc34780f51327636892c8b7b7deca6de814f0b198ae3509c2e7b6713d755eb25a4b38b SHA512 1748f3f62122bb5ca63b9b84ea2d9917d410c1cff0aab699ff0664aab1377eda89c5f4638a86cc2444f482cf9c8aee27d34480087debb394645614a7d1e0b5a2
+DIST pulseeffects-4.5.5.tar.gz 1783582 BLAKE2B 4c2154fad61705811d2e2135bdacc7f1e31d499ea65fbbb044896ba37cfde9ef4cd925fe7cc390c5611fb294d57a7297c7e54c76b3d69505c9b595d47259ad9a SHA512 fe45097bcd5aa9754c612c52cfba7d06d14185e18a75e5ae2a257733159f0288897e4f60d147e164f4bcafcd23978e23a006753b2b26e26613809863895cfab5
+DIST pulseeffects-4.5.6.tar.gz 1822218 BLAKE2B def674bb35970ceb2a440acac20ebd5c406ae1691b58e8e8cdee3f0eacc7077daf989bcd94a962a1ef1054bc81f68108fd445adebb32a96940a91306025d72a2 SHA512 c18e4b52c4eff15db40c398b0a60b7b2e7a069142552a9801d0a580f52145d8b13b4507a9d37aa49919bbdc144b85b3f02e140aca671d9dedfb521ed34dbc99e
 EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
-EBUILD pulseeffects-4.4.7.ebuild 1709 BLAKE2B 42a798d0059e6692d60ef962a1f7fac28f8f982a73d454914cdea8b11ca7176ba1076d21e6490061c7a7145db8516e8737e3c34d50979667cbdd196f140a28b6 SHA512 ee0b4523c7911e3b22715fd000bfb89f46c5b9e361b472d48b075045055cb316f3cdbe1ff130fed9cef518180696330fcd8ade73ac337183d3e3e0a5811e0992
-EBUILD pulseeffects-4.5.3.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
+EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
+EBUILD pulseeffects-4.5.5.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
+EBUILD pulseeffects-4.5.6.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 EBUILD pulseeffects-9999.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
index 9d17e2f2278c..e9b3c7a727d1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.4.7.ebuild
@@ -52,6 +52,7 @@ DEPEND="
 	virtual/pkgconfig
 	dev-libs/appstream-glib
 	sys-devel/gettext
+	dev-util/itstool
 "
 
 pkg_postinst(){
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
index dc0c6cb447c7..dc0c6cb447c7 100644
--- a/media-sound/pulseeffects/pulseeffects-4.5.3.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
new file mode 100644
index 000000000000..dc0c6cb447c7
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+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}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	media-libs/lsp-plugins[lv2]
+	>=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
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 437bd5b6137c..ded84293f8e8 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,8 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
 DIST qsynth-0.5.0.tar.gz 260537 BLAKE2B def589a1cfb76517fa34811fe75a8379043d7e0f9fc661dd456b49414042662c3a3b8f57e2d0de5fae99cbdb60062b12d9b73b93032115648b9a21921766fbeb SHA512 3c7026edfef3115fae8e2167bb961f5e32d886c8d75b3534a3f110d921264cd270953145a4737f9d6660c55fccce81d7306ec0ce4064df6e7226598b52399298
 DIST qsynth-0.5.3.tar.gz 269252 BLAKE2B c496063ba33bc78a65d63151871e841f9d3938fe03049655da3c124fd495c592f9c726c479062c3fb2d1561e4dee3284d12b04e04a51ba06e20d297b6e84ac0f SHA512 15632274e5822f5e1a49bd332c5d8b7e59a54800ad32510f425f06b4557e474d5479bd531b45fc43af20535017a656fbd9469d318940931912a56ea1856dc117
+DIST qsynth-0.5.4.tar.gz 268106 BLAKE2B e7e17c1427cbb6105fc6fbaa511325fcfbed0d06e28374e3b9fdce14a633e6554267339bb1ffe2bf1f16fbebf38095ae02eca86d74412add3a1e16d191cd1e45 SHA512 711b18efea3b4050c567f2c549ab4f44525f53de42c6cfea379260e62966215e6d59432bed946733c7e772d691edb739a882de753cf3f46b932833de7b120b7d
 EBUILD qsynth-0.5.0.ebuild 1271 BLAKE2B b8bbfd868583056ced958ac07010ac886d17e2a502230fa56a8eb832e5b355e80a59745cacbead86144b5607046e1154cf7e03e494038528dd074bcaa7b5b3dd SHA512 6d3c40d98862d8031fd97953e5fcf84dcedebb8f3dae93f344939c7028bc39448270ec3ab5f54cdfc5176de74ec855897b3a4e31e5dc931734c2e05b1b205382
-EBUILD qsynth-0.5.3.ebuild 1329 BLAKE2B 63293f666041dce667e089b0fb022271e70155df62992c93075e54442fd30fad590b0d43267efb08b01d4416d6832e3dbc36d9a3e1bd2b0057220051fb7e4709 SHA512 7625201ee66d74d6213a9ec91df084f083f4f5219bd03a5cdf3a0efcab3c33f02d67c8bbd6784e5535f648f7a4cc091511bf055b3315c65f059c1358b702d8e3
+EBUILD qsynth-0.5.3.ebuild 1328 BLAKE2B 61f84dd2f5da070ed3c18c93e0b0c111673998326f25ec0816126a5bcf5458f4d78932e2fe40735bdb5ceb936b3abf0a1f209d297d5bbf6f07949798874494e9 SHA512 53bee67b1ca4be0d938be720fcb6b4d6a8fe1be52345b61349729d5ff19c85d8cc2f0e5de57f8d0cadf02d47f7852d6509ab67a13a0ade3618b85e01024438bb
+EBUILD qsynth-0.5.4.ebuild 1306 BLAKE2B 49f580815944ad797dd264781e8d58c222338cd4c162556246941e1e8d33f1d3370b3846fc78df2c2d09dff712c1e27235c6e3b9bd1aecc68bb6503a18446e63 SHA512 12595163c9f3a1ea7b7fea0a93a933cdbeca42976a8f56fcb13cd40d382de90f270ba3404d3c9c87a0d42cdd161e03ba6d61f24a8a4c60e5f449c1b530852cfb
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.3.ebuild b/media-sound/qsynth/qsynth-0.5.3.ebuild
index 1abb5201564b..798d5cf90b4f 100644
--- a/media-sound/qsynth/qsynth-0.5.3.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
diff --git a/media-sound/qsynth/qsynth-0.5.4.ebuild b/media-sound/qsynth/qsynth-0.5.4.ebuild
new file mode 100644
index 000000000000..0e48b9712969
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.5.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
+	econf \
+		$(use_enable debug)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
+
+src_install () {
+	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
+	einstalldocs
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use pulseaudio; then
+		cmd="qsynth -a pulseaudio"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}
diff --git a/media-sound/seq24/Manifest b/media-sound/seq24/Manifest
index 45105c7c8e96..e7db7f26202e 100644
--- a/media-sound/seq24/Manifest
+++ b/media-sound/seq24/Manifest
@@ -1,6 +1,5 @@
-AUX seq24-0.9.2-lash-fix.patch 6333 BLAKE2B 2b3f788c97032f7a144a54dc7fa92c19469028eafe53851052aa12ad42b91c6a2f65309aa54e8928d0104b6b4b751d233a3409bbb83cece0f47ff4f58e238627 SHA512 762d1bc75e736947f62316465c4ccd24f0c2ccc610803f04e41c28e1e4dd73e59d12eeacea73383c4d26735bef5c8d9a2300424ea2a3c0fcf0d80465d3431184
-DIST seq24-0.9.2.tar.bz2 213059 BLAKE2B e67a63182f34f7452a8f0550591b5a3d13409782eb42064cff347b333f40ca656477ed601f8b7178f01f35873c992ea8a3d574b43f186b3979f8e09030b8b64c SHA512 31e57c7fafbccf85a69229674d3bcfb86e2fa9b2f095b50fd59a44673896edc5c4f9dd97585923cee9129bc8619ac6eb33274241271cdcc56732c920d4106ec8
+AUX seq24-0.9.3-std-mutex.patch 7495 BLAKE2B 32480d074e8b1f8e32aa983342979709392ee454374bb943c7acd80367d372722417cf192c922572c83219597328c60f34c49d4187eb3d7d311d02ecd80ad3dd SHA512 f5a1cc2d658b9aaeebecf61f102fa34c1613abd82ac94e8febb8bc72b20478813fb0772da7a437dd46dd5f5052dbd428cab54d8f456701f95fd2be06767182d6
 DIST seq24-0.9.3.tar.bz2 221014 BLAKE2B 94b771712d53b3a74d9fed249822ce890959b9159ed8ca0d4f30909f186f1c63a4c93b7e11adcbe51219fd4894469af8cb147da1ee8f82dcc1b42e9d16150d96 SHA512 f0fe13ceedbc87899df058918f3bdd57dbb9f1a3491d23503ae48367ba9eebdd2c8b5706b7b041db0959703a941d52d67f57823937ffdc574b01323eda32e3ad
-EBUILD seq24-0.9.2-r1.ebuild 897 BLAKE2B 89a5ab2342d43d31edda60153a2c47fded368d98a892895b1aaae4dd441c2774d09dc79c0d7efa01aa1074972c1809ce0325a097853ea3d0addac8ac8561a501 SHA512 50136ff4cae38c053ee8b209a6969b7023cb03ea26e3b31ea035dcbe6858432d66a16bcf737452e027230cecc451d1542c4859f00c6adc2f85d43a04100163dd
+EBUILD seq24-0.9.3-r1.ebuild 887 BLAKE2B 1598d557db395dbcea09864c030955ab1ad529f9d4c43105082b5bacb80f980eec50a8e4f98004f2f898063d7baae4e946ec750de28e2230a10da6e673f8efb7 SHA512 171bf85f78bf0556d77caccca4c1286eae5f1405f5d10bbb486b2ffb0edfa2ab3e0cf0eeec28aa3720d8efe74128e2c9c746acf8c8cefa454e3aec36e2aca096
 EBUILD seq24-0.9.3.ebuild 837 BLAKE2B b776d790cc008a07f6611effa13697ab00aa6fbcc2d4fc2710c70f7bb46e1ed07e2224b2f38198caa8d278a44e87a59dcac5e921e29608876b0f87587a65f680 SHA512 6c150a31c96c8b41d7b033ea300b2487d2780d7bc7c29712a2d1fab656ec0e2a19e1265bf49f8f8dd9a5bc2bdb8570855ebbcf2a17b64f311834994dcde48da6
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch b/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch
deleted file mode 100644
index 8b0efadb7b55..000000000000
--- a/media-sound/seq24/files/seq24-0.9.2-lash-fix.patch
+++ /dev/null
@@ -1,248 +0,0 @@
-Upstream fix for segfault when built with lash support.
-https://bugs.launchpad.net/seq24/+bug/696371
-
-=== modified file 'src/lash.cpp'
---- old/src/lash.cpp
-+++ new/src/lash.cpp
-@@ -29,17 +29,9 @@
- lash::lash(int *argc, char ***argv)
- {
- #ifdef LASH_SUPPORT
--   m_lash_args = lash_extract_args(argc, argv);
--#endif // LASH_SUPPORT
--}
--
--
--void lash::init(perform* perform)
--{
--#ifdef LASH_SUPPORT
--    m_perform = perform;
--
--    m_client = lash_init(m_lash_args, PACKAGE_NAME,
-+    m_perform = NULL;
-+
-+    m_client = lash_init(lash_extract_args(argc, argv), PACKAGE_NAME,
-             LASH_Config_File, LASH_PROTOCOL(2, 0));
- 
-     if (m_client == NULL) {
-@@ -65,9 +57,10 @@
- 
- 
- void
--lash::start()
-+lash::start(perform* perform)
- {
- #ifdef LASH_SUPPORT
-+    m_perform = perform;
-     /* Process any LASH events every 250 msec (arbitrarily chosen interval) */
-     Glib::signal_timeout().connect(sigc::mem_fun(*this, &lash::process_events), 250);
- #endif // LASH_SUPPORT
-
-=== modified file 'src/lash.h'
---- old/src/lash.h
-+++ new/src/lash.h
-@@ -43,7 +43,6 @@
- #ifdef LASH_SUPPORT
-     perform       *m_perform;
-     lash_client_t *m_client;
--    lash_args_t *m_lash_args;
- 
-     bool process_events();
-     void handle_event(lash_event_t* conf);
-@@ -54,13 +53,12 @@
- public:
-     lash(int *argc, char ***argv);
- 
--    void init(perform* perform);
-     void set_alsa_client_id(int id);
--    void start();
-+    void start(perform* perform);
- };
- 
- 
--/* global lash driver, defined in seq24.cpp */
-+/* global lash driver, defined in seq24.cpp and used in midibus.cpp*/
- extern lash *lash_driver;
- 
- 
-
-=== modified file 'src/midibus.cpp'
---- old/src/midibus.cpp
-+++ new/src/midibus.cpp
-@@ -877,11 +877,11 @@
- 
-     /* set up our clients queue */
-     m_queue = snd_seq_alloc_queue( m_alsa_seq );
--#endif
- #ifdef LASH_SUPPORT
- 	/* notify lash of our client ID so it can restore connections */
- 	lash_driver->set_alsa_client_id(snd_seq_client_id(m_alsa_seq));
- #endif
-+#endif
- }
- 
- 
-
-=== modified file 'src/perform.cpp'
---- old/src/perform.cpp
-+++ new/src/perform.cpp
-@@ -1342,6 +1342,7 @@
-             stats_last_clock_us= (last.tv_sec * 1000000) + (last.tv_nsec / 1000);
- #else
-         /* get start time position */
-+        /* timeGetTime() returns a "DWORD" type (= unsigned long)*/
-         last = timeGetTime();
- 
-         if ( global_stats )
-
-=== modified file 'src/seq24.cpp'
---- old/src/seq24.cpp
-+++ new/src/seq24.cpp
-@@ -108,12 +108,66 @@
-      * GTK+. */
-     Gtk::Main kit(argc, argv);
- 
--    /* Init the lash driver (strips lash specific command line
--     * arguments, but does not connect to daemon) */
-+    /*prepare global MIDI definitions*/
-+    for ( int i=0; i<c_maxBuses; i++ )
-+    {
-+        for ( int j=0; j<16; j++ )
-+            global_user_midi_bus_definitions[i].instrument[j] = -1;
-+    }
-+
-+    for ( int i=0; i<c_max_instruments; i++ )
-+    {
-+        for ( int j=0; j<128; j++ )
-+            global_user_instrument_definitions[i].controllers_active[j] = false;
-+    }
-+
-+
-+    /* Init the lash driver (strip lash specific command line
-+     * arguments and connect to daemon) */
- #ifdef LASH_SUPPORT
-     lash_driver = new lash(&argc, &argv);
- #endif
- 
-+    /* the main performance object */
-+    /* lash must be initialized here because mastermidibus uses the global
-+     * lash_driver variable*/
-+    perform p;
-+
-+    /* read user preferences files */
-+    if ( getenv( HOME ) != NULL )
-+    {
-+        Glib::ustring home( getenv( HOME ));
-+        last_used_dir = home;
-+        Glib::ustring total_file = home + SLASH + config_filename;
-+        
-+        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
-+        {
-+            printf( "Reading [%s]\n", total_file.c_str());
-+
-+            optionsfile options( total_file );
-+
-+            if ( !options.parse( &p ) ){
-+                printf( "Error Reading [%s]\n", total_file.c_str());
-+            }
-+        }
-+
-+        total_file = home + SLASH + user_filename;
-+        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
-+        {
-+            printf( "Reading [%s]\n", total_file.c_str());
-+
-+            userfile user( total_file );
-+
-+            if ( !user.parse( &p ) ){
-+                printf( "Error Reading [%s]\n", total_file.c_str());
-+            }
-+        }
-+
-+    }
-+    else
-+        printf( "Error calling getenv( \"%s\" )\n", HOME );
-+
-+
-     /* parse parameters */
-     int c;
- 
-@@ -229,65 +283,14 @@
-     } /* end while */
- 
- 
--    /*prepare global MIDI definitions*/
--    for ( int i=0; i<c_maxBuses; i++ )
--    {
--        for ( int j=0; j<16; j++ )
--            global_user_midi_bus_definitions[i].instrument[j] = -1;
--    }
--
--    for ( int i=0; i<c_max_instruments; i++ )
--    {
--        for ( int j=0; j<128; j++ )
--            global_user_instrument_definitions[i].controllers_active[j] = false;
--    }
--
--
--    /* the main performance object */
--    perform p;
--
--    p_font_renderer = new font();
--
--
--    if ( getenv( HOME ) != NULL )
--    {
--        Glib::ustring home( getenv( HOME ));
--        last_used_dir = home;
--        Glib::ustring total_file = home + SLASH + config_filename;
--        
--        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
--        {
--            printf( "Reading [%s]\n", total_file.c_str());
--
--            optionsfile options( total_file );
--
--            if ( !options.parse( &p ) ){
--                printf( "Error Reading [%s]\n", total_file.c_str());
--            }
--        }
--
--        total_file = home + SLASH + user_filename;
--        if (Glib::file_test(total_file, Glib::FILE_TEST_EXISTS))
--        {
--            printf( "Reading [%s]\n", total_file.c_str());
--
--            userfile user( total_file );
--
--            if ( !user.parse( &p ) ){
--                printf( "Error Reading [%s]\n", total_file.c_str());
--            }
--        }
--
--    }
--    else
--        printf( "Error calling getenv( \"%s\" )\n", HOME );
--
-     p.init();
-     p.launch_input_thread();
-     p.launch_output_thread();
-     p.init_jack();
- 
- 
-+    p_font_renderer = new font();
-+
-     mainwnd seq24_window( &p );
-     if (optind < argc)
-     {
-@@ -299,8 +302,7 @@
- 
-     /* connect to lash daemon and poll events*/
- #ifdef LASH_SUPPORT
--    lash_driver->init(&p);
--    lash_driver->start();
-+    lash_driver->start(&p);
- #endif
-     kit.run(seq24_window);
- 
-
diff --git a/media-sound/seq24/files/seq24-0.9.3-std-mutex.patch b/media-sound/seq24/files/seq24-0.9.3-std-mutex.patch
new file mode 100644
index 000000000000..4e8585a94491
--- /dev/null
+++ b/media-sound/seq24/files/seq24-0.9.3-std-mutex.patch
@@ -0,0 +1,331 @@
+Description: Use standard mutex and condition variable classes
+ Use std::recursive_mutex and std::condition_variable instead of custom classes
+ based on pthread.
+ .
+ Fixes FTBFS with recent GCC versions which defines the "mutex" class which
+ conflicts with seq24's version of "mutex".
+Author: James Cowgill <jcowgill@debian.org>
+Bug: https://bugs.launchpad.net/seq24/+bug/1647614
+Bug-Debian: https://bugs.debian.org/822394
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Module.am
++++ b/src/Module.am
+@@ -31,8 +31,6 @@ bin_PROGRAMS = %D%/seq24
+   %D%/midibus_portmidi.h \
+   %D%/midifile.cpp \
+   %D%/midifile.h \
+-  %D%/mutex.cpp \
+-  %D%/mutex.h \
+   %D%/options.cpp \
+   %D%/options.h \
+   %D%/optionsfile.cpp \
+--- a/src/midibus.h
++++ b/src/midibus.h
+@@ -35,11 +35,11 @@ class midibus;
+ #    include <alsa/seq_midi_event.h>
+ #endif
+ 
++#include <mutex>
+ #include <string>
+ 
+ #include "event.h"
+ #include "sequence.h"
+-#include "mutex.h"
+ #include "globals.h"
+ 
+ const int c_midibus_output_size = 0x100000;
+@@ -90,7 +90,7 @@ class midibus
+ 
+ 
+     /* locking */
+-    mutex m_mutex;
++    std::recursive_mutex m_mutex;
+ 
+     /* mutex */
+     void lock();
+@@ -208,7 +208,7 @@ class mastermidibus
+     sequence *m_seq;
+ 
+     /* locking */
+-    mutex m_mutex;
++    std::recursive_mutex m_mutex;
+ 
+     /* mutex */
+     void lock();
+--- a/src/midibus_portmidi.h
++++ b/src/midibus_portmidi.h
+@@ -25,12 +25,12 @@ class mastermidibus;
+ 
+ #ifdef __WIN32__
+ 
++#include <mutex>
+ #include <string>
+ 
+ #include "portmidi.h"
+ #include "event.h"
+ #include "sequence.h"
+-#include "mutex.h"
+ #include "globals.h"
+ 
+ const int c_midibus_output_size = 0x100000;
+@@ -65,7 +65,7 @@ class midibus
+     long m_lasttick;
+ 
+     /* locking */
+-    mutex m_mutex;
++    std::recursive_mutex m_mutex;
+ 
+     /* mutex */
+     void lock();
+@@ -164,7 +164,7 @@ class mastermidibus
+     sequence *m_seq;
+ 
+     /* locking */
+-    mutex m_mutex;
++    std::recursive_mutex m_mutex;
+ 
+     /* mutex */
+     void lock();
+--- a/src/mutex.cpp
++++ /dev/null
+@@ -1,62 +0,0 @@
+-//----------------------------------------------------------------------------
+-//
+-//  This file is part of seq24.
+-//
+-//  seq24 is free software; you can redistribute it and/or modify
+-//  it under the terms of the GNU General Public License as published by
+-//  the Free Software Foundation; either version 2 of the License, or
+-//  (at your option) any later version.
+-//
+-//  seq24 is distributed in the hope that it will be useful,
+-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-//  GNU General Public License for more details.
+-//
+-//  You should have received a copy of the GNU General Public License
+-//  along with seq24; if not, write to the Free Software
+-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-//
+-//-----------------------------------------------------------------------------
+-
+-#include "mutex.h"
+-
+-const pthread_mutex_t mutex::recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+-const pthread_cond_t condition_var::cond  = PTHREAD_COND_INITIALIZER;
+-
+-mutex::mutex( )
+-{
+-    m_mutex_lock = recmutex;
+-}
+-
+-void
+-mutex::lock( )
+-{
+-    pthread_mutex_lock( &m_mutex_lock );
+-}
+-
+-
+-void
+-mutex::unlock( )
+-{
+-    pthread_mutex_unlock( &m_mutex_lock );
+-}
+-
+-condition_var::condition_var( )
+-{
+-    m_cond = cond;
+-}
+-
+-
+-void
+-condition_var::signal( )
+-{
+-    pthread_cond_signal( &m_cond );
+-}
+-
+-void
+-condition_var::wait( )
+-{
+-    pthread_cond_wait( &m_cond, &m_mutex_lock );
+-}
+-
+-
+--- a/src/mutex.h
++++ /dev/null
+@@ -1,63 +0,0 @@
+-//----------------------------------------------------------------------------
+-//
+-//  This file is part of seq24.
+-//
+-//  seq24 is free software; you can redistribute it and/or modify
+-//  it under the terms of the GNU General Public License as published by
+-//  the Free Software Foundation; either version 2 of the License, or
+-//  (at your option) any later version.
+-//
+-//  seq24 is distributed in the hope that it will be useful,
+-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-//  GNU General Public License for more details.
+-//
+-//  You should have received a copy of the GNU General Public License
+-//  along with seq24; if not, write to the Free Software
+-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-//
+-//-----------------------------------------------------------------------------
+-
+-#pragma once
+-
+-#include "globals.h"
+-
+-#include <pthread.h>
+-
+-class mutex {
+-
+-private:
+-
+-    static const pthread_mutex_t recmutex;
+-
+-protected:
+-
+-    /* mutex lock */
+-    pthread_mutex_t  m_mutex_lock;
+-
+-public:
+-
+-    mutex();
+-
+-    void lock();
+-    void unlock();
+-
+-};
+-
+-class condition_var : public mutex {
+-
+-private:
+-
+-    static const pthread_cond_t cond;
+-
+-    pthread_cond_t m_cond;
+-
+-public:
+-
+-    condition_var();
+-
+-    void wait();
+-    void signal();
+-
+-};
+-
+--- a/src/perform.cpp
++++ b/src/perform.cpp
+@@ -426,7 +426,7 @@ perform::~perform()
+     m_outputing = false;
+     m_running = false;
+ 
+-    m_condition_var.signal();
++    m_condition_var.notify_one();
+ 
+     if (m_out_thread_launched )
+         pthread_join( m_out_thread, NULL );
+@@ -1005,7 +1005,7 @@ void perform::stop()
+ 
+ void perform::inner_start(bool a_state)
+ {
+-    m_condition_var.lock();
++    std::lock_guard<std::mutex> lock(m_mutex);
+ 
+     if (!is_running()) {
+ 
+@@ -1015,10 +1015,8 @@ void perform::inner_start(bool a_state)
+             off_sequences();
+ 
+         set_running(true);
+-        m_condition_var.signal();
++        m_condition_var.notify_one();
+     }
+-
+-    m_condition_var.unlock();
+ }
+ 
+ 
+@@ -1262,18 +1260,18 @@ void perform::output_func()
+ 
+         //printf ("waiting for signal\n");
+ 
+-        m_condition_var.lock();
++        std::unique_lock<std::mutex> lock(m_mutex);
+ 
+         while (!m_running) {
+ 
+-            m_condition_var.wait();
++            m_condition_var.wait(lock);
+ 
+             /* if stopping, then kill thread */
+             if (!m_outputing)
+                 break;
+         }
+ 
+-        m_condition_var.unlock();
++        lock.unlock();
+ 
+         //printf( "signaled [%d]\n", m_playback_mode );
+ 
+--- a/src/perform.h
++++ b/src/perform.h
+@@ -32,6 +32,9 @@ class perform;
+ #endif
+ #include <pthread.h>
+ 
++#include <condition_variable>
++#include <mutex>
++
+ 
+ /* if we have jack, include the jack headers */
+ #ifdef JACK_SUPPORT
+@@ -152,7 +155,8 @@ class perform
+     int m_control_status;
+     int m_screen_set;
+ 
+-    condition_var m_condition_var;
++    std::condition_variable m_condition_var;
++    std::mutex m_mutex;
+ 
+     // do not access these directly, use set/lookup below
+     std::map<unsigned int,long> key_events;
+--- a/src/perfroll.h
++++ b/src/perfroll.h
+@@ -39,8 +39,6 @@
+ 
+ #include "globals.h"
+ #include "perform.h"
+-#include "mutex.h"
+-
+ 
+ using namespace Gtk;
+ 
+--- a/src/sequence.h
++++ b/src/sequence.h
+@@ -26,11 +26,11 @@ class sequence;
+ #include <string>
+ #include <list>
+ #include <stack>
++#include <mutex>
+ 
+ #include "event.h"
+ #include "midibus.h"
+ #include "globals.h"
+-#include "mutex.h"
+ 
+ enum draw_type
+ {
+@@ -153,7 +153,7 @@ class sequence
+     long m_rec_vol;
+ 
+     /* locking */
+-    mutex m_mutex;
++    std::recursive_mutex m_mutex;
+ 
+     /* used to idenfity which events are ours in the out queue */
+     //unsigned char m_tag;
diff --git a/media-sound/seq24/seq24-0.9.2-r1.ebuild b/media-sound/seq24/seq24-0.9.3-r1.ebuild
index a63621d8a8cb..1917270dffd8 100644
--- a/media-sound/seq24/seq24-0.9.2-r1.ebuild
+++ b/media-sound/seq24/seq24-0.9.3-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=7
 
-DESCRIPTION="Seq24 is a loop based MIDI sequencer with focus on live performances"
+inherit autotools desktop
+
+DESCRIPTION="Loop based MIDI sequencer with focus on live performances"
 HOMEPAGE="https://edge.launchpad.net/seq24/"
 SRC_URI="https://edge.launchpad.net/seq24/trunk/${PV}/+download/${P}.tar.bz2"
 
@@ -13,18 +14,25 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="jack lash"
 
-RDEPEND="media-libs/alsa-lib
-	>=dev-cpp/gtkmm-2.4:2.4
-	>=dev-libs/libsigc++-2.2:2
-	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
-	lash? ( >=media-sound/lash-0.5 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-cpp/gtkmm:2.4
+	dev-libs/libsigc++:2
+	media-libs/alsa-lib
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )
+"
+RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS ChangeLog README RTC SEQ24 )
 
+PATCHES=( "${FILESDIR}/${P}-std-mutex.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-lash-fix.patch
+	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/sidplay/Manifest b/media-sound/sidplay/Manifest
index 654ab46d8fa4..b29d2a2f9063 100644
--- a/media-sound/sidplay/Manifest
+++ b/media-sound/sidplay/Manifest
@@ -2,5 +2,4 @@ AUX sidplay-2.0.9-gcc43.patch 1097 BLAKE2B 38c060522fad4f8e71a0a6eab3bb32d01292b
 AUX sidplay-2.0.9-gcc44.patch 3726 BLAKE2B 6d775f8a1cfb2e33d1ed9a07f51100c6ceb4da52f25de15ed4be504058b43293916661a94ba768fc898a55898ea5268659cd0548f0e8cd15ee1cf4ea3b519463 SHA512 41f319b4e232d199478d586b8a397493e1cc6a8eaa6b4eb5bec272b520ff8ffa078ac72b3eddf4f2865614bfe1f8e28df5ad3f2699bc74684c476a24b7795f75
 DIST sidplay-2.0.9.tar.gz 362140 BLAKE2B 4b5b5d9aff566f8840c4a1f405f64f1d64b642d32d85eca355a4d97bcd03056456c9b49dedd6eca63d5174893206e90693a2555ff35835f6f037ba964bccaae2 SHA512 38d334b7e649d6043b48705edf3c4cd27d01283b95f42d1b46bb7cf266ca0d5f6fac4a7dfd398578a3278d293342e4d4d09cde8d443d60a8d50e4abbe127afe5
 EBUILD sidplay-2.0.9-r1.ebuild 475 BLAKE2B 2b55b670e2418744b3d01233d5a2e9aad56a53ef8e79fe758be3262d170c82b915f08e3c2d2b780d0348cc7aec50c2d6c1759cb225bdbd86ba90e4107a742cdd SHA512 26c966f556bc00559035f291b90310af937ffb030a09fc4751d7ee6d01fae37e52d1853ac89701850ede241859e10a5d039cf4e278c8ca52a23f76d07381b2de
-EBUILD sidplay-2.0.9.ebuild 474 BLAKE2B aa119bd74a9af90d3c7f0af88db174d70c13f57b0e09127b6f225e23aeec807c8d8dcfb2966d4cd58cca808f0c81155ce6ec96c2e84f2d9afb968c0019c5a9e5 SHA512 b2b76c35af776ea6890f2a853f8ae051b0d6829b70dcac5c4a59843884e6d67f108e588e9c1d7834754518bca9891fb7eb09da144565d980fbaea29819ae43eb
 MISC metadata.xml 331 BLAKE2B 41bbcd40272e97e1e0b10fd8e9471db6bfa393ac15eead124bd6e5885b1a35d746bd5be4ced94ed97d31ea130ed17aee55f81b6582e1895813661e3cf07e55b6 SHA512 83c0e6c0f4c7a85a10c96db7cb2eadffab0ef5e4614b0a091a4e14bb9a37b90d0d509bec47bf75d03853ab39a06ca12bcb5cd89f89e09901340a76c7b5c392e8
diff --git a/media-sound/sidplay/sidplay-2.0.9.ebuild b/media-sound/sidplay/sidplay-2.0.9.ebuild
deleted file mode 100644
index e9a2c0d50f34..000000000000
--- a/media-sound/sidplay/sidplay-2.0.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="C64 SID player"
-HOMEPAGE="http://sidplay2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libsidplay-2.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc43.patch"
-	"${FILESDIR}/${P}-gcc44.patch"
-)
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 5ab5cc753cdf..cf141b1bc593 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,5 +1,3 @@
-DIST sidplayfp-1.4.0.tar.gz 181746 BLAKE2B ec21d900dbfaabe7d8e976acce0c4a53c60b4be8cfb6bc1e53005949f52a0dc28ff90e6087e57e77db571e987cdbc644eacbaaa3a78ef8868c4a48771e2c9603 SHA512 ac91cc26622b211408c50bcef14dcda78b8da81b43a8f334d91a02b89bd6dac0b3e3adaeb84545e6dbcef97354ba6c2dc555e4f0a2ff0298c6710fe1c6cbbd5f
 DIST sidplayfp-1.4.4.tar.gz 183711 BLAKE2B 31ff002d4cd54e827117e2b2f86d253ee1e0bc07fb6ac777653109585c059311205e141e339a8d8cde08209e1c35776d6f0a0ccf0ad754f78eb5e5f4bafd3cfb SHA512 8375a249da80a10d9c0ef55b35c5b047bf0249393026ad8ff25fb8a2660151f1d482fe581a85c6982b3c70ea257807ce17e1c6011874f10c64bec54a1982ec04
-EBUILD sidplayfp-1.4.0.ebuild 894 BLAKE2B 711fcd7d7e4593a836b8f87431a15c11c55031e17404ce8df9564f9a9a50dcafc1d07c1a019de05a90249d8da66cb2cc4b6a4626a65871f67a5c3f1a4be2199c SHA512 cc2cddba953f2e6bc010072cdc4c279e6b0962a90bcc3348f6d91be67e07c1c5f54f98f43b3fac16d6656941bfb2797f78234318c6343759f1eb4f0a1c661db3
 EBUILD sidplayfp-1.4.4.ebuild 880 BLAKE2B 4cd44b11980ba9ede820c59c0eddf795d7eda5bce49e351f1340c159b718f24a0e124c01d5279e9e9a0eeeaa211c1be781e8644a26e1f7845cf7a3867503ec59 SHA512 bed6279bea87e497e959af4ac3d6467fd79e4b2ab3f54747dc0d4f99fe2d434ef7299c0a6155580c58bc87962b1a14a445f48712e9f7d74e00ef64f0eecf9d4f
 MISC metadata.xml 338 BLAKE2B 8f2f847b878e42e85fed57021162ccfd8cb8b54e6c285cea2691b9dd89ab320a59e4df38ae12414eaa81d7f781f81fd6d102e37f0121f98a2d9355ac8e9c131a SHA512 8f2ffc3fd7b2b6af0143e4125cad702a68da198e0433fd3d22775ca1f64d8689acf3cc0fdbd205d7fc0815b95c1c88fa1cca71c3f5572f3aa3b25bb8b3a9b76e
diff --git a/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild
deleted file mode 100644
index 997402d17402..000000000000
--- a/media-sound/sidplayfp/sidplayfp-1.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-DESCRIPTION="A sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa oss pulseaudio"
-
-RDEPEND=">=media-libs/libsidplayfp-1.8.0
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-DOCS=( AUTHORS README TODO )
-
-src_prepare() {
-	use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
-	use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
-}
-
-src_configure() {
-	export ac_cv_header_linux_soundcard_h=$(usex oss)
-	econf
-}
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index b8967d2f9f09..13ea0ac48ce7 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
-EBUILD sound-juicer-3.24.0.ebuild 1494 BLAKE2B cf3b299bce2123b2397591f3ce9b850f2ba7240d350f43122f9020e30b91c3e304d96567be3f2ed97803491a40430e225671529d65955d9cb2e382b57f21adf0 SHA512 9ce32d6895e70b0be5d0c10fabbc3afcea6f3a70c97f7169c29016138fc025fde410494c30c3b5eaf80a1e0ca3a74e48f2fcba0d91b991229b54cfa42edad067
+EBUILD sound-juicer-3.24.0.ebuild 1488 BLAKE2B 3d9d2d6c4d5acea1076696b4be70e05a9af14941d5313396fd4f573b902479e0678ce653af0b71a9beac3d27ca0fbae862bddac5d414b9881f0f184763d2baff SHA512 29515fb4b45edfad7f5099d4824639aad433a6fdf8fae74e02cd4ed47603f56c0d6a3f833efe99ffb76cc6e3ec8185340e8a33e95be466efd11f018bfd169516
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
index 878c4c6fdc38..859df80ed0a7 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,8 +36,8 @@ RDEPEND="${COMMON_DEPEND}
 	media-plugins/gst-plugins-meta:1.0
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	dev-libs/appstream-glib
+	dev-util/itstool
 	>=sys-devel/gettext-0.19.6
 	virtual/pkgconfig
 	test? ( ~app-text/docbook-xml-dtd-4.3 )
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
index 4c9184a1f1ce..f5f9845290bb 100644
--- a/media-sound/specimen/Manifest
+++ b/media-sound/specimen/Manifest
@@ -2,5 +2,5 @@ AUX specimen-0.5.2_rc3-jackmidi.patch 1075 BLAKE2B 1160f005c78fdb575695b73ca5e81
 AUX specimen-0.5.2_rc3-underlinking.patch 2324 BLAKE2B 41887cd863ba7c46dd64e63a70affd945450d93ae4a0f762ee2abb9577a98956ceefc776be842799e3e46f09d80fdec9fe937ae0149e974733e1c4c347ac4f31 SHA512 012c0c08c2706ce11a97fb5a8919b9d72287119658a57151648aa7adf24b22ea6d552d18b4584c68a5077e236ae7653f8c54eaafac7b698015b5e93d9f5d587d
 DIST specimen-0.5.2-rc3.tar.gz 267948 BLAKE2B f7a19c80cfe03730a9eae56ad213ed79555bf0da80bafdc55b29a9316e2cf37e6178d0c452d13f6c6a3cdf700ec8e844c21b86dff32f4eeec305534cd00f8dd8 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4
 EBUILD specimen-0.5.2_rc3-r1.ebuild 1026 BLAKE2B edf02bb07b940394506cfaf1301dab17f44496f8a3ef2cc314db58ab8660d4a530147ad26d0ddd6a20b38966b84ece624ed9206ddaf62c0ecb3257cee9fc30fc SHA512 b0698454918e4e97a78e5e6cca4e59e5a76d96d26930d6ad87041059104373727db38b48057498fdc526f76ddb7dc941874536dacc7fbabbf024e6fd173d509c
-EBUILD specimen-0.5.2_rc3-r2.ebuild 1003 BLAKE2B bc1f3f8e2e00e85f03f532b6a1553920b7639660aab025da5680ac7a869380535322009cc9c993f9a543d8a20c4b480c25ea119ffcf55ed986e1271928884a96 SHA512 0d2a2f30becb1bbbcb034e299616403d0478183407615dc9ba6116cb813b11de2a846a7200f07267062b7e3a965f481040098abfa2cf76cf0d7dcba44cc23de9
+EBUILD specimen-0.5.2_rc3-r2.ebuild 985 BLAKE2B 0596dbb939e955938638d7ac4833c7fa6cd42c23079e31ad2bdac3c6f780675c5d487900d5d3c112f3294680a0b37dfd926346363fd3d499e91df14ac9d6661c SHA512 00c2065f36a1a14aefbf7c04a477a516b65d736a8f3ecd1d00f6ba931220a6b35cbed06fd8cb19e11eed1b690ca50b2a51029cbdf641043a4062296b5335777b
 MISC metadata.xml 469 BLAKE2B f079f7fa89d407784fc4c2503b933a1f2313349babbd0dc2cc373407dc92d650d6067f0203a88d5e390cd4ea21402e9b3a66cb86899978430dd7e47f4228b217 SHA512 ba825914f15f4a5451e943a8973361ed42cd2206c589fd087b1e5b4ae5b797c428fa47ef2ef6f0229b242bcd8f02a90bb5f0a01779e1bb0495cd0f8a5dd86335
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
index b664bba525c3..1de2a64a6516 100644
--- a/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools versionator
-
-MY_PV="$(replace_version_separator 3 -)"
+MY_PV="${PV/_/-}"
+inherit autotools desktop
 
 DESCRIPTION="A Midi Controllable Audio Sampler"
 HOMEPAGE="http://zhevny.com/specimen"
@@ -13,25 +12,30 @@ SRC_URI="http://zhevny.com/${PN}/files/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="lash"
 
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-libs/libxml2:2
+	gnome-base/libgnomecanvas
 	>=media-libs/alsa-lib-0.9
 	media-libs/libsamplerate
 	media-libs/libsndfile
 	>=media-libs/phat-0.4
-	dev-libs/libxml2:2
+	>=media-sound/jack-audio-connection-kit-0.109.2
 	x11-libs/gtk+:2
-	gnome-base/libgnomecanvas
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	lash? ( media-sound/lash )
+"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-jackmidi.patch"
 	"${FILESDIR}/${P}-underlinking.patch"
 )
+
 S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_prepare() {
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 50ef706255be..d160554cd143 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -10,10 +10,13 @@ AUX timidity++-2.14.0-params.patch 716 BLAKE2B d4426e36db91fea9561a81bacb5337c8d
 AUX timidity++-2.14.0-pkg-config.patch 3836 BLAKE2B 64757187ff860fbd4359dca0f567e7b71ad11ffa060e736deccd4994e0409bcc86f1f5151414e532e22f07e4dc9a6b5d75b1617c21deab616a319622a3ced0c4 SHA512 2dba5ca948d31d4498f44f8b4c67d59294e7cf722652b62f9502222867f1c93fa491b9741c049bde7ac976c74e52639bfc359a88e2c7f3728b723e272e40692d
 AUX timidity++-2.14.0-revert-for-required-ctl_speana_data-function.patch 701 BLAKE2B 32fa47b354cc3d9aedd0b3466eb69de08757f731c39d4b11fd8377d607918eedaedb0747b63ab031479790460303e971ad153875b448166632e90cab2af95598 SHA512 096ec664e401446bebe2395309cbe57c61c711a1ce4c23984ba668cdc9aef1a23a1c5d4f9111c0a2bb4e634368b57093f2dfb0aa1c60e281098bac646b8b9214
 AUX timidity++-2.14.0-tcltk86.patch 312 BLAKE2B 040b5c96771398e41adf62354bd48caeadcf030398128c39212f6226abb996d4f086d0476799726d761e0c93b84165c71d7b05a1060c1244483bbae7df782e8b SHA512 e6fd991cf5a1d568dccc1a47629e5562721325668e498b7474382b3f53f3161f1e0f40144ec5e2bb5d6f2b83ddc46fd22a2998d17763e142362cb7419a0bc31e
+AUX timidity++-2.15.0-pkg-config.patch 4257 BLAKE2B f9e81fdc50ff485636aaab4b0c74e7a7caba49eb8884b5176b2a71a3a582542300872786ec56886d645f8b6ec23b5312908053c47c5b107d8ecf905dbdd27402 SHA512 e6ae48d17d0b7b9589df3e90e5923cd53c86b59b2730306c2ec76f8c20013e8befd70e36d4c2629bae906cb967c1404b3595334a6f208f8799d7fbd6e030fe08
 AUX timidity.cfg-r1 669 BLAKE2B 023edf8f503f23817c1941a0cb1a0341f0ff1475405fc906a9acf4adb36ca8769bc015df5c30af50a828dd522d214bf9d6c4feabe2db3419e8100ebd431fdbdb SHA512 98f0690bda6deed6022e97e74a6114334d5f965d646d7c7d150ac177f6eb78277e931ed0b4c5613ef16ba648eaad66a3ed72ed933ca936698ca81365151b223b
 AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6df3428e127c1eb7ea2b82750c86932239c8a6ceb507d06fce2bc5e5ee963d56fd0e8daf2ff7890a9e68a SHA512 34312594866d77244d0eb77b4111a8e7998bd20bcb3542b036b1626d73bf4672eef677a926badceaaee517f1d32752b3e3b1ea4d3f2cc0703d66c1c740e0dc2e
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
+DIST TiMidity++-2.15.0.tar.xz 1363040 BLAKE2B 63612dc96ddef9b24ca35a8fa24c22fee8b0573efb09543e6017070b2d0a68494bc34afe8ffc50b5f7fe2d95397a971d5dc7afd4c9adbb524b119012e716b7f7 SHA512 36c3c79d941903109d5d6d529963d12e8192a857e80402ad5ab0d1e223451a7cf5dc8fdd046b22ae7da96f413d68db8587a8fce348635838eba2f30f7019192f
 EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B b708c93a6b944ca3e6f248dbfb454e962b272891787d81dc375d27b3a3b0db99193bec1639c738496e47d55200c7eec97f4ac1fa618fef768906334bdeae1830 SHA512 45bcefe69f07d111af5a37c96b3a36cc3fe7ff175823a4db49973b540a18f14d2f93a71f5251bc36ec4367d810869c698fcc7d54261d293e14427bb760aa11d0
+EBUILD timidity++-2.15.0.ebuild 5203 BLAKE2B 2479e9bcf7c4503c876ef65f56249d19aaba76382749b0ca998f2494fdafa46b247de37c10764e735c5c201048f723de0bf02ee51e9b299309124bb4d1013680 SHA512 6ae5d163f322429acb976915318c8d82a8f20c38b41840446b38edc87cd1ffba7d4639c790d1e396a4f1a8e5f4f7ca5183baef66bf0baa2dde184ac7313db0f9
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/files/timidity++-2.15.0-pkg-config.patch b/media-sound/timidity++/files/timidity++-2.15.0-pkg-config.patch
new file mode 100644
index 000000000000..3c2e269be029
--- /dev/null
+++ b/media-sound/timidity++/files/timidity++-2.15.0-pkg-config.patch
@@ -0,0 +1,118 @@
+use $PKG_CONFIG rather than `pkg-config`
+
+https://bugs.gentoo.org/497362
+get ncurses info via pkg-config while we're at it
+
+patch by Mike Frysinger <vapier@gentoo.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -163,6 +163,7 @@ AC_SUBST(xawresdir)
+ 
+ # Checks for programs.
+ AM_PATH_LISPDIR
++PKG_PROG_PKG_CONFIG
+ AC_PROG_CC
+ AC_PROG_GCC_TRADITIONAL
+ AC_PROG_INSTALL
+@@ -1348,8 +1349,8 @@ AC_MSG_CHECKING(enable_audio=jack)
+ if test "x$au_enable_jack" = xyes; then
+   AC_MSG_RESULT(yes)
+   SYSEXTRAS="$SYSEXTRAS jack_a.c"
+-  EXTRALIBS="$EXTRALIBS $(pkg-config --libs jack)"
+-  EXTRADEFS="$EXTRADEFS -DAU_JACK $(pkg-config --cflags jack)"
++  EXTRALIBS="$EXTRALIBS $(${PKG_CONFIG} --libs jack)"
++  EXTRADEFS="$EXTRADEFS -DAU_JACK $(${PKG_CONFIG} --cflags jack)"
+ else
+   AC_MSG_RESULT(no)
+ fi
+@@ -1665,69 +1666,8 @@ dnl ncurses
+ AM_CONDITIONAL(ENABLE_NCURSES, false)
+ CONFIG_INTERFACE(ncurses,NCURSES,n,
+   AS_HELP_STRING([--enable-ncurses], [Enable ncurses interface        (default is no)]),
+-  [ AC_CHECK_HEADERS(ncurses.h ncurses/curses.h curses.h)
+-
+-dnl #include <ncurses/curses.h> is failure on Plamo Linux 1.3/ncurses 1.9.9e
+-dnl because <ncurses/curses.h> includes <unctrl.h>:
+-dnl /usr/include/ncurses/curses.h:34: unctrl.h: No such file or directory
+-dnl But surely there is unctl.h at /usr/include/ncurses/unctrl.h.
+-dnl configure must check ncurses header with -I/usr/include/ncurses option.
+-
+-  case "$ac_cv_header_curses_h$ac_cv_header_ncurses_curses_h$ac_cv_header_ncurses_h" in
+-    *yes*);;
+-    *)	for i in /usr/include /usr/local/include; do
+-	  if test -f "$i/ncurses/curses.h" -a -f "$i/ncurses/unctrl.h"; then
+-	    AC_MSG_WARN(ncurses test is failure.  Please check config.h and common.makefile later)
+-	    CPPFLAGS="$CPPFLAGS -I$i/ncurses"
+-	    break
+-	  fi
+-	done
+-	;;
+-    esac
+-
+-    AC_CHECK_LIB(ncurses,initscr,lib_curses_opt=-lncurses,
+-      [ dnl checking pdcurses
+-	AC_CHECK_LIB(curses,PDC_set_ctrl_break,
+-          [ lib_curses_opt=-lcurses
+-	    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-	    lib_user32_opt="$lib_user32_test"
+-	    AC_CHECK_LIB(curses, vwprintw,
+-	      AC_DEFINE(HAVE_VWPRINTW, 1,
+-	        [Define to 1 if you have the `vwprintw' function.]))
+-	  ],
+-	  [ dnl checking libpdcurses
+-	    AC_CHECK_LIB(pdcurses,PDC_set_ctrl_break,
+-	    [ lib_curses_opt=-lpdcurses
+-	      AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-	      lib_user32_opt="$lib_user32_test"
+-	      AC_CHECK_LIB(pdcurses, vwprintw,
+-	        AC_DEFINE(HAVE_VWPRINTW, 1,
+-	          [Define to 1 if you have the `vwprintw' function.]))
+-	    ],
+-	    [ dnl OpenBSD use -lcurses instead of -lncurses.
+-	      case "$target" in
+-		*openbsd*)
+-		  AC_CHECK_LIB(curses,initscr,lib_curses_opt=-lcurses,
+-		    [ AC_MSG_WARN(ncurses interface is not enabled)
+-		      enable_ncurses=no ])
+-		  ;;
+-		*)
+-		  if test "x$VCPP" = xyes || test "x$BORLANDC" = xyes || test "x$WATCOM_C" = xyes || test "x$DMC" = xyes || test "x$POCC" = xyes; then
+-		    lib_curses_opt=libpdcurses.lib
+-		    AC_DEFINE(USE_PDCURSES,1,Define to 1 if you use PDcurses)
+-		    AC_CHECK_LIB(pdcurses, vwprintw,
+-		      AC_DEFINE(HAVE_VWPRINTW, 1,
+-		        [Define to 1 if you have the `vwprintw' function.]))
+-		  else
+-		    AC_MSG_WARN(ncurses interface is not enabled)
+-		    enable_ncurses=no
+-		  fi
+-		  ;;
+-	      esac
+-	    ])
+-	],
+-	$lib_user32_test)
+-      ])
++  [ CPPFLAGS="$CPPFLAGS $(${PKG_CONFIG} --cflags ncurses)"
++    lib_curses_opt=$(${PKG_CONFIG} --libs ncurses)
+   ],
+   [ LIBS="$LIBS $lib_curses_opt"
+     case "$target" in
+@@ -1894,7 +1834,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
+     lib_xmu_opt=-lXmu
+     lib_xt_opt=-lXt
+     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
+-      XFT_CFLAGS="$(pkg-config --cflags xft)";
++      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
+       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
+       lib_xft_opt="-lXft";
+     fi
+@@ -1948,7 +1888,7 @@ CONFIG_INTERFACE(xaw,XAW,a,
+ 	;;
+     esac
+     if test "x$enable_xft" = "xyes" && test "x$have_xaw" != "xno"; then
+-      XFT_CFLAGS="$(pkg-config --cflags xft)";
++      XFT_CFLAGS="$(${PKG_CONFIG} --cflags xft)";
+       EXTRACT_CPPFLAGS(CPPFLAGS,CFLAGS,$XFT_CFLAGS)
+       a_so_libs="$a_so_libs -lXft";
+     fi
diff --git a/media-sound/timidity++/timidity++-2.15.0.ebuild b/media-sound/timidity++/timidity++-2.15.0.ebuild
new file mode 100644
index 000000000000..678ea59d2575
--- /dev/null
+++ b/media-sound/timidity++/timidity++-2.15.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop elisp-common systemd toolchain-funcs user xdg
+
+MY_PV=${PV/_/-}
+MY_P=TiMidity++-${MY_PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
+HOMEPAGE="http://timidity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+
+REQUIRED_USE="tk? ( X )"
+
+DEPEND="
+	alsa? ( media-libs/alsa-lib )
+	ao? ( >=media-libs/libao-0.8.5 )
+	emacs? ( virtual/emacs )
+	flac? ( media-libs/flac )
+	gtk? ( x11-libs/gtk+:2 )
+	jack? ( virtual/jack )
+	motif? ( >=x11-libs/motif-2.3:0 )
+	nas? ( >=media-libs/nas-1.4 )
+	ncurses? ( sys-libs/ncurses:0= )
+	slang? ( sys-libs/slang )
+	speex? ( media-libs/speex )
+	tk? ( dev-lang/tk:0= )
+	vorbis? ( media-libs/libvorbis )
+	X? (
+		media-libs/libpng:0=
+		x11-libs/libXaw
+		x11-libs/libXext
+	)
+"
+RDEPEND="${DEPEND}
+	app-eselect/eselect-timidity
+	alsa? ( media-sound/alsa-utils )
+	selinux? ( sec-policy/selinux-timidity )
+"
+
+PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
+
+SITEFILE=50${PN}-gentoo.el
+
+pkg_setup() {
+	enewgroup audio 18 # Just make sure it exists
+	enewuser timidity -1 -1 /var/lib/timidity audio
+}
+
+DOCS=( AUTHORS ChangeLog NEWS README "${FILESDIR}"/timidity.cfg-r1 )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.14.0-params.patch
+	"${FILESDIR}"/${PN}-2.14.0-ar.patch
+	"${FILESDIR}"/${PN}-2.14.0-configure-flags.patch
+	"${FILESDIR}"/${PN}-2.15.0-pkg-config.patch
+	"${FILESDIR}"/${PN}-2.14.0-CVE-2017-1154{6,7}.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export EXTRACFLAGS="${CFLAGS}" #385817
+
+	local audios
+	local myeconfargs=(
+		--localstatedir=/var/state/${PN}
+		--with-module-dir="${EPREFIX}/usr/share/timidity"
+		--with-lispdir="${SITELISP}/${PN}"
+		--with-elf
+		--enable-server
+		--enable-network
+		--enable-dynamic
+		--enable-vt100
+		--enable-spline=cubic
+		$(use_enable emacs)
+		$(use_enable slang)
+		$(use_enable ncurses)
+		$(use_with X x)
+		$(use_enable X spectrogram)
+		$(use_enable X wrd)
+		$(use_enable X xskin)
+		$(use_enable X xaw)
+		$(use_enable gtk)
+		$(use_enable tk tcltk)
+		$(use_enable motif)
+	)
+
+	use flac && audios+=",flac"
+	use speex && audios+=",speex"
+	use vorbis && audios+=",vorbis"
+	use oss && audios+=",oss"
+	use jack && audios+=",jack"
+	use ao && audios+=",ao"
+
+	if use nas; then
+		audios+=",nas"
+		myeconfargs+=(
+			--with-nas-library="/usr/$(get_libdir)/libaudio.so"
+			--with-x
+		)
+		use X || ewarn "Basic X11 support will be enabled because required by nas."
+	fi
+
+	if use alsa; then
+		audios+=",alsa"
+		myeconfargs+=(
+			--with-default-output=alsa
+			--enable-alsaseq
+		)
+	fi
+
+	if use motif; then
+		myeconfargs+=(
+			--with-x
+		)
+		use X || ewarn "Basic X11 support will be enabled because required by motif."
+	fi
+
+	# needs to come after all audios have been collected
+	myeconfargs+=(
+		--enable-audio=${audios}
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	# these are only for the ALSA sequencer mode
+	if use alsa; then
+		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
+		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
+
+		systemd_dounit "${FILESDIR}"/timidity.service
+	fi
+
+	insinto /etc
+	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
+
+	dodir /usr/share/timidity
+	dosym ../../../etc/timidity.cfg /usr/share/timidity/timidity.cfg
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	diropts -o timidity -g nobody -m 0700
+	keepdir /var/lib/timidity
+
+	doicon "${FILESDIR}"/timidity.xpm
+	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
+
+	# Order of preference: gtk, X (Xaw), ncurses, slang
+	# Do not create menu item for terminal ones
+	local interface="-id"
+	local terminal="true"
+	local nodisplay="true"
+	if use gtk || use X; then
+		interface="-ia"
+		terminal="false"
+		nodisplay="false"
+		use gtk && interface="-ig"
+	elif use ncurses || use slang; then
+		local interface="-is"
+		use ncurses && interface="-in"
+	fi
+	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
+		-e "s/Terminal=.*/Terminal=${terminal}/" \
+		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
+		-i "${ED}"/usr/share/applications/timidity.desktop || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+
+	elog "A timidity config file has been installed in /etc/timidity.cfg."
+	elog "Do not edit this file as it will interfere with the eselect timidity tool."
+	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
+
+	if use alsa; then
+		elog "An init script for the alsa timidity sequencer has been installed."
+		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
+		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
+	fi
+
+	if use sparc; then
+		elog "Only saving to wave file and ALSA soundback has been tested working."
+	fi
+
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	xdg_pkg_postrm
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /media-sound
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)