gentoo resync : 12.01.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-01-12 16:58:08 +0000
commit: c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree: 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-sound
parent: 2891d29af8907ce881662f4a02844926d7a293c7 (diff)
46 files changed, 1151 insertions, 371 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b8491493dae0..cdbc0e54392d 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 40b3933c53e6..ea9f59ee2d96 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,11 +1,14 @@
 AUX alsa-modules.conf-rc 1028 BLAKE2B 91a27d4806bbd88bfb255cb28477cf4976cdbe2c3b2bf10e6e321375f40d4177d6eb563a189829ab49d6a3c71b3ad48cb3e52a343ad780a9f067b6bd3e42e628 SHA512 20b309a44e23408ede66a121d81047f32970fa033728784c76a1caabb72143dbc1c5b970f9e73a910b7ef9026df597cde2afc7c1f52127fab532dba4955b1757
+AUX alsa-utils-1.1.8-missing_header.patch 1580 BLAKE2B 59ac66fa5fbc303978bac8e16c2b026e7c9416ee4c06b220ad7bac926c3136e2053ab24438048dcebf96091e2ea934f743ff3c694d9dbd7fee49439ec900b514 SHA512 10f0924522178d3258eb2086da5ab94681ec580cf89aee98ebbc6d7f759db9484a82e8c10f484139516fe4c4f31ee33f021cc9dc7d472debe8c1353b881c40db
 AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893adad8ea5b65ac166199dfa23acb07a0ae92d933d1b9c74d39cf96a778993b3d72074c27e4a7b4c28f4c SHA512 90c1e974276945f7632dc370a005b58d669b93edbf27116098d4831e69c11c26d9b21e7eacfaf12c50019f8c88dc1f370101e2d905fdde40887fe36bac00d83e
 AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
 DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
+DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b705daa7bd38e6d5e8835a21a9aefeca2fb1a7444c5709516ace0eecdfd5b410b5b24008abebb7ca917763108637bbcca SHA512 f877b491840126420dd9847347d0af865b6d03eccac2e2c3853cdbc76e91899f5a5139753cc41a4db942e7999c8d53cf9bd57d2fd5e1d32c872871b2d25146d9
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2250 BLAKE2B 91f62ec519292ed9ca58c3be32114533da746c9d749db5f8d7c29aefb799342957a4078f9c207713e60582001578850fb1153f33d169cb36297ceb0f1112e5c8 SHA512 8a84e7ba4a4e861f9ad691e87e9e6d5ae42d38365252f3182374f83f37af5cacb9e365a4604e00e7c8dcaff1366ec825b97faefe8553468093d650087cae5c39
 EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
+EBUILD alsa-utils-1.1.8.ebuild 2327 BLAKE2B a6dbd0cedb1f3c9be217caa581f6e3219590f0ec9928d86bb6dadaecc5994c0bb6d805f45b91f5df44c116a9058da1cf560c296114d6975220ee9b2c77962bc5 SHA512 b1b97a5e3ebbafe230187da5bb8563fd680da4e414c0fb5797904fd9e594491496a8500f95e886573fe91e93b551f20d95cf330f48d0898674dec8597f61016b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
new file mode 100644
index 000000000000..bcc1f868e6d6
--- /dev/null
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd udev
+
+DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
+HOMEPAGE="https://alsa-project.org/"
+SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0.9"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="bat doc +libsamplerate +ncurses nls selinux"
+
+CDEPEND=">=media-libs/alsa-lib-${PV}
+	libsamplerate? ( media-libs/libsamplerate )
+	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
+	bat? ( sci-libs/fftw:= )"
+DEPEND="${CDEPEND}
+	doc? ( app-text/xmlto )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.8-missing_header.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	dodoc seq/*/README.*
+
+	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
+	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
+
+	keepdir /var/lib/alsa
+
+	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
+	# scan directory /usr/share/alsa/ucm: No such file or directory
+	# alsaucm: unable to obtain card list: No such file or directory
+	keepdir /usr/share/alsa/ucm
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog
+		elog "To take advantage of the init script, and automate the process of"
+		elog "saving and restoring sound-card mixer levels you should"
+		elog "add alsasound to the boot runlevel. You can do this as"
+		elog "root like so:"
+		elog "# rc-update add alsasound boot"
+		ewarn
+		ewarn "The ALSA core should be built into the kernel or loaded through other"
+		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
+	fi
+}
diff --git a/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch b/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch
new file mode 100644
index 000000000000..560d538a1cb1
--- /dev/null
+++ b/media-sound/alsa-utils/files/alsa-utils-1.1.8-missing_header.patch
@@ -0,0 +1,50 @@
+--- alsa-utils-1.1.8/axfer/test/generator.h
++++ alsa-utils-1.1.8/axfer/test/generator.h
+@@ -0,0 +1,47 @@
++// SPDX-License-Identifier: GPL-2.0
++//
++// generator.c - a generator for test with buffers of PCM frames.
++//
++// Copyright (c) 2018 Takashi Sakamoto <o-takashi@sakamocchi.jp>
++//
++// Licensed under the terms of the GNU General Public License, version 2.
++
++#ifndef __ALSA_UTILS_AXFER_TEST_GENERATOR__H_
++#define __ALSA_UTILS_AXFER_TEST_GENERATOR__H_
++
++#include <stdint.h>
++#include <alsa/asoundlib.h>
++
++struct test_generator;
++typedef int (*generator_cb_t)(struct test_generator *gen,
++			      snd_pcm_access_t access,
++			      snd_pcm_format_t sample_format,
++			      unsigned int samples_per_frame,
++			      void *frame_buffer, unsigned int frame_count);
++
++struct test_generator {
++	int fd;
++	uint64_t access_mask;
++	uint64_t sample_format_mask;
++	unsigned int min_samples_per_frame;
++	unsigned int max_samples_per_frame;
++	unsigned int min_frame_count;
++	unsigned int max_frame_count;
++	unsigned int step_frame_count;
++
++	generator_cb_t cb;
++	void *private_data;
++};
++
++int generator_context_init(struct test_generator *gen,
++			   uint64_t access_mask, uint64_t sample_format_mask,
++			   unsigned int min_samples_per_frame,
++			   unsigned int max_samples_per_frame,
++			   unsigned int min_frame_count,
++			   unsigned int max_frame_count,
++			   unsigned int step_frame_count,
++			   unsigned int private_size);
++int generator_context_run(struct test_generator *gen, generator_cb_t cb);
++void generator_context_destroy(struct test_generator *gen);
++
++#endif
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 770f8af54fed..a5c178400183 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,6 +1,6 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
-EBUILD bluez-alsa-1.3.1.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
-EBUILD bluez-alsa-9999.ebuild 1408 BLAKE2B 5fcb2a033a68053edd7351c7ca02d9131637c5160659a93fa11d428fc5bedc17947c1dada2748d2a5053e28b36e050c509a75ffb14170e0044812e557dcac976 SHA512 073d4600fbcaa8f92ade4d3fd3b037f4b89a9593b52d529a34c4f2d9e0d3684016ada86fd43390ef059aa70b833809bcbbccb82747af47bffb2f725f15ec8ee5
+EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
+EBUILD bluez-alsa-9999.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
 MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
index bb62cc607f2e..c883ca5ff3ef 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.3.1.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.3.1.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
@@ -23,13 +23,14 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index bb62cc607f2e..c883ca5ff3ef 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-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=7
@@ -23,13 +23,14 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
 	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index a33638a729aa..a325b0c7e1f3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,5 +1,7 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
 AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbbece6219feede3e35f9304de783787a75e43f6a1ecabc2d9bdd773c1c5db3e6d85dc206ed5e0d8425c23a37b52d0213 SHA512 e6b8d714ca6a37fd096ad77fb187e9552058dae98c73ebed9f30e04dd03f8467a27ce0cf1afa9a868e86cb5c8aad05599bafb6b56929de9753251e2bb22c6b78
 DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
+DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
+EBUILD cantata-2.3.3.ebuild 3195 BLAKE2B d9dd77ad8ebd2721221e64d867eb0236c16618808348a556c02e03adfe22cec33fd142240c4df673ca420652b54f0d7a6b2ad40b8897aafddb745a44b2b48608 SHA512 d51b4c23ce8ff69b1d815edea7f09e26003db1d009a85a8a6fde855e4bb39a30456204740eaad2c9b7fe8c37643f5fa3bb0953e6f26c034d4419bf74c513466e
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3.ebuild b/media-sound/cantata/cantata-2.3.3.ebuild
new file mode 100644
index 000000000000..0db70f0c745a
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.3.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
+
+DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
+HOMEPAGE="https://github.com/CDrummond/cantata"
+SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
+REQUIRED_USE="
+	?? ( cdda cdio )
+	cdda? ( udisks || ( cddb musicbrainz ) )
+	cddb? ( || ( cdio cdda ) taglib )
+	cdio? ( udisks || ( cddb musicbrainz ) )
+	mtp? ( taglib udisks )
+	musicbrainz? ( || ( cdio cdda ) taglib )
+	replaygain? ( taglib )
+"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus: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
+	sys-libs/zlib
+	virtual/libudev:=
+	cdda? ( media-sound/cdparanoia )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	mtp? ( media-libs/libmtp )
+	musicbrainz? ( media-libs/musicbrainz:5= )
+	replaygain? (
+		media-libs/libebur128
+		media-sound/mpg123
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	streaming? ( dev-qt/qtmultimedia:5 )
+	taglib? (
+		media-libs/taglib[asf(+),mp4(+)]
+		udisks? ( sys-fs/udisks:2 )
+	)
+	zeroconf? ( net-dns/avahi )
+"
+RDEPEND="${COMMON_DEPEND}
+	dev-lang/perl[ithreads]
+	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/qtconcurrent:5
+	dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" )
+
+src_prepare() {
+	remove_locale() {
+		rm "translations/${PN}_${1}".ts || die
+	}
+
+	cmake-utils_src_prepare
+
+	# Unbundle 3rd party libs
+	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
+
+	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do remove_locale
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
+		-DENABLE_CDPARANOIA=$(usex cdda)
+		-DENABLE_CDDB=$(usex cddb)
+		-DENABLE_CDIOPARANOIA=$(usex cdio)
+		-DENABLE_HTTP_SERVER=$(usex http-server)
+		-DENABLE_MTP=$(usex mtp)
+		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+		-DENABLE_FFMPEG=$(usex replaygain)
+		-DENABLE_MPG123=$(usex replaygain)
+		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
+		-DENABLE_TAGLIB=$(usex taglib)
+		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_REMOTE_DEVICES=OFF
+		-DENABLE_UDISKS2=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+
+	has_version media-sound/mpd || \
+		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+
+	if ! has_version app-misc/media-player-info; then
+		elog "Install app-misc/media-player-info to enable identification"
+		elog "and querying of portable media players"
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index a1c16b3f58f1..a8585a854aff 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -4,5 +4,5 @@ DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68
 DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
 EBUILD clementine-1.3.1_p20180416.ebuild 5175 BLAKE2B b66494abab89a91ed12929a31c5253ab9c2190f3a95f5443a15ec8244a51704cafa734d754dc6928393addccfbfe1f081c9ecfe217a83e15e808a79207878e8e SHA512 302a93dc77c533bc65c10de9f82d1ed5da2f42c40c83392b4b1a32da3fd4e25f530e07edcf704780a93abce026ddc41c4b3054ea94964f4a1cc79658eb5e5ad7
 EBUILD clementine-1.3.1_p20181201.ebuild 5254 BLAKE2B 71f4a4ac2cdbcd23cf1a5e4f9e098e0841872306db1fef39189ee53ff2e18aa086095cbdcaf1977932e61be509213edbcd0783054b683ec9d7dcdc78ba8f2178 SHA512 40a9aa0d2bf16e68cd4b749adfeb0ebf46987a84554371f3c85d959f3c46eaf8c48067a9643cfb827850d0a2a3b51e82fb2eb5d90598386bf4394b6bdf2358e7
-EBUILD clementine-9999.ebuild 5106 BLAKE2B 173f32354a9891b77909bee7e617b39b6b90005d7dc40a1da8e271dbc7aeb28421e7b9aeaaf1e075de0be9801df98a8233e89e4b669efb2891854ec3b5fae55b SHA512 6b2a173785f473e5290f673a42d55092bf1e184eff3eed0fabef238758395f7a21d9a090cd29efb36e3db3fd2b52dc55d53a271edf1c8d7038ff5a516cefe39a
+EBUILD clementine-9999.ebuild 5153 BLAKE2B 1f43fd1abb60716a257dea4892036352fa419fa38ec606c9cfe7a12ebf10e31d817f44f8e7744eb043cf71e8a08057bccd58c5bc8416185d22dc4f8bd23cf8bc SHA512 ca24106145c5fe3a1ecf1a80fd6667ef02330a3da854b33e35cc0e303023e60bc177fc51cf89c9a050ddc99eb7c00a4bf017359b2824be6bdf94d08edd451cbe
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 78421f8b1167..8fcba65622c4 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-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
@@ -11,9 +11,10 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
 	GIT_ECLASS="git-r3"
 else
-	SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	COMMIT=
+	SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_P^}"
+	S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
 inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
 unset GIT_ECLASS
@@ -50,7 +51,6 @@ COMMON_DEPEND="
 	>=media-libs/taglib-1.11.1_p20181028
 	sys-libs/zlib
 	virtual/glu
-	virtual/opengl
 	x11-libs/libX11
 	cdda? ( dev-libs/libcdio:= )
 	dbus? ( dev-qt/qtdbus:5 )
@@ -61,6 +61,7 @@ COMMON_DEPEND="
 	projectm? (
 		media-libs/glew:=
 		>=media-libs/libprojectm-1.2.0
+		virtual/opengl
 	)
 "
 # Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
@@ -81,7 +82,6 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-cpp/gtest-1.8.0
 	dev-libs/boost
 	dev-qt/linguist-tools:5
-	dev-qt/qtopengl:5
 	dev-qt/qtx11extras:5
 	dev-qt/qtxml:5
 	sys-devel/gettext
@@ -89,6 +89,7 @@ DEPEND="${COMMON_DEPEND}
 	box? ( dev-cpp/sparsehash )
 	dropbox? ( dev-cpp/sparsehash )
 	googledrive? ( dev-cpp/sparsehash )
+	projectm? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( media-sound/pulseaudio )
 	seafile? ( dev-cpp/sparsehash )
 	skydrive? ( dev-cpp/sparsehash )
@@ -136,7 +137,7 @@ src_configure() {
 		-DLINGUAS="$(l10n_get_locales)"
 		-DENABLE_BOX="$(usex box)"
 		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_DBUS="$(usex dbus)"
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
 		-DENABLE_DROPBOX="$(usex dropbox)"
 		-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
 		-DENABLE_LIBGPOD="$(usex ipod)"
diff --git a/media-sound/cmusfm/Manifest b/media-sound/cmusfm/Manifest
index 60bca8345645..49f8a60c9bef 100644
--- a/media-sound/cmusfm/Manifest
+++ b/media-sound/cmusfm/Manifest
@@ -1,7 +1,7 @@
 DIST cmusfm-0.2.5.tar.gz 28651 BLAKE2B c69dcaa5900ed4cf3d1a0274ac3dc6e6322b73222a472c26434fa4912c2f351fa67b0f3ac1d91df9f707d5c38d6ffa7c4401ed3500ed929adcbb63b9e513f765 SHA512 0db8d865342438531bfb800d835800240e47732444795159f72ed3c91a4c3f0747ba2da1dcc8e71ef340ba5a3febdb39d8dd5868b134afcbcf7b3614a7790eae
 DIST cmusfm-0.3.1.tar.gz 34521 BLAKE2B d5f7ce5cb37a03114e910f0ad7fd39bb3e940ce9d0ad416e464dc6cfc5438bbe901845b610bd8d0e508bde236ef6ed9cb894afb5a4cae710b1347d3173ffa60b SHA512 2d4d551d2a82fc2d70c7f75705f8cec236a0cf7b8e5268c91cc32b4ede4ecd51c4577d673b8c36f041e514af59142f2c9c001cd422c0790f0e0b3596b4394064
 DIST cmusfm-0.3.3.tar.gz 37553 BLAKE2B f266d83edbed960d8c466cba80ce57d645c5c9cdfceac27c29d0ef424c8135f22377dc0490462d3107dfcfd32ac9d15fa6142269b453c8a80818da9bd10a28fd SHA512 6537905bdf09d04f09783237997536a1ee231ee4e589826d87f435c0dd7542dbd7d97167990bf949d2a9eb73c4a9a4da1bab17888de0aecedb2a63deaa873f39
-EBUILD cmusfm-0.2.5.ebuild 867 BLAKE2B 7df639f3de885e1875bba7d2698d7fb21458ac112f7fd42f05503ce3f8687d7890f230fd5b37f6089d0858ea88d077a886d271818dff5d83c766884e0520e9d3 SHA512 a66b67a699e56e9b8d09e66e1e969ef914f98b465811a581a99460b48572dd2e1f9786c493d003c151198183616c5e1074e8f8a46435d1c223378fa3a7a17a69
+EBUILD cmusfm-0.2.5.ebuild 867 BLAKE2B 5fe3f2d2bb351af4f6ad3c45804fcde9852208f34f092be37c180602a96d79d17acc5ccc171366cc633b13ed9b2b8d732c96fe83bed39579022d7ac268afafb4 SHA512 852444e6d0acbd19536ddcd76822de5b5a056eb4d7b8c4e6dc355f0ac16a24d6bff8993b7032da28ad52c7265e0bf06b65cfa4bc73a1cfead5b7d8faa89b7b42
 EBUILD cmusfm-0.3.1.ebuild 840 BLAKE2B 0d11dacbaf8c1f76800f7047f75385dcf542fe38fe80f25a8397e435538a04960c507b8b41c0e6583be07188298eb565d2b42bbe97818b245f0b0c3d95a32821 SHA512 30d2b76f3ad5f5ae6d590f7d7432bfaef706021d98615424a2145edf15591254e7330316abbc392a66607767fdeafac8075dfaa9ce537432335a903607a3e6d8
 EBUILD cmusfm-0.3.3.ebuild 840 BLAKE2B e8f63cc66e0c89d19fe660b9b8dd9219262bc8fdd2540b65ff65ebdb4dffffe2f87293d4cb4752e50bd2056eeba3bce444bee134aaf3c5f92a2da98f5ecf7e9d SHA512 a5f8add218d22e8a95b4bac4fd2fba6edcfd0f6e1ab6c647f1701671c3ee0ec6984905160dc4a8ee2833149022224cc7cb1fcf20b7b594f9c69889f301e87d1a
 MISC metadata.xml 339 BLAKE2B 6a18cee3e017ee1e67fc035e63bcf5248a175a2e116964467f8f021e5b3f49606dbff1cc7aeb472e81d4f44c767e077b24fcd9f533868f0c4332f8d6465ec961 SHA512 78c63eceb28e387d635e34fe4800d0af9e30fd5ba4687955bb5383bd8ff4c9e3573d200ddcb36f3efd16d732cc6d7ca48c59381826ea80f6791a0c31da91d08b
diff --git a/media-sound/cmusfm/cmusfm-0.2.5.ebuild b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
index df0641f9480c..704bd8f11246 100644
--- a/media-sound/cmusfm/cmusfm-0.2.5.ebuild
+++ b/media-sound/cmusfm/cmusfm-0.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
 
 DEPEND="net-misc/curl
-	dev-libs/openssl
+	dev-libs/openssl:0=
 	libnotify? ( x11-libs/libnotify )"
 RDEPEND="${DEPEND}
 	media-sound/cmus"
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 31f7f5f3b87d..b328135d8590 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,5 +1,7 @@
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
 DIST gnome-sound-recorder-3.28.1.tar.xz 458764 BLAKE2B f6d8691758b85e6cfad0d9ddc8d894bfe8a78d34084524986bf6df694c50ca615a666a0d6fc56a82149274f40c346ed6fb317668a5d6a729b06ea4516bcb7f66 SHA512 badc5b9013a5b2e66078e4e3c93431297730b8e8ef241daa30d1fd58c5e7d6f58201c569cf8e58b24c1510fa6cce068740a0e68015b5bd59f793cf18c9f566e9
+DIST gnome-sound-recorder-3.28.2.tar.xz 454216 BLAKE2B 9f9a5a7c0a5a34c2a5ba00ed6d83736a0facb2dd7ffbe86b9c482e7bc50b282f9e20a8800591238e74a45c3c8eb2adf27c66dea59d0551d87c8997b2ef53d24c SHA512 1f4022d96d636391d4973bdc1285286a61a28107b9f875e66b4b2def767b4f2900ba2fe4b92166b1cdb61dc0b5afe65c0f81ffa7304aa38c1f510108dcd8b70f
 EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
 EBUILD gnome-sound-recorder-3.28.1.ebuild 1082 BLAKE2B cca83913fb79be60ee6e39f9effe4d37715aecc8392bf6dea364381df216b2c61fdb30e961c12fcd7152c3efbada9b47bca85037dad901f824a1634b3d2f5014 SHA512 74ee69a6dc5224fb35d532baccb1a2cf6ea234c544bf32039de740ff4ac22e80d9847109d5db2a63c1ba9a5565768318d215eeb26ee7b1995730dec83227fac8
+EBUILD gnome-sound-recorder-3.28.2.ebuild 1082 BLAKE2B f549983172742bbd2d8c47754410fbad4bc68e663f06f846d8c0467d3bac5cd658a9855cc3613743febc3f3731bb4d235c3ffa381c743751568de6a02f6a6e7f SHA512 e3c2a4267d968815e21ff5b75ce48fb78a7bb0ade398e7f34bb6bdf1dd383d3f3187024025e14843862caef7ae685d74cd310c3fe76d25f02693cbad410d941d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
new file mode 100644
index 000000000000..3a1a0f652494
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/gjs
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 5c9a89919c77..8b55b8dd358c 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,9 +1,5 @@
-DIST grip-3.4.3.tar.gz 740870 BLAKE2B d6b703d4ba08bf976a53e70772977a6b0fd5cd231fc16bf6a387497ad6db8e0ba2226ebe05d77135e7ec55911af0d3cd6cb7608da1452083335f9f8f46cbc182 SHA512 e7690cfe375de525f7dde7cc4d64ac9577f702a58bbd2cc1aa318dba58b208a8affe9e8e07078d6a16ba1340b0bd17edce1c8cf750631c8d677a3bd2679bb361
-DIST grip-3.7.1.tar.gz 961428 BLAKE2B 0c31b549577a1bbde17936e8e243d6fa573c6ac0c6035ea303c983c6ac26a0f7ddef193cea74a4148655f2305db97b3e74476bfe763fcbe77c656e012b4fe07a SHA512 812c6d0715e18da78b8657722697cf7b39b345f2d94c5a3002c6a512ff0482d4e96b58910e0c2fd459ac707a24754c6c491e66eac7692c49ec69bb869079202c
-DIST grip-3.8.1.tar.gz 960857 BLAKE2B 0d1323961eeb9593fb4644a31369852f8d40582b7ba00af3b2255f443a354cca74f5d60c80b135d09bc514d8302807191e6c8f38bf080d5a6237859ccfc90178 SHA512 9e1ebdf6de523c4b818f2b35f976ea0ceb83f7769e3355a7a5af8ea831c34be21ad0dd2106c3ddb8f61d31fe3f32e745ab806fd6aa125a06beda3d2bf381428e
+DIST grip-3.10.0.tar.gz 980402 BLAKE2B fe5cd88d170c64916abffb69fe07b66452a11ae13d75d0f24ae1cdae3bf87c1dd811f5d30be2379cd2bcd4a47ef8e7f6603c5573ffead6c94105585533645b85 SHA512 61253be210d006b778d9a071cc8701f11f03ee2f29179a7ba69f5d9309de0e113ab7b0bca5491d8f7603d1df9b912048c4b1a502bcb38c5b54664516be4acdc6
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
-EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
+EBUILD grip-3.10.0.ebuild 1232 BLAKE2B 458a4cd5560f48c872a19d0359563054a2b961176789329c0370eb3d72093ebe826a9c048dc25c7f3133355c02464095754057a664471656d1b5059f1d9246f4 SHA512 3bceff62a4ac1c85845c318cc5e8ab43b9b17c37dbb05f6d63b4608c6232a951c2ec37748939c1fb94d979f4caf9a6c0d336622ea873ba9a8dcb5ba4f29ece9e
 EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.7.1.ebuild b/media-sound/grip/grip-3.10.0.ebuild
index b664cc4ecb4e..4f7ac3d6b08f 100644
--- a/media-sound/grip/grip-3.7.1.ebuild
+++ b/media-sound/grip/grip-3.10.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool
 
 DESCRIPTION="GTK+ based Audio CD Player/Ripper"
 HOMEPAGE="https://sourceforge.net/projects/grip/"
@@ -33,12 +33,13 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	sys-devel/gettext
+"
+BDEPEND="
 	virtual/pkgconfig
 "
 
 src_prepare() {
 	default
-
 	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
 }
 
@@ -48,5 +49,5 @@ src_configure() {
 
 	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
 
-	econf
+	econf --disable-werror
 }
diff --git a/media-sound/grip/grip-3.4.3.ebuild b/media-sound/grip/grip-3.4.3.ebuild
deleted file mode 100644
index 7eb40385061a..000000000000
--- a/media-sound/grip/grip-3.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/grip/grip-3.8.1.ebuild b/media-sound/grip/grip-3.8.1.ebuild
deleted file mode 100644
index b664cc4ecb4e..000000000000
--- a/media-sound/grip/grip-3.8.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf
-}
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 4852df72b6c4..2eba4972c078 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,7 +1,5 @@
 AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
-DIST lmms-1.1.90.tar.gz 16580373 BLAKE2B 7ae6025647f949aa015dc64cb6595e1e13b21c9a9d72699f464c4ab15f3213aff353df840cf520ea48611f45d0aba2cec7c2fbb6ac9610ff816dfe9c81d57ea9 SHA512 4e8bc4ec70c613b69ff14e463860e6f86236cb7b238529d41c4e9cc1b9642590110d1d07f87b9e2a4e139454c3a1f851f95a5eaef12e95660b50dd6ea17aa486
 DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
-EBUILD lmms-1.1.90.ebuild 2001 BLAKE2B edbfb370f068786cb2d2d2bd39a3d3203a3c200c52846ac76f5e3f4727a2ce32be8e4585c52a955cbc6eb71e95c0a7a5fca1f99c6549513c8ac52cf465ee6ccf SHA512 0bd83dc94431a467567174d65361c4b381a1286b3941e319d33a72297cccde9ddcec6a885938a51cf4e0c3ffebca0d45d4c0c6004c5e46077a16bdcbf0f42474
 EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
 EBUILD lmms-9999.ebuild 2256 BLAKE2B c48c85ee481f7ed320d2e1b4106a0cca8f9ea68589d54d9f078e0203ba7d34673da0fabd2e36f8ea1e86874c34ea2e45b7fd793993c34899ae25617d7c15daa8 SHA512 60a7a9f3db22e4f6f1e5c2e7bdb4a308ea7aaf45fccf22ab63a1340c4a42083f3b704e443bf5d9b4357dca2d1fd31ec489bf864ceba609d2d5e72c6ecf3694e1
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/lmms-1.1.90.ebuild b/media-sound/lmms/lmms-1.1.90.ebuild
deleted file mode 100644
index a3e5bc6169a4..000000000000
--- a/media-sound/lmms/lmms-1.1.90.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-	SRC_URI="https://github.com/LMMS/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="alsa debug fluidsynth jack libgig ogg portaudio pulseaudio sdl soundio stk vst"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui: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 )
-	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}
-	dev-qt/linguist-tools:5
-	>=dev-util/cmake-2.4.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
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)
-		-DWANT_ALSA=$(usex alsa)
-		-DWANT_JACK=$(usex jack)
-		-DWANT_GIG=$(usex libgig)
-		-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
-}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 5177a40a047a..02bc1ca7defa 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,6 +4,8 @@ AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75c
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.3.tar.xz 664992 BLAKE2B 42e2bef46f4eb99e43c4078373dab4301cafa3062459abfed08e9f4b448a1fcfaa40da5a53941b49b426abecf2f31278fdb0857293b24156fa77845c56cbd095 SHA512 c6ce513ea641d026594cd7ae6e9051bd0060e45f5839d89b350ba144cc9094a8e1490052df4d024cbc92d88680ee8e8bae14fc8037431394771018a75c3ee3d7
+DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
 EBUILD mpd-0.21.3.ebuild 8234 BLAKE2B a0f7578c2062368f60916d22c4b403fe192e1048bba733a9f17bed900bccc20f86dae23e1241d7ee84acc5a4cadd7ba7a40b397b536c6e85a6ffa242812c8464 SHA512 254d6ec58bca9086aed9c3bb0b858bcf4fabd74e4cd4a4a991e0a7a61a0839d31cf50cd997e4d5b7ce71817521b83c518cb6390a798552959577ff5c3a4c854f
+EBUILD mpd-0.21.4.ebuild 8234 BLAKE2B e26601d1a2bba280083324b70b86ce7d52a81d91b94482120ca26f2f3390161d7c6c1b7faff64e7d891da671bb71223e621db026e6f99bff31bb34d911f212a5 SHA512 f2cd49afa96fe36502b3a03d105799209f7cd39bb20ed58b9f181eb8c454d71d0b917de8f5f41fdc421b1f7e94187ad4a534d00bd502d20a863c336dc71ba875
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.4.ebuild b/media-sound/mpd/mpd-0.21.4.ebuild
new file mode 100644
index 000000000000..e93c903ec20c
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.4.ebuild
@@ -0,0 +1,298 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd user
+
+MESON_AUTO_DEPEND="no"
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
+IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tcpd? ( sys-apps/tcp-wrappers )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">dev-util/meson-0.47.1
+	 virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dlibwrap=$(usex tcpd enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index 0690df4abb6e..8daaffd80963 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,3 +1,5 @@
 DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
+DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
 EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
+EBUILD ncmpc-0.33.ebuild 1922 BLAKE2B 12ccee76195f41dda18d07239f7b2d5976bfc3de0356ae0a6e5b8b22c3accb47a4d768bf1eff1c6f081de84f1e22c5c47abdf1f6d068b6ec535041728db2baa3 SHA512 e9b361a9f9a5c2588a16c3697fe849619774115205cedb4c225c30f536777188a83bb1d3d5190841260a222ce8bcdfd012e57809d2a7c5db3aabcf48c24dc5d5
 MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
diff --git a/media-sound/ncmpc/ncmpc-0.33.ebuild b/media-sound/ncmpc/ncmpc-0.33.ebuild
new file mode 100644
index 000000000000..5aa8337eea5c
--- /dev/null
+++ b/media-sound/ncmpc/ncmpc-0.33.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
+SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre"
+
+RDEPEND="
+	>=media-libs/libmpdclient-2.9
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+	pcre? ( dev-libs/libpcre )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/meson-0.47
+	>=dev-libs/boost-1.62
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+"
+
+src_prepare() {
+	default
+
+	# use correct docdir and don't install license file
+	sed \
+		-e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+		-e "s/'COPYING', //" \
+		-i meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dcurses=ncursesw
+		-Dcolors=true
+		-Dmini=false
+		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
+		-Dartist_screen=$(usex artist-screen true false)
+		-Dasync_connect=$(usex async-connect true false)
+		-Dchat_screen=$(usex chat-screen true false)
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dhelp_screen=$(usex help-screen true false)
+		-Dkey_screen=$(usex key-screen true false)
+		-Dlyrics_screen=$(usex lyrics-screen true false)
+		-Doutputs_screen=$(usex outputs-screen true false)
+		-Dsearch_screen=$(usex search-screen true false)
+		-Dsong_screen=$(usex song-screen true false)
+		-Dlocale=$(usex nls enabled disabled)
+		-Dmultibyte=$(usex nls true false)
+		-Dnls=$(usex nls enabled disabled)
+		-Dlirc=$(usex lirc enabled disabled)
+		-Dmouse=$(usex mouse enabled disabled)
+		-Dregex=$(usex pcre enabled disabled)
+	)
+
+	meson_src_configure
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index a0c378df47d7..26bca5cfcc40 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -3,6 +3,6 @@ AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
 EBUILD picard-2.0.3.ebuild 1860 BLAKE2B ae08290f7560ae4cc709c6d09864076b3167c335399ea92950b8ec4464ab700f8285124c77605ada1491404e4509bcf405b040e65316541a91b1f3e434b6b3f0 SHA512 d9113e15846984d10eca61bb0181a2615c80055034aa07b30d54e1aac12865bf4a86bd41e95561dcf59a7676951b244e1c228dedacf8d137bdbd3f050a1859cd
-EBUILD picard-2.0.4.ebuild 1756 BLAKE2B a551d93dd338e98f190d4e269d99eee1b3ad9dff50c7579640636cb38f1966dd1727c2d9c487f02dc27a63e83a8be5814c69d8092845f625e8211babea7bb53a SHA512 79f78d8a674966554680593d0cf45054ee36430baa7462ced01736a658fa87e91e5d3e0129e56d3d400ccdf49fbd51b6a86a1d0009b3fa44310b097ae998ea2f
+EBUILD picard-2.0.4.ebuild 1755 BLAKE2B 1ca7397b6819efea1c2982fe7894084941c24bbe90aeea6bfd4fa450c3eada01591d9821789ab66db0036d3a49d14868f752ee1a0463c68c97ec402af13e0719 SHA512 7f8a7ecfc5a55f6e2b7bc12c039abf561b8d06a761d5ba983d5ffa2d3920841ed1a1f74988101a7580931d44b64e295c5cd982d0cb25c3de16a71876f41f6aa8
 EBUILD picard-9999.ebuild 1696 BLAKE2B 0923250ae18bc8d129649750325e0d8cbe0a9de61caa574f3f73a6023d5b915de3d4615447961ae5c9be24162ed4f6e2cdf69d263b3f80347f92337d0380faa7 SHA512 f85dfa4b86c95e3dcc3cecc4ab04efc14d0cda35e402850b3f2bae56fd278ac9bc9cbb9091367a6c6b1393b16ce055f0618f2e44aa16daa83d2e589ff5ac05e7
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.4.ebuild b/media-sound/picard/picard-2.0.4.ebuild
index 760daf7633e6..efafb521689c 100644
--- a/media-sound/picard/picard-2.0.4.ebuild
+++ b/media-sound/picard/picard-2.0.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
new file mode 100644
index 000000000000..5af4680fe088
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -0,0 +1,2 @@
+EBUILD pulseaudio-modules-bt-9999.ebuild 840 BLAKE2B fd2855d5823b84fa98c3a33b2b5e385f0c9085da66464cac6469277f485cd69ca0300dc2ecadcd8006a9b3fb24510bf792b07a526b402a7eabee0e504e75c440 SHA512 cfd3b17327cec5620c9ca8a0bf90a955671e908b8492f8efba3ad84b69e204fad3c2aacf9d605de9751b0100ff554b8e742957db826444481cbba8a7c4eb5b14
+MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-sound/pulseaudio-modules-bt/metadata.xml b/media-sound/pulseaudio-modules-bt/metadata.xml
new file mode 100644
index 000000000000..38b28ff6e621
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>zx2c4@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
new file mode 100644
index 000000000000..23b537c2088d
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth (alongside SBC and native+ofono headset)"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/EHfive/${PN}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+DEPEND="
+	media-libs/fdk-aac
+	virtual/ffmpeg
+	media-libs/sbc
+	media-libs/libldac
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	>=net-misc/ofono-1.13
+	media-sound/pulseaudio[-bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+mycmakeargs=( -DFORCE_NOT_BUILD_LDAC=ON )
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b13210dff789..48c972723199 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,8 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.1.tar.gz 1035274 BLAKE2B c8fd9b6e73ef2abc07837560faa10661a0f46f503b6a6023a9cde08086fafdea18cdc73b99c8fd5176942e066629ffc085e47e591831c034fd8b739ff4975347 SHA512 11ff0a689c6bf718d95eb0202fb73e06d194a71be9393685a2b444c3fc22bfac5f022ee177a73d786e6704f56173fd702f30005e7ace48fb825f3180f0dfe99a
-DIST pulseeffects-4.4.3.tar.gz 1051621 BLAKE2B 24fc360d86a04674aa0bd4cf39b29b1bfcc67acf2001f5ae271a355a1fb01f5be8a76ed588c187c2cb4ca5b7468f72d6df97f502d483b386e2e741493bad4dc7 SHA512 34173c9ad90c2da269cf86fd7410ca0f1614c98065f2106fa9f208bc145509ca1e26342d61012d954e00637bb18a4f456b6a8f5fb432adb6405051c2d9c8cff9
+DIST pulseeffects-4.4.6.tar.gz 1053954 BLAKE2B b88922c591ff24a886d9b66363e5757ad68fe683e7de88d32146a26f8f86aa5a5feb322b75471cec45dae159125f80aab1470503a73a59be4259c96b6c66ce80 SHA512 35eb6c3e750a77c8fcf8de6da0c34ad6d6bcb72b0ee81d5b719aba37a71271b72195bb4d3e1123b4f82ce07ab7d8917c5fe52f5e40e884595d5982e95cff4bec
 EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
 EBUILD pulseeffects-4.4.1.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
-EBUILD pulseeffects-4.4.3.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.4.6.ebuild 1684 BLAKE2B 4c0ef6feb120b67a365ad4a36b1e12e602dc1a0273dfbeb7131015ca803629e0f10690f1c69cca3f315365213d95f117512195db6922d59d6f183c3461b6a183 SHA512 70ad9f9308ad45bf2c5a9b68b68d98aa53ec19386a46029a0d3573790bd5b5f788e0a6c731638f552d82c8edc8525b72c511e1aaf8a879f1a552cc9284af3624
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.4.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.4.6.ebuild
index edcf67ece621..502ea295a5f1 100644
--- a/media-sound/pulseeffects/pulseeffects-4.4.3.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.4.6.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
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index fd7a703130e5..033cd7ecba1a 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,4 +1,6 @@
 AUX rhythmbox-3.4.2-gstreamer-1.14.patch 16445 BLAKE2B 0adc6ea739a5a420d8817117cc97477f00453fb0f6426da0dff912ab6ad9ad435645c13657950b1fd31243be4cc21c49d2bf0b5701b5844ac17f8a8279350dc6 SHA512 6e204d2e9af111a138c13aa0a5cb5f74d56ade81e86c7cd5349617119288221b46533682d7b974c1453a6d0a9a0de1fa40f2cc4dcb9f474bb93818d44930520a
 DIST rhythmbox-3.4.2.tar.xz 6909436 BLAKE2B f5714485b253370a161f2255030d85bc8a697d795f97011c2acf6acbf8c9312f5180c0ec06ebe2d6e70730dc3fd4e97289b1f3a5e4dd4989a4e8135433430aab SHA512 275f7c6344c88c7331d433895d479517e7a4b854f6ae660abd79b3c324f5e7a06132fa44387443ec9ce50b20187e1abf1ec9683ec4bedbd4b17da6efece8399b
-EBUILD rhythmbox-3.4.2.ebuild 3418 BLAKE2B 1833c5ca7ca047baa21b990ae2254fc1491230fd9c4d8007cb08015554555554821aa5197c22817c4c4fb1635d4964c9449770c8a0262b22a056ffb376d59bdc SHA512 bf81a76ad3bcbe77c4737d69828cb4690f0a8267f93a93d13dd2b4e65c24c130176eef9cb6250132dc84cdc80e4482f7f967dd2cb59bdd1898b28f98928449fa
+DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
+EBUILD rhythmbox-3.4.2.ebuild 3443 BLAKE2B 70ed5f930ef74f4ab93d08af7f60337acdc875a44f752b05cf7a5038889c958a1c71d75e313fb92f61d73dbfa07f183b9de63c0f423efa38f3fa558bf74b97a0 SHA512 fb4a84c482fc82e5cdea2024f5545cf7235789b28a023908278f69c68285d1e58bdb6bcf0cdbe92ed0abbb7514ddd6ec14667a08692336e5eeab671daec194f6
+EBUILD rhythmbox-3.4.3.ebuild 3375 BLAKE2B 6a0cab92219a30abbcb18dd590850e459c90ee650171e5d105bd6c2a264e1125c50ecb4e482e33aa0e50b67042fae6a426f3595d847e34512d9a2e8528f45b19 SHA512 6688812c1f6c2a81ac21f79d77df61a62381427dec5908d85ea61a33f64687d0789f0a42850fb86be3f953e5ade67971c4176e45e673c8c14536d2b6b815628b
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
index 258f18663802..5f274f786f54 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.2.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.2.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
@@ -77,12 +77,13 @@ RDEPEND="${COMMON_DEPEND}
 		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
 "
 DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35
+	dev-util/itstool
 	virtual/pkgconfig
 	test? ( dev-libs/check )
 "
+# eautoreconf needs yelp-tools
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gstreamer-1.14.patch
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
new file mode 100644
index 000000000000..a9801c4d3bc9
--- /dev/null
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE="xml"
+
+inherit eutils gnome2 python-single-r1 multilib virtualx
+
+DESCRIPTION="Music management and playback software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Rhythmbox"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
+REQUIRED_USE="
+	ipod? ( udev )
+	mtp? ( udev )
+	dbus? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/libxml2-2.7.8:2
+	>=x11-libs/gtk+-3.20.0:3[X,introspection]
+	>=x11-libs/gdk-pixbuf-2.18:2
+	>=dev-libs/gobject-introspection-0.10:=
+	>=dev-libs/libpeas-0.7.3[gtk]
+	>=dev-libs/totem-pl-parser-3.2
+	>=net-libs/libsoup-2.42:2.4
+	>=media-libs/gst-plugins-base-1.4:1.0[introspection]
+	>=media-libs/gstreamer-1.4:1.0[introspection]
+	>=sys-libs/tdb-1.2.6
+	dev-libs/json-glib
+
+	cdr? ( >=app-cdr/brasero-2.91.90 )
+	daap? (
+		>=net-libs/libdmapsharing-2.9.19:3.0
+		>=media-plugins/gst-plugins-soup-1.4:1.0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	libnotify? ( >=x11-libs/libnotify-0.7.0 )
+	lirc? ( app-misc/lirc )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	)
+	udev? (
+		virtual/libgudev:=
+		ipod? ( >=media-libs/libgpod-0.7.92[udev] )
+		mtp? ( >=media-libs/libmtp-0.3 ) )
+"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-soup:1.0
+	media-plugins/gst-plugins-libmms:1.0
+	|| (
+		media-plugins/gst-plugins-cdparanoia:1.0
+		media-plugins/gst-plugins-cdio:1.0 )
+	media-plugins/gst-plugins-meta:1.0
+	media-plugins/gst-plugins-taglib:1.0
+	x11-themes/adwaita-icon-theme
+	python? (
+		>=dev-libs/libpeas-0.7.3[python,${PYTHON_USEDEP}]
+		net-libs/libsoup:2.4[introspection]
+		x11-libs/gdk-pixbuf:2[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+
+		dbus? ( sys-apps/dbus )
+		gnome-keyring? ( >=app-crypt/libsecret-0.18[introspection] ) )
+	upnp-av? (
+		>=media-libs/grilo-0.3:0.3
+		>=media-plugins/grilo-plugins-0.3:0.3[upnp-av] )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	virtual/pkgconfig
+	test? ( dev-libs/check )
+"
+# eautoreconf needs yelp-tools
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	# --enable-vala just installs the sample vala plugin, and the configure
+	# checks are broken, so don't enable it
+	gnome2_src_configure \
+		MOZILLA_PLUGINDIR=/usr/$(get_libdir)/nsbrowser/plugins \
+		VALAC=$(type -P true) \
+		--enable-mmkeys \
+		--disable-more-warnings \
+		--disable-static \
+		--disable-vala \
+		$(use_enable daap) \
+		$(use_enable libnotify) \
+		$(use_enable lirc) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable python) \
+		$(use_enable upnp-av grilo) \
+		$(use_with cdr brasero) \
+		$(use_with gnome-keyring libsecret) \
+		$(use_with ipod) \
+		$(use_with mtp) \
+		$(use_with udev gudev)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check CK_DEFAULT_TIMEOUT=60
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog DOCUMENTERS INTERNALS \
+		MAINTAINERS MAINTAINERS.old NEWS README THANKS"
+
+	gnome2_src_install
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 415c7dfcabde..fc44b37da93c 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.94.262.g3d5c231c-9_amd64.deb 104191924 BLAKE2B 75d5067fee6333897e33dd43f3bea11f0811df30f9d3d35a537298675516e6e9c8af609460daaf2a79be91133b45a4b76c9539abee9cdbc04362caeefbbea27a SHA512 e6aa650a207fb636cd789055d4b17bc9c0fec1f6421877e4e80d3d5239f1a1bb881c5bfa4788a6cbe7748175e6c731af66a3395d2089d2d9a94dabfe5d07b09f
+DIST spotify-client_1.0.96.181.gf6bc1b6b-12_amd64.deb 105145290 BLAKE2B 1ffb55ac3684d021b181e27d1183c5f0c1bd22ad8e6decbd64b0172a7925e824b6f74d40edbb1ae4401bf954860f47d9d1ffad6d879e85e02406869709d817cd SHA512 8ecff0657849058863deb8fce9304d4c9aa5a511f8043a0ba52d138a29979d3217da7568ab2058271f3e448206406fc0e1651ba7d438f677b1a2036ecb5937e2
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.94.ebuild 3429 BLAKE2B 13dd3c2f7bc09032bb9d42f20b502ec6448d54d4b51ca370a52beaaa66e8355d44e01850f15cddd1e237a267348edc5a91507931be3c0d92a3e6bae1fbfa67ef SHA512 38f275b7f5d77357d13cbfadda4b4e00605f1613421d5de755eee3d4fda08ac3ebad067183d07d443af25ebc5a64897374af7a764bedf051c7fb8bde664569bf
+EBUILD spotify-1.0.96.ebuild 3430 BLAKE2B 2078bd77d0f4e59f7a09181cab4fac996c34fbfd47fa0194eed1a691951fc425043e4a6a97a4cfb50f4b52cb5e14bf32dbf75fccad31aa166a7ebffd817f50f6 SHA512 2e8d7f6033d2bb79bd9d6bf244f737ac48b268640f6252b3db10f0f152e6cc4e3ea6b85296df1cde00a40e5357627b6825dae0a11364fd935ff8d4ac23729d27
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.96.ebuild b/media-sound/spotify/spotify-1.0.96.ebuild
new file mode 100644
index 000000000000..6de8d1d091fb
--- /dev/null
+++ b/media-sound/spotify/spotify-1.0.96.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2-utils pax-utils unpacker xdg-utils
+
+DESCRIPTION="Spotify is a social music platform"
+HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
+SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
+BUILD_ID_AMD64="181.gf6bc1b6b-12"
+#BUILD_ID_X86=""
+#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
+#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
+LICENSE="Spotify"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="libnotify systray pax_kernel pulseaudio"
+RESTRICT="mirror strip"
+
+DEPEND=">=dev-util/patchelf-0.9_p20180129"
+# zenity needed for filepicker
+RDEPEND="
+	dev-libs/openssl:0
+	dev-libs/nss
+	gnome-base/gconf
+	gnome-extra/zenity
+	media-libs/alsa-lib
+	media-libs/harfbuzz
+	media-libs/fontconfig
+	media-libs/mesa
+	net-misc/curl[ssl]
+	net-print/cups[ssl]
+	x11-libs/gtk+:2
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	dev-python/pygobject:3
+	dev-python/dbus-python
+	libnotify? ( x11-libs/libnotify )
+	pulseaudio? ( media-sound/pulseaudio )
+	systray? ( gnome-extra/gnome-integration-spotify )"
+	#sys-libs/glibc
+
+S=${WORKDIR}/
+
+QA_PREBUILT="opt/spotify/spotify-client/spotify"
+
+src_prepare() {
+	# Fix desktop entry to launch spotify-dbus.py for systray integration
+	if use systray ; then
+		sed -i \
+			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
+			usr/share/spotify/spotify.desktop || die "sed failed"
+	fi
+	default
+
+	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
+	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
+		|| die "failed to patch libcurl library dependency"
+}
+
+src_install() {
+	gunzip usr/share/doc/spotify-client/changelog.gz || die
+	dodoc usr/share/doc/spotify-client/changelog
+
+	SPOTIFY_PKG_HOME=usr/share/spotify
+	insinto /usr/share/pixmaps
+	doins ${SPOTIFY_PKG_HOME}/icons/*.png
+
+	# install in /opt/spotify
+	SPOTIFY_HOME=/opt/spotify/spotify-client
+	insinto ${SPOTIFY_HOME}
+	doins -r ${SPOTIFY_PKG_HOME}/*
+	fperms +x ${SPOTIFY_HOME}/spotify
+
+	dodir /usr/bin
+	cat <<-EOF >"${D}"/usr/bin/spotify || die
+		#! /bin/sh
+		exec ${SPOTIFY_HOME}/spotify "\$@"
+	EOF
+	fperms +x /usr/bin/spotify
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
+			"spotify-client.png"
+	done
+	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
+	if use pax_kernel; then
+		#create the headers, reset them to default, then paxmark -m them
+		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
+		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
+	ewarn "To remove the cache:"
+	ewarn "rm -rf ~/.cache/spotify"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index 397cb13f36af..058a7b6848b7 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,6 +1,4 @@
 AUX tomahawk-0.9.0_pre20181030-fix-warning.patch 885 BLAKE2B dc798712921855a0fe5c99c00c96fe48cb3a9ca76ef24842225591306003b4fb95f17b85da64b5d41f74b0ff0324e623a84d9bb27a51a2f0da027a6e3b9064a9 SHA512 8d361166830671771e1fad3f04b7747133a917e052842bfb6eff20fe0df1dc3045dec42e6bcc8d40cbdd20afa3c3a7264deb49f879d8247ec484c22cd24e89e5
-DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
 DIST tomahawk-0.9.0_pre20181030.tar.gz 9875208 BLAKE2B aa0b3955ab0308df5ff4d9fead1106bb26c12594fd958c0d43ff72da4d47de42dc4f96d64f3594828ee6200108b610a600b2b764e09b2e88c8412b22b7d6e605 SHA512 de08dc2873975c4278e36ef01ae516d106edc235ac8cf79dab8cc2338dd47cae3102aa6461c98146ca0ff3c68e1a507168a302a051103482f6636f5cdab97202
-EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
 EBUILD tomahawk-0.9.0_pre20181030.ebuild 1719 BLAKE2B fb60cb5b1d1242063fd1061f602402b680de409245f988f07e136ab80f80dd4fd6e4d3c614a8686931ab5a59a2c8a5020eda9ee0074e719a85cbd39e740e7bdc SHA512 5131942184c391b6d9865e0f0e7bdb0bc068a97214b8c88a446cebcfd05ae548b1156ec4be01bb0aeabc81eab8ee8612bd90cf5c8e4429a5a60e4bb94d42ba25
 MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
deleted file mode 100644
index 3c553a30e8cd..000000000000
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20180501.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=34c1f88171f00a3e9fae57250799f3d3623b5f74
-inherit kde5 vcs-snapshot
-
-DESCRIPTION="Multi-source social music player"
-HOMEPAGE="https://www.tomahawk-player.org/"
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="telepathy xmpp"
-
-CDEPEND="
-	$(add_frameworks_dep attica)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebkit)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	app-crypt/qca:2[qt5(+)]
-	dev-cpp/lucene++
-	dev-cpp/sparsehash
-	dev-libs/boost:=
-	dev-libs/qtkeychain:=[qt5(+)]
-	>=dev-libs/quazip-0.7.2[qt5(+)]
-	>=media-libs/liblastfm-1.1.0_pre20150206
-	>=media-libs/taglib-1.8.0
-	media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3]
-	>=net-libs/gnutls-3.2:=
-	x11-libs/libX11
-	telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] )
-	xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] )
-"
-DEPEND="${CDEPEND}
-	$(add_qt_dep designer)
-	$(add_qt_dep linguist-tools)
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${CDEPEND}
-	app-crypt/qca:2[ssl]
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CRASHREPORTER=OFF
-		-DBUILD_TESTS=OFF
-		-DBUILD_TOOLS=OFF
-		-DBUILD_WITH_QT4=OFF
-		-DWITH_KDE4=OFF
-		-DBUILD_HATCHET=OFF
-		-DWITH_TelepathyQt=$(usex telepathy)
-		-DWITH_Jreen=$(usex xmpp)
-	)
-
-	if [[ ${KDE_BUILD_TYPE} != live ]]; then
-		mycmakeargs+=( -DBUILD_RELEASE=ON )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 458c2ad7520c..4814684c2935 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,7 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
 DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
-EBUILD whipper-0.7.0.ebuild 1577 BLAKE2B 668694c4bb2d36d96f86a29198139312a4ad21ba1615912dcd33a62b12465478f859584afe8647f8f241076e973e9cbf07fd5c630f7d73650d14831ac9f259b8 SHA512 6187ea4ac13ae93b5e4e780e1c36d808038f08cd02395a67ca7065f480d652049ef55e4cc62e60ae508a40488d19716fb24c661f210b493ebb2a1858c48fa476
+DIST whipper-0.7.3.tar.gz 168393 BLAKE2B b34151ede7c867dbbca34fcec3d8ef81cb50d66abc760fa54bec880f8f1186faf3e0f5298c2890501b9bd2f586b80d2cdc45a0755b6fe12fc1a2215e9ea9ecbb SHA512 ac96393471a6b4c40f5870f6e3183b65d43229314e2a1eacbf065c51ac61cbc772f2de3bde9f20ee1f7ffec427cd03c31f27df60eb6c621a699927646080c0ab
+EBUILD whipper-0.7.0-r1.ebuild 1524 BLAKE2B 636f64d95e641a89110436ee76fd62da430bcd720e99bad6d01a3c58384c4977912c9e90c2cbbc9333d46b62ddfac2b5e88dd4f294725498df79ef03c9048220 SHA512 9e427de20c9518adf1bbab1cb60ae3b06885dca221e628251871794631a1db0dd2a970e2dda761e49798c13534d5a70bc73580fb9d78774639746a9b944bad50
+EBUILD whipper-0.7.3.ebuild 1550 BLAKE2B 0f6253476e28c9a15ba33356639fa111c6d36a384e17247daf70d11aa0c487d0057f6c9c65f13304a173db413dadd284defef7d0244e0af44a30f445f46196ba SHA512 6e460f634a82c454851695eba770b667ff324488b50d258daeb92d4d0e30224161721239ef9c0736a28485251ed412ef67cfdbb4bbe0da6f25df352a0a707515
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.0.ebuild b/media-sound/whipper/whipper-0.7.0-r1.ebuild
index 0806473cc347..2aace1ef8765 100644
--- a/media-sound/whipper/whipper-0.7.0.ebuild
+++ b/media-sound/whipper/whipper-0.7.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
 
@@ -23,7 +23,6 @@ DEPEND="
 "
 RDEPEND="
 	app-cdr/cdrdao
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
 	>=dev-libs/libcdio-paranoia-0.94_p2
 	dev-python/cddb-py[${PYTHON_USEDEP}]
 	dev-python/pycdio[${PYTHON_USEDEP}]
diff --git a/media-sound/whipper/whipper-0.7.3.ebuild b/media-sound/whipper/whipper-0.7.3.ebuild
new file mode 100644
index 000000000000..f7f2f40ca587
--- /dev/null
+++ b/media-sound/whipper/whipper-0.7.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
+HOMEPAGE="https://github.com/whipper-team/whipper"
+SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/libsndfile
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
+"
+RDEPEND="
+	app-cdr/cdrdao
+	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
+	>=dev-libs/libcdio-paranoia-0.94_p2
+	dev-python/pycdio[${PYTHON_USEDEP}]
+	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	media-libs/flac
+	media-libs/libsndfile
+	media-libs/mutagen[${PYTHON_USEDEP}]
+	media-sound/sox[flac]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
+	"${FILESDIR}/${PN}-0.7.0-src-Makefile-respect-CFLAGS.patch"
+)
+
+src_prepare() {
+	# accurip test totally depends on network access
+	rm "${PN}"/test/test_common_accurip.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C src CC="$(tc-getCC)"
+}
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
+}
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 906161fd30da..eedf60147ca9 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,7 +1,6 @@
-DIST yoshimi-1.4.1.tar.bz2 3674539 BLAKE2B a3561f4129b1da137caec4a4bb8a59222ca43c875a6533ce0c74ccff8d499a40cf98a1258f44e1a2f290fdc6f28786ce26772d19489c03590a360825488e5b3c SHA512 2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499
-DIST yoshimi-1.5.1.1.tar.bz2 4035895 BLAKE2B 4579555c96f68ede8f6b604039f23512a041f879b23155334c6aab891fdb11d4e77b8d7d38ebad98b114d49da5fa815114872ca5cddd7f30fd5d56b5d4178be9 SHA512 f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28
+AUX yoshimi-1.5.10-cxxflags.patch 2471 BLAKE2B 0e3d614e4cb9ccb1eb7a25665794fb22db89ca877d613fe4806afebd3692fafa422c2bcba7c9d28080e37a0e7004fcbefeedd0532c5541220e77e4149f8551f6 SHA512 cd15dd79b324ae27c80745c84720bf6b04d7d78c3bed3f2541ab84f82e60928865a49ded6f7fb383cdb5fdc61a05fb8d9fc02869d4846f734eab332f040fa7d0
+DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
-EBUILD yoshimi-1.4.1.ebuild 1015 BLAKE2B 80c0ec583a13eb7aae5ea376c447c02ae31009cf73d4be324e8364203ab2b13f81294d77089d814e926eee592183eb0ee9ba5269113394eb3e1c042c6584561d SHA512 4dd13708b3d1829755bde9e37d982a7c61e822ef61fae1303fdb87318b6847ec96e002b7b16a94103f7e924fd869e65aa4a80acf28b091a28476b4fed76e3e15
-EBUILD yoshimi-1.5.1.1.ebuild 1032 BLAKE2B dcbedf93b5ca4c39206ac0809c6147b8b9133eeefb2692346ca3575ed40441c3bb0d32d855a8bfcb36686e434916775d9501537a81d313ec3fece389dde84788 SHA512 5764063f8511b3ad75e1ea4fdaedd377cc0622ef2bd0a576701d4bb047a144e60b9e458bf90b626ca9d6b555b66fe726c207c2a59cebe5507e982c767ca0e496
+EBUILD yoshimi-1.5.10.ebuild 1224 BLAKE2B cc6bfae99aa65e76e3b7b4037832d3b7fae68e5ccbfdc40c3ddb0b8013474ea8a44fed1de95f51bf278f6a8796c74e84c18907ce913e968cff0034be5f8de9ea SHA512 55de53bd5189d84d1832fae1ae8eb2048e84eff2e61305862e5f14e01769d11acb16a1e573b1d57dedd6d7bea7cb8dd45a01a5f69aa068f5922a0888f192d99b
 EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6
 MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231
diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
new file mode 100644
index 000000000000..7e64e1fdc729
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
@@ -0,0 +1,64 @@
+Respect user CXXFLAGS setting.
+
+--- yoshimi-1.5.10/src/CMakeLists.txt
++++ yoshimi-1.5.10/src/CMakeLists.txt
+@@ -302,27 +302,27 @@
+ set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
+ 
+ # set platform specific compiler flags
+-if (BuildFor0ld_X86)
+-    set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
+-else (BuildFor0ld_X86)
+-    if (BuildForAMD_X86_64)
+-        set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
+-    else (BuildForAMD_X86_64)
+-        if (BuildForCore2_X86_64)
+-            set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
+-        else (BuildForCore2_X86_64)
+-            if (BuildForNEON)
+-                set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
+-            else (BuildForNEON)
+-                if (BuildForThisCPU)
+-                    set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
+-                else (BuildForThisCPU)
+-                    set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
+-                endif (BuildForThisCPU)
+-            endif (BuildForNEON)
+-        endif (BuildForCore2_X86_64)
+-    endif (BuildForAMD_X86_64)
+-endif (BuildFor0ld_X86)
++#if (BuildFor0ld_X86)
++    #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
++#else (BuildFor0ld_X86)
++    #if (BuildForAMD_X86_64)
++        #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
++    #else (BuildForAMD_X86_64)
++        #if (BuildForCore2_X86_64)
++            #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
++        #else (BuildForCore2_X86_64)
++            #if (BuildForNEON)
++                #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
++            #else (BuildForNEON)
++                #if (BuildForThisCPU)
++                    #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
++                #else (BuildForThisCPU)
++                    #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
++                #endif (BuildForThisCPU)
++            #endif (BuildForNEON)
++        #endif (BuildForCore2_X86_64)
++    #endif (BuildForAMD_X86_64)
++#endif (BuildFor0ld_X86)
+ 
+ if (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Debug")
+@@ -330,8 +330,8 @@
+     message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
+ else (BuildForDebug)
+     set (CMAKE_BUILD_TYPE "Release")
+-    set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
+-    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
++    #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
++    message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
+ endif (BuildForDebug)
+ 
+ configure_file(
diff --git a/media-sound/yoshimi/yoshimi-1.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild
deleted file mode 100644
index d7d64c58b5a2..000000000000
--- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
-	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
-	media-libs/fontconfig
-	media-libs/libsndfile
-	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBuildLV2Plugin=$(usex lv2)
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
index b8e82d9c8ffe..e7de48192156 100644
--- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils gnome2-utils xdg-utils
 
 DESCRIPTION="A software synthesizer based on ZynAddSubFX"
 HOMEPAGE="http://yoshimi.sourceforge.net/"
@@ -20,10 +20,10 @@ RDEPEND="
 	media-libs/fontconfig
 	media-libs/libsndfile
 	>=media-sound/jack-audio-connection-kit-0.115.6
-	sci-libs/fftw:3.0
+	sci-libs/fftw:3.0=
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
-	sys-libs/zlib
+	sys-libs/zlib:0=
 	x11-libs/cairo[X]
 	x11-libs/fltk:1[opengl]
 	lv2? ( media-libs/lv2 )
@@ -34,13 +34,13 @@ DEPEND="${RDEPEND}
 "
 
 CMAKE_USE_DIR="${WORKDIR}/${P}/src"
+PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
+
+DOCS=( Changelog README.txt )
 
 src_prepare() {
-	mv Change{l,L}og || die
-	sed -i \
-		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
-		-e "s:lib/lv2:$(get_libdir)/lv2:" \
-		src/CMakeLists.txt || die
+	# respect doc dir
+	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
 
 	cmake-utils_src_prepare
 }
@@ -51,3 +51,13 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-01-12 16:58:08 +0000
commit	c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch)
tree	9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-sound
parent	2891d29af8907ce881662f4a02844926d7a293c7 (diff)