gentoo resync : 05.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-05 21:17:31 +0100
commit: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree: c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-sound
parent: 0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)
129 files changed, 2598 insertions, 1080 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6be9f428836c..75811151df39 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcm2ps/Manifest b/media-sound/abcm2ps/Manifest
index e2db68e0138c..29e27ac0c584 100644
--- a/media-sound/abcm2ps/Manifest
+++ b/media-sound/abcm2ps/Manifest
@@ -3,10 +3,12 @@ DIST abcm2ps-8.13.10.tar.gz 249235 BLAKE2B b3a4fe8b1b3f41e1b35b3ce0574826719eb85
 DIST abcm2ps-8.13.11.tar.gz 249332 BLAKE2B 6ae96a64f5e0ef9e46222645f3013f85e1501b5d9f5b3ddce40af65be371f3dca3162c8d2cd72ade5bc9608a9c657d341d45b2a27adf976b74eeb29ff56eaa0c SHA512 857102194fbc00a0ad21f36776a6fc3cdf0256a20f9a344440eff5e9e060e78dd32178948b53a33517964e75ba9e2954e96e857daf076ca296fa123388879056
 DIST abcm2ps-8.13.12.tar.gz 249460 BLAKE2B 2383d0f71d68dc8d8131aa5ffb5d756f2ded6a9773a5d6e5d7cde46c9c819628ac76c2504cc8dd6febf86f17e3a3da9f35db47564ed237b367ef427a657727b9 SHA512 3d708f02e358bde56b3f5407cd9f7d5a3645c6d0158f600ca7f2aef2a6c6ad03733d310e75375a65c8352a5a688c3b7841b74c014e857992d6eb128b81069f6b
 DIST abcm2ps-8.13.9.tar.gz 248893 BLAKE2B 94744aa81c3b91b438af8f86b4c6cb65d72645a1735175aab9397d23e6a8fe2be1afe70e1c741f68df33bc1c075416cf475a63713fc3f7e1ec801a31bc615889 SHA512 7ce6efe605c073674ec7f30d26a34848e22a5c9f97058431243ee17598e35ebc991b760bc99847294f860f6b936e3ae2f504d2de842a487f226e32c47fac438e
+DIST abcm2ps-8.14.4.tar.gz 258383 BLAKE2B 7f9163309cb7a31eaecf443b5bd754c7389b4717ed891e2082f618499b4491428ae0fff7b4804d2c21c8ff3d948557c9d649afb0c2a9ae9407aad39545ed66d5 SHA512 7ba5a25ef7ad18a46bdd45393836a0ede2838af2c24822ecf3c1759328619663fe600eaf607de900527f88fa4a9c21d1da8965cafa45f4aa6dc5754b37ae3722
 DIST transpose_abc.pl 21045 BLAKE2B 08a28cd9021410ed461283e057ce89000846b9e733edd36343a476189c854a96007057a8fc4207a06504ad94e802b42a246ae4a0a1ed080909b60cc941ab724a SHA512 dc2623608a7b59d7e0c4d25160e69f696f170e9938dc3e035edbaf6f0163b4c6139892ec8734ea2aaba997507dcf32208562e898690600dc3c199046d4d151f3
 EBUILD abcm2ps-8.12.9.ebuild 926 BLAKE2B f1f268ce6ef144df2babcbf9c0df3add68432b770178d3691a292a3f9f88ca2396299eefad816286a0ed967a135a909327f8a7162ffc510ce72582429149b9a8 SHA512 322377f6f6e14a0e77685c9ab0af1d68676d8e846bc7ee9d134655a43ce5e10385ef08050952242a8fe155ae9a0e11be88a2a7c87885c2a36006bf4615fd95f1
 EBUILD abcm2ps-8.13.10.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
 EBUILD abcm2ps-8.13.11.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
-EBUILD abcm2ps-8.13.12.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
+EBUILD abcm2ps-8.13.12.ebuild 935 BLAKE2B 95371dd825265a89d981a73937ad7d5e27dddf35865561bd91cc21085e567432c0e05ded06ebecaad20813740341905c75ed420ccbce0a25917776099b5354f8 SHA512 7bfb4154114273f6572fd487c4cab15af18db337884b7c8ad24bfefa32926598acd65fe202f79862602b3213bd8199f946451855fe99d9026cccac1ed20b74fe
 EBUILD abcm2ps-8.13.9.ebuild 928 BLAKE2B 9d8011958b30d0a15d5a010c6c142e277b804f724757b59b726df1cff84be4b397ef5ef82be2a180b670a1a1bbb89d8904f21bd2967edb57fa1f9b1278a7ab4d SHA512 114dd7423b6035d2f890e5b5325704eefd2ab7f5dec1ba0073cfdbbcee9feea99e7aae1e7e99c3d9156dcc3b782cdb2f3267a8aa54565c2e678739564783a54c
+EBUILD abcm2ps-8.14.4.ebuild 876 BLAKE2B 4736ba1d5fab17fe909e206be14c5bbc3db54a571dae2e012db8bc55a527185d2cb0806a2745455f56c6806f56369fea2ff4f0d8ea33fc2d42e0c2d70b04e0c9 SHA512 d3f70c0d2a4d5258bd3174670ec80eba024b3c58532a4515ebadb5e646bac3b5a693f554aa5871e1229cd5709556216bd91773e22c561e5fc8e04aeb8b170459
 MISC metadata.xml 360 BLAKE2B d590a7cb36ab74b8880f987b711b24df69a96e9a1fb9e7a5e8a0ff08ad65a5646596aeb866af37a2f4a4acd9984a211acbcedffd855ac5b88506e627d02515ed SHA512 7612e5473e6185cac8f54baf6e1bc1bb75e9e6b252d2cd59ed8865c190e0fee1924cbe6e6fc79c03fedfbcf5f9228d45244483b7ec2ccd7a8bd4997c4b6893c9
diff --git a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
index 2d4a35b58897..06691aa0af01 100644
--- a/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
+++ b/media-sound/abcm2ps/abcm2ps-8.13.12.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="A program to convert abc files to Postscript files"
+DESCRIPTION="Program to convert abc files to Postscript files"
 HOMEPAGE="http://moinejf.free.fr/"
 SRC_URI="http://moinejf.free.fr/${P}.tar.gz
 	http://moinejf.free.fr/transpose_abc.pl"
@@ -14,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples pango"
 
-RDEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
diff --git a/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild b/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
new file mode 100644
index 000000000000..4b808b9d06d6
--- /dev/null
+++ b/media-sound/abcm2ps/abcm2ps-8.14.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to convert abc files to Postscript files"
+HOMEPAGE="https://github.com/leesavide/abcm2ps"
+SRC_URI="https://github.com/leesavide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples pango"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="pango? ( x11-libs/pango media-libs/freetype:2 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--enable-a4 \
+		--enable-deco-is-roll \
+		$(use_enable pango)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin abcm2ps
+
+	insinto /usr/share/${PN}
+	doins *.fmt
+
+	dodoc README.md
+
+	if use examples ; then
+		docinto examples
+		dodoc sample*.*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 0ce5cd2ad9ac..47656b4d7122 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -3,6 +3,6 @@ DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd2
 DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
-EBUILD alsa-tools-1.1.6.ebuild 3545 BLAKE2B 0e90047c181bcba0a9acabcd866ac7c4c2b431d9813d2e42a30f96d3492c6ac1a90a1c347e5d8ea7b1057e0f34a7e5084749abca98e3a6a289deb71436ab5cf9 SHA512 8226210e6e41e07ae036a5f333e439e7da09b2955e45d3029263e81ea8adeb2040fad44abb3aecb3b9899ed8718cd66084f1dac426642f55f691bd7a363b0bb4
-EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81
+EBUILD alsa-tools-1.1.6.ebuild 3551 BLAKE2B f47b5d46525d70fe5f6147be5c1c15a387c13a01248dc23587af8262d73fba73afd546e5dbf9c55a8370d457e5d0c15d75b9c62ea82e9400ad8750fe3a2fbc74 SHA512 adddcc1c52a9facee00e8e9d1db6a197f32f43b3a1ccd3aabda33a46987ba1bbea16cbbd8015fe0875e8661ef305480f0dbf2f633a32aed173d44d57466ecad1
+EBUILD alsa-tools-1.1.7.ebuild 3549 BLAKE2B 20d2c75e3e1276871c30dcb8e4202502aac46c46a2ad6cec946706f9e32e5d8f49ab50a01ed7913814bc3b6a3290db84af78e188182f35d1d97879b952b7d673 SHA512 c35600237d55050fa2410d67a27a733ea482f5e4327b2ddc94292526c06e89f8cda41c44fca6e678a0751177c8d4cb26de54d79694ebac55778fc8fc64e856c2
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
index 23ac4f241bbc..64011815ec4d 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -43,7 +43,7 @@ pkg_setup() {
 		$(usex alsa_cards_mixart mixartloader '')
 		$(usex alsa_cards_vx222 vxloader '')
 		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhr '')
+		$(usex alsa_cards_pcxhr pcxhrloader '')
 		$(usex alsa_cards_sscape sscape_ctl '')
 	)
 
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 446f976a0369..90bcf068eaa6 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
@@ -43,7 +43,7 @@ pkg_setup() {
 		$(usex alsa_cards_mixart mixartloader '')
 		$(usex alsa_cards_vx222 vxloader '')
 		$(usex alsa_cards_usb-usx2y usx2yloader '')
-		$(usex alsa_cards_pcxhr pcxhr '')
+		$(usex alsa_cards_pcxhr pcxhrloader '')
 		$(usex alsa_cards_sscape sscape_ctl '')
 	)
 
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 118dd02a26e0..e150dfef9fa6 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,5 +10,5 @@ DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b70
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
 EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
-EBUILD alsa-utils-1.1.8.ebuild 2327 BLAKE2B a6dbd0cedb1f3c9be217caa581f6e3219590f0ec9928d86bb6dadaecc5994c0bb6d805f45b91f5df44c116a9058da1cf560c296114d6975220ee9b2c77962bc5 SHA512 b1b97a5e3ebbafe230187da5bb8563fd680da4e414c0fb5797904fd9e594491496a8500f95e886573fe91e93b551f20d95cf330f48d0898674dec8597f61016b
+EBUILD alsa-utils-1.1.8.ebuild 2325 BLAKE2B c1c1f42135253389c0ad5af2cf97209c8276d65910fbb64d7829575f81e5d5bc7f7840fea011cbf431d1db1ed69d233dfc77883e6cad32488c7bed2ff9c5865d SHA512 165ac58b035d4831411e0eda69dac2c01e267bd0df1f526e194e74fe990d9ce73bd690c83d386aa48573162895ed0616a5e809ed809bf4b239b73d5688338cda
 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
index bcc1f868e6d6..39874af1a0e1 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -10,7 +10,7 @@ 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"
+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}
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index f0d7ed6f9ca8..abf4696c614e 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,7 +1,5 @@
-DIST amsynth-1.5.1.tar.gz 1297131 BLAKE2B 175c008cd4d7bb45234fa22a31132bcd144df98a3dba34fba3a834ffc8623f52c76b412b3b784cb83ee25d12a8762f62bea8e3488b76039ae64e6a39c4404dbe SHA512 5f1551f9d1398a97738ac6f764f169d8cdd55e94464438adb226d1284fe8845e190fe5dd7a740b33972c1bbe76aa2d60467b7a663ec6717bb9fac75e5aac62d1
 DIST amsynth-1.7.1.tar.gz 1409439 BLAKE2B 80fbd2c56b307cb7defce46e2dafe72ce1a56222314faaec9b2d16be9f4412869e377a8cea97d20803eb668b259f2110179607b4148acb8ba7d5e0ef1bb5b14b SHA512 ad5eff805f3ad30a7cc9f3933bbe82b99c670c669c0c405d5045a410afc75cdc0d692856e73ccf870d3ca66e0997a81a5c35baf57b33bb6012f19056cff725c9
 DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
-EBUILD amsynth-1.5.1-r1.ebuild 1057 BLAKE2B 99ac01fa27cc572705cb80bf2432870002ea5c5dc4a92d0546a019185e4a986fef9c114ff0574e405283b4cb185442ed5d9c081ad4141527a5590f31f4738233 SHA512 57cdf9495e3dbd1250bc3090b548d95a280f3443c3b3dd6ac28eccc3530c4050f64ab75954a1f3e617275910bd3f551c44ad1bc16c6a9bf1dcb3a5e4da90349c
 EBUILD amsynth-1.7.1-r1.ebuild 1003 BLAKE2B 54955a36527911ef69dbfb92731eeed27b0f0ff8266dc886697375adc0bc84864543a7610d74884ac29cc365c687b68842414932eeac0d717e611fcf52cb13b2 SHA512 7ebff70fd04c27fd458f0c40266d239c5e6a2255c012e4db4f47d8576621fac0081c22ce62f21136b69d4bd29819300e944bd0aa2b297b5044ef416489a9e8ea
-EBUILD amsynth-1.8.0.ebuild 1042 BLAKE2B b604beb035107d81f40592c33ce38dd602de904c94271fd257d37443fb3a4b71a137396839ee3e8bf150d82fec08801c7d26e681e0077d4a7cad385223391f85 SHA512 699579bf178be7a44b6b8b8cceb567fc2f2e53e972b81ebffe067a33ee65cb8550938319c85583a4d961a777fa7df6c8cb651fe17be26a23cadf736c73aba03a
+EBUILD amsynth-1.8.0.ebuild 1041 BLAKE2B 201ab68413c01eda167184fc8043059d3e03c7d1b1da13aae5c7af38290a0cc6de76de0949ef6bca724161595901986b19b38f32f2350f4081881bb91eb96dee SHA512 5a1ba0dd28236911e10c0e21a7b4ea348ab35fd28ada32b0c56eb9d8d49bb5e3c08029a8290946891f9243c0d86ba77d4720d293c106eaca0fcef185315b0040
 MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
diff --git a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
deleted file mode 100644
index e820000ed8f6..000000000000
--- a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools flag-o-matic
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi jack lash oss sndfile"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	sndfile? ( >=media-libs/libsndfile-1:= )
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-		)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-		>=x11-libs/gtk+-2.20:2
-		)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	oss? ( virtual/os-headers )"
-
-DOCS="AUTHORS README"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		CFLAGS="" \
-		CXXFLAGS="${CXXFLAGS}" \
-		$(use_with oss) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with sndfile) \
-		$(use_with dssi)
-}
diff --git a/media-sound/amsynth/amsynth-1.8.0.ebuild b/media-sound/amsynth/amsynth-1.8.0.ebuild
index 608183e92473..1b250c91fe2b 100644
--- a/media-sound/amsynth/amsynth-1.8.0.ebuild
+++ b/media-sound/amsynth/amsynth-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="alsa dssi gtk jack lash lv2 oss sndfile"
 
 REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk )"
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 1b4a7fe87e59..050d6d1d9e87 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,4 +1,5 @@
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 EBUILD aqualung-1.0-r2.ebuild 2474 BLAKE2B f1c14d90aa54b2312d04296666cbc1e319ed39db869af0cf580f41a440dc157fb4413328aafd016bafc6ac954e4c84e0746d34a1eb815ac7502ad8ca47a9a1fc SHA512 b70e2166296131222298abee45a2e4972fe7c8264a8111dbf2a6cfedb7706b0bcc73014c306302d3e9dc8697983b1e2a8fb09631abe576815bf82fb5a36d5aa5
+EBUILD aqualung-1.0-r3.ebuild 2479 BLAKE2B 82fc4bd1295ba6a5cdd9e0c2216994470bb1c76f1b61eef8e1f2e8ec26ab9d7d51930a07041dc0b29c63a4f310fafe4336f46a8ee0e4ae08a5ce42a65d2aad45 SHA512 710d5891e7b6be0d20ff4194ea5a6629f8f7038a32022519a4caa9b1b4c3181b24de36f6e4bef60c03eda8e5a7b8e499caeb528aeaecde23d2570a060a506ac9
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild
new file mode 100644
index 000000000000..975f08e2a444
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	flac? ( media-libs/flac )
+	ifp? ( media-libs/libifp )
+	jack? ( media-sound/jack-audio-connection-kit )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( dev-lang/lua:0= )
+	mac? ( media-sound/mac )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( media-libs/libmad )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( media-libs/libsndfile )
+	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="
+	${RDEPEND}
+"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ffmpeg3.patch"
+)
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 81d2085090da..0eaf7e80b5b8 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
 DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52465d3c473de309f48ac196c2d40885acf08fe84669ccfd5c107d7e45e45069c1757fbc2b550cdb8eaa90e01475 SHA512 37b8ed7c7eed46e594807866d29c3bd37cba8d880c68e714168ae373a8d0dbc58cf837dbd704f95ddbe2544880470fb1f176ab6a67643a4a45b048eabb87e4c2
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
 EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
-EBUILD asunder-2.9.3-r1.ebuild 1045 BLAKE2B ca487c6e9b44f7ffe47d6245e555a0d66875da1abd3b999d79c315f60d304ecc9e4c56da2603eac25c704e3a9bfa0bf48ad5e730dd4a8a4f69ac6a2fc051651f SHA512 c9b4828e8e907fe02467fc2b10f1d4ec074e10d8b238a73987278f4001177905a1db8127c1dc3f23e01f5260507e9f05fb7085f9463a21b1c9c0896bd4ece2f3
+EBUILD asunder-2.9.3-r1.ebuild 916 BLAKE2B d0667f09a4408d0a2506cdac7e28a7a9bf55d60660d2d583ff240e3421da12917a76711c25584b52c9e70eedca1e24f1cd8431c71df60e2820228a20fb260774 SHA512 15602f1ce1ec6be393d591c88743a34c01a15ddff8d40087077906aad551f2ee6f7cd24082b269e2b64acdbee74c4e069125a3e59aaf9742c2ff1d868bcac1a7
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
index 34f0aaa1ed75..df537f03bf42 100644
--- a/media-sound/asunder/asunder-2.9.3-r1.ebuild
+++ b/media-sound/asunder/asunder-2.9.3-r1.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit xdg-utils
+inherit xdg
 
-DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
+DESCRIPTION="Graphical Audio CD ripper and encoder with support for many output formats"
 HOMEPAGE="http://littlesvr.ca/asunder/"
 SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
-COMMON_DEPEND=">=media-libs/libcddb-0.9.5
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=media-libs/libcddb-0.9.5
 	media-sound/cdparanoia
 	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	flac? ( media-libs/flac )
 	mac? ( media-sound/mac )
 	mp3? ( media-sound/lame )
@@ -34,11 +34,3 @@ src_prepare() {
 	default
 	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 2181a34ef61c..42a3076727dc 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,4 +1,5 @@
+AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 924 BLAKE2B a12d1ccea387fffdc81812b4e8563fb446914444dc7362fdfdec2a6867ee8afb9a2c1993723d7d6d82ee24675550228db8de4b8f3d1478716525f61e33d11daa SHA512 99bb83a33f82b18d203d07c754c0f948206545b1639fdc41c74ef04f66e84758503e5212e89fd4c4a3ae4392566b8275dcde51543a518812c518a8c1d91dd347
+EBUILD aumix-2.9.1.ebuild 997 BLAKE2B f61e38c06cdb32cac7ffa212fd938c1ea383826d39fcbaeeb8589f3e22a5ec1790bcb5e191b204a9bcf6b7211683dfbbf20b7ac4dfd353dfbddb81c52941e877 SHA512 7bdcb6e6bf892acb276be89f228cb4c214e367e7372ca65b2bb3928790ef1ce61e7d2c916cc727ba78b7b687ac4ba7a047df1b69efd1bf896fe5efe851a7f934
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index fc6bf40487e4..deffad3e7208 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit desktop
+inherit autotools desktop
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
@@ -14,24 +14,33 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="gpm gtk nls"
 
-RDEPEND="sys-libs/ncurses:0
+RDEPEND="sys-libs/ncurses:0=
 	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
-src_configure() {
-	local myconf
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch" #578722
+)
 
-	use gtk || myconf="${myconf} --without-gtk"
-	use gpm || myconf="${myconf} --without-gpm"
+src_prepare() {
+	default
+	eautoreconf #578722
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(usex gtk '' --without-gtk)
+		$(usex gpm '' --without-gpm)
+	)
 
-	econf \
-		$(use_enable nls) \
-		--disable-dependency-tracking \
-		${myconf}
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/aumix/files/aumix-2.9.1-tinfo.patch b/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
new file mode 100644
index 000000000000..969e034e0cbb
--- /dev/null
+++ b/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/578722
+
+--- aumix-2.9.1/configure.ac
++++ aumix-2.9.1/configure.ac
+@@ -69,6 +69,8 @@
+    [  --without-ncurses       compile with no ncurses or mouse support],
+   AC_MSG_RESULT([Compiling without ncurses support]),[
+   dnl Checks for ncurses library.
++  AC_CHECK_LIB(tinfo, main, TINFO_LIB="-ltinfo", TINFO_LIB=)
++  AC_SUBST(TINFO_LIB)
+   AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
+   if test $initscr = on; then
+     CURSLIB="ncurses"
+@@ -83,7 +85,7 @@
+     fi
+   fi
+   if test x$CURSLIB != x; then
+-    LIBS="-l$CURSLIB $LIBS"
++    LIBS="-l$CURSLIB $TINFO_LIB $LIBS"
+     AC_DEFINE(HAVE_CURSES, 1,
+       [Define this if you have (n)curses and want to use it.])
+     AC_CHECK_LIB($CURSLIB, getmouse,
diff --git a/media-sound/awesfx/Manifest b/media-sound/awesfx/Manifest
index 72791d62c38f..b9abf7f25bb6 100644
--- a/media-sound/awesfx/Manifest
+++ b/media-sound/awesfx/Manifest
@@ -3,5 +3,5 @@ AUX sfxload.initd 398 BLAKE2B 90c2c51638531b7d51092b70af966db961889f0991a60ee8ff
 DIST awesfx-0.5.1d.tar.bz2 282981 BLAKE2B 1d8e656a4645a24c62e355bb091b0c666ca63b8921e27e53eaefe7d7944bd33eba6595d2509946c58bbfd5a0a28e981e4b31b23d364c5744ed5c36482bcebeb3 SHA512 50cd27ca4da8bd38fd11fcdbb2eb8806ea8956c834433c92cb094e0a6ee143175ba85be4665431527133abf8430e6fb60eb69ee35b0afed81d11db517cbb3758
 DIST awesfx-0.5.1e.tar.bz2 307929 BLAKE2B a3bee0750ca44ab2e732f6bdb2c119104521330226e243be1b0ab9c19e2bfd87176ad2dc039f26b9552be621a7af2ef86852e2f31f8d0b9158b093712d2447e1 SHA512 f70e631b6ab6ec6dcbde7773c1da5cba72763d2198c2ac51f4bde0fee80f057f296cabc915aed805e744f7b2323b4e2b20b6d894c79cf5682457a3fc6a9be11d
 EBUILD awesfx-0.5.1d.ebuild 874 BLAKE2B 18627c40d0b192598d797979e7690cb91ac9153b225907f492db3b891010c2007f518c089217fc6e74ee9d5d5f4348cb6bd8db93f1d38a0b72b774401f015de4 SHA512 2a784d392ec1da69b4ae90a19db5f1629dbe253671b13345e33f3b2afdf325d49238b3c24a89fb9892b2aff8fb62c344ad82d9f7df705cc8570ab34a4b0d763e
-EBUILD awesfx-0.5.1e.ebuild 876 BLAKE2B 1462768e0e959a8c097372c23556e1c39d62f54a064b57a41d9f50184aef20fdd43a88684d2767ff6d44a2fa8314ed05a98655378a2c6be868e79984a1c62281 SHA512 83042eac3b1eec2ea42ad65095dcdcbb9cd876b0d820ef049d9e8c0b879d845d4e60a184cc84640a5d0b9ec52db68a9465498b3777f9ce2c51bc6ce113bd8535
+EBUILD awesfx-0.5.1e.ebuild 876 BLAKE2B 8521dbf176fbc18cc5c07e6096895f7776498d0fd37c2ab5e2a97703842b148f475176143e629f1f43f7b54a3f7f6b1db0d63b1b578d0d642ff15f57e508cf9f SHA512 5f78e33fc8a83e28690c4c3f16e52f99f83d4dcb16065ef2e46288659e6f66bd049f14f27f77b821e764eb0cb826413d068a2a73eddd8051d07328438b046908
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/awesfx/awesfx-0.5.1e.ebuild b/media-sound/awesfx/awesfx-0.5.1e.ebuild
index 1c993f919762..2e218cacb6b7 100644
--- a/media-sound/awesfx/awesfx-0.5.1e.ebuild
+++ b/media-sound/awesfx/awesfx-0.5.1e.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="AWE32 Sound Driver Utility Programs"
 HOMEPAGE="http://ftp.suse.com/pub/people/tiwai/awesfx"
@@ -12,8 +12,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND="media-libs/alsa-lib"
-DEPEND="${RDEPEND}"
+DEPEND="media-libs/alsa-lib"
+RDEPEND="${DEPEND}"
 
 BANK_LOC="${EPREFIX}/usr/share/sounds/sf2"
 
@@ -27,7 +27,7 @@ src_configure() {
 src_install() {
 	default
 
-	rm -f "${ED}"/usr/share/sounds/sf2/README-bank
+	rm "${ED}"/usr/share/sounds/sf2/README-bank || die
 	newinitd "${FILESDIR}"/sfxload.initd sfxload
 	newconfd "${FILESDIR}"/sfxload.confd sfxload
 }
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index a5c178400183..62426ef6d2d0 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,6 +1,9 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
+AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
+DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 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
+EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
+EBUILD bluez-alsa-9999.ebuild 1575 BLAKE2B e0d699a254f142dd4d242a0fec3dfc7aee14622af0e60f5db07c86d7616ccb2670a4ea208ef4c5d958b1ae13299eb48f63c2d9c4578d217a1b6c5d8b87f1f4c0 SHA512 3f286815b387693125e3f695ab4442608168da21661917cf75f98e641f6958270fbcc5f04df519270cbcff2e848d5e146217916101e714bc0020d52427fe77fb
+MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
new file mode 100644
index 000000000000..6c33c4f7d936
--- /dev/null
+++ b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools multilib-minimal
+
+DESCRIPTION="Bluetooth Audio ALSA Backend"
+HOMEPAGE="https://github.com/Arkq/bluez-alsa"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
+else
+	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="aac debug hcitop ldac ofono static-libs test"
+
+RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${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=
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-rfcomm
+		$(use_enable aac)
+		$(use_enable debug)
+		$(use_enable ofono)
+		$(use_enable static-libs static)
+		$(use_enable test)
+		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+
+	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
+	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+}
+
+pkg_postinst() {
+	elog "Users can use this service when they are members of the \"audio\" group."
+}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index c883ca5ff3ef..cc7360650950 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,10 +17,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop static-libs"
+IUSE="aac debug hcitop ldac ofono static-libs test"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -28,7 +28,8 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
-	)"
+	)
+	ldac? ( >=media-libs/libldac-2.0.0 )"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
@@ -42,8 +43,11 @@ multilib_src_configure() {
 		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
+		$(use_enable ofono)
 		$(use_enable static-libs static)
+		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
+		$(multilib_native_use_enable ldac)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
new file mode 100644
index 000000000000..55530ea8b831
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
@@ -0,0 +1,31 @@
+From 52b08766b08ec7ef8393343553934ca148c175af Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 24 Mar 2019 13:04:24 +0100
+Subject: [PATCH] configure.ac: Fix pkg-config checks for libldac
+
+libldac actually provides the following two pkgconfig files:
+
+ldacBT-enc.pc
+ldacBT-abr.pc
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 270a74c..6f0b04b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,8 +81,8 @@ AC_ARG_ENABLE([ldac],
+ 	[AS_HELP_STRING([--enable-ldac], [enable LDAC support])])
+ AM_CONDITIONAL([ENABLE_LDAC], [test "x$enable_ldac" = "xyes"])
+ AM_COND_IF([ENABLE_LDAC], [
+-	PKG_CHECK_MODULES([LDAC], [libldacBT >= 2.0.0])
+-	PKG_CHECK_MODULES([LDAC_ABR], [libldacBT_abr >= 2.0.0])
++	PKG_CHECK_MODULES([LDAC], [ldacBT-enc >= 2.0.0])
++	PKG_CHECK_MODULES([LDAC_ABR], [ldacBT-abr >= 2.0.0])
+ 	AC_DEFINE([ENABLE_LDAC], [1], [Define to 1 if LDAC is enabled.])
+ ])
+ 
+-- 
+2.21.0
+
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index d35dea0f11fb..4fa05b5a0f0c 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -10,5 +10,7 @@
   </upstream>
   <use>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
+    <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
+    <flag name="ofono">Enable ofono elephony support</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 131a8ede9295..bdf182b44e61 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,4 +1,9 @@
+AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e734750c1b8a6591459bbebe582fa5a6e632c17d45a6d05e0f58a18ed20432efcceb36e9c3f057e79770eb5db0 SHA512 6333c5d5700985f4a9b0996848409a4f149a70d2e32ce0b0132ac4044e46ca763c037c26e2a886f30c1a439b60619a21a398583d184f513dbca581a878bd0754
+AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
+AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
+DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
+EBUILD cmus-2.8.0.ebuild 3829 BLAKE2B 4645a05212286ce2c2ba9f583ad71d978fa785b0c88d0a43560b48a0ae2ffd6bcc88afb22c95a3a2f7d696d8f7e97caf7d5ad5b6e32abe13f9760dcf6d7f41dd SHA512 c7f526006697f50bf6df78ee8dc4341acbbb5ee3d5558adfef816a9dd664b0587d6db021d3b173ab6c52218a14a6bfac2dc7a344cfd138c7a139f811ba38a5b5
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
-EBUILD cmus-9999.ebuild 3621 BLAKE2B 51bc89fc599042b367f0fc790aabf7202a57bcf3a688dc32b075dc82ebdbe6acd69a9953543fe02169c6e83dc4caa35360fa1d9f6f0a082fe8147c655c2a4c61 SHA512 7f94ef69e91eb456abea984db4240e833d484d9bae03bbdf4de027331e1c11e5a5524dcf7b11909954855b002b1e478b1c51b49f7c35648d56b7d44ef4824702
-MISC metadata.xml 793 BLAKE2B a7f7b70d43eca969e128e92ce3375b14fcd0d65fae8c744c4ecc3e235dbebf112ee068a98597afa4eb882c6992461ae354d7880303fe7c78950c25af0df5b715 SHA512 4074bc35433dc4c9dec0902c0a792f005fdeddc81b886be2c7ca5191423488182b6159445b5a29ad20a10740539d5e1e1dcc60253d724a1a2e8f80c65b2f5b36
+EBUILD cmus-9999.ebuild 3705 BLAKE2B 2452b59c056ad050a8e3015d10d157a0492ddb7ba1620883c83b36129f40dbc4d8838652f88b7122a4b9c6e281175f90be6b63c7942bebc840bd3eb2073eaa55 SHA512 03ded6c4b2fc7b4e1a201e98191d38311be5d2c56d17f9ed8b58af72c251eafe7180f0a5fda5baddbb104790d94e45716abd176ac2d4a4a999633edf7a08bde0
+MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
new file mode 100644
index 000000000000..7ad9b48909d2
--- /dev/null
+++ b/media-sound/cmus/cmus-2.8.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+fi
+
+DESCRIPTION="Ncurses based music player with plugin support for many formats"
+HOMEPAGE="https://cmus.github.io/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+	+vorbis wavpack"
+
+REQUIRED_USE="?? ( elogind systemd )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	aac? ( media-libs/faad2 )
+	alsa? ( >=media-libs/alsa-lib-1.0.11 )
+	ao? ( media-libs/libao )
+	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cue? ( media-libs/libcue )
+	discid? ( media-libs/libdiscid )
+	elogind? ( sys-auth/elogind )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( >=media-libs/libmad-0.14 )
+	mikmod? ( media-libs/libmikmod:0 )
+	modplug? ( >=media-libs/libmodplug-0.7 )
+	mp4? ( >=media-libs/libmp4v2-1.9:0 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	systemd? ( sys-apps/systemd )
+	tremor? ( media-libs/tremor )
+	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
+	wavpack? ( media-sound/wavpack )
+"
+RDEPEND="${DEPEND}
+	pidgin? (
+		dev-python/dbus-python
+		net-im/pidgin
+	)
+"
+
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
+
+DOCS=( AUTHORS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-elogind.patch"
+	"${FILESDIR}/${P}-ffmpeg-deprecations.patch"
+	"${FILESDIR}/${P}-opus.patch"
+)
+
+S="${WORKDIR}/${P/_/-}"
+
+my_config() {
+	local value
+	use ${1} && value=a || value=n
+	myconf="${myconf} ${2}=${value}"
+}
+
+src_configure() {
+	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
+
+	use debug && debuglevel=2
+
+	my_config cddb CONFIG_CDDB
+	my_config cdio CONFIG_CDIO
+	my_config discid CONFIG_DISCID
+	my_config flac CONFIG_FLAC
+	my_config mad CONFIG_MAD
+	my_config modplug CONFIG_MODPLUG
+	my_config mikmod CONFIG_MIKMOD
+	my_config musepack CONFIG_MPC
+	my_config vorbis CONFIG_VORBIS
+	my_config tremor CONFIG_TREMOR
+	my_config opus CONFIG_OPUS
+	my_config wavpack CONFIG_WAVPACK
+	my_config mp4 CONFIG_MP4
+	my_config aac CONFIG_AAC
+	my_config ffmpeg CONFIG_FFMPEG
+	my_config cue CONFIG_CUE
+	my_config pulseaudio CONFIG_PULSE
+	my_config alsa CONFIG_ALSA
+	my_config jack CONFIG_JACK
+	my_config libsamplerate CONFIG_SAMPLERATE
+	my_config ao CONFIG_AO
+	my_config oss CONFIG_OSS
+
+	if use elogind || use systemd; then
+		myconf="${myconf} CONFIG_MPRIS=a"
+	else
+		myconf="${myconf} CONFIG_MPRIS=n"
+	fi
+
+	./configure prefix="${EPREFIX}"/usr ${myconf} \
+		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
+		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
+}
+
+src_compile() {
+	tc-export_build_env BUILD_CC
+	emake V=2 \
+		CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
+		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
+}
+
+src_install() {
+	default
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/_cmus
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+
+	if use pidgin; then
+		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
+	fi
+}
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index bf501b22bd38..0b1b04b727cc 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 multilib
+
+inherit bash-completion-r1
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
@@ -12,28 +13,33 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-DESCRIPTION="A ncurses based music player with plugin support for many formats"
+DESCRIPTION="Ncurses based music player with plugin support for many formats"
 HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
+IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
 	+vorbis wavpack"
 
-S="${WORKDIR}/${P/_/-}"
+REQUIRED_USE="?? ( elogind systemd )"
 
-CDEPEND="sys-libs/ncurses:0=[unicode?]
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	sys-libs/ncurses:0=[unicode?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
-	cue? ( media-libs/libcue )
-	cdio? ( dev-libs/libcdio-paranoia )
 	cddb? ( media-libs/libcddb )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cue? ( media-libs/libcue )
 	discid? ( media-libs/libdiscid )
+	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( >=media-libs/libmad-0.14 )
 	mikmod? ( media-libs/libmikmod:0 )
@@ -42,19 +48,25 @@ CDEPEND="sys-libs/ncurses:0=[unicode?]
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
 	pulseaudio? ( media-sound/pulseaudio )
+	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
 	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	pidgin? ( net-im/pidgin dev-python/dbus-python )"
+	wavpack? ( media-sound/wavpack )
+"
+RDEPEND="${DEPEND}
+	pidgin? (
+		dev-python/dbus-python
+		net-im/pidgin
+	)
+"
 
 # Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
 REQUIRED_USE="tremor? ( vorbis )
 	mp4? ( aac )" # enabling mp4 adds -lfaad
 
-DOCS="AUTHORS README.md"
+DOCS=( AUTHORS README.md )
+
+S="${WORKDIR}/${P/_/-}"
 
 my_config() {
 	local value
@@ -90,6 +102,12 @@ src_configure() {
 	my_config ao CONFIG_AO
 	my_config oss CONFIG_OSS
 
+	if use elogind || use systemd; then
+		myconf="${myconf} CONFIG_MPRIS=a"
+	else
+		myconf="${myconf} CONFIG_MPRIS=n"
+	fi
+
 	./configure prefix="${EPREFIX}"/usr ${myconf} \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
@@ -106,7 +124,9 @@ src_compile() {
 src_install() {
 	default
 
-	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
+	fi
 
 	insinto /usr/share/zsh/site-functions
 	doins contrib/_cmus
@@ -117,8 +137,3 @@ src_install() {
 		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
 	fi
 }
-
-pkg_postinst() {
-	einfo "USE flag 'wma' was replaced by 'ffmpeg'"
-	einfo "Details here - https://bugs.gentoo.org/show_bug.cgi?id=553834"
-}
diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch
new file mode 100644
index 000000000000..e1309c78911d
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.8.0-elogind.patch
@@ -0,0 +1,22 @@
+From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001
+From: Shiba <3816409+shibotto@users.noreply.github.com>
+Date: Tue, 12 Feb 2019 15:29:43 +0100
+Subject: [PATCH] Add support for elogind (#846)
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 1f46c30a..4627126e 100755
+--- a/configure
++++ b/configure
+@@ -289,7 +289,7 @@ check_vorbis()
+ 
+ check_libsystemd()
+ {
+-	pkg_config LIBSYSTEMD "libsystemd"
++	pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3"
+ 	return $?
+ }
+ 
diff --git a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
new file mode 100644
index 000000000000..941f47e3d499
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
@@ -0,0 +1,124 @@
+From 9877eb02381fd4c57059f9c77be03127c28d8f88 Mon Sep 17 00:00:00 2001
+From: Niko E <nefthy@users.noreply.github.com>
+Date: Mon, 11 Feb 2019 09:09:21 +0100
+Subject: [PATCH] Fixes ffmpeg deprecations (#861)
+
+- av_register_all is no longer needed since 4.0
+- AVStream::codec is deprecated since 3.1
+- avcodec_decode_audio4 is deprecated since 3.1
+---
+ ip/ffmpeg.c | 42 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
+index eaad5c4f..418a37f8 100644
+--- a/ip/ffmpeg.c
++++ b/ip/ffmpeg.c
+@@ -128,9 +128,11 @@ static void ffmpeg_init(void)
+ 
+ 	av_log_set_level(AV_LOG_QUIET);
+ 
++#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100)
+ 	/* We could register decoders explicitly to save memory, but we have to
+ 	 * be careful about compatibility. */
+ 	av_register_all();
++#endif
+ }
+ 
+ static int ffmpeg_open(struct input_plugin_data *ip_data)
+@@ -143,6 +145,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
+ 	AVCodec *codec;
+ 	AVCodecContext *cc = NULL;
+ 	AVFormatContext *ic = NULL;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++	AVCodecParameters *cp = NULL;
++#endif
+ 	SwrContext *swr = NULL;
+ 
+ 	ffmpeg_init();
+@@ -162,11 +167,20 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
+ 		}
+ 
+ 		for (i = 0; i < ic->nb_streams; i++) {
++
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++			cp = ic->streams[i]->codecpar;
++			if (cp->codec_type == AVMEDIA_TYPE_AUDIO) {
++				stream_index = i;
++				break;
++			}
++#else
+ 			cc = ic->streams[i]->codec;
+ 			if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
+ 				stream_index = i;
+ 				break;
+ 			}
++#endif
+ 		}
+ 
+ 		if (stream_index == -1) {
+@@ -175,7 +189,13 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
+ 			break;
+ 		}
+ 
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++		codec = avcodec_find_decoder(cp->codec_id);
++		cc = avcodec_alloc_context3(codec);
++		avcodec_parameters_to_context(cc, cp);
++#else
+ 		codec = avcodec_find_decoder(cc->codec_id);
++#endif
+ 		if (!codec) {
+ 			d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
+ 			err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
+@@ -196,6 +216,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
+ 
+ 	if (err < 0) {
+ 		/* Clean up.  cc is never opened at this point.  (See above assumption.) */
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++		avcodec_free_context(&cc);
++#endif
+ 		avformat_close_input(&ic);
+ 		return err;
+ 	}
+@@ -207,6 +230,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
+ 	priv->input = ffmpeg_input_create();
+ 	if (priv->input == NULL) {
+ 		avcodec_close(cc);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++		avcodec_free_context(&cc);
++#endif
+ 		avformat_close_input(&ic);
+ 		free(priv);
+ 		return -IP_ERROR_INTERNAL;
+@@ -252,6 +278,9 @@ static int ffmpeg_close(struct input_plugin_data *ip_data)
+ 	struct ffmpeg_private *priv = ip_data->private;
+ 
+ 	avcodec_close(priv->codec_context);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++	avcodec_free_context(&priv->codec_context);
++#endif
+ 	avformat_close_input(&priv->input_context);
+ 	swr_free(&priv->swr);
+ 	ffmpeg_input_free(priv->input);
+@@ -305,7 +334,20 @@ static int ffmpeg_fill_buffer(AVFormatContext *ic, AVCodecContext *cc, struct ff
+ 			AVPacket avpkt;
+ 			av_new_packet(&avpkt, input->curr_pkt_size);
+ 			memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size);
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
++			if (avcodec_send_packet(cc, &avpkt) == 0) {
++				got_frame = !avcodec_receive_frame(cc, frame);
++				if (got_frame)
++					len = input->curr_pkt_size;
++				else
++					len = 0;
++			} else {
++				got_frame = 0;
++				len = 0;
++			}
++#else
+ 			len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt);
++#endif
+ #if LIBAVCODEC_VERSION_MAJOR >= 56
+ 			av_packet_unref(&avpkt);
+ #else
diff --git a/media-sound/cmus/files/cmus-2.8.0-opus.patch b/media-sound/cmus/files/cmus-2.8.0-opus.patch
new file mode 100644
index 000000000000..ea95fa8536ce
--- /dev/null
+++ b/media-sound/cmus/files/cmus-2.8.0-opus.patch
@@ -0,0 +1,22 @@
+From 0be981476e019e9fddb5529a73aadf004e94656b Mon Sep 17 00:00:00 2001
+From: tomty89 <tom.ty89@gmail.com>
+Date: Tue, 12 Feb 2019 18:55:09 +0800
+Subject: [PATCH] ip/ffmpeg: enable opus support (#865)
+
+---
+ ip/ffmpeg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
+index 04b916cc..427257c7 100644
+--- a/ip/ffmpeg.c
++++ b/ip/ffmpeg.c
+@@ -519,7 +519,7 @@ const int ip_priority = 30;
+ const char *const ip_extensions[] = {
+ 	"aa", "aac", "ac3", "aif", "aifc", "aiff", "ape", "au", "fla", "flac",
+ 	"m4a", "m4b", "mka", "mkv", "mp+", "mp2", "mp3", "mp4", "mpc", "mpp",
+-	"ogg", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
++	"ogg", "opus", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
+ #ifdef USE_FALLBACK_IP
+ 	"*",
+ #endif
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f64fa63b73fc..f19bd0670b18 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="cdio">use libcdio for CD support </flag>
-    <flag name="cue">enable CUE sheet parsing</flag>
-    <flag name="discid">enable reading the ID of the inserted CD</flag>
-    <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
-    <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="github">cmus/cmus</remote-id>
-    <remote-id type="sourceforge">cmus</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
+	<use>
+		<flag name="cdio">Use libcdio for CD support </flag>
+		<flag name="cue">Enable CUE sheet parsing</flag>
+		<flag name="discid">Enable reading the ID of the inserted CD</flag>
+		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
+		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>
+		<flag name="systemd">Enable MPRIS support via <pkg>sys-apps/systemd</pkg></flag>
+		<flag name="tremor">Use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cmus/cmus</remote-id>
+		<remote-id type="sourceforge">cmus</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 0b0f5a552fcc..85c4246ee83c 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,6 +1,7 @@
 AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
 AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 BLAKE2B 6ff8c90887d262d3ee8c755ae695291d2c8c757758254c41f40bf8f07646d3810935f3c339b63525219c1358593e8e42b58a134917c83b4030ea80d5d8479e9e SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0
+AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 772 BLAKE2B 5c32881817c038fcf129940ad8cfb98a7b2c3d02498ab6ce16ccc5f4189430022ab36748eccf07b491084234d4da4fbf267f18154ceb9ae8cda143fb3d5feb7e SHA512 338f9824d94cabcfe49d344b6f583722ca78fa708b399f339fac1ae0b159d0552e3995c04806761e15fe9467950a55765ca9f242304d94bea2068eacb8d16a29
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 842 BLAKE2B cbbffb25cb940b96fc61f659a60c90e83a52dfb76bd1ec01f4198dbb390fa122d1cfaefe1458ab6690ec04b23c2a9546d3054661fc9cda7e10f8e6ec58c41781 SHA512 93efbb1508fca5581cef95f369dbe3e6a123b1998e18b3ccd3a4c1112d39303a1ead81b26e414042ca26bf5c803cd4a3a377803832a3bf5291cf8e7a5e4b6be2
 EBUILD cvoicecontrol-0.9_alpha.ebuild 951 BLAKE2B 9b1d2ba07c664826373679ed678d0f23eb12478160d8bb0f51f4e4f4280460f067b03096879da4aaad376c233c75cdcd699f76093baf63543ada542dc50f8e96 SHA512 04d08e6961d1e2d9cd7ca55cf62a5452286574f5a49feee282a0475f19f3cdda2bd90acf34d60f13471f23cf42465dcf0209a00983aff2c54cd5aa9bab650695
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index 5aed99496537..205285a0b803 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-MY_P=${P/_/}
+inherit autotools
+
+MY_P="${P/_/}"
 
 DESCRIPTION="Console based speech recognition system"
 HOMEPAGE="http://www.kiecza.net/daniel/linux"
@@ -11,18 +13,28 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc ~x86"
 IUSE=""
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${P}-gentoo-2.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gentoo-2.patch"
+	"${FILESDIR}/${P}-tinfo.patch" #647166
+)
 
 src_prepare() {
 	default
-	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in || die "sed failed"
 	# Handle documentation with dohtml instead.
-	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in || die "sed #2 failed"
+	sed \
+		-e "s:SUBDIRS = docs:#SUBDIRS = docs:" \
+		-i cvoicecontrol/Makefile.am || die
+
+	eautoreconf #647166
+
+	sed \
+		-e "s/install-data-am: install-data-local/install-data-am:/" \
+		-i Makefile.in || die
 }
 
 src_install () {
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch
new file mode 100644
index 000000000000..2ad44a1d7f42
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch
@@ -0,0 +1,10 @@
+--- cvoicecontrol-0.9alpha/configure.in
++++ cvoicecontrol-0.9alpha/configure.in
+@@ -12,6 +12,7 @@
+ AC_CHECK_LIB(pthread, main, [LIBPTHREAD="-lpthread"], LIBPTHREAD= )
+ AC_SUBST(LIBPTHREAD)
+ AC_CHECK_LIB(ncurses, main, [LIBNCURSES="-lncurses"], LIBNCURSES= )
++AC_CHECK_LIB(tinfo, keypad, [LIBNCURSES="$LIBNCURSES -ltinfo"])
+ AC_SUBST(LIBNCURSES)
+ dnl Checks for header files.
+ AC_CHECK_HEADERS(fcntl.h glob.h math.h ncurses.h pthread.h signal.h stdio.h stdlib.h string.h sys/ioctl.h sys/select.h sys/soundcard.h sys/time.h sys/types.h termios.h time.h unistd.h)
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 0acc76d1cf7e..8d5101665fda 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -2,5 +2,5 @@ AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc1
 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
-EBUILD darkice-1.3.ebuild 1309 BLAKE2B 3d29d9e552859c1e9c32cd003b966fea820588d9e92d4fe62ef54c5e73edcb519cb8ce30aafe9b8df30e6b75716e62af32b223c777331dd04f908133c141e833 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e
+EBUILD darkice-1.3.ebuild 1258 BLAKE2B f45e5570b5b9fc147617602ff2fbccb43a672b813e48c7ca0a5d79e29d8ff4282e3ae8ac7dbe1da76719044ec2e9e474d0d955e50e9c36d05100cdc7a2c0872c SHA512 9af70f5938cda673d468edc24c5968b047e6b8d30134bb5a60c7ed32e080ce0553c5594d61b06a435b0838691afd8c26f8a7f04d000ab50eb411fcda551b36f8
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index b3c01b466369..aba277257e7b 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils
 
 DESCRIPTION="A live audio streamer"
 HOMEPAGE="http://www.darkice.org/"
@@ -10,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ~sparc ~x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
@@ -28,23 +27,21 @@ DEPEND="${RDEPEND}"
 REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
-#PATCHES=(
-#	"${FILESDIR}"/${PN}-1.2-gcc47.patch
-#)
-
 src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_with aac faac) \
-		$(use_with aacplus) \
-		$(use_with alsa) \
-		$(use_with jack) \
-		$(use_with libsamplerate samplerate) \
-		$(use_with mp3 lame) \
-		$(use_with opus) \
-		$(use_with pulseaudio) \
-		$(use_with twolame) \
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_with aac faac)
+		$(use_with aacplus)
+		$(use_with alsa)
+		$(use_with jack)
+		$(use_with libsamplerate samplerate)
+		$(use_with mp3 lame)
+		$(use_with opus)
+		$(use_with pulseaudio)
+		$(use_with twolame)
 		$(use_with vorbis)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/dir2ogg/Manifest b/media-sound/dir2ogg/Manifest
index 4a3615c9fa5f..ec0e7a9a630c 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -3,5 +3,5 @@ DIST dir2ogg-0.11.8.tar.gz 21145 BLAKE2B ff3fe7586e935bc3d3c2de7e3625807bc91c0b5
 DIST dir2ogg-0.12.tar.gz 19608 BLAKE2B 39b1210b2458f7774aef64f29b07826a19b274d17a6038fc676557c8b15bed3662f851b87414b9318be154cdadd450001ea45bd8ed6103cffb2ee183511fe617 SHA512 bd76ba168b6e5305e4e5cfd87333200ec72a1d6e7055e966e1544abc842b39743b479b80c63382e10e85eebad92e97ec33e6fe52b0ace2df024ed50468e3946e
 EBUILD dir2ogg-0.11.6.ebuild 872 BLAKE2B 87808d632d07bcb7508af868d3402486314b0fc18b1da430e3548e97d89efbcc8dfd4121aa54686c26a7aadbc1440a35101fdf8a7f3579ae9507890ff848fa7b SHA512 a85412cd58fca620d19da47247d3bba1878bc91a179381b9a252d403aea5cc7d7f3d6e4700aa8c0c71b0a387d27af150b96f2429309f0ce5fef9976bb0d9f5eb
 EBUILD dir2ogg-0.11.8-r1.ebuild 1145 BLAKE2B 41a93cc9b8d4f3ec250d4a954b5e7fc2727998e6cacc192b7b524564d886581c419e00fc58b35da0a40d41d546d57e883722f92fa7c4d2065b01ea8af7566ef7 SHA512 5d8b1e1ecd29a43a84163f0bb6ffe12b13e65772f011434e1754703316fb58b170895e2624b7cb72ee42953979f3b852bfabca81991c0698a08f3227ce15085c
-EBUILD dir2ogg-0.12.ebuild 1132 BLAKE2B 170ac13f55ae807b29417d86e06b63a3ca1de8079d4fda205f6e7501a428917659c9b34bdb9de3d9f21b0cdc7e65f8f745131d1fbff39d8b06398393332f1acc SHA512 873f8f23c73377a758562036a0dfc6f7daedf02b2bc65aee00aaea31a04472ca064bd967785754fc9556014cd9db5bd4df1b6784d391e09b5c954e293d71afd2
+EBUILD dir2ogg-0.12.ebuild 1170 BLAKE2B 5d323c29bf9e9b345b866801c62b9c61206371f9580f468f36bcdf49deb41b8de1e4626f939f0950c16041cae6be05d97038a0e214db2c5f6af46fe684af75b6 SHA512 10aeacfbfd77e8c49b2d467466a0f92d91e842671db53cb7a57e0aa7a9704a9c8c1ac36fafa241597440478759328c64c8fe4c0847a58095808b08ae8860149b
 MISC metadata.xml 420 BLAKE2B 96885d28693df18ad564fe6ff658cd66bc39b3d556dcb5079ba531fea3bf603cdd558cd083c82bf76e06c170bf21e880600981dcb114117e55d585664119f1e5 SHA512 3c87da9d9f935209757f3731cb1b80817d28eab005b9ce29cc5113e3ad063e61666d1e00585e709b77f1ba3aca5703f4c9f64100c075062cddf58c2f72edc074
diff --git a/media-sound/dir2ogg/dir2ogg-0.12.ebuild b/media-sound/dir2ogg/dir2ogg-0.12.ebuild
index 91ad62072f25..cc8c8840f0b0 100644
--- a/media-sound/dir2ogg/dir2ogg-0.12.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.12.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
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="aac flac mac mp3 musepack wavpack wma"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 DEPEND="${PYTHON_DEPS}"
 RDEPEND="${DEPEND}
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index 9f5248f6006b..3ed41c35b0cd 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -3,5 +3,5 @@ DIST drumstick-1.1.1.tar.bz2 1011275 BLAKE2B dff36487a1cf79512150638c793c471fb41
 DIST drumstick-1.1.2.tar.bz2 1012371 BLAKE2B e60a5678d33db1831130037bb4a6df6da8de815a6a0ca33a167f85596f45a1d420ca4c689c756c1fd3f794fb2a097bc19878d78bfe0789a40f9eae1b306b769f SHA512 6e84fbf2ce717cdb3c669a477de65d2f32c277073d812546267c0a9556f7ead612e3140cbc412fcd560786ca024f201a1eb3ba9de4b037e3ba8d4db89e0e2e29
 EBUILD drumstick-1.1.0.ebuild 1764 BLAKE2B 2c42c5d81f55c43ad019db34a15765ed2578541e69550c6871898a1b2568fd3b5ff3dfaeadf46e9a5803b284020463f1f7278da2fbcfd9266fe070169d84077c SHA512 26f6cbb97288f9d1b0413f5fc7545491e68b725a9633898b2147d846855bb01411ab3a28b3a39113d277048e90b53e6416104b75ec45fbc15bfa294ed3f2312d
 EBUILD drumstick-1.1.1.ebuild 1467 BLAKE2B 152cc25ca806b624879653c1ba904003ea941941ceea8924f99828c8a55fa0b747550631e4179b14f8dcad46744eb16eb22792e8bcf3f8cb737e847a78454b09 SHA512 b57479c4c339a7d9ca6577787eef67fc1b4c9252b57564405dc7eaf2bd78401d8b73e2710a51e68ca0917310812a3a414c65f4c63c150570fbd2358b7be76a01
-EBUILD drumstick-1.1.2.ebuild 1468 BLAKE2B 838a09dbb365a68ed994ec6ff16c2be3d48bf70b7c2775b23db9fd46bee0d40a08587edbaca834f64ca7aa0a2fbf21651cdb08302b756919f8e928ddc0a1b6e2 SHA512 596ab9ddf2928f7858313804ec5a425efc8ca2ff20fb445def3f5a4ea8afab126b6b26b3ec47b797a3938ac555dafa597594c7b6d35b4874c97c33e8379e4485
+EBUILD drumstick-1.1.2.ebuild 1467 BLAKE2B 41261e947a6f6183976e66b1ea6fd1a2088df669542ca5d5b253bce0855067aae8a00a1b3bb55cb6d3a23e19cce3bcc57e423cc259c10d2c2317c9714f3b4472 SHA512 2571bab9d4936521b08c8847ab866553acd87974b5a428cfcfffa2febe05aa940efece6ee6f1c501b5f1c25db0c376a62bbf8d75e63157a467733abcafbd87c1
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-1.1.2.ebuild b/media-sound/drumstick/drumstick-1.1.2.ebuild
index 637a6a2cf57f..ba70fe478c6a 100644
--- a/media-sound/drumstick/drumstick-1.1.2.ebuild
+++ b/media-sound/drumstick/drumstick-1.1.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 0e3261d74bfe..781fec2c5f0c 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
 DIST elisa-0.3.0.tar.xz 1248496 BLAKE2B 8a52c35ca1e7a81927d8e95020854725407700e93e15bb778366946e7c19578df6939daec058743d9dffeece43dbb946c0f0ce6612c9ae50ff51c3c023cece1d SHA512 8097f8f2bbcb6199adf856d0786e77a33c46c3ead8f55fb29839862ec96db5ba957a8181af013650e4d8c9ecf32b104f17c26921204e6c7478c0a3a7152c9b9a
-EBUILD elisa-0.3.0.ebuild 1440 BLAKE2B be33c90af6256abbe8503462555df35f4c56f7500cdb91998499cf2f65629c1658237e29ebbca2b8ed8b699bbebb2dcbe04758dad382e0b53b708bf5549d43d6 SHA512 53a2245ea670c93ed0f661f6c732ca1a14147212efc82e1d58f1f63ad44920d53860875cae1a0496fc55fffa389df8a2217d87e6d9eb33e7616ccc42a555a185
+EBUILD elisa-0.3.0-r1.ebuild 1411 BLAKE2B 43edb77ed78a798787dac60534278659637b35fa47b7a1d312bf4ccf0269d7f2ea58d5d16266d28cfd5cdf0ea61ccdc95d68834d484423ae19c7d64c4abb35fb SHA512 db066616b3f067a629fe077bf3fc6f287041a428d63ca6c3d36431a24e07785382a5d54a5478b0af6db627b904e1f537462cd6f4485f3a496e79476e5616f866
 MISC metadata.xml 313 BLAKE2B 76e574d16964ee300bbfd452a53738f99626f7e572847cc923e8b1688dd3e55843a7f4aa5511525eed8e6a9513bc687f131b2a50d173901b54ce94d080d4103f SHA512 17fba6644e9931a1bda042c4ae7e9ad414276c0b159418630c6d20013f4d4b68cd62f150c5076f99e3c719d93f0103fba824fcbbfeebab1478aeddb19181c2f6
diff --git a/media-sound/elisa/elisa-0.3.0.ebuild b/media-sound/elisa/elisa-0.3.0-r1.ebuild
index 1c81c1161797..179c74eabb5a 100644
--- a/media-sound/elisa/elisa-0.3.0.ebuild
+++ b/media-sound/elisa/elisa-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_TEST="forceoptional"
 KDE_HANDBOOK="optional"
@@ -17,7 +17,10 @@ HOMEPAGE="https://community.kde.org/Elisa"
 LICENSE="LGPL-3+"
 IUSE="mpris semantic-desktop"
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -42,10 +45,7 @@ COMMON_DEPEND="
 		$(add_frameworks_dep baloo)
 	)
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	$(add_qt_dep qtgraphicaleffects)
 	$(add_qt_dep qtquickcontrols)
 	$(add_qt_dep qtquickcontrols2)
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index acbf55cac7fc..b975d84a65e3 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,5 +1,5 @@
 DIST fapg-0.41.tar.gz 94315 BLAKE2B 9814ae7fff84060b647b2e82d0aae3b3fbaa290ea673a7fe9b539ea3efb82d5e310692a70b2d1d976b37714c227665897c5983bdd14e6e14c241e9bd1e4baa45 SHA512 17efde8cf0760f2eb3136814d9d332352b9c378213104a5540aee381482d3da72fd17e63e96360bcffe1850399124f1c6fcff9471a89881f746453a092d64ceb
 DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
 EBUILD fapg-0.41.ebuild 628 BLAKE2B c4cd12fc4dcec2ad93660146ae2fdc0f437e7ace8a2b2892fb69e19f504682e8dd4583c9137277d14a6b3f8bf401644c529c618b27caafaad27bfa701f6faa55 SHA512 2a980502ca2761d3862846e1639c7d5dcd27429d8ae2f4eae8d286e95c3444e64555b5d864cda8b91f44e8e192c831452995584996490eb92454351caa283096
-EBUILD fapg-0.42.ebuild 631 BLAKE2B 352730ac8ca833eef23543267c61d525970e3e471f80e9f63092c2c60b9db28bebe2b550ddc26f872ee3198d679340b8337f5f75f6bb9d47d7123be8915caa98 SHA512 faa1d1ddb952fc456a40c363d5dd992103213043256b9abee361704eb6012eb2a48731445f320d97a361d43158a89f24dd186ecee019b653ccc3ef7780f5ff73
+EBUILD fapg-0.42.ebuild 556 BLAKE2B d80a865305fa82f51d4c139b83b893c67ea8a9414b52ae1ed8efd8b4a965be475a1a9297d43b30bd6a1308bf3ca794a91d6ed456f499b16a6b083d256f08aed4 SHA512 d5b5ebeb18bd975d7355d7990d6bd0271b53b1eb671ff1685893e84bba9b3097680ff761954e1d5730b2914c5ea21e71aa0c3772d339c60fad80e6544e433324
 MISC metadata.xml 345 BLAKE2B e790a1276e74a87344d475c26e041546981c9d72b52c87f4a059d455db310fa4bcf6423d46e44971fe0776cc3ef52163235d6ebf7dca68aae20d2339c1e946fb SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.42.ebuild
index 48e9605be9e6..22a8f8f9a2f4 100644
--- a/media-sound/fapg/fapg-0.42.ebuild
+++ b/media-sound/fapg/fapg-0.42.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="Fast Audio Playlist Generator"
 HOMEPAGE="http://royale.zerezo.com/fapg/"
 SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
-IUSE="xspf"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-RDEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
-DEPEND="${RDEPEND}"
+IUSE="xspf"
+
+DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
+RDEPEND="${DEPEND}"
 
-src_compile() {
+src_configure() {
 	local myconf=""
 	use xspf || myconf="${myconf} --disable-xspf"
 	econf ${myconf}
-	emake || die "make failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
+	emake DESTDIR="${D}" install
+	einstalldocs
 }
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 4a9f9b3e88d5..6b68a1080fa6 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -2,10 +2,8 @@ AUX 3.28.2.1-appdata-test-fix.patch 1102 BLAKE2B a4af513d38152b19f4dfd1e40ded23b
 AUX 3.28.2.1-icon-fix.patch 943 BLAKE2B 49731d14897e5ce6ca10addb90a63361eb127e64be46ec672852df7a1221c1843c174263881ff714432341dac0f56d1a09772d8a42c67da2e981b6e144f97641 SHA512 5a07e984bc6132439b5c1b20dc36fe2b8cdb42ab84bee876c750f02bf2f97a4302d16547e38da0249e4596ea5431ddc212b36d392ab8657d9eb2482a46f3772b
 DIST gnome-music-3.24.2.tar.xz 1557848 BLAKE2B 329d60da4c2c601524e01bddf086ea699bc10ea311d440ae24af0a83829d7ad4c351963e1b08bd30a8538c9b9987d9f2a41f95690ae31e75c06aac0cc9db2dcf SHA512 a922c80f922b9231e9bbe0cbd1fd33c059c719350c250dbb24316224e3306de7576303119fc9ec303f569559c36d6b076b5ec1076b4f9221a8fb133dcd9f040e
 DIST gnome-music-3.26.2.tar.xz 1563244 BLAKE2B 5a5d27b34470a49a752cb67a1040e227595fd15c6ca4f7656818636d614dfef8ec082dc014ea05c271f512f7c362dc2f81a38359ef04e0663467f62ff3ac2423 SHA512 e8efe31003a54b6cfea151c5402c4d06e48928be7b79332f7f9fb8a567ff7d0d42a43e943398ad6cb7e391d0162322c7fde74922a4b16e52ec24691cc1bfc5b0
-DIST gnome-music-3.28.2.1.tar.xz 2990404 BLAKE2B e91f0bb569eb7d61b0b3136a2f5c22e35dab10f9a3a0412e387ee9f23b8be811eafdde0394ec66df7915ae9c6eb899d479d1462bc9e70d678842ebe3f8417fb5 SHA512 d50dc84ccee7c65391bbc3a5fa48e75be82f633bbfeb4082f7d76ea21fb53c03af00c79088f12ce43a677737265485b20a3736415f1592acfa185140d4142c59
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
 EBUILD gnome-music-3.24.2.ebuild 1600 BLAKE2B b557c83509fa13fe33fea28b1938fe55b898ab056cf18a06ed01cab765474b28d2e2264be63b90056516e5e9cda41e2976116ca14ecf8ae2168288edf38d46b5 SHA512 36233e11a15d7c4a26a077f146d805f9ff971851816e1bb2be624aa3ab73d3f6c02f9029da5020163b7c00e67bc509d39cc45d887dc10bd47c0c7229e18b97cd
 EBUILD gnome-music-3.26.2.ebuild 1630 BLAKE2B 061c29740c59a142be455acb0643284a533fc557b0953e2a40c61c021d1e5e7b27b0fbe12084fbc3ba0f0dd828db8246d48e572cdd6650cf2d7c48d725a9110d SHA512 bc39dc181c9d9e853c79432c11c444a73099207721e013ba52b20e752ab0b72b0ea7f746ce40a3f28da2f0bf27f48eb778e22a1ab1557163f6ffd2a3f6cee8c9
-EBUILD gnome-music-3.28.2.1.ebuild 1835 BLAKE2B 6fed6218cd01e1004b98a032311ddfdb159e572de4a63f5d5bea2747ce7c63db2dab2cc9e27fe5024fa190d7c11474293544586257fe976a2181d3113457fcbb SHA512 dc9cdb21cba8ad4ebd5d30f2fc878c510d47793c35cca7ed51347b599f8d420ae45ac0a0a5ca459fe900ef1c315f4abce144d478e8dd483188001d12d583a4a1
 EBUILD gnome-music-3.30.2.ebuild 1934 BLAKE2B 6272d666d847d9c970e5e8352afa10980a2fb2387a5d64aba830bef9c8543ed3d6d60f771d1338f488831b6da16a801ac7a7334fa1b81027eeccc9f5259b5796 SHA512 9d3ab939cdc919ab2181ceeccbc4b61d6ceb50776a712e40c08d1fad4007dd1602c44ec111f6bca4f03a87e940d9af58a72836475d8ec8abe63f83443d7cba90
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild b/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild
deleted file mode 100644
index a9035d163c44..000000000000
--- a/media-sound/gnome-music/gnome-music-3.28.2.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.19.3:3[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	>=app-misc/tracker-1.99.1:=[introspection(+)]
-	>=dev-python/pygobject-3.21.1:3[cairo,${PYTHON_USEDEP}]
-	>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	>=media-libs/grilo-0.3.4:0.3[introspection]
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		>=app-misc/tracker-miners-1.99.1[gstreamer]
-		>=app-misc/tracker-miners-1.99.1[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	dev-python/requests[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-appdata-test-fix.patch
-	"${FILESDIR}"/${PV}-icon-fix.patch
-)
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index b328135d8590..7f52ed972933 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,7 +1,5 @@
 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.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild
deleted file mode 100644
index abb3d9fd119a..000000000000
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 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/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
index 7ac1a43c04c0..ffea00f87891 100644
--- a/media-sound/kaudiocreator/Manifest
+++ b/media-sound/kaudiocreator/Manifest
@@ -1,5 +1,3 @@
-DIST kaudiocreator-1.3_p20170806.tar.xz 706008 BLAKE2B 62f2a3106c581e43921a1b8abcc78039b45773d618e531d77f00cbcd121722aa2bf8ef0d4f009f656400d55f414aebc69742b2fe736ec5ea08d7106e18573f6e SHA512 0e06092f8519e9a5a1341f828442de5eace4982723fcb466c23e771d4c42f0c67e91bbf59e6a924d0dc9f2cb8b7b04aaa1660ac97a0075ea6aae155f6a4b2533
 DIST kaudiocreator-1.3_p20190225.tar.gz 762053 BLAKE2B 6527d260148ee32d5cb234808ae40205370fc98dd205f32fe74ae1e0958b3f5dffd4e93c338150caa7a990a3818f35a2dc925f351bad1bea98c3b8546840b524 SHA512 63d6e24f001b3664c001581f9e1d929adc096bd563d841a10dd9966ac4e56f1d4ae80ad90e4aa5b879529e8e6710242bce69a0a71cbbf5d3cd3d1f67abaa8957
-EBUILD kaudiocreator-1.3_p20170806.ebuild 1737 BLAKE2B 72df346f68cab5e0a7c49e815feb525f2424b2b09a76379bff97d70d5d2f6d40cb30cc12f8e5a2f15a33b5a8d5b483da722f644d8a102c793b2aee1908758d98 SHA512 23b6544b34348d39102f9a4417b9534ffcb47fcddf53487f22662f981d13a08f16bd1ef56374794c87df7c2d57e8602bee1be5d8f0105a4a2d30ee20f3533372
-EBUILD kaudiocreator-1.3_p20190225.ebuild 1802 BLAKE2B 28eb8d9fc0cc36beeada2a48202f7cfb95eb67869cdb25bbaf47e3dcdaa81ddda2e8d3d53960b56584228a9f1bc8d3e5de04f91dcbc05c1c0c5d2fd2edba9f42 SHA512 2d59916641f131bc036bf475a103d314ddad19cdc3697e39d8da9daa5df2282bb890215fb13faf3cc02fabe4a04cb56f2bc5ac5b72d354ba9731db67cc10ec1b
+EBUILD kaudiocreator-1.3_p20190225.ebuild 1800 BLAKE2B 7f5103edeb4fc638f24d7187d120db6062c02f1d945022cbd74369218b50b047390293ea579da7cedb5411358f63b4cbe8a9f87801e394c967394d7346188873 SHA512 a1d96e81ddcf20632fa78062b44ffdb8681409c3d3aa85339efa958f6b6113f7c7afc0c98a5e07324526856ef2c16a79606e735f329f5d1a2f0243627180259c
 MISC metadata.xml 355 BLAKE2B 37b0260333559b93b9952b5a74e13010e7f2ddd57959f8bbd66ec5087ef180bcfdb6e82179ab99ad263b0cf04e1673461b4a6fa292992e74d63028d3d220e844 SHA512 c755125a1f6939ebb9f280bfaed947da3b6455dd66ba1db80eda78142386c3673b44d564922a522055d64015c2e99afd80ac523fb73ad388f6eca7f8aced2760
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
deleted file mode 100644
index 55c8e84afbb6..000000000000
--- a/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="CD ripper and audio encoder frontend based on KDE Frameworks"
-HOMEPAGE="https://www.kde-apps.org/content/show.php?content=107645"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_kdeapps_dep libkcompactdisc)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/libdiscid
-	media-libs/phonon[qt5(+)]
-	>=media-libs/taglib-1.5
-"
-RDEPEND="${DEPEND}
-	$(add_kdeapps_dep audiocd-kio)
-	!media-sound/kaudiocreator:4
-"
-
-DOCS=( Changelog TODO )
-
-pkg_postinst() {
-	local stcnt=0
-
-	has_version media-libs/flac && stcnt=$((stcnt+1))
-	has_version media-sound/lame && stcnt=$((stcnt+1))
-	has_version media-sound/vorbis-tools && stcnt=$((stcnt+1))
-
-	if [[ ${stcnt} -lt 1 ]] ; then
-		elog "You should emerge at least one of the following packages"
-		elog "for ${PN} to do anything useful."
-	fi
-	elog "Optional runtime dependencies:"
-	elog "FLAC - media-libs/flac"
-	elog "MP3  - media-sound/lame"
-	elog "OGG  - media-sound/vorbis-tools"
-
-	kde5_pkg_postinst
-}
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild
index bf29fd9c775b..1f738fd28d7a 100644
--- a/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3_p20190225.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kde.org/applications/multimedia/kaudiocreator/"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index ff311830d0cc..2fea9b1f2bd7 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,3 +1,5 @@
 DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
+DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
 EBUILD kid3-3.7.0.ebuild 1892 BLAKE2B a0136ed5d6f8bf649a7ef068ba5cbfc928ab480dfe258b6d70b8d0f9b94ebd7d2e7d0e574ef4f8e2414d2cd6ddb2aacd29ab5e4ee79dbee22e2e09e255f505d9 SHA512 d152bf282c735e9e302a99464c6056346dc0616bb4fbe282446da4ea87934891eabb2f1b08dca677ff628b7ab08391305434dc0019d332808710038e32657460
+EBUILD kid3-3.7.1.ebuild 1634 BLAKE2B 2e500c9faae9bea5864cbc0233761468ead726659ef5e866de9e271964410089a0a502ff0b889ee33357905b6cc4013dd6922238edd64a3cc51a6a5ca13ad37d SHA512 deca2ec8bb69526203c5bfc8825f52f8d49372b9d40fe4ce9655cbb3067fe785ca2b509dd45aae993681857e5fa86f991b896478aa6149e510193531df11e9f8
 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
new file mode 100644
index 000000000000..0ae648d6fa23
--- /dev/null
+++ b/media-sound/kid3/kid3-3.7.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils xdg
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	sys-libs/readline:0=
+	acoustid? (
+		media-libs/chromaprint
+		virtual/ffmpeg
+	)
+	flac? (
+		media-libs/flac[cxx]
+		media-libs/libvorbis
+	)
+	kde? (
+		kde-frameworks/kconfig:5
+		kde-frameworks/kconfigwidgets:5
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/kwidgetsaddons:5
+		kde-frameworks/kxmlgui:5
+	)
+	mp3? ( media-libs/id3lib )
+	mp4? ( media-libs/libmp4v2:0 )
+	taglib? ( >=media-libs/taglib-1.9.1 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+"
+RDEPEND="${DEPEND}
+	!media-sound/kid3:4
+"
+
+src_prepare() {
+	# overengineered upstream build system
+	cmake-utils_src_prepare
+	# applies broken python hacks, bug #614950
+	cmake_comment_add_subdirectory doc
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_CHROMAPRINT=$(usex acoustid)
+		-DWITH_FLAC=$(usex flac)
+		-DWITH_ID3LIB=$(usex mp3)
+		-DWITH_MP4V2=$(usex mp4)
+		-DWITH_TAGLIB=$(usex taglib)
+		-DWITH_VORBIS=$(usex vorbis)
+	)
+
+	if use kde ; then
+		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+	else
+		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+	fi
+
+	cmake-utils_src_configure
+}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1571a4695e2a..dc50ec2d8508 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -6,6 +6,6 @@ AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3300 BLAKE2B a679e802dfd19fdffad845e0fd42d3d43fdd19e09ae9ad52b6b49b9fb444a524fb3318851350035bd821fcaf4bb1df272a490eafcb14c021af55f85448a9ffa6 SHA512 b9da9bd8eab7806adb139a738a2bdae404d6f30d10e6dbc07e1cc0295c3c1f20508bb841a426b6cb650f270615a3a58608f6b4e08e2b1895acf049027406fdcf
+EBUILD lilypond-2.19.80-r1.ebuild 3299 BLAKE2B 996bfcf42327e0d6372b0867f07592be6e11afbcecdebfa79561dfae3079ee38f0a2b233357705cb00e74b18c2dbdb1e802fe6ddff120f2548d446e593bff745 SHA512 e2561b9c1adc9738ff275fb0eee2eaa2425269c009a94855d27a3f2585b75c0620ab515f447d19ce9817edd14797b3daacf6880ccd0b8979a61f68dfc6700497
 EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index 11303d064643..b4574b4a73c9 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.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
@@ -23,7 +23,7 @@ IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -31,7 +31,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	emacs? ( virtual/emacs )
 	guile2? ( >=dev-scheme/guile-2:12 )
 	!guile2? (
-		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
+		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
 		<dev-scheme/guile-2.0:12
 	)
 	${PYTHON_DEPS}"
diff --git a/media-sound/lmms/Manifest b/media-sound/lmms/Manifest
index 39249b10ebb0..a1b87169162e 100644
--- a/media-sound/lmms/Manifest
+++ b/media-sound/lmms/Manifest
@@ -1,7 +1,4 @@
-AUX lmms-1.2.0_rc4-qt-5.11.patch 855 BLAKE2B 755c3ca48e1b8ab90105764e534f01efcbd52dc2eb6d0e9d47e23409b3b8682f891920a06c0be1b4c161d0f40613956225dfde9c6143021d84f11a75ac012577 SHA512 6505f27e6113a623669ec80be6eea0071097b718c56c4f2cf8432363e8b74bdfe480b7160fe72956bbc8e854032d57e400b39cbb1ea58f100897639f4fe7c0f7
-DIST lmms-1.2.0_rc4.tar.gz 16596115 BLAKE2B ec8a132f900417749899b084915d31348e267aebcded218d919559f195ce4826091bc3576932d2fa9115c2e040ba73b84db05eeaca3fbcf33b930791241de990 SHA512 8f102f2a4f157da1b8477d4f73bd5b86e7d11453491f6764deed1c61654c0836e612e19d1dac33d154ed9d1b0a0c65084a0537be832c94e72b904264269b6a96
 DIST lmms-1.2.0_rc8.tar.xz 14318692 BLAKE2B 972404ab6ce517c748aad21528d5891af5d12c47d38a18f802fb3a5dfc5d6f3ee91cce14a6ff267341c06c9607328b018e1b612f7f0f550372a35038749a7bb3 SHA512 b8fb9c505d9f5e7854767bcd223c8578d4977e59d7bf64993fe0b57e00d1de87f8e77366c3195d8ea429eb3dd44c641e3dbecf27e64609e892a4453ab17d7343
-EBUILD lmms-1.2.0_rc4.ebuild 2239 BLAKE2B 63acb53d7d68b73631efb1be036106f7bd4b0ac8d6e20e470f90312570a6ddfbb04aaa48b2656d8615912c7235392d14ddfdbf7998fd09a6052093a3c018899d SHA512 21c51bb41fe5c85c5a6d9e5f6f3552ff890ac1161041676b718a795fe7690bf45bc85b2f4c0cd3af4143a2f59532c5d7a98c17cb66b9fa343971eea66b94f1fe
-EBUILD lmms-1.2.0_rc8.ebuild 2405 BLAKE2B 0cb97dcf05570649b51705d618334f58eaeccb382a7c88e9fa7f7931585595effba13c92f5d18b61fbd5ca45919bb43db2aabca9f56321b426afe20af4450739 SHA512 245a43d4c2fd4bacc99e3226c97a4b1298ebe52c34a8b62c248d89e0f5d4a273134a68a9348217372d48d075d260d2730e933f554ec3cbd4c6108090599226da
-EBUILD lmms-9999.ebuild 2313 BLAKE2B 58c0b08d3fa447b6f24abaf71bbd56db669200e3ca0dcae426014b3fdd4f0ad982d32ef95b09ffe41df62d46e919a0aff69793fc26475d4c6a410dbef68435b2 SHA512 56be7987ad80263ea4f5f5d52c53b6fe724d5205b92036b60c96126c9e9ee2876d11564a40eafc5f4c0bdd1b8f8a16ea0a466b762a8317742c211e0f1b878915
+EBUILD lmms-1.2.0_rc8.ebuild 2381 BLAKE2B af03643f06d4acf0e20617111c6b72924ec3f3bdca9b597b6ffb2eef5a4d4baeb9d0a1f66975dcd22b4d959d919e0f668e4fc264bcbc4955c74fc2bfb7134719 SHA512 22555ba14f36692c389358b917e01d764d948fe0301a70353ec5bce7ea992e65cc23f0f88b0e355800cb5149dcc1fd51865c472f0f2ad3e40af95209d1a6c575
+EBUILD lmms-9999.ebuild 2289 BLAKE2B 6478c818d455f024f2ca2a6990c7966037250441ea0870e16bb18a6ac5a87609e473bd416ca6d6cfa50862ff65a1b4c2692f5fa5c1cfc8e8acc7c6b1bc7de92e SHA512 3210450792654040d75011816237a9f3ff6b06b32dade0c9614a6b6077d852fb0e7c080b28913dd90d2c2b46ea27b3eb780c557b1d0c87fe4fe649747fa0e17e
 MISC metadata.xml 956 BLAKE2B 0146d8de32c1f9aaa1b111f10e48de20bde5e3634527b4da37ec14d2a148e6eb974bf6665e4fe6254732dff28ec24e3ca7fd1d7b860928453a223bd183895715 SHA512 d96540b061f24e031f1cbb381c05f4eb368e207f8300e8b68e57a36deb2bfb6108453e8428e2534e895927a738d74d8692fc918d8456e0f01b5ec971d4400acc
diff --git a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch b/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
deleted file mode 100644
index ee1328e8c962..000000000000
--- a/media-sound/lmms/files/lmms-1.2.0_rc4-qt-5.11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From daa3f535158f321e7a01ea531fc3085f2d26ab37 Mon Sep 17 00:00:00 2001
-From: Hyunjin Song <tteu.ingog@gmail.com>
-Date: Wed, 23 May 2018 14:59:45 +0900
-Subject: [PATCH] Fix compilation with Qt 5.11 (#4374)
-
-Add extends attribute for custom widget RowTableView per upstream uic change http://code.qt.io/cgit/qt/qtbase.git/commit/?id=058474884c2505a8a00d4c59b4922bfcd3597c2f
----
- src/gui/Forms/EffectSelectDialog.ui | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gui/Forms/EffectSelectDialog.ui b/src/gui/Forms/EffectSelectDialog.ui
-index a9c6de0191..f8e7734862 100644
---- a/src/gui/Forms/EffectSelectDialog.ui
-+++ b/src/gui/Forms/EffectSelectDialog.ui
-@@ -102,6 +102,7 @@
-  <customwidgets>
-   <customwidget>
-    <class>RowTableView</class>
-+   <extends>QTableView</extends>
-    <header>RowTableView.h</header>
-   </customwidget>
-  </customwidgets>
diff --git a/media-sound/lmms/lmms-1.2.0_rc4.ebuild b/media-sound/lmms/lmms-1.2.0_rc4.ebuild
deleted file mode 100644
index a85c255a0f3e..000000000000
--- a/media-sound/lmms/lmms-1.2.0_rc4.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-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"
-	S="${WORKDIR}/${P/_/-}"
-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 )
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-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
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/lmms/lmms-1.2.0_rc8.ebuild b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
index b0055f08f80d..2827a9620b2e 100644
--- a/media-sound/lmms/lmms-1.2.0_rc8.ebuild
+++ b/media-sound/lmms/lmms-1.2.0_rc8.ebuild
@@ -71,7 +71,6 @@ 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
diff --git a/media-sound/lmms/lmms-9999.ebuild b/media-sound/lmms/lmms-9999.ebuild
index 44670637ff58..4fddbf9d2960 100644
--- a/media-sound/lmms/lmms-9999.ebuild
+++ b/media-sound/lmms/lmms-9999.ebuild
@@ -69,7 +69,6 @@ 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
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index bcfe63eaf1cb..fcf1e3d9a5f0 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,6 +2,6 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1350 BLAKE2B e70932c4abccf08d212bbc7f777fc01249f62df8311083a3de8d1dd6f2ec340bfef9de69d946cb8bb7e2183346b29df1e61b01334c6984efb058214d9c1138fb SHA512 9643694bd9a1d97a879bafa1ab2f225c298b4f1d3aa92a2096def0dfef58897ea0e0a838a4157726f3cbab117d7d4c7ad20585888a2f58e485bc7509b9edecc3
-EBUILD mac-4.11.4.5.7.ebuild 1359 BLAKE2B 3a6f2a706bc325d338541547d4d112b221735ab7e08642662c16c9444144d2ddffddd48e03e5439e896974b03e5951dcfc0f072c2d7c6bb2fd4ac87ed1cbedf4 SHA512 a4eb177a493ca9a09272793df96a3a48337b1e2658845eab63c011789206b9be443e0bae341ea47b3cd354c7a067e9694fb7b7e2701152112518ce331aa95d23
+EBUILD mac-4.11.4.5.7-r1.ebuild 1311 BLAKE2B 32e2b958cbb8570956cbafd6f539a5c1b3ed9b25f20526abe300e3eaaaed472d7b21e3179b0b99a891c307e45c4703f8e3e1332682925a6bde7ad559dce8b5c5 SHA512 869deaee6fde8ce9896c43fb5f5db23d0d6fe427e072763e3227e31ae9514b39152e1d437d62b6c26a19a96cb7845875b8a6a30ba7c0a979149b897c0e8bdf98
+EBUILD mac-4.11.4.5.7.ebuild 1321 BLAKE2B c2f1b98f21ff7bc6c52868869f5b7155d8e88d7db3816c0543b3910fa2eb20de1a9bab983474e55f5ec11ce52a652289587182c740a057591e1d0ba5e805ae32 SHA512 fb1d912f512ed224a52f5899182ae40220f8e7c6cc2aa8f2c8a4d7ae3bf841e2a0e7607b685b7f07c82e348554b69f070f7a629f82b036ab04eed376dedd3404
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index aa65b9a5e9ee..3391de9d7884 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.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
@@ -10,12 +10,12 @@ MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
 MY_P=${MY_PN}_${MY_PV}
 
 DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
 SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ppc ppc64 x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mac/mac-4.11.4.5.7.ebuild b/media-sound/mac/mac-4.11.4.5.7.ebuild
index 1f1674b693b3..a76614813cea 100644
--- a/media-sound/mac/mac-4.11.4.5.7.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ PATCH=s$(get_version_component_range 5)
 MY_P=${MY_PN}_${MY_PV}-${PATCH}
 
 DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
 SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
 
 LICENSE="mac"
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 9a3529800f93..a84a5242da87 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -3,5 +3,5 @@ DIST mikmod-3.2.7.tar.gz 279228 BLAKE2B 47c125c76446fed42ca4a40f1d745cef8261ac64
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
 EBUILD mikmod-3.2.6.ebuild 458 BLAKE2B 12a8b2456d6558e66a0f057f5c8ecb492b959610b387dd9f94b5b818bed7459bf7a546b3fcdc26dab60b0c9c958966b32ae59e5b45e889db572f97ef20edee80 SHA512 c955942a4a008790f189c27bc91e8f860ca61a3193383afa1cd68d5275e6b525deabc523e83418881f52d41495e71f2a177cdc04555d0426f905db8c2aa55678
 EBUILD mikmod-3.2.7.ebuild 466 BLAKE2B e01b40632ef1d1158804d7331a01049b159e8b7192bf6b066b437975715a5f5c2fb010938d3b4acc0bb07569bdbac1e4862d424825ce16cfd9cd8708bfd36417 SHA512 60a483907d1b11029944dcadb586c3c79ebccd9a4f5946ea1fcd7c41926bcb52aa5fee61ceb0420c25640668ca8e7acf4544b132bd059edd0c40a120f9e0826f
-EBUILD mikmod-3.2.8.ebuild 471 BLAKE2B 81bfc349de678bb9ebe60a1d32fc22f98b73c18e28f1457eb188424638e5f786e032eed7e8fa5d461b67108a6672fae5f83b6de44a34035cc6337a66cde3c898 SHA512 5822593b62b8bca58ee42ee9e25e4db913dc61a9397bbe7319378c8d53456957c1181788ce2687edb79db352b13936ca014bfc6c83048440f39433b9ac0a930a
+EBUILD mikmod-3.2.8.ebuild 471 BLAKE2B 838b4da56ac7851bb9e5529e5e739e8239090b7ed3113d26aea32368f37876756cd2bc9763c55e7592f890c17c49f3b9452d5117ef6de0d54f3c04b6a3882724 SHA512 2dee158c4a15091b002667dd32a7c9f693f05321dd851a9b5369312d4f729c5854387d065f1ce3a79e311d757c7cc5b90a58de7257c1da5cae94ebca01aa71b0
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index 3bac2834ab08..c4356cddee7a 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A console MOD-Player based on libmikmod"
 HOMEPAGE="http://mikmod.sourceforge.net/"
@@ -12,8 +12,9 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libmikmod-3.3
+DEPEND="
+	>=media-libs/libmikmod-3.3
 	>=sys-libs/ncurses-5.7-r7:0="
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}"
 
-DOCS="AUTHORS NEWS README"
+DOCS=( AUTHORS NEWS README )
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 5a116e3103c7..43a1740e5a8e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -8,5 +8,5 @@ EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4
 EBUILD mixxx-2.1.5.ebuild 3003 BLAKE2B a7f2261d2a470e77b7b7d227bf68cd15e32572bca684662c66480cb8adef3878c8b25d7e85b19496ce6e977d45cd72e7e9063a405d1603bfcaef30f4637fe022 SHA512 3d59474452d549a5c2c72028067a554ec4b4b5e11e57cbed1ca445c00578026bb87b5377066335d438245597bf120e11425e0fd0a5dd0164ba1e09378e6d56a4
 EBUILD mixxx-2.1.7.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
 EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
-EBUILD mixxx-9999.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
+EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index 7de8d9c94349..c3949aa84c2b 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-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
@@ -78,13 +78,12 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.0-docs.patch
 	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
 	# use multilib compatible directory for plugins
-	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
+	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
 
 	default
 }
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index 779c2e3b2187..1f398910768e 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2310 BLAKE2B 39a958560b6bef0144f70b1ddbce0d0d66d18040635cb6532ea1e94407f73d2a129c737b5a4e773e3dc50bba664b5bc297a2280f28a40ff29f0102bef16383ab SHA512 38fe9e096b04070c2161c761053d3d6f69c964657c7f18c9ad07566b7022302c6ac732e84e1e7b5ba59d87a6b63aec6b66bdd6035b98f3046bb40c362aa53d82
+EBUILD moc-2.6_alpha3.ebuild 2309 BLAKE2B 4eb66dfcbf1937b4f53f4ca55e10e13c3a7b11c643c1ba23b0420ca74ae62285ee8906a83a34efbd4061017259f96c63853a79c77d66dfd3ab43c46a05491ba5 SHA512 bf0ee47a7722d2ad30e6df63f39325f298a87ab30c3dc0daeb40dd1fec6302bcdf1cac7b754ebf612a2316f7c4df84b599c2da22d9b3b60e5618753e7ced18ea
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index e1099644e2a5..cd4d54fb88f7 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.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
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 sparc ~x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest
index 1758f167267b..9afa74ec7ed1 100644
--- a/media-sound/mp3info/Manifest
+++ b/media-sound/mp3info/Manifest
@@ -2,6 +2,6 @@ AUX mp3info-0.8.5a-format-security.patch 507 BLAKE2B e3a26ec3df15f24436d7c463f69
 AUX mp3info-0.8.5a-ldflags.patch 466 BLAKE2B 77cd382d37bd35cf4cb06996946cd61c98918395eb7cbba021a98084db90ae1024f8729413c1073e619e2de72de5b7f70706280e2d75b1f3eb100021c12b5ca8 SHA512 868b62dd4565e1f59a057bb4af06ba6618ba320f1a28104b936ae889ca851c344c3a221afedcb309bf11287079c86f44d5f92b6cfcdd8a6ef2e4a72508ed052c
 AUX mp3info-0.8.5a-tinfo.patch 195 BLAKE2B b8b25093c6b320d5f635d35b958699072d13498e93921dd7221aa0c5454deaf3ae77fb4a7d5fd7aeaea0a27b2d1737c22749c8a326fd8d9af52aeb5fb1584e92 SHA512 3e2deb03559afa3029c673a7c9bb165c6c3419b19a629f9b55e20f96e49b8132c2d454274a8f5c64e20330c148351c4ef51e92164d230124b9d3a6d90d2b2653
 DIST mp3info-0.8.5a.tgz 127482 BLAKE2B 303b7fb798604693c58e6412e5e282fbfb1ae126166a7c3d12c335953669c6e8482fb287313d6f44fb802545d728a58ae5f58c4e25bcea1d530879fe87910577 SHA512 30e0ef62deaa090fc115317f6c372f408077dfceed7e05faa6744b8516291e38d21f1742732f6532585f0c3d8c705d8c7026c2bed84c97e1f497d433637affd2
-EBUILD mp3info-0.8.5a-r1.ebuild 924 BLAKE2B 3ea4b8c88c1bcc17d6600fe6336190a4c90d9fd83c33e2b8ff86123ae8b32fd65f9c13432c156e79ab150b5d020207a1e3bbeb3e7c49a192e9991be828915a76 SHA512 a56ed4547d52793c33ef042cdd0f1ee5c103bc5d2b45b8afd6cfa54a4f283ac83f16e017362972153e41b7d82a5dda55adc9f2e1c4d559627ca5596ae67139ff
+EBUILD mp3info-0.8.5a-r1.ebuild 932 BLAKE2B 10fff96e08979079e936acc5769724f364e98cfc9b5135d4673942cb15d3b564ce40760e5b1bffca426e551825f40e0e92cea1acce5e3bc2222b0106ae2ed13b SHA512 ea5fdc950bbe80cf0769c4ff30f530c6c509d20d125ae584e838204e960a08b60b8278e37536857cdea877a4d621842f23b190cfe82bc5b6e616910cd7e8e66d
 EBUILD mp3info-0.8.5a.ebuild 901 BLAKE2B 3db0a926a9e7b8f26778f0a9cfcd5a7b019c4b966ff6f23684343463810ce4f5f9ace1896ddc52cef1c35fc2e633462e1a11e5365b1b5bf58ccfb6413d0cfc5e SHA512 3ea667a13f1b618a7370686b9d2b0e184a3a87677d45c6fe541a25a45bdabcb206f89e244d6fa16b78bff9166dd6588afc702a961d3247714f784edd9fb9abd6
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
index 5982213a3da6..c536ded44571 100644
--- a/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
+++ b/media-sound/mp3info/mp3info-0.8.5a-r1.ebuild
@@ -1,26 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit toolchain-funcs
 
 DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor"
-HOMEPAGE="http://ibiblio.org/mp3info/"
-SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
+HOMEPAGE="https://ibiblio.org/mp3info/"
+SRC_URI="https://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="gtk"
 
-RDEPEND="
-	gtk? ( >=x11-libs/gtk+-2.6.10:2 )
-	sys-libs/ncurses:0=
+BDEPEND="
+	virtual/pkgconfig
 "
 DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
+	sys-libs/ncurses:0=
+	gtk? ( >=x11-libs/gtk+-2.6.10:2 )
 "
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-ldflags.patch"
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index 247b91ab5093..ec1b6fcb2cf8 100644
--- a/media-sound/mp3splt-gtk/Manifest
+++ b/media-sound/mp3splt-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST mp3splt-gtk-0.9.2.tar.gz 1070580 BLAKE2B b49a246eeb03d11ec8d4c8968323c62e200439af5d2cb52321442365615b20444908f4c33e6bddeec4051fc320f303b98a1d341bc834ec768bc4d803d2fb5be8 SHA512 e837cbc0759cd6535fc466099a170d066ab72b4854f8546f524261fe660887f5d2add60d9fa1e19d68d811004c682a324b5bcba86aa8cb89ae1ad2bc2f9b1d9d
-EBUILD mp3splt-gtk-0.9.2-r1.ebuild 1146 BLAKE2B 915f8fbcc69b2382a9589be580882e5aabbc93b485ce6f5d8349acc1d427b84b489679e33030a983597b52a8a43b806f9178dff1edb8db7ba8ec0b4c07d1d64c SHA512 f2046acc088a9447096b48ee27a8705b8037dcd69e2f76592158203ea51a6626cb3da119cf1b113f4689e6b59b439e6ec73d7730e029a55eaa4240b4156b9011
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 1144 BLAKE2B c43cc8ec5dd140e5acb10cd3060a1dcd44c5d1f9a4c2fd3a5359c7dcfadc8af8ca99c693ea1481c273c7243eabe4cccde02d4d36e04bdca57f5f0e8503e3b4cf SHA512 00b6bebd9461917b73b1d3ea3708240f398625935487b13cf0c6fb298e8abbbfff86aa146945794c75f9a0771dfa5bc4105b6be269653220b46888ff887f2b0d
 MISC metadata.xml 426 BLAKE2B d40b4d17f8b9b613f30a83b785db5728b5d1c3485594a470758e1be644dab472d3c4130d36631f0f3dc48db14dedd673afd36142b9f33cd9f7c8e5c50f7b8ce7 SHA512 bdb4ccec57ed706d1bec69d42ae6dc1f4c5aa59155cb671df061632155d8aacceb83ec3e1c66702176d4be5a462a31d30153e32696bcf28dc6a9b2eb137f9de9
diff --git a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
index 771bf3e83a70..741682ebf20c 100644
--- a/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
+++ b/media-sound/mp3splt-gtk/mp3splt-gtk-0.9.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="audacious doc gstreamer nls"
 
 RDEPEND="
-	~media-libs/libmp3splt-0.9.2
+	>=media-libs/libmp3splt-0.9.2
 	x11-libs/gtk+:3
 	audacious? ( >=media-sound/audacious-3.0 )
 	!audacious? ( dev-libs/dbus-glib )
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 0cf1d4075e78..5e7a6532a5d5 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,5 +1,5 @@
 DIST mp3splt-2.6.1a.tar.gz 260476 BLAKE2B d40555eb98886ef229baade1c390498d2fb3bdb79f9efb3e8ff286c7db70165b9c18d5bf4c331c175fad937d2eb85d1419f5e15b8fc31fb60d07ed02d7e39e24 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
 EBUILD mp3splt-2.6.1a.ebuild 701 BLAKE2B 5d5b33841e8cedc429f19f58bea0af6f0f88b96f84d270a11a9720b5e5659978f99a168c05b00d230e72cc99fdca455e80044a46d29eee992b01a6d5fd4fbdf1 SHA512 70cfd32c331223d21c33693d7b77018781b2a86dd7875cb80935a1868e95c0c474efa0dd5e315cf0ce0fbe7c0634508ceec653765824442d273de3088207605f
-EBUILD mp3splt-2.6.2.ebuild 705 BLAKE2B 368fa29e66560db85220965a0d68ee01c8a0134fac71d287a9c919c2811af4863ab8f39047a9a407fe2daa4f411e3a80fffb62c4a050cd67b83ca3a686b9b56e SHA512 9ef39ce7e877c2ab1c922da341001cf9ddffbb3b401422d6def03d465e18f7e139b51fc9b0d4e4373c219e8945fa3d16e2a4d9407d536bf0bb1dd71d055664ce
+EBUILD mp3splt-2.6.2.ebuild 706 BLAKE2B ae6a6f788217a8509ef3656c7a375a0d9a593df9b8562d07931cb34f75bd7a3ad3dac6dbe129ee859167da5ed6ffd06fa4e9269783b93efb8c0609dda62be3fb SHA512 43644996c9ec92dbe185454fe78383020bf2989066e4542f86e2a923c4b638cbc76878d017c9f9252700992418ca490245b3efd6fb1f6850540f46d895155b5b
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 58e3c10e0a20..88d0bf3cc76c 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit multilib
 
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="flac"
 
-RDEPEND="~media-libs/libmp3splt-0.9.2[flac?]"
+RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-devel/gettext"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index a9aac90b0e5a..ccb50baba1bf 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,12 +1,12 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
-AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
-AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
-DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d50d7a4ed349d0c2c61cab1c6e519da96f552f38692bedf18ffbdb2032ae0a3314a05b2f2461c2da526f85e5 SHA512 b3a938f43cd554e0e761890ca7ea910e21b8f98f54f5bfceb0efcbef4df46db0d110d1bbc24a233021b463e3424d6246c1013f5a6ebdfc85a418008d49ced7a4
-EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
+DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
+DIST mpd-0.21.7.tar.xz 670268 BLAKE2B 1dc6b923e6c6f66ec1f0769b6c4d785761a798659c192184801cee5cd6df361fba0107275650da3e5982ebad5370fb6fe1fe4f7bb9da8986e9c359e4ec2a7815 SHA512 a6e8848c851ca464cfd26284d6479d561f127bc102128e8a41274bc1d62d87a3720843ff1922b5b64b33280217a6036b512f7aa0ce7d7f6b90cbed9fe787c5ca
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
+EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
+EBUILD mpd-0.21.7.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/files/mpd-0.20.21.logrotate b/media-sound/mpd/files/mpd-0.20.21.logrotate
deleted file mode 100644
index 55694c4531c3..000000000000
--- a/media-sound/mpd/files/mpd-0.20.21.logrotate
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	weekly
-	delaycompress
-	compress
-	postrotate
-	/etc/init.d/mpd reload
-	endscript
-}
diff --git a/media-sound/mpd/files/mpd-0.20.4.init b/media-sound/mpd/files/mpd-0.20.4.init
deleted file mode 100644
index 0a4c61677bcb..000000000000
--- a/media-sound/mpd/files/mpd-0.20.4.init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-: CFGFILE=${CFGFILE:=/etc/mpd.conf}
-
-depend() {
-	need localmount
-	use net netmount nfsmount alsasound esound pulseaudio
-	config ${CFGFILE}
-}
-
-get_config() {
-	x=$1
-	test -e ${CFGFILE} || return 1
-	sed -n \
-	  -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
-	  ${CFGFILE}
-}
-
-extra_started_commands='reload'
-command=/usr/bin/mpd
-command_args=${CFGFILE}
-required_files=${CFGFILE}
-pidfile=$(get_config pid_file)
-description="Music Player Daemon"
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	kill -HUP `cat ${pidfile}`
-	eend $?
-}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
deleted file mode 100644
index a4f1962c0a1b..000000000000
--- a/media-sound/mpd/mpd-0.20.21-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info systemd user
-
-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 +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-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 ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-	webdav? ( curl expat )
-"
-
-COMMON_DEPEND="
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	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:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	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 )
-	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="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	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
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable webdav)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-boost="${EPREFIX}"/usr
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	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
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.21.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.21.6.ebuild b/media-sound/mpd/mpd-0.21.6.ebuild
new file mode 100644
index 000000000000..9f214249da52
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.6.ebuild
@@ -0,0 +1,295 @@
+# 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
+
+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="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.21.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/mpd/mpd-0.21.7.ebuild b/media-sound/mpd/mpd-0.21.7.ebuild
new file mode 100644
index 000000000000..969b82d84813
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.7.ebuild
@@ -0,0 +1,296 @@
+# 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
+
+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.49.2
+	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.21.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/mpdas/Manifest b/media-sound/mpdas/Manifest
index f9ab0c790f09..73fd69d25955 100644
--- a/media-sound/mpdas/Manifest
+++ b/media-sound/mpdas/Manifest
@@ -4,5 +4,5 @@ DIST mpdas-0.4.1.tar.gz 15117 BLAKE2B 0d1c527434aeecf822f686e50ca43bf684c4ed528d
 DIST mpdas-0.4.2.tar.gz 15695 BLAKE2B 907417050ab1b3d6577311e633b060dad2ff834b5436b7ed086ab5cb9ef291004916fc07cbe18ba4b80eeec8573775cc8e212b93d4ed103cbab3ce81082a18ae SHA512 cebd3c027002ac5283834edf3a1338b449c4a78261690cb5d25c57f767f1b0b81ff8ca5c64d79d6aecf5e86ba0c7b63a51131f6cc9031f2922e92eeddcada353
 EBUILD mpdas-0.4.0-r1.ebuild 713 BLAKE2B 457d000fb43cfa63a8d897dd9b4ea9c7fab52f9e2b3a875616104a2c5988c78d6bdb43c67a7a8753610dcdd79504f5fa42b077db8a752058ec3f665ab197eade SHA512 6ff9c4c330e1a0cd2da0082469f2c4e194e9861a252f6733c427cb62c85b5e3d8ffd63528439296817614e0f7c9c3e4ee6341106823a5718fedc22f88f82f49c
 EBUILD mpdas-0.4.1.ebuild 715 BLAKE2B 5cdbecdd1167865e850733c2f4bcc7ad598c4bafcba46e35afb17e8ddf941ae2137d9e192c5212ce1bbce5c9d58376acd1d808e768551ece2f3c2b786d304ba4 SHA512 79b9bc6753ae2d6a19c07b72ea4d2848b4d34a5e94033c28b8c7aa75e32145903d715c70da3e7ac2c24095e5d43a8ef60b8ce12f764cb20ed7853ca8cc02b7af
-EBUILD mpdas-0.4.2.ebuild 778 BLAKE2B 4bdb9e54ddce763ce23ab8c70ae68943d3f1e96e5ce268c196b12b0a03c3b1b88ed01be6febfeb5dd0be33641e4ccb345974e7b6b57e94633cd0dffcc37c9df1 SHA512 f562d8c3cfb343cbb032849e158c890f920727b7c25116dcdfc17de0695e934cbf05cbf8113a472a9a27fb911d28f4a3a9383f12e5ba9bf3ab32f774897c6ccb
+EBUILD mpdas-0.4.2.ebuild 788 BLAKE2B 91fefa743ede8093667fba953314fc28d41ea427ebf344e1d05d224197da958a67c72f8baff8afb794853e1dcf7657241f0f4cf6f704d33430b6bacaa182ee49 SHA512 be73bc9490f418920606434241c3a803ac73b4d57eccaed23bcd0522ea3fcfc3852462e660ef6cdfbc5789d9d2bc372fd0e361ff6c4babe0ce1805610913595c
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/mpdas/mpdas-0.4.2.ebuild b/media-sound/mpdas/mpdas-0.4.2.ebuild
index 65382e379dd7..67cdeae8e69c 100644
--- a/media-sound/mpdas/mpdas-0.4.2.ebuild
+++ b/media-sound/mpdas/mpdas-0.4.2.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="An AudioScrobbler client for MPD written in C++"
-HOMEPAGE="http://50hz.ws/mpdas/"
-SRC_URI="http://50hz.ws/${PN}/${P}.tar.gz"
+DESCRIPTION="AudioScrobbler client for MPD written in C++"
+HOMEPAGE="https://50hz.ws/mpdas/"
+SRC_URI="https://50hz.ws/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="media-libs/libmpdclient
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/libmpdclient
 	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	sed -i -e 's/@//' Makefile || die
 	default
+	sed -i -e 's/@//' Makefile || die
 }
 
 src_compile() {
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 380197325c72..f9460e1e60e6 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,4 +1,6 @@
+DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD mumble-1.3.0_pre20190313.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
-EBUILD mumble-9999.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
+EBUILD mumble-1.3.0_rc1.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
+EBUILD mumble-9999.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0_rc1.ebuild b/media-sound/mumble/mumble-1.3.0_rc1.ebuild
new file mode 100644
index 000000000000..d15c4124e796
--- /dev/null
+++ b/media-sound/mumble/mumble-1.3.0_rc1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
+else
+	if [[ "${PV}" == *_pre* ]] ; then
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	>=media-libs/speex-1.2.0
+	media-libs/speexdsp
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	jack? ( virtual/jack )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	x11-base/xorg-proto
+"
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(usex jack '' no-jackaudio)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse pulseaudio)
+		$(myuse rnnoise)
+		$(usex speech '' no-speechd)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	use pch || conf_add+=( no-pch )
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir=release
+	if use debug; then
+		dir=debug
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	doicon -s scalable icons/mumble.svg
+
+	doman man/mumble-overlay.1
+	doman man/mumble.1
+
+	dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 1b3d0c7ac3ac..d15c4124e796 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -15,9 +15,10 @@ else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 	else
-		MY_P="${PN}-${PV/_/~}"
-		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_P}"
+		MY_PV="${PV/_/-}"
+		MY_P="${PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${P/_*}"
 	fi
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 43d8d82d6e42..ad393ca93264 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,7 +4,9 @@ AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc3
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
+DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD murmur-1.3.0_pre20190313.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
-EBUILD murmur-9999.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
+EBUILD murmur-1.3.0_rc1.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
+EBUILD murmur-9999.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_rc1.ebuild b/media-sound/murmur/murmur-1.3.0_rc1.ebuild
new file mode 100644
index 000000000000..4ee163ac142e
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.0_rc1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd user readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	virtual/pkgconfig"
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	default
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini} || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir=release
+	if use debug; then
+		dir=debug
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	doins scripts/murmur.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	if use dbus; then
+		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
+		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+	else
+		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
+	fi
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur /etc/murmur/murmur.ini
+	fperms 640 /etc/murmur/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 9795d40d3832..4ee163ac142e 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -16,12 +16,14 @@ else
 	if [[ "${PV}" == *_pre* ]] ; then
 		MY_P="${MY_PN}-${PV}"
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
 	else
-		MY_P="${MY_PN}-${PV/_/~}"
-		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
 	fi
 	KEYWORDS="~amd64 ~arm ~x86"
-	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 1077bf76a536..3b3d11342f0a 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -3,6 +3,7 @@ DIST ncmpcpp-0.8.1.tar.bz2 464123 BLAKE2B 0edb57fc3a0527dea085a10736ff2cdca3ea25
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
 EBUILD ncmpcpp-0.8.1.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1403 BLAKE2B 716e85eca79367ad182bdd8c6cf2f46e1adb8bc1458ff856451ac35824d219d01ba4cd32b0e4bc38ee2fcf00dc4a61eb44e9af7f87b191c5607fe7fd0d1cd0f5 SHA512 2cea3c8b3b76fec3e8955ae748cca24ad5b69115503cc4c745c243a8494e0e457a4bcd7152b5fbdc6d680f2c7ec4f94c76d0e40ea1235261709389aa446b0789
 EBUILD ncmpcpp-0.8.2.ebuild 1398 BLAKE2B 884dd2b899f971087dd8c8152be1df83928e897e6e34b0d65394bd3771a95e024510ae2efcd02fdf2cce8406ab3b31cd38822a640086c6d757ac9dda5a4bed2b SHA512 478763e7f57d66b1005efa5a81e919bb38a78340f67edf7bcb4212edaf46ea2a2a88b5f6df9a8f287d0553cd588085cf779da6f0b081d38ea0e870d4ef6db622
-EBUILD ncmpcpp-9999.ebuild 1393 BLAKE2B df97f04580a0043cd6bb4dd1dfd9b756f11a98dd14f05058e64f30a50c0a557a5fdab6bef229ff512c07b4b314e99bfbc043a69e16ddf540bea72b7b1b6ba724 SHA512 bb3920892524c4f6969490f0219786bae21f20f9660ed6a78f7b307f46396966679c5aa7368e558336f203d25c344b7509282fd7e77890e1bcea9d96f138d5e0
+EBUILD ncmpcpp-9999.ebuild 1395 BLAKE2B f8a77e9ac893098a5a37b2540832498862125868b59f75082194151bb1f0a503d773011a61f41195a2dc95d1dd6638bab9b90a57f0dd62961131b62d7893359d SHA512 b1a99cfbb6b20a9ebd5be2ef1e088ed3db036bd64ab73d5b398e1d1a6e62a623a57376747dbcd2bf84d469a2ab6f55a5d727335e5b830e151fcb52177352f53c
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..50bc9b2e8d63
--- /dev/null
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
+HOMEPAGE="https://rybczak.net/ncmpcpp/"
+SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="clock icu outputs taglib visualizer"
+
+RDEPEND="
+	!dev-libs/boost:0/1.57.0
+	>=media-libs/libmpdclient-2.1
+	dev-libs/boost:=[icu?,nls,threads]
+	net-misc/curl
+	sys-libs/ncurses:=
+	sys-libs/readline:*
+	icu? ( dev-libs/icu:= )
+	taglib? ( media-libs/taglib )
+	visualizer? ( sci-libs/fftw:3.0= )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	sed -i -e '/^docdir/d' {,doc/}Makefile{.am,.in} || die
+	sed -i -e 's|COPYING||g' Makefile{.am,.in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable clock) \
+		$(use_enable outputs) \
+		$(use_enable visualizer) \
+		$(use_with taglib) \
+		$(use_with visualizer fftw) \
+		--docdir=/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc doc/{bindings,config}
+}
+
+pkg_postinst() {
+	echo
+	elog "Example configuration files have been installed at"
+	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
+	elog "as user configuration files."
+	echo
+	if use visualizer; then
+	elog "If you want to use the visualizer, you need mpd with fifo enabled."
+	echo
+	fi
+}
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index 78f586c9c78e..f5c7770182d2 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools git-r3
 
 DESCRIPTION="featureful ncurses based MPD client inspired by ncmpc"
-HOMEPAGE="http://ncmpcpp.rybczak.net/"
-EGIT_REPO_URI="git://repo.or.cz/ncmpcpp.git"
+HOMEPAGE="https://ncmpcpp.rybczak.net/"
+EGIT_REPO_URI="https://repo.or.cz/ncmpcpp.git"
 LICENSE="GPL-2"
 
 SLOT="0"
@@ -20,7 +20,7 @@ RDEPEND="
 	net-misc/curl
 	sys-libs/ncurses:=
 	sys-libs/readline:*
-	icu? ( dev-libs/icu )
+	icu? ( dev-libs/icu:= )
 	taglib? ( media-libs/taglib )
 	visualizer? ( sci-libs/fftw:3.0= )
 "
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 768195cb50fc..d9df75f099ec 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
-EBUILD pavucontrol-4.0.ebuild 890 BLAKE2B f40bf933b2e8112336080c2d4b284c8c80e09b686fef19d5281e9f94dcac620bd07c9a434ac74e9793880e2cf82eef497c63576dcb0c123f612afab9e7115f04 SHA512 d7a36766f88e6a34307f903aee17cadc28a6693036c78c94b3f3135684c8a19cf004b19181de49a423a8603195f2d82de7ef9cdb1cfcc828982e1514e42903b0
+EBUILD pavucontrol-4.0.ebuild 893 BLAKE2B 85b0e9e4bfc0d8894a01a7f6b46d19bb340ed53d52f3728c5007cba8dd43929220b8ffc277262830a4f86df8dd75afa687136848310b6ad0ebcc308c8fb772ad SHA512 e25a85ed23f2c3fa383190b3277a1b42889677c1ff552b09e31f2b4f520b9d4cb4f453032c69f4f4620f6f10b4a26793683af9eba0411c013012ecea8acfd6c9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 8291e6f1a184..8b512d96dcd8 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
-	>=dev-cpp/gtkmm-3.0:3.0
+	>=dev-cpp/gtkmm-3.0:3.0[X]
 	>=dev-libs/libsigc++-2.2:2
 	>=media-libs/libcanberra-0.16[gtk3]
 	>=media-sound/pulseaudio-5[glib]
diff --git a/media-sound/playerctl/Manifest b/media-sound/playerctl/Manifest
index 00f0f2e82266..5ecf06f365ae 100644
--- a/media-sound/playerctl/Manifest
+++ b/media-sound/playerctl/Manifest
@@ -3,8 +3,10 @@ DIST playerctl-0.5.0.tar.gz 17015 BLAKE2B 5da1d0fd4e442ac5f124bd693ae14222624c52
 DIST playerctl-0.6.0.tar.gz 22124 BLAKE2B 6bb90586c56e21a00b5e6e1769248b9782a8211b01dacf590857fe4fe199d6d3fa7aa46a36cba9a8e198a1aad0bf17973fc15140db11c484edfb0275971d3d08 SHA512 8023b5704ca2a428510df6228850b616061289764cc3c4190c0c46f79d6a20e499495f2d773bd821357653ba63bca40eac70f7cc3a11251da3c6a4f7781db739
 DIST playerctl-0.6.1.tar.gz 22921 BLAKE2B d2f5874280e1a99b318bc83c40a38ee31d9c68426cb63e1e16e8ded26bac1a894d78a929f46d45d631af70e37476a4151c520eb69c94e80026689a12c682f0ad SHA512 07c302eb06a96bf3b8aa180e68e85ef6f9fdb5933b80fbce8ee5f9a36c1d961eaf5638e319ff0b26475984acc57a447a4aa8e705667f77e4bd393364cdbfb284
 DIST playerctl-2.0.1.tar.gz 43700 BLAKE2B 9df01bdb5f71a589a40462ed807b0f150d8c90921d1e0ef96bf99f20d9e58345307af35b39cc95e8ab37fcf9e5686935d856e050b61210188008b65281e63557 SHA512 6a5807abc79358bab0ad30a11897a8109121d5eb7d9e17d2c695221ef83942c3c7235fc738ab27c9dd2d3364c04737355e9c88ec5d49f999565565fb4494f720
+DIST playerctl-2.0.2.tar.gz 44241 BLAKE2B 3a1d5f59fdb0067f1147f4ef95990ae0755a372469c0f03491b4f3aec8d0cf754bb4d3057063211ee810532967ace0d35fa6a7f3f8cee8d7a5c09031cb5b11c9 SHA512 ad588f81d42c8000ccd2d2dedacfcd82887a958189b354ad6285545f7ed59e885febe0c3f9e3da915ae0fd0af4bfb4cefda54f17f0560fc4c00b1be6e92f3ac0
 EBUILD playerctl-0.5.0.ebuild 909 BLAKE2B 4b4149e81209610d4de900f59860270d9bee8d97821350f5a9dd921869c6987b0952d93e958f662ded41a08ba58709dfb9af5b4c71e9b5ce209cbbde8c1135b7 SHA512 81bd0b13240357151302d2ba9bc28631e634b25437a19112b3b10e0d1939141c9acb0cf26f62d795bfff8f0d0d70c0a74149aeafa0185a2cae6a67ee8c8db666
 EBUILD playerctl-0.6.0.ebuild 919 BLAKE2B 9023af5a6c9fe937c5096e12720b676c434e45c21238326d957dd50f33d4a44ed20abd2f541386ae471ce6835efdfad1f406fcb220ae6833cc94544aeec2445f SHA512 898d55b119f86d63a9b46dab9b10f53017caa728ba484c7ab814b58f936ae4a25d168b407d86e560099b478b4dfa10fcef01ea5c9c4ecb1d8367cc833cc26e28
 EBUILD playerctl-0.6.1.ebuild 973 BLAKE2B a6f3a4432d1b42984a3426977b05f4e94b303afc755a061f121196e882704cf440c8606b9829099ff91d3e01653ecf75e2beee121b9d0683c6e3c4c0c1b8032c SHA512 0c57ffda7cedd332b10cc566967f35c9a89b0cf732025fe9b4febedb89801332b7a357fb281520dfeee668ae1cea95b1d9c26e9a5cde6fdf0536bdbe9f355d5e
 EBUILD playerctl-2.0.1.ebuild 1053 BLAKE2B 2d5414790ca1e1745e6c86bf2524718c37c843c162050f688072ca9385d23054fb63494a9ac41fb89579eb5b28717650186f70b2ff10cdf0093b52c26dc0aa0f SHA512 d2b1bd2e41f60fb5c61923ec8088986ac5acd695462a5d4dd7be6b7689792072e8846de0da4071c26bb00add72e19f33ee063302760a26547948f4ce7782a84d
+EBUILD playerctl-2.0.2.ebuild 895 BLAKE2B 2c298cbd020cf05b0f6501cd0516e2164bbcc3cf7f2b65a263a992e7af8a27bebef341dd4e24eecb879a3ebd9b96ffa8017b62542e0c62e0764233b8ed0e2cdd SHA512 6c1e0442d8913e2601da8a0257a76d51f3587b53b345b3051973d295970bb974fda5e358f048537e51dc14e99350c435382b4a330e1819f2cd4acd1abaa5907c
 MISC metadata.xml 487 BLAKE2B 26a06ce93634d362dee7b3a595d5257ef946c27a17c181f758fa3c0acd33aeb45c825643311da3739791f80402e38b8fd618ea43655ec60689978cf2e0f2f30f SHA512 f97cd3597a70b86c784f11ffcc5c7c8fb5c16a124cb871907f8e3f216b7ff26d7e2954a52f52a5640fc8a8f41300a4419c527c57f410350a322ed36b1fa2e77f
diff --git a/media-sound/playerctl/playerctl-2.0.2.ebuild b/media-sound/playerctl/playerctl-2.0.2.ebuild
new file mode 100644
index 000000000000..6f909ea8d41b
--- /dev/null
+++ b/media-sound/playerctl/playerctl-2.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson xdg-utils
+
+DESCRIPTION="A CLI utility to control media players over MPRIS"
+HOMEPAGE="https://github.com/acrisci/playerctl"
+SRC_URI="https://github.com/acrisci/playerctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc introspection"
+
+RDEPEND="
+	dev-libs/glib:2
+	introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	doc? ( dev-util/gtk-doc )
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use doc gtk-doc)
+		$(meson_use introspection)
+	)
+
+	xdg_environment_reset # 596166
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	docinto examples
+	dodoc -r "${S}"/examples/.
+	docompress -x "/usr/share/doc/${PF}/examples"
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index fa02b2ed2014..080accdfdc54 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,5 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
+EBUILD pulseaudio-12.2-r1.ebuild 11542 BLAKE2B a410f322510d6a74fe005f95fdf9f32c43e0e892a3577687f26366a37b48793c20865dca6c393dc607fc72404b7445f1796fe76304379aacb7f28be4f999cc54 SHA512 7db67aad091ed831aeaebb4c067851dfa92fabd05bf877e78d8f6ccdd1b88de419d985ef52739e6735b7c3e0f4e4a023f3a47834968e28ef74fac4c84acbe93b
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
-MISC metadata.xml 3208 BLAKE2B c403977ebc346d7bb9c3749225bcc31324a70ed5e737eda2c7d2b6f6d3de9270425ba0aa605dd8a592f89ff249b5caecaff85a2482c0c008412c1eefc5736db1 SHA512 32ac643d5de46c26075f5539bb2feb6fdece76e88ea591e85768ecef41ec8db577577c084aa80e33ca96670eb98858474d3a4c5a8ed78801b4336fecbed89260
+MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index a0d16e0c7810..38993dac40af 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -17,6 +17,7 @@
       PulseAudio plugin enabled. This ensures that clients supporting
       ALSA only will use PulseAudio.
     </flag>
+    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
     <flag name="gconf">
       Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
       to GSettings module automatic migration (keeping the user configuration)
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
new file mode 100644
index 000000000000..06d7c5b03461
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
+SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
+
+# libpulse-simple and libpulse link to libpulse-core; this is daemon's
+# library and can link to gdbm and other GPL-only libraries. In this
+# cases, we have a fully GPL-2 package. Leaving the rest of the
+# GPL-forcing USE flags for those who use them.
+LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
+
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+
+# +alsa-plugin as discussed in bug #519530
+IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
++gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon
+ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
++udev +webrtc-aec +X zeroconf"
+
+# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
+REQUIRED_USE="
+	?? ( elogind systemd )
+	bluetooth? ( dbus )
+	equalizer? ( dbus )
+	ofono-headset? ( bluetooth )
+	native-headset? ( bluetooth )
+	realtime? ( dbus )
+	udev? ( || ( alsa oss ) )
+"
+
+# libpcre needed in some cases, bug #472228
+CDEPEND="
+	|| (
+		elibc_glibc? ( virtual/libc )
+		elibc_uclibc? ( virtual/libc )
+		dev-libs/libpcre
+	)
+	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
+	X? (
+		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
+		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
+		x11-libs/libSM[${MULTILIB_USEDEP}]
+		x11-libs/libICE[${MULTILIB_USEDEP}]
+		x11-libs/libXtst[${MULTILIB_USEDEP}]
+	)
+	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
+	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
+	alsa? ( >=media-libs/alsa-lib-1.0.19 )
+	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
+	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
+	jack? ( virtual/jack )
+	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
+	lirc? ( app-misc/lirc )
+	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
+	gtk? ( x11-libs/gtk+:3 )
+	bluetooth? (
+		>=net-wireless/bluez-5
+		>=sys-apps/dbus-1.0.0
+		media-libs/sbc
+	)
+	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/udev-143[hwdb(+)] )
+	equalizer? ( sci-libs/fftw:3.0 )
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	orc? ( >=dev-lang/orc-0.4.15 )
+	sox? ( >=media-libs/soxr-0.1.1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	media-libs/speexdsp
+	gdbm? ( sys-libs/gdbm:= )
+	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
+	dev-libs/libltdl:0
+	selinux? ( sec-policy/selinux-pulseaudio )
+" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
+
+RDEPEND="${CDEPEND}
+	realtime? ( sys-auth/rtkit )
+	gconf? ( >=gnome-base/gconf-3.2.6 )
+"
+
+DEPEND="${RDEPEND}
+	sys-devel/m4
+	doc? ( app-doc/doxygen )
+	test? ( >=dev-libs/check-0.9.10 )
+	X? (
+		x11-base/xorg-proto
+		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
+	)
+	dev-libs/libatomic_ops
+	virtual/pkgconfig
+	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
+	dev-util/intltool
+	>=sys-devel/gettext-0.18.1
+"
+# This is a PDEPEND to avoid a circular dep
+PDEPEND="
+	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
+"
+
+# alsa-utils dep is for the alsasound init.d script (see bug #155707)
+# bluez dep is for the bluetooth init.d script
+# PyQt5 dep is for the qpaeq script
+RDEPEND="${RDEPEND}
+	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
+	system-wide? (
+		alsa? ( media-sound/alsa-utils )
+		bluetooth? ( >=net-wireless/bluez-5 )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="~HIGH_RES_TIMERS"
+	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
+	check_extra_config
+
+	if linux_config_exists; then
+		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
+		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
+			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
+			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
+		fi
+	fi
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+	gnome2_environment_reset #543364
+
+	enewgroup audio 18 # Just make sure it exists
+
+	if use system-wide; then
+		enewgroup pulse-access
+		enewgroup pulse
+		enewuser pulse -1 -1 /var/run/pulse pulse,audio
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Skip test that cannot work with sandbox, bug #501846
+	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
+	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--disable-adrian-aec
+		--disable-bluez4
+		--disable-esound
+		--disable-gconf
+		--disable-solaris
+		--enable-largefile
+		--localstatedir="${EPREFIX}"/var
+		--with-systemduserunitdir=$(systemd_get_userunitdir)
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(multilib_native_use_enable alsa)
+		$(multilib_native_use_enable bluetooth bluez5)
+		$(multilib_native_use_enable glib gsettings)
+		$(multilib_native_use_enable gtk gtk3)
+		$(multilib_native_use_enable jack)
+		$(multilib_native_use_enable libsamplerate samplerate)
+		$(multilib_native_use_enable lirc)
+		$(multilib_native_use_enable orc)
+		$(multilib_native_use_enable oss oss-output)
+		$(multilib_native_use_enable ssl openssl)
+		# tests involve random modules, so just do them for the native
+		$(multilib_native_use_enable test default-build-tests)
+		$(multilib_native_use_enable udev)
+		$(multilib_native_use_enable webrtc-aec)
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_use_with equalizer fftw)
+		$(multilib_native_use_with sox soxr)
+		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
+		$(use_enable glib glib2)
+		$(use_enable asyncns)
+		$(use_enable neon neon-opt)
+		$(use_enable tcpd tcpwrap)
+		$(use_enable dbus)
+		$(use_enable X x11)
+		$(use_enable systemd systemd-daemon)
+		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
+		$(use_enable systemd systemd-login)
+		$(use_enable systemd systemd-journal)
+		$(use_enable ipv6)
+		$(use_with caps)
+	)
+
+	if use elogind && multilib_is_native_abi; then
+		myconf+=(
+			--enable-systemd-login
+			SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
+			SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
+		)
+	fi
+
+	if use bluetooth; then
+		myconf+=(
+			$(multilib_native_use_enable native-headset bluez5-native-headset)
+			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
+		)
+	fi
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# hack around unnecessary checks
+			# (results don't matter, we're not building anything using it)
+			ac_cv_lib_ltdl_lt_dladvise_init=yes
+			LIBSPEEX_CFLAGS=' '
+			LIBSPEEX_LIBS=' '
+		)
+	else
+		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
+		if use elibc_glibc ; then
+			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
+	fi
+
+	ECONF_SOURCE=${S} \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+		use doc && emake doxygen
+	else
+		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake -C src ${targets[*]}
+	fi
+}
+
+multilib_src_test() {
+	# We avoid running the toplevel check target because that will run
+	# po/'s tests too, and they are broken. Officially, it should work
+	# with intltool 0.41, but that doesn't look like a stable release.
+	if multilib_is_native_abi; then
+		emake -C src check
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
+		if use doc ; then
+			docinto html
+			dodoc -r doxygen/html/
+		fi
+	else
+		local targets=( libpulse.la libpulse-simple.la )
+		use glib && targets+=( libpulse-mainloop-glib.la )
+		emake DESTDIR="${D}" install-pkgconfigDATA
+		emake DESTDIR="${D}" -C src \
+			install-libLTLIBRARIES \
+			install-padsplibLTLIBRARIES \
+			lib_LTLIBRARIES="${targets[*]}" \
+			install-pulseincludeHEADERS
+	fi
+}
+
+multilib_src_install_all() {
+	if use system-wide; then
+		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+		use_define() {
+			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
+
+			use "$1" && echo "-D$define" || echo "-U$define"
+		}
+
+		unifdef $(use_define zeroconf AVAHI) \
+			$(use_define alsa) \
+			$(use_define bluetooth) \
+			$(use_define udev) \
+			"${FILESDIR}/pulseaudio.init.d-5" \
+			> "${T}/pulseaudio"
+
+		doinitd "${T}/pulseaudio"
+
+		systemd_dounit "${FILESDIR}/${PN}.service"
+
+		# We need /var/run/pulse, bug #442852
+		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
+	else
+		# Prevent warnings when system-wide is not used, bug #447694
+		if use dbus ; then
+			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
+		fi
+	fi
+
+	if use zeroconf ; then
+		sed -e '/module-zeroconf-publish/s:^#::' \
+			-i "${ED%/}/etc/pulse/default.pa" || die
+	fi
+
+	dodoc NEWS README todo
+
+	# Create the state directory
+	use prefix || diropts -o pulse -g pulse -m0755
+
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	if use system-wide; then
+		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
+		elog "This mode should only be used on headless servers, embedded systems,"
+		elog "or thin clients. It will usually require manual configuration, and is"
+		elog "incompatible with many expected pulseaudio features."
+		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
+		elog "For more information, see"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
+		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
+		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
+	fi
+
+	if use equalizer && ! use qt5; then
+		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
+		elog "This will build the equalizer module, but the 'qpaeq' tool"
+		elog "which is required to set equalizer levels will not work."
+	fi
+
+	if use equalizer && use qt5; then
+		elog "You will need to load some extra modules to make qpaeq work."
+		elog "You can do that by adding the following two lines in"
+		elog "/etc/pulse/default.pa and restarting pulseaudio:"
+		elog "load-module module-equalizer-sink"
+		elog "load-module module-dbus-protocol"
+	fi
+
+	if use native-headset && use ofono-headset; then
+		elog "You have enabled both native and ofono headset profiles. The runtime decision"
+		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
+	fi
+
+	if use libsamplerate; then
+		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
+		elog "particular advantage over speex. Upstream suggests disabling them."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 9385518bcf3c..f9cf7bfed190 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,9 +2,11 @@ DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.5.tar.gz 1783582 BLAKE2B 4c2154fad61705811d2e2135bdacc7f1e31d499ea65fbbb044896ba37cfde9ef4cd925fe7cc390c5611fb294d57a7297c7e54c76b3d69505c9b595d47259ad9a SHA512 fe45097bcd5aa9754c612c52cfba7d06d14185e18a75e5ae2a257733159f0288897e4f60d147e164f4bcafcd23978e23a006753b2b26e26613809863895cfab5
 DIST pulseeffects-4.5.6.tar.gz 1822218 BLAKE2B def674bb35970ceb2a440acac20ebd5c406ae1691b58e8e8cdee3f0eacc7077daf989bcd94a962a1ef1054bc81f68108fd445adebb32a96940a91306025d72a2 SHA512 c18e4b52c4eff15db40c398b0a60b7b2e7a069142552a9801d0a580f52145d8b13b4507a9d37aa49919bbdc144b85b3f02e140aca671d9dedfb521ed34dbc99e
-EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
+DIST pulseeffects-4.5.8.tar.gz 1826469 BLAKE2B fd19eb0c96b478eefd3d21c94887c8403d3b3c26b9e9e3850782565655994c25f45ccd4a4a119bc16b2299f299578a09499279b927ba9a5dc7a605b27c847dbf SHA512 4fbe59e034051b29e34eb3afba2db84a789c4f0ada8e26ee341f855c16417be7d29445bb8b5119796bc333a76714c2f450358c7d6ee1852420934b91c7ba86b2
+EBUILD pulseeffects-3.2.3-r1.ebuild 1508 BLAKE2B 8de30d74bdd807b2003c54cce7752f05fe60c10a4ad52c0d2180f926cb1f4af94844b9afb99b6cacdd776521d093acc72fe2f181a54175373fb1c2b767134634 SHA512 cef02bea9f8006de5bf33c2bd25528849f3addcc6409672f6ed8753ee621aedd0f985e45a33c2ddcba429305e71df8a2b3fa4135fd163913c36e25b0ac25b5f8
 EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
 EBUILD pulseeffects-4.5.5.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 EBUILD pulseeffects-4.5.6.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
+EBUILD pulseeffects-4.5.8.ebuild 1774 BLAKE2B 949e7481e96674e3a62570eecdfd6542a6d92f65fe35a9c8077e1ab37fc76717e94b65c78cae2d382f5d872e250374449d83613a3e004ee4fab1a18e62302d67 SHA512 d6fe05ad2ead861c6d0a6008e346be0634687261374f23402d029fba3b45c5f40ba1df3906b3ffe37f36d710316eb339769351e44926bbcac1e825d1797038c3
 EBUILD pulseeffects-9999.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
index e410210bfa05..54b3db05c075 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.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
@@ -25,7 +25,6 @@ IUSE=""
 
 DEPEND="
 	${PYTHON_DEPS}
-	python_targets_python3_4? ( dev-python/configparser )
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
new file mode 100644
index 000000000000..c45904327f5b
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index ded84293f8e8..487a6b22b509 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,8 +1,8 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.5.0.tar.gz 260537 BLAKE2B def589a1cfb76517fa34811fe75a8379043d7e0f9fc661dd456b49414042662c3a3b8f57e2d0de5fae99cbdb60062b12d9b73b93032115648b9a21921766fbeb SHA512 3c7026edfef3115fae8e2167bb961f5e32d886c8d75b3534a3f110d921264cd270953145a4737f9d6660c55fccce81d7306ec0ce4064df6e7226598b52399298
 DIST qsynth-0.5.3.tar.gz 269252 BLAKE2B c496063ba33bc78a65d63151871e841f9d3938fe03049655da3c124fd495c592f9c726c479062c3fb2d1561e4dee3284d12b04e04a51ba06e20d297b6e84ac0f SHA512 15632274e5822f5e1a49bd332c5d8b7e59a54800ad32510f425f06b4557e474d5479bd531b45fc43af20535017a656fbd9469d318940931912a56ea1856dc117
 DIST qsynth-0.5.4.tar.gz 268106 BLAKE2B e7e17c1427cbb6105fc6fbaa511325fcfbed0d06e28374e3b9fdce14a633e6554267339bb1ffe2bf1f16fbebf38095ae02eca86d74412add3a1e16d191cd1e45 SHA512 711b18efea3b4050c567f2c549ab4f44525f53de42c6cfea379260e62966215e6d59432bed946733c7e772d691edb739a882de753cf3f46b932833de7b120b7d
-EBUILD qsynth-0.5.0.ebuild 1271 BLAKE2B b8bbfd868583056ced958ac07010ac886d17e2a502230fa56a8eb832e5b355e80a59745cacbead86144b5607046e1154cf7e03e494038528dd074bcaa7b5b3dd SHA512 6d3c40d98862d8031fd97953e5fcf84dcedebb8f3dae93f344939c7028bc39448270ec3ab5f54cdfc5176de74ec855897b3a4e31e5dc931734c2e05b1b205382
+DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
 EBUILD qsynth-0.5.3.ebuild 1328 BLAKE2B 61f84dd2f5da070ed3c18c93e0b0c111673998326f25ec0816126a5bcf5458f4d78932e2fe40735bdb5ceb936b3abf0a1f209d297d5bbf6f07949798874494e9 SHA512 53bee67b1ca4be0d938be720fcb6b4d6a8fe1be52345b61349729d5ff19c85d8cc2f0e5de57f8d0cadf02d47f7852d6509ab67a13a0ade3618b85e01024438bb
 EBUILD qsynth-0.5.4.ebuild 1306 BLAKE2B 49f580815944ad797dd264781e8d58c222338cd4c162556246941e1e8d33f1d3370b3846fc78df2c2d09dff712c1e27235c6e3b9bd1aecc68bb6503a18446e63 SHA512 12595163c9f3a1ea7b7fea0a93a933cdbeca42976a8f56fcb13cd40d382de90f270ba3404d3c9c87a0d42cdd161e03ba6d61f24a8a4c60e5f449c1b530852cfb
+EBUILD qsynth-0.5.5.ebuild 1303 BLAKE2B 8d03befa17b78a2014071b76ebfa19290331616d4b184461503b21145dc01faa8f19ee7c87c5f722b4e210105fb20c2b92f87a5e61e9d32bcaedffb9e8fdc46b SHA512 56faea03030d1146c338dd22d9e6477ffbb01d3531feb38dfbf0cfa4ceccc5ef451235977e0b99b824a6f0d07dd69b69ddfd5e4e2948ca02bc6be7ce1b09b9e1
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.0.ebuild b/media-sound/qsynth/qsynth-0.5.5.ebuild
index cea03459dc6d..8c607d5d7f0c 100644
--- a/media-sound/qsynth/qsynth-0.5.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils flag-o-matic qmake-utils
+inherit desktop flag-o-matic qmake-utils
 
 DESCRIPTION="A Qt application to control FluidSynth"
 HOMEPAGE="http://qsynth.sourceforge.net/"
@@ -11,18 +11,20 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="debug jack alsa pulseaudio"
-KEYWORDS="amd64 ppc x86"
+IUSE="alsa debug jack pulseaudio"
+KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+DEPEND="
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
+	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
 "
+RDEPEND="${DEPEND}"
 
 REQUIRED_USE="|| ( alsa jack pulseaudio )"
 
@@ -30,9 +32,9 @@ PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
 
 src_configure() {
 	append-cxxflags -std=c++11
+	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
 	econf \
-		$(use_enable debug) \
-		--with-qt5=$(qt5_get_bindir)/..
+		$(use_enable debug)
 
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
@@ -43,7 +45,7 @@ src_install () {
 
 	# The desktop file is invalid, and we also change the command
 	# depending on useflags
-	rm "${ED}usr/share/applications/qsynth.desktop" || die
+	rm "${ED}/usr/share/applications/qsynth.desktop" || die
 
 	local cmd
 	if use jack; then
diff --git a/media-sound/rplay/Manifest b/media-sound/rplay/Manifest
index ef443c15dce8..c232178bd5f8 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,4 +5,5 @@ DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
 EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
+EBUILD rplay-3.3.2-r3.ebuild 1219 BLAKE2B eff8616537fc314a29a3df8048854c9a3bd2cf9fa025e0fb13a14e970b28f901f95e69f6b99cc121c53a9110c259fd64eca89813e07b05c9dc5b8d2e531f4007 SHA512 687299901457889f9d6dcb56099ea0dc73c73578c22c9378f36b1e48335441e521af5d7260e54c8a93698a7788e315f10ceb301e4f48071274faff0aad0290d9
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
new file mode 100644
index 000000000000..f94e25893517
--- /dev/null
+++ b/media-sound/rplay/rplay-3.3.2-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools user
+
+DESCRIPTION="Play sounds on remote Unix systems without data transfer"
+HOMEPAGE="http://rplay.doit.org/"
+SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-sound/gsm"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/debian/patches"
+	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
+)
+
+pkg_setup() {
+	enewgroup rplayd ""
+	enewuser rplayd "" "" "" rplayd
+}
+
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	mv rx/configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-rplayd-user=rplayd \
+		--enable-rplayd-group=rplayd
+}
+
+src_install() {
+	# This is borrowed from the old einstall helper, and is necessary
+	# (at least some of variables).
+	emake prefix="${ED}/usr" \
+		libdir="${ED}/usr/$(get_libdir)" \
+		datadir="${ED}/usr/share" \
+		infodir="${ED}/usr/share/info" \
+		localstatedir="${ED}/var/lib" \
+		mandir="${ED}/usr/share/man" \
+		sysconfdir="${ED}/etc" \
+		install
+}
diff --git a/media-sound/sexypsf/Manifest b/media-sound/sexypsf/Manifest
index 609928d60792..2271155c88ac 100644
--- a/media-sound/sexypsf/Manifest
+++ b/media-sound/sexypsf/Manifest
@@ -2,5 +2,5 @@ AUX sexypsf-0.4.7-misc.patch 7770 BLAKE2B ec617d75c15378dea9546b4a098430d9904258
 DIST sexypsf-0.4.7.tar.bz2 83001 BLAKE2B f2c74374f68cda1837ab4f91e338377dee539f60ca28efdc31b10a48d1028aa54892f5a2e2e6e23b145dea88a1e20e9b2a6c0155547c9d7fe10b6a5f415ab72e SHA512 5b4fe7662769e668e15bea0db8785c5355a803dfe39f86eeba6dfce5df573f342525e10bc5317e1cd2b1ef70730ee4cf766c9d02cc9f404b0e39defbb30c364c
 DIST sexypsf-0.4.8.tar.bz2 82954 BLAKE2B ce710cfe20372f81e5c4f18857b46e7eef1837b87469bdf999dd677f617802da0f7cb0ff9ff1a0ee78f6424b179b33cc111ba98619dde4a03b178c63397749a4 SHA512 bb95cdb40cf7172fdf815d6a2083adc4f684973534625d76c4fdb04752888acecfdd5ba329f9e2eed64311f30eb4400c8913ace13e4fa371c89c774905dc35d0
 EBUILD sexypsf-0.4.7.ebuild 1029 BLAKE2B 87a2c5e8d5e95a067b6ae9919620f7e1fb377f51ceef9a3ab4015a5a93d575dc21cb11ed001fa4a24dcf23971abadda9c99d1bd9f5da6196c1344c427e97834e SHA512 30840716a6885ea9aca3f87cbaed4a43fce6342f10645f515e14a22fe2cfaa7150fc22eb5a0cce6a6d86aaa0bc4b7ef449dd4ada6edaf7c2e55701833d547326
-EBUILD sexypsf-0.4.8.ebuild 523 BLAKE2B 3524ae28655af5c9c703b5b1dfbaa29fd28884207ebcb59c1d5f3f3989e1dad4d6ecabd85136f9aa723d18fbcd72e2c07b6309d5aa6899b9ec43adbd9d86157a SHA512 0deb8a5d513a7217d729b16259140f2f0ff248f05c3b32eef6a4b407359e827a00e9dc2d57498ddbdbfa8aacb755748363fc95af2daf23fa9ea115395cb8a3ac
+EBUILD sexypsf-0.4.8.ebuild 506 BLAKE2B 5bc5e06f7bc845dce61cd84ecf021eefe88ce967fc7dc320c850e21f27150d129506c17a366bce1ada4154b6cb395c35c6b7f0704d48c04b8e17ed76d39f9c9d SHA512 bf59e499ca6074a020dc8881393c19bcae3142f65aeffe6b25acde3f54e4a8054bede1f93a3d7e5c924057a0458a9e6c4f8cc02b07f90161f20809622c67f722
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/sexypsf/sexypsf-0.4.8.ebuild b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
index 4e6f81968a1e..a4b4be55b434 100644
--- a/media-sound/sexypsf/sexypsf-0.4.8.ebuild
+++ b/media-sound/sexypsf/sexypsf-0.4.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
-DESCRIPTION="sexyPSF is an open-source PSF1 (Playstation music) file player"
+DESCRIPTION="Open-source PSF1 (Playstation music) file player"
 HOMEPAGE="http://projects.raphnet.net/#sexypsf"
 SRC_URI="http://projects.raphnet.net/sexypsf/${P}.tar.bz2"
 
@@ -19,7 +19,7 @@ DEPEND="sys-libs/zlib"
 
 src_compile() {
 	tc-export CC
-	cd "${S}"/Linux
+	cd Linux || die
 	emake
 }
 
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index a8a5e14fcf4d..83dac5f07fd1 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,5 @@
 AUX sonata-1.6.2.1-mpd18-compat.patch 820 BLAKE2B 473334fdd3f3b72352dbc2a35c842765cd8140c1ec65e905f50c48c234f13fd26c85267cae5db9e497d55229c1896feffb301d70df7a298dfc8a6bf1d09ae31d SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66
 DIST sonata-1.6.2.1.tar.bz2 314333 BLAKE2B a2d7f6f8b5fe4b774136c70e7a354a8b8d948f44e876e3d59b0a216cb482de6c9b5a38b1332347136466965bd0551a03ba53f9e554c969ce901e880fa691496e SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
 EBUILD sonata-1.6.2.1-r1.ebuild 966 BLAKE2B dd16bc734d1b82516bf58fdf2d68a3d8e2a6af2a24ffd0186a3df50293491db4220ada3dab009a989fe4f002cce671448a4f044dc8102545677137a742e549b9 SHA512 e21e1e906562b6a3d23a08ac0ecb2d3e05865a2a8ee931a106ec495c47694176bb78915baf6f3baa9df29beb60f4f36cd491e0e35280d79b0265cdc215ec7198
-EBUILD sonata-1.6.2.1-r2.ebuild 901 BLAKE2B ac2624768356ea5112f1785d31efcaf96813cc8e84ce454d9f8309850f2c54fcae04e3d72088334d4091c3951b48309e888c8f412fe3fff977f6e7bccc4923ec SHA512 19b4d898a4b06ea0aaeb8055cf6902919380763e563c65516968b9f648aa9d900da41d0b4d842054425d67ef62862ca597b960c2e124ac7393c0c73fc88c8bcd
+EBUILD sonata-1.6.2.1-r2.ebuild 915 BLAKE2B 3d41a5188a97c770cd78d4301dc79cc5179bc4a6332f56d91af984a5fab45188d1d85c3d2eafbcab6be160ab4431bc38376308d5df5fc96b1624612b57ce1015 SHA512 9b94dc86b289fa6319f1eea86eab475c63ea127baf11bbfe750e658d6dbd9086e2cccf7524e6f306656c19a27b99de6c798e30f7d05cc31287afa4cadaa0bfd3
 MISC metadata.xml 615 BLAKE2B 818b8486f6142d1816045cee963976f34d462f2b26662c242aef72155c180bf9ab6c739ae9925a2cf71434bddbf6f0fcb5487ebac018889bfae6ef6ad41e7f1f SHA512 bec106b2bd1a9ca9f55d833f822b0cd9eb9541989f030e7a6698c3428efe2d99ae7ad88d6ef572a4af4a07c1d1450e1a031842608b10f9891ca9fa40816affa4
diff --git a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
index 435883e6aa0c..96a2bdd4d479 100644
--- a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
+++ b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
 DISTUTILS_SINGLE_IMPL="true"
-
 inherit distutils-r1
 
-DESCRIPTION="An elegant GTK+ music client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.nongnu.org/sonata/"
+DESCRIPTION="Elegant GTK+ music client for the Music Player Daemon (MPD)"
+HOMEPAGE="https://www.nongnu.org/sonata/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 # now released at https://github.com/multani/sonata/releases
 
@@ -17,7 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="dbus lyrics taglib"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	>=dev-python/pygtk-2.12:2
 	x11-libs/gdk-pixbuf:2[jpeg]
 	>=dev-python/python-mpd-0.2.1
@@ -25,14 +28,13 @@ RDEPEND="
 	lyrics? ( dev-python/zsi )
 	taglib? ( >=dev-python/tagpy-0.93 )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
+
+DOCS=( CHANGELOG README TODO TRANSLATORS )
 
-DOCS="CHANGELOG README TODO TRANSLATORS"
 PATCHES=( "${FILESDIR}"/${P}-mpd18-compat.patch )
 
 src_install() {
 	distutils-r1_src_install
-	rm -rf "${D}"/usr/share/sonata
+	rm -r "${D}"/usr/share/sonata || die
 }
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 3b340ec1ff14..e0e6fca31ab0 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
-EBUILD soundconverter-3.0.0.ebuild 1799 BLAKE2B 7b962993406c4a58e530afff0aa966308ac3154c64a43b8a4fdb8fe20a2a15e1a21e2bfa4de52b91860fdc0a6fb08db536a9bd1c02c491946ff92cf0f0a9bdaf SHA512 d263c6e6268d769c424b387a58163f5d178b8f52bd2b6c2cf1ee03cd8622584a87218833b1bb1a03205179d991373b683fdbfc86643875f9ac7b56eac69e4075
+EBUILD soundconverter-3.0.0.ebuild 1797 BLAKE2B f83a22a7acd5914b385d2eb4cad0ff74e03e9061956e02a5ad5e4715ccf15370a4e1c1e4dbf63a931a90a66d037f4d3ef23c2f478cc347871c36a0248d5babab SHA512 222d2ef0e3a993a28da7f8d033135dad5da098fbaaa37aaba0b682ac771ef002b5bd149f7914d52c114ae3717e9a33de76f2a928b2beccbb467cc514816c5367
 MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
index da78a4cd53e2..80a65a531013 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 inherit gnome2 python-single-r1
 
 DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
+HOMEPAGE="https://soundconverter.org/"
 MY_PV="${PV/_/-}"
 SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 093bcfbd3131..3f49e1211d8e 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,4 +1,6 @@
 AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
+AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513
+AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f
 DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
-EBUILD soundkonverter-3.0.1-r1.ebuild 1531 BLAKE2B 162a9c595ae9c111dbeca6e5a9994763f440ba8bd82c459f6a33fa0e97d83ebff313527b67729ed51b88b537fc69ccdfbe9a88bf5e7271a80abfeda9ffc986f4 SHA512 801f8ffe7148b433b4ca1d6aece1866bf73cd23f6d4e99ca144e2178f887eecb97a95677ad5ae1cdc9fdb2d7c161f1710b7cb0342c2b19cde211d6d2393a3003
+EBUILD soundkonverter-3.0.1-r2.ebuild 1547 BLAKE2B dfa49893b5daa640d15c9b0a2f8cfa2fe1a13f993b97e2b9a17cbfd076c669578f58a9244b088050c6c4ff63526038685eb9735e64cc70d286691d87c63a3a8b SHA512 b40b601e4c3654254df386af3eea1bd6e1e778992058770a16214a32518af17cc5ea95a05416b9539ff56e8bddf5ab426a925995dfd9034039e68ec7182441d7
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
new file mode 100644
index 000000000000..cc5a584b5e0c
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
@@ -0,0 +1,23 @@
+From 16fb09fcbd5712b7b75004229dbb74f85f213b53 Mon Sep 17 00:00:00 2001
+From: Daniel Faust <hessijames@gmail.com>
+Date: Mon, 6 Aug 2018 18:35:15 +0200
+Subject: [PATCH] Fix adding directories to the Replay Gain tool
+
+Fixes #70
+---
+ replaygainscanner/replaygainfilelist.cpp | 2 +-
+ 1 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/replaygainscanner/replaygainfilelist.cpp b/replaygainscanner/replaygainfilelist.cpp
+index edd64d0..3df5d58 100644
+--- a/replaygainscanner/replaygainfilelist.cpp
++++ b/replaygainscanner/replaygainfilelist.cpp
+@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi
+             if( filter.contains(codecName) )
+             {
+                 QList<QUrl> urls;
+-                urls.append(directory + "/" + fileName);
++                urls.append("file://" + directory + "/" + fileName);
+                 addFiles( urls, codecName );
+             }
+ 
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
new file mode 100644
index 000000000000..cae51b5790bc
--- /dev/null
+++ b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
@@ -0,0 +1,23 @@
+From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001
+From: eclipseo <30413512+eclipseo@users.noreply.github.com>
+Date: Fri, 7 Sep 2018 18:15:43 +0200
+Subject: [PATCH] Install appdata in /usr/share/metainfo
+
+appdata file should now be installed in /usr/share/metainfo.  /usr/share/appdata is deprecated.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a0e36de..521d0da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
+ install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
+ install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
+ 
+-install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
++install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
+ 
+ add_subdirectory(icons)
+ add_subdirectory(images)
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
index 3dea21807b66..b930b9c11d26 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
@@ -1,20 +1,22 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit kde5
 
 DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="https://www.linux-apps.com/search?projectSearchText=soundKonverter
-	https://github.com/dfaust/soundkonverter"
+HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
 SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-COMMON_DEPEND="
+BDEPEND="
+	sys-devel/gettext
+"
+DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -36,14 +38,15 @@ COMMON_DEPEND="
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
 "
-DEPEND="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!media-sound/soundkonverter:4
 "
 
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.0-deps.patch"
+	"${FILESDIR}/${P}-fix-add-dirs.patch"
+	"${FILESDIR}/${P}-metainfodir.patch"
+)
 
 S="${WORKDIR}"/${P}/src
 
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
index f5f9845290bb..1b5884b1cb3a 100644
--- a/media-sound/specimen/Manifest
+++ b/media-sound/specimen/Manifest
@@ -1,6 +1,5 @@
 AUX specimen-0.5.2_rc3-jackmidi.patch 1075 BLAKE2B 1160f005c78fdb575695b73ca5e81e45c6312a9f3c928ce32f097b8d96075ed012610420872aaa247bf39c28ad1cdd27dde23582ba2708269b9576f5c7127326 SHA512 14f223e0f19cf0697529048f60b84324689983e5b2799d235e0257e2fdfe1e2698e2bbe5a32a90c372300f70869f4cd1f460d3731636a3b45f9424e3add3f2e5
 AUX specimen-0.5.2_rc3-underlinking.patch 2324 BLAKE2B 41887cd863ba7c46dd64e63a70affd945450d93ae4a0f762ee2abb9577a98956ceefc776be842799e3e46f09d80fdec9fe937ae0149e974733e1c4c347ac4f31 SHA512 012c0c08c2706ce11a97fb5a8919b9d72287119658a57151648aa7adf24b22ea6d552d18b4584c68a5077e236ae7653f8c54eaafac7b698015b5e93d9f5d587d
 DIST specimen-0.5.2-rc3.tar.gz 267948 BLAKE2B f7a19c80cfe03730a9eae56ad213ed79555bf0da80bafdc55b29a9316e2cf37e6178d0c452d13f6c6a3cdf700ec8e844c21b86dff32f4eeec305534cd00f8dd8 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4
-EBUILD specimen-0.5.2_rc3-r1.ebuild 1026 BLAKE2B edf02bb07b940394506cfaf1301dab17f44496f8a3ef2cc314db58ab8660d4a530147ad26d0ddd6a20b38966b84ece624ed9206ddaf62c0ecb3257cee9fc30fc SHA512 b0698454918e4e97a78e5e6cca4e59e5a76d96d26930d6ad87041059104373727db38b48057498fdc526f76ddb7dc941874536dacc7fbabbf024e6fd173d509c
 EBUILD specimen-0.5.2_rc3-r2.ebuild 985 BLAKE2B 0596dbb939e955938638d7ac4833c7fa6cd42c23079e31ad2bdac3c6f780675c5d487900d5d3c112f3294680a0b37dfd926346363fd3d499e91df14ac9d6661c SHA512 00c2065f36a1a14aefbf7c04a477a516b65d736a8f3ecd1d00f6ba931220a6b35cbed06fd8cb19e11eed1b690ca50b2a51029cbdf641043a4062296b5335777b
 MISC metadata.xml 469 BLAKE2B f079f7fa89d407784fc4c2503b933a1f2313349babbd0dc2cc373407dc92d650d6067f0203a88d5e390cd4ea21402e9b3a66cb86899978430dd7e47f4228b217 SHA512 ba825914f15f4a5451e943a8973361ed42cd2206c589fd087b1e5b4ae5b797c428fa47ef2ef6f0229b242bcd8f02a90bb5f0a01779e1bb0495cd0f8a5dd86335
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
deleted file mode 100644
index e96807b02ab6..000000000000
--- a/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils
-
-MY_P=${P/_/-}
-
-DESCRIPTION="A Midi Controllable Audio Sampler"
-HOMEPAGE="http://zhevny.com/specimen"
-SRC_URI="http://zhevny.com/${PN}/files/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE="lash"
-
-RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
-	>=media-libs/alsa-lib-0.9
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	>=media-libs/phat-0.4
-	dev-libs/libxml2:2
-	x11-libs/gtk+:2
-	gnome-base/libgnomecanvas
-	lash? ( media-sound/lash )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-jackmidi.patch" \
-		"${FILESDIR}/${P}-underlinking.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable lash)
-}
-
-src_install() {
-	default
-	dodoc AUTHORS BUGS ChangeLog NEWS PROFILE \
-		README ROADMAP TODO STYLE TODO WISHLIST
-	doicon pixmaps/${PN}.png
-	make_desktop_entry ${PN} Specimen ${PN}
-}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index be566e56d65e..c392e8ecce3f 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -3,7 +3,7 @@ AUX teamspeak.service 418 BLAKE2B fad43e28b976db44b290937654f3fa503a7a17dbba17e7
 AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b911b11175932d2b3031dabcfa29d2bafe37742a05cea5e6dc8913abfdba140f9c2203515eb5da4444b3bbdd1 SHA512 60993fa58beb07f3304e7603abe91dba2e23e3f6868a6e2894bf55e1e79c358defd1a08523e6ade16d1eb1042aad1783c76c2dff8e6ce282d08d77800c3357db
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.6.1.tar.bz2 8523183 BLAKE2B 1b6bd2850547ae6f86f348c988660ceab3786c16ff920e433b2e942ab2b995f8e2b9814213bddf012762cb540e2c10cc12641408e7528f9e424984f84e900104 SHA512 185559df9129b61322b7b0fda4c021e0bbfad0eecacd78c45e9467a29cd2eb5a822bed214312255f641869b4218c93931b6145fb17acacda7eab23bca5a9a8fc
-DIST teamspeak3-server_linux_x86-3.6.1.tar.bz2 8391111 BLAKE2B ad11dfe38b99db314ba73799a94fd047cf07a9f33990a0bcca99490af8cb1a4c054d3722c3bde634545f1e922d67f1d6bba57e03029f57d0999d1164f99240c4 SHA512 ca693e9bb2d6b4f994ac0934621ec9050e5b985fd34c534677754cb37a4586aa2e6ec78dea440bd919f8dce18acd238befc54d6aa73829eb94f2536ff3050ef7
-EBUILD teamspeak-server-3.6.1.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
+DIST teamspeak3-server_linux_amd64-3.7.0.tar.bz2 8631710 BLAKE2B c18acc1a0755ba86aaafdd0d1b50f5f56085c5ab2ad12d3a701de2d90ff2bfb741cb81efa66843e282fb934d718f8d11d8bf8ee8fda452314a6969b93f4cf3e8 SHA512 74b6ab1685aaf5b5065a346129eb329b87aedd36495442d17c2f6bacaeef2e484e7b811b279a26a8993054026aeb81a9c1907fa8b580ad87d8ad630fe66be3de
+DIST teamspeak3-server_linux_x86-3.7.0.tar.bz2 8491441 BLAKE2B 62691579e248bbda23041887beb7395df37dafd0417f291928eb000b2b43ed755704ac8e6c340d9dab9abaa1a9b7f4cbd1b299010296b3d76d8a742890810a56 SHA512 53d420c82ed78d5d1998e278080ca6a204a5191e4f3f2001a3fc67c69a0f6ff5f2b2f32667632ba87d9ebefd3996618a3845467879f27cfd63284dd5eb940ddf
+EBUILD teamspeak-server-3.7.0.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild
index d944f47933ef..d944f47933ef 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild
diff --git a/media-sound/umix/Manifest b/media-sound/umix/Manifest
index 13b25bcc114e..a878282315c9 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -1,5 +1,5 @@
 AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
 DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 695 BLAKE2B 185a36534971d34df0b11c6cf6d0140ec595556edbc0148cffb19b5182a9653ea1e1e22a6b48080d1d7d17a34421cefc0e8ecdbfc8531212082db0c4cc80eb8c SHA512 de04eaa64f8507652711c5773c14aac6cba458d9d920ec046edeaf04a465076158ae69e882d4cc190122cfd642c7435ba5d05570801ff5f5d8e753fd1ad76b61
+EBUILD umix-1.0.2-r1.ebuild 700 BLAKE2B 5cf044d5416e0e9c1944abe971aae61066db7ae5d0df270dc402a420c36a628ca4590f95858662aa0fea972862f894bac957c589b6e9727e088620b481dfe7a2 SHA512 2ad4f8e1e7767364c7ded426817f55addc1244e1424d7a811b67a1cc5187aeedba26874599a5e618877b814d7e717bc3fb1f7a9e8010d8d5c96127a4fac1c0e7
 EBUILD umix-1.0.2.ebuild 627 BLAKE2B f08396b4ac2659b8511bcc8c1b44653cd07f657aa2a27b021a6f55cbab861301ecc95817d6898fe066deaf9cd9b9783f3903b89c78374bd5fdb974e84a085c9f SHA512 00c36690b96c9f6106657b229c884e7e7ee0d6a94e367c26e2bcddfd7645303be054d319c994c4204664441471f2fe655af747b31deae55efe6fb722c796a548
 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
index 8af3d98d5b02..cb9c1380a34e 100644
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ b/media-sound/umix/umix-1.0.2-r1.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="Program for adjusting soundcard volumes"
-HOMEPAGE="http://umix.sf.net"
+HOMEPAGE="http://umix.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
@@ -14,15 +15,11 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 IUSE="ncurses oss"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
-RDEPEND="
-	${DEPEND}
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-tinfo.patch
-)
-DOCS=(
-	AUTHORS ChangeLog NEWS README TODO
-)
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+PATCHES=( "${FILESDIR}"/${P}-tinfo.patch )
 
 src_prepare() {
 	default
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index 01c9242856d2..f8e85422efca 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,8 +1,6 @@
 AUX volumeicon-0.4.6-glib-2.31.patch 649 BLAKE2B 1d9605a0cd6e122a6f38e6d056233264fb1f25261fb4111e17e5f09e0c326fb55015b6804fcb6166bedb7947304615214f2ac87c44695a92e70db8addbc06a6e SHA512 6b11df00cbe09d5152a111dc3788e2f9acae83879cb81277265c5ad727e454f00014aaa9d75d0cd1ffe402a2a85801fab9d3ccce1399a8ba1bc5752997f0c65b
 DIST volumeicon-0.4.6.tar.gz 136769 BLAKE2B 3044843571052b9e543279435e090d81f2a675495c4563458141327a6a542ea65dd8323058beec1ebe80fbb42ac5a439b39c95ea5b63cb4ec0c302fddc6b7833 SHA512 f5b649a113270a417046532ec9b80e738afe1275ce919a8a7adafbac05cdf58f9454a5386d3304cce652a90e63bc5297fa8cd5b369e0f1149c898483cbfe2f71
-DIST volumeicon-0.5.0.tar.gz 160089 BLAKE2B cb91924d5058edaf21897d58f1df4dbda200e30142f57d22e3e22ce7ddb87cc7bd6538cd339d1b985d839f51f7845dc59648c17762c77c34bb387839c72432e3 SHA512 26c4973a600495886222920e6eea80a7d54ebecf9b9fa46dea6808e25bf3b5edc5b37ff0740da270e77faac687d2151d8cc53259b356e17ce99ed0e38b7fbe38
 DIST volumeicon-0.5.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
 EBUILD volumeicon-0.4.6.ebuild 774 BLAKE2B cfddaabcfc08da4f95d45e739f1d12ea6925ebe51b7bfa8805f8631685a7ddad9454835de5ce9bd8526646fff0f814cfc5f8ac8c9ae0903e300450cedb69b148 SHA512 0d8635e822f5053b0cfd1ab15e045eaa787d179fe7311145cc839b437507ff88304e55e185a5ce78a510f0af25e677f2e6a35b0045869457334dd8b3f813b33a
-EBUILD volumeicon-0.5.0.ebuild 695 BLAKE2B 19f5be2f32aaa75caad99c6bf2ef099c45e065a4e5fa928a7a35e6e10b9f0319c0972563cc913de21b16f4ba36f84e9a8c4436fff6a99ed8029a74153d023a4e SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9
-EBUILD volumeicon-0.5.1.ebuild 695 BLAKE2B 19f5be2f32aaa75caad99c6bf2ef099c45e065a4e5fa928a7a35e6e10b9f0319c0972563cc913de21b16f4ba36f84e9a8c4436fff6a99ed8029a74153d023a4e SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9
+EBUILD volumeicon-0.5.1-r1.ebuild 679 BLAKE2B 3362b68ecb4f07edcdc8b95bfbaa397960bf701b43b173bb354a33c4fe38ca755161ae1c4d84242f05c4c3dd0af35b504770d5942d2a44e7cb8e8ebc1f32f5e2 SHA512 4292196484983b2e5af79b36a1863d49cdadb34608a85eab4e230e4126835dc9bf28bbf08ac8283078c01b4cbe3ffb923a651ee76b7c0f6bdb3fcd0cb687f828
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/volumeicon-0.5.0.ebuild b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
deleted file mode 100644
index cce7ca83a323..000000000000
--- a/media-sound/volumeicon/volumeicon-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A lightweight volume control that sits in your systray"
-HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
-SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libnotify"
-
-RDEPEND=">=dev-libs/glib-2
-	media-libs/alsa-lib
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog"
-
-src_configure() {
-	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
-	econf $(use_enable libnotify notify)
-}
diff --git a/media-sound/volumeicon/volumeicon-0.5.1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
index cce7ca83a323..5f3deee45511 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
@@ -1,26 +1,29 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A lightweight volume control that sits in your systray"
-HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
-SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
+HOMEPAGE="http://nullwise.com/volumeicon.html"
+SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="libnotify"
 
-RDEPEND=">=dev-libs/glib-2
+RDEPEND="
+	dev-libs/glib:2
 	media-libs/alsa-lib
-	x11-libs/gtk+:3
+	x11-libs/gtk+:3[X]
 	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
+	libnotify? ( >=x11-libs/libnotify-0.7 )
+"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog"
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
 
 src_configure() {
 	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index b16ff2247845..314523bae580 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -2,5 +2,5 @@ AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364
 DIST xwax-1.5.tar.gz 77582 BLAKE2B 5d02dbf1b4ee30f333b6df2ca63b657683aa15d5790fc474f54a6571314f5e506b4403e983889fc8afcca77489b3b15285907d61e33f080123d94ac4c20bd5ed SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
 EBUILD xwax-1.5.ebuild 2174 BLAKE2B 33f6a0373b5605036879f87e06064f48d870f6175d61d62f88d6ed536092bc72f8e725851b22f0b24801e685ca6a55e9ad70a874803403ce85d746db4f467cc4 SHA512 02324db41aad3424fcc9b8fa2f221ba95d74ecdae659fc84ea425ff262e6ed97f3c77f41a1f45268966cd83c5c9075ba73a9e0e299a49bafbf496343f969e04e
-EBUILD xwax-1.6.ebuild 2178 BLAKE2B 4822ebf69ae9b3fb902f5905b4343a4140f61fd59a4e21287aed301d07c9971e9a851fc88315390d229433d4dc60d0c49673c4a0e82b209ee8c77a14746f00fe SHA512 1213009c6f809a5c4b104fe160c30ab7f513e9be626c8b57c3754bf3c575981d5d0a94dbd0cf9e859d85d9871b05b0112966603fb6be6a7f242230e66e1425ac
+EBUILD xwax-1.6.ebuild 2193 BLAKE2B fd0928afc037e639165198edc97979bf43ababd8606d564447b3ecc7e65905ad00f4057a076c715234b017128f7c0096f10fe8063511d7c97327469bbc6ee110 SHA512 3c2117c0a69682f1c0b46676d791731098d794dc9a683d3a5386638de0e9534fbdeae39097f30d0e508d26e52b18bfbb3821827ec432d7940860ec2563949032
 MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild
index 89ce08abad33..d265c8017b5c 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -1,35 +1,40 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit toolchain-funcs user
 
 DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://xwax.org/"
-SRC_URI="http://xwax.org/releases/${P}.tar.gz"
+HOMEPAGE="https://xwax.org/"
+SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
+
 REQUIRED_USE="|| ( cdda mp3 fallback )
 	|| ( alsa jack oss )"
 
-RDEPEND="sys-libs/glibc
-	sys-libs/pam
+DEPEND="
+	media-fonts/dejavu
 	media-libs/libsdl
 	media-libs/sdl-ttf
-	media-fonts/dejavu
+	sys-libs/glibc
+	sys-libs/pam
 	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
 	cdda? ( media-sound/cdparanoia )
+	fallback? ( virtual/ffmpeg )
+	jack? ( media-sound/jack-audio-connection-kit )
 	mp3? ( media-sound/mpg123 )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
+"
+RDEPEND="${DEPEND}"
 
-DOCS="README CHANGES"
+DOCS=( README CHANGES )
 
 src_prepare() {
+	default
 	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
 	# the Makefile
 	# Also remove the dependency on the .version target so we don't need
@@ -42,7 +47,7 @@ src_prepare() {
 src_configure() {
 	tc-export CC
 	econf \
-		--prefix "${EROOT}usr" \
+		--prefix "${EROOT}/usr" \
 		$(use_enable alsa) \
 		$(use_enable jack) \
 		$(use_enable oss)
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-05 21:17:31 +0100
commit	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (patch)
tree	c85d72f6f31f21f178069c9d41d41a7c1ff4b362 /media-sound
parent	0706fc6986773f4e4d391deff4ad5143c464ea4e (diff)