gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-sound
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
255 files changed, 2247 insertions, 3039 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ec65e33cdd99..a19acdad57c4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/a2jmidid/Manifest b/media-sound/a2jmidid/Manifest
index fbb567adbbb3..c472c95ebad5 100644
--- a/media-sound/a2jmidid/Manifest
+++ b/media-sound/a2jmidid/Manifest
@@ -1,7 +1,5 @@
 AUX a2jmidid-link.patch 981 BLAKE2B 137be987dd55e3d929e3e7fb165c164b23ae322444f8f9ff9e4138b88e586064ba5428d8af3c3edb8e0e6e4939905b1016cf42236c23c21171e7d920dd99ae74 SHA512 63e9d127ce6aab4e075cdfdf33835dfd3d96fead9c0383231ffa0aa731d339e487857e6fd8e085c2a4e520de6a739adae42be930d062b8b05a6e739ad5625175
-DIST a2jmidid-8.tar.bz2 162764 BLAKE2B 4c173d458bc9bf393496bc53dcd92e796826386f3d2704f6d1fc108dd7e4fb660271cc2befec655b516dd669189fb01c23576fdd39c1c23b485346390edfb0a7 SHA512 6182a295462ae587461ca395d85c956523bfecd113d031d0ae8a9f304fc3d41f6a5097b3a1a9fc06bd0eef7fe08a4b3c116a3361ff9e63468c3e40b736215592
 DIST a2jmidid-9.tar.gz 47925 BLAKE2B ad079e76a54f56ee8f82150c306f91aead52f86632978ea6f3376a0bf163744379210b34701b39da4ee14fc4d8a1c6be82d1052abeb8ccf79410bc242d174d62 SHA512 5bd13b6904ed68c5bfe40ca516fd49b7eb4d4a946b9908ee04687265848734c8e1a81579f0f1a5bd0752595be8858dc748da10487b7f366394c09a5ffc7d5e5c
-EBUILD a2jmidid-8-r2.ebuild 956 BLAKE2B c913243c31d2fd6240b49dcbc6d0a97a91614525c6ec137c7a0bd5fecfa4bddddba7b958a3f2b618e8a4db82c5e0d7cb808236d58ffda4468e0ae8e25d1b9ffb SHA512 46096941737dbced449ebb7e70cbbc0675a8e7f64a634c419bef327db4610a0f9c4532b953e2a69727e8d488e8c014858d1b8deb2a754038f58563d66044d96c
-EBUILD a2jmidid-9.ebuild 739 BLAKE2B e630f23c58df5e2ba3fa7ce16a71dad454b746c7d9d77f180de320e963d949e2ad7c965f73c5b3e004321bba83cb2db8cd8dc6148a12acaa7f07429b0a918c31 SHA512 8918f14c559a3943887a2f3548c624983ac79f06fad4ad0fddd190f20075e59a7070807a0595ece1cdc142071a435db12fe376c318b7380f5a41d6812b190807
-EBUILD a2jmidid-9999.ebuild 712 BLAKE2B ca18b440e12df88210cfaad307940d03828012a29536399f5ae70159cc7aae58b488a9965c7a1f22e8cfe13c50f6b91c732c63f408aea42d7eca32e77c3e6ec2 SHA512 e6f8e3488a748c3702732dfce1c0e7a967020700bfcff8841c3e61fd2395cdb05a6453c499d7e52816d1b40762d98bf4a94b1280b18866ccedb619eeb2e58ddd
+EBUILD a2jmidid-9.ebuild 721 BLAKE2B df5f2785de192c4e35f2ede9ac66579ab9c7c331b72e738e4979ec595ed4f6bb568dde84e0bb05ec8a3a3f9601c4731161f88580c40a12e0653897ce3930ac40 SHA512 e260ffc7b9a2570fb5f6903d516ea5056c3165c9e28ca479111add14c0a957fe9ec6038df8aea62ca796033b360bd13f3a2fef97ed1883d25766afdde46b4f2c
+EBUILD a2jmidid-9999.ebuild 696 BLAKE2B dd6e045e6c9e3de4077fc5b460d327b690e144e5d34690bccb8371b87ba82ae76cc5801eb9198e9881c3c1d6f3e1a640fc29f6755b029c503cdf21b955ae51c1 SHA512 3a8bb0cf20126b77dca5accc82540e43e5bc5e4a4c930e7b7efe48bba59b7cc92664ad468ceb3c8bf0afd0851098819da6c7ca6a6cdb8a813f3da7cc413fdc03
 MISC metadata.xml 369 BLAKE2B bd88b29130a3c698de0abb7984ebcc130c84c55de1e53c69a74279874a350d10651d9a312dfcc76de17e64e5af43f79b31a663247430cbc60ee87def0845fcd9 SHA512 7d8b83bedfbc2cf55cbab1475e7e04c835ef5a49e7500de000a032cc256551a26a73aa6a3a3989dabd4e7f69a4d4a1ac4bbd2d806d5b3d22cdb230793ff91096
diff --git a/media-sound/a2jmidid/a2jmidid-8-r2.ebuild b/media-sound/a2jmidid/a2jmidid-8-r2.ebuild
deleted file mode 100644
index f60d9eb0ef2d..000000000000
--- a/media-sound/a2jmidid/a2jmidid-8-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-NO_WAF_LIBDIR=1
-
-inherit python-single-r1 toolchain-funcs waf-utils eutils
-
-DESCRIPTION="Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"
-HOMEPAGE="https://repo.or.cz/a2jmidid.git"
-SRC_URI="http://download.gna.org/a2jmidid/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="media-libs/alsa-lib
-	virtual/jack
-	dbus? ( sys-apps/dbus )
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=(AUTHORS README NEWS internals.txt)
-
-src_prepare() {
-	# Bug 518382
-	epatch "${FILESDIR}"/${PN}-link.patch
-}
-
-src_configure() {
-	if use dbus ; then
-		waf-utils_src_configure
-	else
-		waf-utils_src_configure --disable-dbus
-	fi
-}
-
-src_install() {
-	waf-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/a2jmidid/a2jmidid-9.ebuild b/media-sound/a2jmidid/a2jmidid-9.ebuild
index 8879e053f463..24f6219b7f58 100644
--- a/media-sound/a2jmidid/a2jmidid-9.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9.ebuild
@@ -11,14 +11,13 @@ SRC_URI="https://github.com/linuxaudio/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dbus"
 
 BDEPEND="
 	virtual/pkgconfig
 "
 CDEPEND="
-	${PYTHON_DEPS}
 	media-libs/alsa-lib
 	virtual/jack
 	dbus? ( sys-apps/dbus )
diff --git a/media-sound/a2jmidid/a2jmidid-9999.ebuild b/media-sound/a2jmidid/a2jmidid-9999.ebuild
index c3d3a8ed15a2..7609deb0eba6 100644
--- a/media-sound/a2jmidid/a2jmidid-9999.ebuild
+++ b/media-sound/a2jmidid/a2jmidid-9999.ebuild
@@ -18,7 +18,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 CDEPEND="
-	${PYTHON_DEPS}
 	media-libs/alsa-lib
 	virtual/jack
 	dbus? ( sys-apps/dbus )
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index e573fbd655f8..ed032a3f3927 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -4,5 +4,5 @@ DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75c
 DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3509 BLAKE2B d82ab3d9c125cd4617706efe528e0329dccbadf5d82d72462c34b81f7f48aa9574f989399849a93173533596a6d7e69b619b1baf27a6f634dea3e13c51ac4a18 SHA512 c51185818a2e3cba8d8d78879ef20f4cecccc69ebbd1e6f39683bba3eb537d041f773bf43af0a92872ee1a9158720dd3e8b9de6cd23ece3cbdac91b839608a11
 EBUILD alsa-tools-1.1.6.ebuild 3569 BLAKE2B ebfb9fa84e07a45372088119ac8d49fc5933600874fe5187f3c6ab9b5a8eb4df9f066204d0aad1061d5354cb247fc9e11a3faeb871e68cf8584fc67e180a05d9 SHA512 631bc96a57be0e78bdabc6c0b6a9a2a244aac8179313048c9482a1f6141f29989b3e3dee0c8685f405e45ec6831f686c371fc6318a0187eb32d8ac4da6a71a87
-EBUILD alsa-tools-1.1.7.ebuild 3575 BLAKE2B 4e96ae5cb9bb09b357bd3babf8c982df2bbda2b7b08a2077ee239644c590e59a9e6baa1b19c96cf5d7ec0de331f21d8b9e3be32fa08f8dc04bf12897b7a3ed09 SHA512 340de1088c8a3e125ae1ea3cef5ce7e8ba5b1534a44d43a7c8234e1284f1d7f50473480dcea6cb39eb5df33308fb04d36812ac5c10a51df8d4f5b9d38f48e5ed
+EBUILD alsa-tools-1.1.7.ebuild 3580 BLAKE2B a4ac6835474572cc9a3999d450a5a28a8afa69381a5258dd2c343f4e40c5bd64a7dd924afd498e32aa5a019c7fc7ab0172182878ac03c1161ee15d70ad9b2618 SHA512 98711596f571eff25588b818d637dbd45943b37b6ee076be61210e4a893cf26ee88b9c693c55c2db9435f987e4bf861684942ad211609eb40a7d5876ab4cb86c
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
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 4b9c01c3c787..686cdd3fbbbf 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~hppa ia64 ~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
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 2ed23de5a807..f4e2b4180c3a 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -12,7 +12,7 @@ DIST alsa-utils-1.1.9.tar.bz2 1268833 BLAKE2B 56fe00bd7dce21969f9f91d1d82a6644da
 DIST alsa-utils-1.2.1.tar.bz2 1270194 BLAKE2B e5cb4d6c94f09f1eb9044a7f34904bc662ac2eb9ae734f333cf22271b4add1de1032ac38cf064807146095edc2eae452c197b98b4dd63f0004e1705f8e322e4f SHA512 b7729659cd9809197dc30042f522f5103ff41ddc047f13f9c733c93f7e91a26f90cd864c70e654d12ef7a552b1d9ebe2727a24ec9fad03560cb7cdea906662ec
 EBUILD alsa-utils-1.1.2.ebuild 2217 BLAKE2B 2b0293d7f3acf6bae13cd1aaa341509b9fc47fd54425c675aeb2f44b84057a211c0a27e7f72140ff7e53a99a564b5d2e09f4536c66c6af536628235573c6d7aa SHA512 81906644eba293211f1ab2eb440edd572b675f159051468e53a3ad21d503bfcf4c031492c80952a19b6950bb1bf85571c68df29c410986a40e4131d89daa6570
 EBUILD alsa-utils-1.1.6.ebuild 2267 BLAKE2B 62b70e332647004bb076720a4fbe6ffcb62cf5cf681d928bfd774bcccdf27aeb9360ec57f1bf40e2054b8214e45fcc865a9c954ef819e8754052b03cb8858e17 SHA512 d2df64e3857c67b5a144af362aa3986346c379b0e2b8530688f10fafc8ffe2e8d81c33cd416bdfe36c2102e3651d09c77b61d1ca12b07a465e38275215654a39
-EBUILD alsa-utils-1.1.8.ebuild 2339 BLAKE2B 8b5270cd07c10aa87e7d6d2a01c970da53903da5a7c0b126ab12f236b8b3503d8ddc114c9801e534ccc09d09f32147c57cf38ab006ce68d27f009c270ae1740e SHA512 db6a0d8e24d8e3fa8e7eb4fd16dca16939ffa8426eb938bac27b04034c44449a43f166d5f071ab9921942edecb2adacaf725d40eafd3943cf92eb0a06e6579e1
+EBUILD alsa-utils-1.1.8.ebuild 2338 BLAKE2B 3618d6e3a8983cdac336f7c68e2c20e7ac0aaddc535ca83f7f8a0f4e2eb4acb6cc0931184fc8d23756b509f819581555c361ec2b3d6a41b6023f359ae66476f0 SHA512 89fc70da32aa126e27a76468adaf91dd05509a0347abc934d87945a618a1e1749f032e7b63d82cc1dbc2c9b5755b98abe1d7ad17fb0e14aedfc937021abed028
 EBUILD alsa-utils-1.1.9.ebuild 2423 BLAKE2B 27a87cd73011e680060fa04173aaff943b6b7674a0b937588c6421ae2f25bdd5ac1b37a15ec5a80a5d1ece1548275c6892e12a79564a8e3953aaa8ab596ee676 SHA512 38c1fd5cd8463d2cf4dabd3b509ff2270ad33f0c6fc3afba73560563767c8432baaf03bb315876f54ea0c2ebc6dbff23b8ae90599ac2f4cb1d8088f2d72711e2
 EBUILD alsa-utils-1.2.1.ebuild 2345 BLAKE2B 5b3405496a4998ba5b38d166d578ebe49230ce7a7aa9a85b2f78da35216df5fdfa1a369c3a1386ced0b64ed544cf528c16d1a46615baf011145e2a39f246188f SHA512 c1a049f4ce15e57d3f1f85c422fcd7ab4d9ac32d7bd3bbb008d351cf9a4b102baa0b9761738e6ae226fc699dcef998428b4dedb3037cbfc46a088a4108ac7c7c
 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 97f2e8d076c5..27b0fc51dfe2 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="https://www.alsa-project.org/files/pub/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/alsamixergui/Manifest b/media-sound/alsamixergui/Manifest
index 4134ac331295..8237d0a11c1a 100644
--- a/media-sound/alsamixergui/Manifest
+++ b/media-sound/alsamixergui/Manifest
@@ -1,6 +1,6 @@
-AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 477 BLAKE2B f26aef512ee8831f44cb43e5c8fb769fe3e358906e5ef8cc98e8e7a761f73d32dd82f27c1feaf45c41eab040a52b9132e48ff9d662352996e2eed32b156fdb15 SHA512 da74646008a039aa5278f40ca7e06d387dbb8c5fcaa4d53e7b8431e73c9465336efb36e33d8b16d204638c52686bf1356ce9892645497cad6c2353a8471b647e
-AUX alsamixergui-0.9.0.1.2-gcc34.patch 334 BLAKE2B 7688ea14cfd7c85eacb71a07a78fd3288658b39f5cb1c2e92623cb384f85d1063ec4997e4fd0cc2f317e08884f34ea80801a8fb076c1a4974e72e31196e6e04f SHA512 4f5bd6d25433a3795aeee16969e8850bb27c408510fd14f9fca8c2757b6153345c0a57caaff0a655603cd93adb5f76bb5a5b79c1f9fc06f1bb6bde90fd10acf0
-AUX segfault-on-exit.patch 321 BLAKE2B deb48a1ab001debc9e2cffcbd625a153d5f1371800f72919f977740693bcedc3e94c64e59194a82b1269e141f18ed1a0b8accfcc2ff116703d8dd274dab0e4e2 SHA512 b9c806b78f246a65727bf75325ba08fd1a76fc6dc696afbdf4c81f972b6793c52eac404129829782e4b81edc19d9024a4795720a0d8f76cce61325bc063470cd
+AUX alsamixergui-0.9.0.1.2-fltk-1.1.patch 481 BLAKE2B f95c1efd41761972fb0d40fd19d6f23e02a277f58ddf52b314137697425de3cd8dabee13c4749895ea393f8ad9d336b9a14692dcd29885588c57699a84944333 SHA512 c4d7ecb6f332b27fc89d2d4693cdeb583374cf2700f523b568f04d0b7d4658cd73dc8e7594fd21dcddd001405fdbde5e69a8548f412131bba9d22a887e4da644
+AUX alsamixergui-0.9.0.1.2-gcc34.patch 338 BLAKE2B 72d991c5ec3c88c0d96031f1feecefbbba365283295bfcd9484b1fb4faa51d3e743e3a63d19c8a143a0ee4a72f38de365f8f983cb1abdea4487cc527d57e5061 SHA512 5fe717ef8dd9fe3e339b1b96ac255950bc93a4e850aba1dbb546cb02e3c2c9cd4a7e2f93dbfb46002da0e90ed3fee89ac7f2024eb2bb8689a50e7cf124f33c19
+AUX segfault-on-exit.patch 325 BLAKE2B 591d498aa051a2f4405a9d068c84218c38caa9ae237db602a1bda6ce57d99e8ca3d9102ca307c3aaaccd3e2cdd93db74585fa8fc01a59d92d78fc517fee2aa38 SHA512 de0795e1220283822c658204b734d45775d4e1c11582920159eb4016a481c15e4a6c1f4b5f39b451c154a7459f8958506127c75403ac2731ea695ea0a28ed56f
 DIST alsamixergui-0.9.0rc1-2.tar.gz 70255 BLAKE2B 6caac083ce8edbd701fdc6f24bf19e1097dc260d92c4dfeb20f4b5cabba606882d3a94542e01567ef403708c29d0ca7933228b51926f4587d935042466c597af SHA512 c1eac24c87e3d3dd8a582312a24e4f517d084845a3a0cd0a7253e3386685d72a691fe138853002b0277361d397271fbc9f445fd5ad0f5d604e5ad022a408d6b7
-EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 914 BLAKE2B 64ec279141f50aabe9d389427d2803433d1d09b85fae80d2c55c55d1f2997d5b1acef5830b5455291dc45a64d481a8b61d14cf665ca2f534f66e80dcb9ea1370 SHA512 03495c2c26840d0db6bcb48f7659170bc948a7d2b915fd20171f7e37a79dc233e61d22e38959040396c3f569f56f8de99e0f5e231d2df7c17ebdb6a181b13f44
+EBUILD alsamixergui-0.9.0.1.2-r4.ebuild 917 BLAKE2B 04108ec26ba767b60221f6f865c8fc18d8928e202f332d2bda935e675f45ffc891aac9bc5f08e3685dd0553c264a583b94b0be39d786cb06e559dfc22a8d72ed SHA512 e4e0f4d43a2b483464076a8682021defdd50e06319ccc35979703f5706a4b84e024005f5e6d635ab69a560a8d5ef6c53395d38dc6b216f1d6f75ca1a1e7cab56
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
index 2a3d2ac79e91..bca2f9d1f995 100644
--- a/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
+++ b/media-sound/alsamixergui/alsamixergui-0.9.0.1.2-r4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils flag-o-matic
+EAPI=7
+
+inherit autotools desktop flag-o-matic
 
 MY_P=${PN}-0.9.0rc1-2
 
@@ -15,32 +16,34 @@ SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+	media-libs/alsa-lib:=
 	media-sound/alsa-utils
 	x11-libs/fltk:1"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog README )
+S="${WORKDIR}/${MY_P}"
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc34.patch
+	"${FILESDIR}"/segfault-on-exit.patch
+	"${FILESDIR}"/${P}-fltk-1.1.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gcc34.patch \
-		"${FILESDIR}"/segfault-on-exit.patch \
-		"${FILESDIR}"/${P}-fltk-1.1.patch
-
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_configure() {
-	append-ldflags "-L$(dirname $(fltk-config --libs))"
-	append-flags "-I$(fltk-config --includedir)"
+	append-libs "-L$(dirname $(fltk-config --libs))"
+	append-cppflags "-I$(fltk-config --includedir)"
 	econf
 }
 
 src_install() {
 	default
+
 	newicon src/images/alsalogo.xpm ${PN}.xpm
 	make_desktop_entry ${PN} "Alsa Mixer GUI"
 }
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
index a7c121dbc9d1..8c6501419859 100644
--- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-fltk-1.1.patch
@@ -1,5 +1,5 @@
---- configure.in
-+++ configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -11,11 +11,11 @@
  AC_PROG_LN_S
  
diff --git a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
index 6f37970aa568..a17452cbbe49 100644
--- a/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
+++ b/media-sound/alsamixergui/files/alsamixergui-0.9.0.1.2-gcc34.patch
@@ -1,5 +1,5 @@
---- src/alsamixer.cxx
-+++ src/alsamixer.cxx
+--- a/src/alsamixer.cxx
++++ b/src/alsamixer.cxx
 @@ -654,7 +654,7 @@
        if (joined) {
  #ifdef ALSAMIXER_GUI
diff --git a/media-sound/alsamixergui/files/segfault-on-exit.patch b/media-sound/alsamixergui/files/segfault-on-exit.patch
index 6dc2feb8cc58..f2106d088416 100644
--- a/media-sound/alsamixergui/files/segfault-on-exit.patch
+++ b/media-sound/alsamixergui/files/segfault-on-exit.patch
@@ -1,5 +1,5 @@
---- src/alsamixer.cxx
-+++ src/alsamixer.cxx
+--- a/src/alsamixer.cxx
++++ b/src/alsamixer.cxx
 @@ -1869,7 +1869,7 @@
  			if (procWindow) delete procWindow;
  			if (mainWindow) delete mainWindow;
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 162a2214f9a2..9b432374db7f 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,5 +1,5 @@
 AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
 DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
-EBUILD apulse-0.1.12-r4.ebuild 1422 BLAKE2B 2d6285fee007177284ad3e2d0ff06c006ffd31362b8f428db5689c4897044bf9f06855c9c79cb6d48ad93e951d7ba3a6e0def3325e4d767693c5e9f627064e59 SHA512 ed85600610668531916dace2a10abc0d3e39cf7ca353e8c530b930ef8742d99f3b0a5e0928f8a39230b9fd1041630e34e0dd5c62e41382e7a47521386396427c
+EBUILD apulse-0.1.12-r4.ebuild 1449 BLAKE2B a906511d311d43c9c45f8f292c02b98add6e3d74d7fc9402a4ec9a6629ce70cdb839a98a5a23179ccdb8e821fc3016cabdb5679f4a2ddb4c0de02efd6202e8a3 SHA512 2b865a68d87ee96c614f92263936c3d9f0a183a603af84b8b46f306173b06ddd86a553b3f1c05fa8a860c2fe3582e0f650c14f29d2530b138e0ace95bf60bccc
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
index 5d0b6c1550a7..c91aa5a9d138 100644
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 IUSE="debug sdk test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib[${MULTILIB_USEDEP}]
diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index a227996d3659..a7aa370b3013 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -6,4 +6,4 @@ EBUILD audacious-3.10.1.ebuild 1795 BLAKE2B bcea95295deb3f1b069c44441c7aa27e2a41
 EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
 EBUILD audacious-4.0_beta1.ebuild 1768 BLAKE2B 19fe627632cd73686ee0314b21e7175571b0dc70cf43746d7fb4d401ad3e15e8cf0ee0a06eab8af0830235751ad43435b041aef1d30a3b73a6b208a84f184335 SHA512 4baad23c469aef2475963c8e21f119289db5b6c5e6e6d38a6a072024c94040d00fca10e6deeb3b1743ca477bd14bfcf1e60f0c64422ebb68f5f916dc12cef6fd
 EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
-MISC metadata.xml 511 BLAKE2B 2013e88b3dc8ef7aedffbada7c4342fdb1d51f39e56f4523204a62aa2e31054c9c5cb6414dcfdb9abde09a9d8619b112cbe7862d9090f8702360c73a2af0f479 SHA512 11ec4fc4cb255dd7d71449b711a66e39f433fdf04b39d57d2d02e87914870aea39156c01586a2ceb8eb42c1819eeefd5ed535cb233fd27d982dd8e316ae4727f
+MISC metadata.xml 514 BLAKE2B 6ca503bd16bd79e7a453a6eca5c74802c2b078b3cefa4cf886fac391feb2a11db4398a462502cd4f10dcb2c5ffc60f30e51ab348761118cb1a446c8d865b9145 SHA512 6c8d823ff6be4d914e79193e20fa3dca4948f3945b5c6e6977e72f3d6dee3a8ba01ddc06d3a1a7231c5cf3b585d4f655703cd6df8f3c21d326c91db2edda5107
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index c563fb869343..c8f2cbef49ce 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
+		<email>asturm@gentoo.org</email>
+		<name>Andreas Sturmlechner</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
diff --git a/media-sound/beets/Manifest b/media-sound/beets/Manifest
index 366c4e371379..6be367a91c66 100644
--- a/media-sound/beets/Manifest
+++ b/media-sound/beets/Manifest
@@ -1,6 +1,3 @@
-AUX beets-1.4.8-imagemagick-detection.patch 770 BLAKE2B 120e0af71fe9c63548f49bf20fa94ec20f8b0cfb8395b319d6f8e2a62b5212adb229691c35297615a3b0272b215c87e1ff861e1887d227fc9460501900edae48 SHA512 6c5da1591e0bfc0936dca52c48f74b80b57c18bb0398877d38deb7d448df9466a8544628e0ce6948204a8deae4679c8dd454dab9a2f0778a236eaa60387a1751
-DIST beets-1.4.8.tar.gz 1493539 BLAKE2B 63c44f05bbf139cd43b5f5ada972fd30beeea2303c6b479b1be35ea21fabb0039b3c8eb6e90f8f1b2a61fed36d97ce09a32c6346cbd3b84c7c978e796505f4b4 SHA512 449bed88185a5ecb4781719e092c2428ddc52fb8084033db64a4c0eca8899154192e7cea82517993d60326c7fe39b26429584ba368ffc35800f722d8d6a03217
 DIST beets-1.4.9.tar.gz 1494459 BLAKE2B 2daf77caf395143813c8b288fc376b5aec01d49281d40ba5942daf9941891146d698a1517ced958e480c6f253eadb6a7e09029e079c97e6cc17d44ac18fa0e7b SHA512 616bad4ca3ecdd05d2f59846fd67215f476ce89cc34d63bc6351efcbaf1e33e5ca783cb8a716e8597b56a7e08e6a6dc15e64b51e89dd786bfb6c5d847f66de5a
-EBUILD beets-1.4.8-r1.ebuild 3664 BLAKE2B 094cc8dfbf32cea571e4789db182a60ad07eeb772a47be47d45843eefe70c20e619f7524e98f533d14e899983b534d7b5c7aeeeed4e8aa00a723ec325d4449de SHA512 62f4c4d9619fc07388427830fc3a8248e7b7477c6a18a451b75e4291dd928adf40db39ddf606b2b1a9feeaa5e4728796d184b2e905aadec09ff0946a7961d8c0
-EBUILD beets-1.4.9.ebuild 3614 BLAKE2B ea994ce3c35058ab24813c663b5182650c06e9d5f0f3e875065ba09abdb413031a0a80047b3c9d179887be9db6d765e6ecc868b236aa550ab502b1a39227b9e4 SHA512 8185506e4c7c3b343bd072c169d352c39507fc83dcbffe9e15752a227ce03532c14439dd63e03707e98c3f17201149a1b785fd3512d9ad9aa53b0012197d6230
+EBUILD beets-1.4.9-r1.ebuild 3641 BLAKE2B 602fc8c9eb237bdac3e483e79a8575ae3a8cee21d6ac8b2fb0bde29f9b15c1cf2710bd43d49cd30b158dfba02348ef8d4fc28ace94e915740790f13e30c71701 SHA512 13b5d03db6412d1bd50b6132d76ef380fa7936d798193d33f1fc899a638dafc0a99e651457c6574af2e9ed6043114f7df6f550089bdaa72e7b1d83b3a7f7a0a5
 MISC metadata.xml 2707 BLAKE2B f178a50b9b107e6c5083cc255750416751d0e077f95fc8111b826e458e30d72ce978fe8c8a29056ad076b121fe2690fd636212eb68c758eedb4f380afd29a6d9 SHA512 58ea485657e54c0f1aecbbed49a6c3ce683ef5560f66a02d95c7c89de597a038499b8268771db9fe344dd9baaafe4af750c9402f1725bb791c89dbf4de90d705
diff --git a/media-sound/beets/beets-1.4.8-r1.ebuild b/media-sound/beets/beets-1.4.8-r1.ebuild
deleted file mode 100644
index 4cfc7d72806a..000000000000
--- a/media-sound/beets/beets-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_beta/-beta.}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python3_{5,6} )
-PYTHON_REQ_USE="sqlite"
-inherit distutils-r1
-
-DESCRIPTION="Media library management system for obsessive-compulsive music geeks"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-HOMEPAGE="http://beets.io/ https://pypi.org/project/beets/"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="MIT"
-IUSE="badfiles chromaprint discogs doc ffmpeg gstreamer icu lastfm mpd replaygain test thumbnail webserver"
-
-RDEPEND="
-	>=dev-python/jellyfish-0.7.1[${PYTHON_USEDEP}]
-	dev-python/munkres[${PYTHON_USEDEP}]
-	>=dev-python/python-musicbrainz-ngs-0.4[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-oauthlib[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	>=media-libs/mutagen-1.33[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	badfiles? (
-		media-libs/flac
-		media-sound/mp3val
-	)
-	chromaprint? (
-		dev-python/pyacoustid[${PYTHON_USEDEP}]
-		media-libs/chromaprint[tools]
-	)
-	discogs? ( dev-python/discogs-client[${PYTHON_USEDEP}] )
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	ffmpeg? ( media-video/ffmpeg:0[encode] )
-	icu? ( dev-db/sqlite[icu] )
-	lastfm? ( dev-python/pylast[${PYTHON_USEDEP}] )
-	mpd? (
-		dev-python/bluelet[${PYTHON_USEDEP}]
-		dev-python/python-mpd[${PYTHON_USEDEP}]
-		gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
-	)
-	replaygain? (
-		gstreamer? (
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-			media-libs/gst-plugins-good:1.0
-			media-plugins/gst-plugins-meta:1.0[ffmpeg]
-		)
-		!gstreamer? ( media-sound/mp3gain )
-	)
-	thumbnail? (
-		dev-python/pyxdg[${PYTHON_USEDEP}]
-		virtual/python-pathlib[${PYTHON_USEDEP}]
-		|| (
-			dev-python/pillow[${PYTHON_USEDEP}]
-			media-gfx/imagemagick
-		)
-	)
-	webserver? (
-		dev-python/flask[${PYTHON_USEDEP}]
-		dev-python/flask-cors[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test" # tests broken in 1.4.3 already
-
-PATCHES=( "${FILESDIR}/${P}-imagemagick-detection.patch" )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	rm_use_plugins() {
-		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
-		local use=${1}
-		local plugins=${use}
-		use ${use} && return
-		einfo "no ${use}:"
-		[[ $# -gt 1 ]] && plugins="${@:2}"
-		for arg in ${plugins[@]}; do
-			einfo "  removing ${arg}"
-			if [[ -e "beetsplug/${arg}.py" ]]; then
-				rm beetsplug/${arg}.py || die "Unable to remove ${arg} plugin"
-			fi
-			if [[ -d "beetsplug/${arg}" ]]; then
-				rm -r beetsplug/${arg} || die "Unable to remove ${arg} plugin"
-			fi
-			sed -e "s:'beetsplug.${arg}',::" -i setup.py || \
-				die "Unable to disable ${arg} plugin "
-		done
-	}
-
-	default
-
-	rm_use_plugins chromaprint chroma
-	rm_use_plugins ffmpeg convert
-	rm_use_plugins icu loadext
-	rm_use_plugins lastfm lastgenre lastimport
-	rm_use_plugins mpd bpd mpdstats
-	rm_use_plugins webserver web
-	rm_use_plugins thumbnail thumbnails
-
-	# remove plugins that do not have appropriate dependencies installed
-	for flag in badfiles discogs replaygain; do
-		rm_use_plugins ${flag}
-	done
-
-	if ! use mpd; then
-		rm -f test/test_player.py || die
-	fi
-}
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	cd test || die
-	if ! use webserver; then
-		rm test_web.py || die "Failed to remove test_web.py"
-	fi
-	"${PYTHON}" testall.py || die "Testsuite failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	doman man/beet.1 man/beetsconfig.5
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	einstalldocs
-}
diff --git a/media-sound/beets/beets-1.4.9.ebuild b/media-sound/beets/beets-1.4.9-r1.ebuild
index e2da8e5f2f7f..f7001b9fd20a 100644
--- a/media-sound/beets/beets-1.4.9.ebuild
+++ b/media-sound/beets/beets-1.4.9-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 MY_PV=${PV/_beta/-beta.}
 MY_P=${PN}-${MY_PV}
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
 inherit distutils-r1
 
@@ -80,7 +80,9 @@ RESTRICT="test" # tests broken in 1.4.3 already
 
 S="${WORKDIR}/${MY_P}"
 
-src_prepare() {
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
 	rm_use_plugins() {
 		[[ -n "${1}" ]] || die "rm_use_plugins: No use option given"
 		local use=${1}
@@ -101,8 +103,6 @@ src_prepare() {
 		done
 	}
 
-	default
-
 	rm_use_plugins chromaprint chroma
 	rm_use_plugins ffmpeg convert
 	rm_use_plugins icu loadext
diff --git a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch b/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
deleted file mode 100644
index 1564cd80b1ff..000000000000
--- a/media-sound/beets/files/beets-1.4.8-imagemagick-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 299cb53e44efdbccd2ad623434edcdbd4073547a Mon Sep 17 00:00:00 2001
-From: Filipe Fortes <fortes@users.noreply.github.com>
-Date: Fri, 17 May 2019 15:02:18 -0400
-Subject: [PATCH] Fix ImageMagick Detection
-
-The `return` statement was at the wrong indent level, so we never checked for the legacy `convert` executable
----
- beets/util/artresizer.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
-index 3590dcf22..1ee3e560d 100644
---- a/beets/util/artresizer.py
-+++ b/beets/util/artresizer.py
-@@ -278,7 +278,7 @@ def get_im_version():
-                                int(match.group(3)))
-                     return version, legacy
- 
--        return None
-+    return None
- 
- 
- def get_pil_version():
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 9c2b40aae7e2..43cc0ac89127 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -4,7 +4,7 @@ AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac4
 AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
 DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 DIST bluez-alsa-2.0.0.tar.gz 116895 BLAKE2B 97dfd3364259e8a633de0259c84efe4dc4a80a9f388620200c44136844af6f3e101bf6d49931e1b5cd466d4b1ff13b2a7b9284d4599db72039ee3c5afa5800ba SHA512 21152be594421cd00056e94065dcf767ca01f7b040117974315f97aab45db020264e33dabddac7fee12834a4ada9073b9ff680c25d8775b47604cb0bec638a7b
-EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
-EBUILD bluez-alsa-2.0.0.ebuild 1630 BLAKE2B eb77664e4585045703292e641800d35d632cb5e5ef23cdd4c4fedbc0f45e56a72240ef3af854d2664f87ab93533b0db6f2a8bd4f901188feddf4c882a4b1a4c8 SHA512 cb9ac7860b962ef95d8d29281196957db8f94379ecadcb2ff8094f4aa98189d2fb0f9ebc27ceba823ce1be38ec92d52a114e838e48c8ff887c6d5531bb6030ab
-EBUILD bluez-alsa-9999.ebuild 1630 BLAKE2B eb77664e4585045703292e641800d35d632cb5e5ef23cdd4c4fedbc0f45e56a72240ef3af854d2664f87ab93533b0db6f2a8bd4f901188feddf4c882a4b1a4c8 SHA512 cb9ac7860b962ef95d8d29281196957db8f94379ecadcb2ff8094f4aa98189d2fb0f9ebc27ceba823ce1be38ec92d52a114e838e48c8ff887c6d5531bb6030ab
+EBUILD bluez-alsa-1.4.0.ebuild 1670 BLAKE2B cb789ef1012c5c5c05e24c17ab0dbea9fa6e690b1524ed1591182a8b760952087b2d07b8d94cf925705f5777ea53dc9e7b2a354acae9452351d4fc5cabb7d359 SHA512 6d827de99d82bba9eee711bcaa6363ff75bbc2ea891d4314115b636e3b64a157366a2bf355933b339ff1de448cc3e51638c54615f029c09ee37b701009b8b4ac
+EBUILD bluez-alsa-2.0.0.ebuild 1657 BLAKE2B 54511c7b9c053bccbf7723fc8c3f90197e54350a8e4b62125d5c1e13339a99f2f24c266d848f0dcca557000f59b31b250813a18381a297358e25a3b9fb8d97d5 SHA512 7bfaac39bd31c04ad7972f711c7664d064f36d53cea669eaedf9de18cbf37f36dd1932013640728ae1bf209a5bd4530b5c34318c6ca953d830b414a52f158ca5
+EBUILD bluez-alsa-9999.ebuild 1657 BLAKE2B 54511c7b9c053bccbf7723fc8c3f90197e54350a8e4b62125d5c1e13339a99f2f24c266d848f0dcca557000f59b31b250813a18381a297358e25a3b9fb8d97d5 SHA512 7bfaac39bd31c04ad7972f711c7664d064f36d53cea669eaedf9de18cbf37f36dd1932013640728ae1bf209a5bd4530b5c34318c6ca953d830b414a52f158ca5
 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
index 6c33c4f7d936..ebcf1d253247 100644
--- a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
@@ -18,6 +18,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="aac debug hcitop ldac ofono static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
index 0e5b0d27ae84..32e9eef4fbc0 100644
--- a/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-2.0.0.ebuild
@@ -18,6 +18,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="aac debug hcitop ldac ofono static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 0e5b0d27ae84..32e9eef4fbc0 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -18,6 +18,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 IUSE="aac debug hcitop ldac ofono static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
diff --git a/media-sound/cadence/Manifest b/media-sound/cadence/Manifest
index c5fa40344e51..b4b1d64eee84 100644
--- a/media-sound/cadence/Manifest
+++ b/media-sound/cadence/Manifest
@@ -1,5 +1,5 @@
 AUX cadence-add-skip-stripping.patch 2184 BLAKE2B 61db0094b2ae8059c1cf162d553db9624cf84e0d92483bd42678b6be8dd0e25aaf7eb5cde6983e65c54cbe61d2f0f1a507d74a73572662c64e489e8c30b7cc56 SHA512 dda75f3b7f23c9303206fde30ca9c90eaf3999edd8b1d02f5cd3e0680d72dc59b0966ce9100d4274490595f7aa6df3ed6ef6f91ed672840341f9d5083805b239
 DIST cadence-0.9.0.tar.gz 2202265 BLAKE2B 03d38f611df05597d2b4016f263d36f2386be421383a38b51dee519514e6d1ed79bf92ea2a789ea868a25d4c805e9e94cd0971f479b772799bf6bf3170349b4a SHA512 381c9c57c1d96452a91969e134420d63ef06f5ec144050779d0a06a1098e8ed1693c70165b6640e04acc448d382e717e71ead1b29ba5043f0668675850cad7d1
 EBUILD cadence-0.9.0-r3.ebuild 2130 BLAKE2B 9005e7559a7240592f8d73c90b1cd4c2d57cc3af381a28a717968583b228232ba850ed4a57242591b2456205ff1ba112b78033d286f197de622af642216cce79 SHA512 f0ab2d5fcead875e1736e785d6383f745a3ce78fb7afe090144a61c8a05e5290b770dcc84fc7420dbb1fffe56adf23b97c11f3c165aa3e1722ac85e153e9e86f
-EBUILD cadence-9999.ebuild 2074 BLAKE2B 25fc6d2f008ea2f32249fb4b365008a9eec566f0ad252c9632fd0e3d6150d6ec35d2b2feb78f334d0259d30d9b8a4028a54dab39fa085390148f418f9e52a3b1 SHA512 f769b9f08d787650a884e94435c047b10639b4b1785654c318acbefebc9fc3b4471a3014fd06f8012c4688b88178ac0b39a8bd35e4104c3d0cfeb625f5b54e6e
-MISC metadata.xml 486 BLAKE2B 58cf78a035486def369b21d2b1da269e2766681d26317f5c25cf46fe00e79c78c4e0e0dae020ae9842684953d4b621f565adf3909c44c6294d7f3e9c4a9ce078 SHA512 5af8ba22da556ab2cc9a266afd3cede8618f389dd298758aaa60a1d398ac2f754a5e823fd518154a226a10f8568ac548f33a916034ec0c04e96fffcc08ed8232
+EBUILD cadence-9999.ebuild 2016 BLAKE2B 5fec7d48d618086a76a5defaa53f39494c51585280180286dbf178294fc003d9a79c4bcba459b57d170f8fc74779ffdddfc0839ca9f14bfd33d0bac335285b94 SHA512 1fb6b9e9d22f5f893684f4e6d7c35c55263ce18a4421df5318abe10a197e8fe9c2a11d6934d41683f95fb332f265d3fd8117dd1aa8edb96c1fabfebb6dd869cd
+MISC metadata.xml 479 BLAKE2B 3690ab2ae4302a28f89271af11a205dcfa8cb0b5eafd13e818f603d66c2ac11caf131cef21e6fd5f924ba8ef59e8e3db45d782fe4dde97c63024736a15c33d4f SHA512 6e7b12c1edf9dc3214a3c19e3cc5aaff60abe737b50c91d3160aa81fc45927a93812a76d161db03f4068f06ab765c1f699e73fa85cbef5f7a4035188ea582e8c
diff --git a/media-sound/cadence/cadence-9999.ebuild b/media-sound/cadence/cadence-9999.ebuild
index de44214ae7ca..2350c0a718dc 100644
--- a/media-sound/cadence/cadence-9999.ebuild
+++ b/media-sound/cadence/cadence-9999.ebuild
@@ -30,8 +30,6 @@ CDEPEND="
 RDEPEND="${CDEPEND}"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-add-skip-stripping.patch )
-
 src_prepare() {
 	sed -i -e "s/python3/${EPYTHON}/" \
 		data/cadence \
diff --git a/media-sound/cadence/metadata.xml b/media-sound/cadence/metadata.xml
index e72e0a80aa33..914b94cd73eb 100644
--- a/media-sound/cadence/metadata.xml
+++ b/media-sound/cadence/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>miroslav.sulc@fordfrog.com</email>
+	<email>fordfrog@gentoo.org</email>
 	<name>Miroslav Šulc</name>
 </maintainer>
 <maintainer type="project">
diff --git a/media-sound/cdparanoia/Manifest b/media-sound/cdparanoia/Manifest
index f266af67c283..5741757036c5 100644
--- a/media-sound/cdparanoia/Manifest
+++ b/media-sound/cdparanoia/Manifest
@@ -2,5 +2,5 @@ DIST cdparanoia-3.10.2-patches.tar.xz 12228 BLAKE2B 0a78bf713807ed738110543c0e4a
 DIST cdparanoia-III-10.2-patches-2.tbz2 6242 BLAKE2B 6eb0f3c3a331421497e406df969de61d42590f4e8ffff13ffc212ec4a03170b1e02e00322c5c4f2042e5cc4be2cffff58ec8b9b57d851d5df8bebc3fb88ac913 SHA512 523a9ef9f3de263236aad6da102b807a6620cde8767e297e54dcd552f59077d959a89187bc82ad71c577fa66c4862d7c651e922b8b8b8369dd63685cbda9cb74
 DIST cdparanoia-III-10.2.src.tgz 183236 BLAKE2B 295065388e45371329ea7b04bac03c90fd854478d34eb46fa95db03054a1a21effe7863e5065a9148e558796c352d5087b6ef1c3c4c20342e66abd7d2c9eef85 SHA512 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
 EBUILD cdparanoia-3.10.2-r6.ebuild 1321 BLAKE2B 30833fc15e666cd3268bc6c93119e664eb2b70735f86d151411700094675ad5bd9665d74ac446dcd0fe668d4e6249a3b67a0dcfc9d05d9ec3d3e778c2896c1c1 SHA512 669c340b310ad79f0fb659d36bfaf06d27df486cea58bb9aaa2b5a312eea3399a95f07ff7e25a9719f041adf378f49d1fb7f2891b398d416e2e9e9bb3ccce41d
-EBUILD cdparanoia-3.10.2-r7.ebuild 1384 BLAKE2B c56766440549954218b890cf93d5be6c688bff451793a029f88a328b86b36de6f87ccb1300ad17794dfb2f5c38fb3d8a8102b68f11e74a00d31b8cf861c73aff SHA512 625fef5a96d1ff46a6a780bc32866aee3abddec66eb503a6b1df095f4a2d57688ad2b50171613939d60be7239e6b32c476a59123510b17a4fbfc9a5efd2dae35
+EBUILD cdparanoia-3.10.2-r7.ebuild 1376 BLAKE2B f531b54f81938fe003840a5f7c6c1abca2eaf61736c2cef8cf3bda5ffd27e37f1fdddaf795a10c5e2182ce3699af5b960e066b205771fe46607988e2f09ccd76 SHA512 941051de125f63192bf588a98506cbd4041ab0191056b1de9931c35cce2475f6d24c6f26e420ca0d8cacbede4d889fffe2ad9698dbe5a2ea9e6a432fa61f251a
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
index fdeb82c9e0c7..02084be3366c 100644
--- a/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
+++ b/media-sound/cdparanoia/cdparanoia-3.10.2-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.xiph.org/releases/${PN}/${MY_P}.src.tgz
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 RDEPEND="app-eselect/eselect-cdparanoia"
diff --git a/media-sound/cdstatus/Manifest b/media-sound/cdstatus/Manifest
index 3c01a2ff20d6..a98dbe1acab9 100644
--- a/media-sound/cdstatus/Manifest
+++ b/media-sound/cdstatus/Manifest
@@ -1,3 +1,3 @@
 DIST cdstatus-0.97.03.tar.gz 115982 BLAKE2B 85c8f7383ec985896704b1fb4d77f6c7c2c1f8b84ae8914f675980f11cc558ed63b592d974387c5bc579ea2a0a6481e0a8b01ae46aac9a96ed3558e9f26a225a SHA512 d9819bfd40360b8796810d38b2c9f75c87a1256adc289d261e0cf56557170492eabc7fb0c4f7ee91c6303f24867ff4540962556edfdd8cf46b02df0236037177
-EBUILD cdstatus-0.97.03.ebuild 486 BLAKE2B aa05407eb1b0d4a35de35a911863ca2f0fbc0eba49dfa1000f9e85ec51c2ce562b59372453a09901f5723bdd93b66d706b553fd4c8cdb3a509f466aba530c9f9 SHA512 c30c13b5c5083db7a1bb7fce39abda28eaf306f6996447ffade05b83ab1b4788fdefd51bc3719a4ac4f14256c13faeb6366fa44b161e5324568abb8d2a7a2db0
+EBUILD cdstatus-0.97.03.ebuild 483 BLAKE2B ea1395e7d68a30ebfa5a85f52611dbb40a7f2693c55bf8ed2c4744881d6765d3a1b9df46a0dbb84c45985a98d5cbeb5d1dd92aec53b759c3f5cc448c77dd4c1e SHA512 5de9368aedb85cafbafefa1261b4e6cab8b604f486557fc7f60fca30d74769db3eff2ad2e69a8e28e2d91a4e42bab48d438e10b7b7bba1566616dd5d67b23617
 MISC metadata.xml 331 BLAKE2B 5dcc2ceb66c009d882b35cca299c673cf3c74bc04bc2f1c8154fbc471324625436cc36a92703da315811b8082b4fb7e0c6f90a623845df2d42b2bb0394be23c7 SHA512 9f671ef16e9fc4800e4f4d1c003679332b467654a860ce36558c671208077e325116b8f9355c6888c38cedfc95a7ee226b720c8bf4ef9a8287facb21ab6ac5aa
diff --git a/media-sound/cdstatus/cdstatus-0.97.03.ebuild b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
index 09a57010bdba..e4ae820f71f7 100644
--- a/media-sound/cdstatus/cdstatus-0.97.03.ebuild
+++ b/media-sound/cdstatus/cdstatus-0.97.03.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Tool for diagnosing cdrom drive and digital data (audio) extraction"
 HOMEPAGE="http://cdstatus.sourceforge.net"
diff --git a/media-sound/cdtool/Manifest b/media-sound/cdtool/Manifest
index c06bf59dd52b..5923fee4849b 100644
--- a/media-sound/cdtool/Manifest
+++ b/media-sound/cdtool/Manifest
@@ -1,4 +1,5 @@
+AUX cdtool-2.1.8-fix-build-system.patch 1329 BLAKE2B 9f4d36b274e8184c1c7b2043010f0de5a3624ab6adc3c46bd96e0f5f155cd8ee4ed915103690a1a0e49df3c533967617ed2284a79e58fb8f3f369b711efa9425 SHA512 15415365506d0087243436adecb3eb8e42b91bebaf77477800f464ac53fefed90041e1f3d634f6b6a0d20036f29bef4d8ad5c3e589c4a1a9b8c38e098546dd96
 AUX cdtool-2.1.8-glibc-2.10.patch 3511 BLAKE2B 09d13db78aee424fbdb06900a68ed17ee564ea249c0adc7814fea617e218884ed5651264e56cff9f1bf5ed0460318a9d038c11c36e36d5e45c5d8fa30d10696d SHA512 5b58d80d1cd28cbedeae89bc8452d3b047faf9eb61c3444b3b3fba5a709adf834b4451fac74cf8c48fe1b6e41c33683f427856ba1d9acc4ecbb5f0eb3b135326
 DIST cdtool-2.1.8.tar.gz 116847 BLAKE2B 2c1be3cbbff91078fb398913105676e2ea46828a7739a0dd28bbbb0acfece23272a05015494ef54d7f235186f07a0bc77ff43077c937ac38f099304ec4e2b218 SHA512 9e4e65c753b0be024f0ceb04ec0fee52031992196e0e4a2b8dfef9dbc9feaa81462be61700c6d01f413941d66f7f3e374fb327e1bebcb79207c7b4c790cea006
-EBUILD cdtool-2.1.8-r1.ebuild 622 BLAKE2B ff489105f39aa58ff082c37be35cf70f7f3bf58f2d21393927fb30cf367328311be435751106cb55a049b8ae513f8ecf43b4a559ebe4265a808f141539ea7804 SHA512 f4717364d0fa3d09df1c9ef2135aea4da4e98e93b9007d5baee7fa60e194be8a25bfa4a3b6c190c575a476697e11b6a3ab81aa725fd910d88997e81e9ea67c31
+EBUILD cdtool-2.1.8-r1.ebuild 473 BLAKE2B fdf1a167a19f1dbd539f035590aaaf9a4e7ff5fe3c48ccf0345f675d78b556618f21b9dc4118fca404bd81e13e2ed691bcedb5c149984840f9134a37f851016e SHA512 1656bb070b7e5044c1bcd7adf21c34d69b92ffb8db8f4bef88b74db74417d473e8fdb2d74262c10bc88bcfdd70ececab892476ebfe3c7e517e2a7aae6818b3a0
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/cdtool/cdtool-2.1.8-r1.ebuild b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
index 6706ada72f63..0d81cefca180 100644
--- a/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
+++ b/media-sound/cdtool/cdtool-2.1.8-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-inherit eutils
+EAPI=7
 
 DESCRIPTION="collection of command-line utilities to control cdrom devices"
 HOMEPAGE="http://hinterhof.net/cdtool/"
@@ -15,11 +14,7 @@ IUSE=""
 
 RDEPEND="!media-sound/cdplay"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-	sed -i \
-		-e '/INSTALL/s:-o root::' \
-		-e '/LINKTARGET/s:/lib/:/$(notdir $(libdir))/:' \
-		-e '/^install-links:/s:$: install-files:' \
-		Makefile.in || die
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
diff --git a/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch b/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch
new file mode 100644
index 000000000000..c059a645112f
--- /dev/null
+++ b/media-sound/cdtool/files/cdtool-2.1.8-fix-build-system.patch
@@ -0,0 +1,40 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -44,11 +44,11 @@
+ install: install-files install-links
+ install-files:
+ 	mkdir -p $(DESTDIR)$(bindir)
+-	$(INSTALL) cdctrl $(DESTDIR)$(bindir) -o root
+-	$(INSTALL) cdloop $(DESTDIR)$(bindir) -o root
+-	$(INSTALL) cdadd $(DESTDIR)$(bindir) -o root
+-	$(INSTALL) cdown $(DESTDIR)$(bindir) -o root
+-	$(INSTALL) cdtool2cddb $(DESTDIR)$(bindir) -o root
++	$(INSTALL) cdctrl $(DESTDIR)$(bindir)
++	$(INSTALL) cdloop $(DESTDIR)$(bindir)
++	$(INSTALL) cdadd $(DESTDIR)$(bindir)
++	$(INSTALL) cdown $(DESTDIR)$(bindir)
++	$(INSTALL) cdtool2cddb $(DESTDIR)$(bindir)
+ 
+ 	mkdir -p $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL) cdctrl.1 $(DESTDIR)$(mandir)/man1
+@@ -59,9 +59,9 @@
+ 	$(INSTALL) cdtool2cddb.1 $(DESTDIR)$(mandir)/man1
+ 
+ 	mkdir -p $(DESTDIR)$(libdir)/cdtool
+-	$(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool -o root
++	$(INSTALL) cdtool $(DESTDIR)$(libdir)/cdtool
+  
+-LINKTARGET = ../lib/cdtool/cdtool
++LINKTARGET = ../$(notdir $(libdir))/cdtool/cdtool
+ LINKS = cdplay cdpause cdstop cdclose cdeject cdir cdinfo cdreset \
+         cdvolume cdshuffle
+ 
+@@ -69,7 +69,7 @@
+ install-links-local: bindir = .
+ install-links-local: install-links
+ 
+-install-links:
++install-links: install-files
+ 	for command in $(LINKS); do \
+ 	  if ! test -h $(DESTDIR)$(bindir)/$$command; then \
+ 	    echo installing $$command; \
diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest
index c06d0a6315a9..ec80fbaa2c4d 100644
--- a/media-sound/clementine/Manifest
+++ b/media-sound/clementine/Manifest
@@ -5,5 +5,5 @@ DIST clementine-1.3.1_p20191004.tar.gz 8528437 BLAKE2B 11c7bd7ac4ad4cdc75e2c5e54
 EBUILD clementine-1.3.1_p20190127.ebuild 5045 BLAKE2B 1a5413ccdf502d0c56cf09c4067161b128e5f8a2fe960e9c3b0dc2b7ed05e13b59fac2a866c11d5d53a715a4d3557b8ce84050e94c5974a9aa357a3dededae1b SHA512 88d87ecba083252f52a4aac810680ea088c49b70216dbe1d9a51f1a7b7d8912c35e8dbcee3879a8475f53fb8db3a5f95449d22b2f185cd179a077b57f6804b92
 EBUILD clementine-1.3.1_p20190609.ebuild 5110 BLAKE2B 2ace372f4b6ba4969d075e8954f0a5bfa5ea78037cb1dfb129b1a4d726990df4a862925a3b901da2ef1d5de088a20d720e4b3a59d5b66778e2bb4a860850daa5 SHA512 3689915216cebe991bd0d5ae9596ea0844f0583ec39f287f9487bd859e6e95d4dcc8c075efc94a69af52df3fbf4af222b2d430e7dedc002b92c0f38b067bf810
 EBUILD clementine-1.3.1_p20191004.ebuild 4615 BLAKE2B 310536c020206dc6754799dc80261ebe2fbb18304923fb61a241484f0bd019c4310e2d3fead5eabd07e89369d3aab54eb87fbc6d365e1000730a47afe453074b SHA512 edca69e331d5547b8e274b5151713ad45bb171bddbe9f3558142be4e6d8da05525297688a0b8f5c1ae2283c9bd364b0297154c5483c323886da694b3d5198965
-EBUILD clementine-9999.ebuild 4525 BLAKE2B 1a0b9278c9cd56c0ef4cf0019f92ff29bbaadb34bb480dfd01dc1ae67d575178d9fabc0e8986d9085c061ed7b455ff02d523250f4e6bd787b825005f917ef37e SHA512 e9e585fb5dd850ff7e633aa2efd571dcb7bde3b976d391a20c97db1fab3157c00f5e5d768e351caa5d62be0b670d8662de9812312093ba7c6783f0d1c9dd4a9c
+EBUILD clementine-9999.ebuild 4552 BLAKE2B 9a41188b10607092a1e6689e490bc835997f79cb5234228a854f041d70d4119b1a7ba550f0139773fb61f46ce7cafaabfc6367a4e41a57ff5693a572899ab306 SHA512 040b8ed1f7381a23900fe17bf29b238716337b457c5579f21a4d610fbb32f23d0aa8932c29b06b5f24189aabed5de3b3764597fa1e2dadeb0b66f9ba12e38cba
 MISC metadata.xml 1052 BLAKE2B 670e37f375845acd8dcbc27339690ab21eeab2328ea04bc089a84ef2f608a04594ab35fc3bab6fc989a535f28321b4bef150374e27f8930326c35e0edcaa7f52 SHA512 cefd5c85937f11065d37c5287cd34a3977eaa4c223089bd9297786701845201d03af6596ac3d88e773baf291e07efe1137ceb29357ec2b0520f37e51a8de301b
diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild
index 4feab71f0716..3efe963fe1b3 100644
--- a/media-sound/clementine/clementine-9999.ebuild
+++ b/media-sound/clementine/clementine-9999.ebuild
@@ -22,6 +22,7 @@ HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="
 	udisks? ( dbus )
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ae835192abb3..01caf0ae26eb 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -2,5 +2,5 @@ DIST Csound6.10.0_manual_html.zip 15944722 BLAKE2B dfb2d00650e8d9ff650c60a5601b6
 DIST Csound6.10.0_manual_pdf.zip 8687461 BLAKE2B ff738378e10ce7e3fd9ab44bed67fdbf4a1de62d89d738a35fd46f25996d85dd8e97260af31bb2fbfe199aecd3f16f0adb5bf94d9a15807d6424002d7ab9682c SHA512 cf6ec335782032fb0703a3042c0222316cd215eba2be242e65d4f1ae23d886177620c96cc63c1aace43a72c1d6258a88612c1ffd5ef0e43675729bae39969fa1
 DIST csound-6.10.0.tar.gz 42036496 BLAKE2B 4305eb2aedb076f4a4079e1353f05f9ffe6159311fe905a11998f80eab9ccbbfe57c0601b94762480c486f8edbe0aa0f9b20d18f4db8f9f49d6466a7b2ef4697 SHA512 1ccf0a2d5273da016ec585e788e4af0b91f55c3be081a51c53dc39b0fbcfba0cf1308828784a1e5dfc39250dedbd3f4b48afbb5c4140c11fd469ca6753702ed4
 EBUILD csound-6.10.0.ebuild 6030 BLAKE2B d75bf31734fb280ec29e92b3cbb99df558a8cb7cabe4d3a3faa3a83d3d0559e337f054711350535ef102d5dd9ccc4f3009dc753f3caf9de4a882a5c706bdcdc8 SHA512 2fce2d37b7584833d84b51c791c8a41a5164bd2bb5f24abb97232a7c1b4ddec7d8f0eb5195241208477285f3b371bf98aa31b95548ebe493bc816200e736db8a
-EBUILD csound-9999.ebuild 5617 BLAKE2B 73254be6aa90bff3722cefaa25fe2b3d6706d554e1cac1e928f2928f951ff0988b0a67c09df02fcbe98f7931cbc64572c7b239aea31b315997c42b8c3c759f17 SHA512 94bcc221fa2f90f27e6497ee087c47e1ef3f44994eb53b4b556731d244558d3b3205e32a67373b22e9b8c7c00742688538240cd84286d994f980ea1fb8d5f9bc
+EBUILD csound-9999.ebuild 6981 BLAKE2B 3b0405d259fb32061af330f15f69d7953b0f8f2ef75a279851bc22cc7a0e3b624eab825a8b278ae76ba43a3927624d5d6421ef6443d60503de2777032b337ea8 SHA512 37da0b6c89a0a6e15c5cf1d2daca0102b7f9d7d9f9fb47a655a5ea5f6cc87b23dcc05884e728fd28b4cfac658c288ec54e69bbc436d13099b7afd26d2bd442e7
 MISC metadata.xml 1487 BLAKE2B e94fef343f96f5fe68a0fb486b7f8bd9f8af7fb3f585696a4b6d909cc1e87f2da66ab73b24ad1b3c809db472877febb8fbde2c3fc5b2abfab35c3efe9eddf321 SHA512 215f491284f409a299d5c4ef8d9df6f377a4a5e032bce40870fb72c7c6bbcdaa8ea0879a86c3379207e0b69df7f735254936e97ed68ebd2aeecf9498c646037e
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index c0694b7cd5cc..b0de613cfe23 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit cmake-utils java-pkg-opt-2 python-single-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -24,30 +24,45 @@ HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua csoundac curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth +image jack java keyboard linear lua luajit nls osc portaudio
+# java doesn't work atm as it needs to have some variables specified to work, see src_configure
+# mp3 doesnt work as media-sound/lame does not install cmake file
+IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
+fltk +fluidsynth +image jack keyboard linear lua luajit nls osc portaudio
 portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
 vim-syntax websocket"
 
 IUSE_LANGS=" de en_US es es_CO fr it ro ru"
 
 REQUIRED_USE="
-	csoundac? ( || ( lua python ) )
-	java? ( cxx )
 	linear? ( double-precision )
 	lua? ( cxx )
 	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
+#	java? ( cxx )
 
-RDEPEND="
+BDEPEND="
+	dev-libs/boost:=
+	sys-devel/flex
+	virtual/yacc
+	chua? ( dev-libs/boost )
+	python? ( dev-lang/swig )
+	nls? ( sys-devel/gettext )
+	test? (
+		dev-util/cunit
+		${PYTHON_DEPS}
+	)
+"
+# linear currently works only with sci-mathematics-gmm-5.1
+#   https://github.com/csound/csound/issues/920
+# currently not used deps due to some issues
+#	java? ( virtual/jdk:* )
+#	mp3? ( media-sound/lame )
+CDEPEND="
+	dev-cpp/eigen:3
 	>=media-libs/libsndfile-1.0.16
 	media-libs/libsamplerate
+	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
-	csoundac? (
-		x11-libs/fltk:1[threads?]
-		dev-cpp/eigen:3
-		dev-libs/boost:=
-	)
 	curl? ( net-misc/curl )
 	dssi? (
 		media-libs/dssi
@@ -56,10 +71,9 @@ RDEPEND="
 	fluidsynth? ( media-sound/fluidsynth:= )
 	fltk? ( x11-libs/fltk:1[threads?] )
 	image? ( media-libs/libpng:0= )
-	jack? ( media-sound/jack-audio-connection-kit )
-	java? ( virtual/jdk:* )
+	jack? ( virtual/jack )
 	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( sci-mathematics/gmm )
+	linear? ( =sci-mathematics/gmm-5.1* )
 	lua? (
 		luajit? ( dev-lang/luajit:2 )
 		!luajit? ( dev-lang/lua:0 )
@@ -73,17 +87,8 @@ RDEPEND="
 	utils? ( !media-sound/snd )
 	websocket? ( net-libs/libwebsockets )
 "
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/yacc
-	chua? ( dev-libs/boost )
-	csoundac? ( dev-lang/swig )
-	nls? ( sys-devel/gettext )
-	test? (
-		dev-util/cunit
-		${PYTHON_DEPS}
-	)
-"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
 
 if [[ ${PV} != "9999" ]]; then
 	DEPEND+="doc? ( app-arch/unzip )"
@@ -106,6 +111,7 @@ src_prepare() {
 		-i CMakeLists.txt || die
 
 	local lang
+
 	for lang in ${IUSE_LANGS} ; do
 		if ! has ${lang} ${LINGUAS-${lang}} ; then
 			sed -i "/compile_po(${lang}/d" po/CMakeLists.txt || die
@@ -115,45 +121,97 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_ALSA=$(usex alsa)
-		-DBUILD_CSBEATS=$(usex beats)
+		#-DBUILD_BELA=OFF
+		#-DBUILD_BUCHLA_OPCODES=ON
 		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_CSOUND_AC=$(usex csoundac)
-		-DBUILD_CSOUND_AC_LUA_INTERFACE=$(usex csoundac $(usex lua))
-		-DBUILD_CSOUND_AC_PYTHON_INTERFACE=$(usex csoundac $(usex python))
+		-DBUILD_CSBEATS=$(usex beats)
+		#-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
-		-DUSE_CURL=$(usex curl)
-		-DNEW_PARSER_DEBUG=$(usex debug)
-		-DUSE_DOUBLE=$(usex double-precision)
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
+		#-DBUILD_EMUGENS_OPCODES=ON
+		#-DBUILD_EXCITER_OPCODES=ON
+		-DBUILD_FAUST_OPCODES=OFF
 		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DUSE_FLTK=$(usex fltk)
+		#-DBUILD_FRAMEBUFFER_OPCODES=ON
+		#-DBUILD_HDF5_OPCODES=ON
 		-DBUILD_IMAGE_OPCODES=$(usex image)
-		-DUSE_JACK=$(usex jack)
 		-DBUILD_JACK_OPCODES=$(usex jack)
-		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		-DBUILD_JAVA_INTERFACE=OFF
 		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
-		-DBUILD_LUA_OPCODES=$(usex lua)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DUSE_GETTEXT=$(usex nls)
+		-DBUILD_MP3OUT_OPCODE=OFF
+		-DBUILD_MULTI_CORE=$(usex threads)
+		#-DBUULD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DUSE_PORTAUDIO=$(usex portaudio)
-		-DUSE_PORTMIDI=$(usex portmidi)
-		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_P5GLOVE_OPCODES=OFF
+		#-DBUILD_PADSYNTH_OPCODES=ON
+		#-DBUILD_PLATEREV_OPCODES=ON
+		#-DBUILD_PVSGENDY_OPCODE=OFF
 		-DBUILD_PYTHON_INTERFACE=$(usex python)
+		-DBUILD_PYTHON_OPCODES=$(usex python)
+		-DBUILD_RELEASE=ON
+		#-DBUILD_SCANSYN_OPCODES=ON
+		#-DBUILD_SELECT_OPCODE=ON
+		#-DBUILD_SERIAL_OPCODES=ON
+		-DBUILD_SHARED_LIBS=ON
+		#-DBUILD_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs)
+		-DBUILD_STATIC_LIBRARY=$(usex test)
 		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
-		-DBUILD_STATIC_LIBRARY=$(usex test)
-		-DBUILD_MULTI_CORE=$(usex threads)
 		-DBUILD_UTILITIES=$(usex utils)
+		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
+		#-DBUILD_VST4CS_OPCODES=OFF
 		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
+		-DBUILD_WIIMOTE_OPCODES=OFF
+		-DBUILD_WINSOUND=OFF
+
+		-DFAIL_MISSING=ON
 		-DNEED_PORTTIME=OFF
-		-DBUILD_RELEASE=ON
+		-DNEW_PARSER_DEBUG=$(usex debug)
+
+		-DUSE_ALSA=$(usex alsa)
+		#-DUSE_ATOMIC_BUILTIN=ON
+		#-DUSE_AUDIOUNIT=ON
+		#-DUSE_COMPILER_OPTIMIZATIONS=ON
+		#-DUSE_COREMIDI=ON
+		-DUSE_CURL=$(usex curl)
+		-DUSE_DOUBLE=$(usex double-precision)
+		-DUSE_FLTK=$(usex fltk)
+		-DUSE_GETTEXT=$(usex nls)
+		-DUSE_GIT_COMMIT=ON
+		#_DUSE_IPMIDI=ON
+		#-DUSE_LRINT=ON
+		-DUSE_JACK=$(usex jack)
+		-DUSE_PORTAUDIO=$(usex portaudio)
+		-DUSE_PORTMIDI=$(usex portmidi)
+		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+
 	)
 
+	#use java && mycmakeargs+=(
+		#-DJAVA_INCLUDE_PATH="${JAVA_HOME}/include"
+		#-DJAVA_AWT_LIBRARY="?"
+		#-DJAVA_JVM_LIBRARY="?"
+		#-DJAVA_INCLUDE_PATH2="?"
+		#-DJAVA_AWT_INCLUDE_PATH="?"
+	#)
+
+	# set the library that we want to use
+	if use lua ; then
+		local package
+
+		if use luajit ; then
+			package="luajit"
+		else
+			package="lua"
+		fi
+
+		mycmakeargs+=(
+			-DLUA_LIBRARY="$(pkg-config --variable=libdir ${package})/lib$(pkg-config --variable=libname ${package}).so"
+		)
+	fi
+
 	use python && mycmakeargs+=(
 		-DPYTHON_MODULE_INSTALL_DIR="$(python_get_sitedir)"
 	)
@@ -194,7 +252,7 @@ src_install() {
 	fi
 
 	# rename extract to csound_extract (bug #247394)
-	mv "${ED%/}"/usr/bin/{,csound_}extract || die
+	mv "${ED}"/usr/bin/{,csound_}extract || die
 
 	use python && python_optimize
 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 793bf5218169..b3dd721e54aa 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r1.ebuild 1773 BLAKE2B 35b268fae476589810cb824bb2dbce3fa22e8d34620e968b3c6e8b6e92b4ec1e60733906758f2f963477acc3b7b89c78fb9638b84860985673252452988963ca SHA512 8b91a196a3e34c4c60695d3ff554040db3cbcb4587f53a5c87e3042e1dcb94721296a6ddba046d8d2e25ab45bde25de98c5bbd4a5680d2e2b0b749b60f146d5e
+EBUILD easytag-2.4.3-r1.ebuild 1800 BLAKE2B 89fd4d5d2cf8a5edc8cf75dfdaec2c4ba14f1fddafd8e2c99702026f32933aa0037042ee78f625dffaff6bbc24da97054b8173dada441d691382ca46cc3357a6 SHA512 20a79dd7f1c3f239c7431a070b546ff03c659f4e2da6c59a330294b523bb0959b3ca56bb42809ce5a018e0a9bab397e49a54163ffa5d88965fe7de4bce7319cf
 MISC metadata.xml 514 BLAKE2B b5fdb67baedcef2a155492cf00b63b35ae13c7fe214ba657722043bf824e607dfdf3d50deeb24c4ebb2cc704b7deb41d66c8ea8aa2f3b5911a72cb833b9e05a4 SHA512 eb53f395ef50eb4a86865629809332930907f459cd3b7b2d052727e4c25a27fd9e1acd9660fc354eb16ce7f6ff41e323689548e8b8a671e0878344cc0eb9ddc9
diff --git a/media-sound/easytag/easytag-2.4.3-r1.ebuild b/media-sound/easytag/easytag-2.4.3-r1.ebuild
index 630be7217fa0..7736f4dd65ab 100644
--- a/media-sound/easytag/easytag-2.4.3-r1.ebuild
+++ b/media-sound/easytag/easytag-2.4.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
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	opus? ( vorbis )
 	speex? ( vorbis )
diff --git a/media-sound/ecasound/Manifest b/media-sound/ecasound/Manifest
index f2ba38cb3f8d..f2a335254e98 100644
--- a/media-sound/ecasound/Manifest
+++ b/media-sound/ecasound/Manifest
@@ -3,5 +3,5 @@ AUX ecasound-2.9.1-tinfo.patch 442 BLAKE2B fd9d1251bcfc8a05acae992b0e5baca334d11
 DIST ecasound-2.6.0.tar.gz 966629 BLAKE2B 35539d80ea306f2ba38980838895c66a2f5db918854f0bd0d0cd1513d0cdaa00a9359337b469a41b8fa42cd88e7642e8393d91fdb1add277edfe77bde633e1cc SHA512 48b3c65e301a775499765c55b09bddacfde24bfd7a5be6c03389c7bda882abe98b061aaa39ec12a797e3a5a2808f446751155b36c263f0f12da2db1495515c5e
 DIST ecasound-2.9.1.tar.gz 1057333 BLAKE2B 37e337d379ef649877278a4a3736ef98cde57aeee5a547d3a8e3b9d81785a8a33c964680a6b6871a26d097520f7eab20b186291698869014ec9a12c2ced49b28 SHA512 b91fd68cb4809fdf62b25323fbf52c9bb7de6663287d5aa2576cc4fb28e322850b7020df2718ed6087f5d9f5f96692a476287378ea65853d01834523e8eb7033
 EBUILD ecasound-2.6.0-r1.ebuild 1727 BLAKE2B cb86bb09597a3acc6a6417234ff3acd299eb009ca00c57d0b8dbf617a6460d741df22d2f6ba9b8522ebe083ad6b5eb392f30f2bef0a8d5e6c00dbbd34f86e92d SHA512 decedce6d807ca441b8e70f0e5f24f0f60af1ecf66fc5883866fb2fb167b7e4d044d174d05f26c5abb4ce3e1ff8ba9a105a56be58099ac8f9af66483d92eeb2e
-EBUILD ecasound-2.9.1-r1.ebuild 2321 BLAKE2B 0ddf55f0f41c7325a685a46104600eb16f301fa9053b1a04d27ce75079c71da29e37bd022867e9765bf364b9d6ed75af9acbb34c9c07862bd86e5808631f1238 SHA512 8de3629ca871f4048dadc27aac20833a07b6dc93464913e1c9ae6fe5b117dfba5af0b0e613bec2bd2cbf9272477227a7cc903ffc6e025f5a31f68afc73895b19
+EBUILD ecasound-2.9.1-r1.ebuild 2345 BLAKE2B 26f6ff3bb916ebf8356dc2518fab18a9b35016bdec8c72984061e64f05df170bf493c79cb14abcad874a55755d638eae41d484a308c205f579b5caadd6a77254 SHA512 cc4f42bec08b50ed899cca85bb056bc85d7be492f0c4846c316f964f599453411485caab62049ef7bb5ce9651243ba9662fae4d3d6483debe92cf328d91fc1b8
 MISC metadata.xml 991 BLAKE2B 5730449cc175d580ae46d63a1a463ee8f417dfeab0fcc305903cc511020a2f24b2313ae09cb89d0f627789837a80ad2754b900ceb2e1a9a8ded661bf00f3ce4d SHA512 a057fab8c46cfec1f615671b8c511978c077362e4943134d6a572f141e9cd42dbc4a8d303fbd2d8c28b94d8423e5c0cf5105c352c0fab3a1bd18ff0a2141450c
diff --git a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild b/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
index e9a6f5f90cf3..d7a884894e3c 100644
--- a/media-sound/ecasound/ecasound-2.9.1-r1.ebuild
+++ b/media-sound/ecasound/ecasound-2.9.1-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
@@ -15,6 +15,7 @@ SLOT="1"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa audiofile debug doc jack libsamplerate lv2 mikmod ncurses oil osc oss
 python ruby sndfile static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( lv2 )
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index f2faa1a43d17..5e38086156df 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,3 +1,3 @@
-DIST elisa-0.4.2.tar.xz 1274720 BLAKE2B 8b8a0db29ec2011bd4494167e637646e873020b24fa721f78683d0c2d062961919a9750a91955204fb65c8efcfcb883ae055c8d2de477a508d990657e1926197 SHA512 8044eca86613be279d2f8df61dd518b69672ba2f586474866f11df7494912020e59bb87905eb3c30a44c2f9bf21466de7f7efac35a6db0f822dfac013a6d57eb
-EBUILD elisa-0.4.2-r1.ebuild 1561 BLAKE2B e564aa8d8c6cfbab6fdc4eda61ca25667b5b59cd4ea19e68b1e2364c69854ac39c075916761e1bcede850343751b517d9cebb1ea7e12f8fc53308d840378424d SHA512 18740b955c59bdcc1409903744a5ff047c596e0d706c74f85889c41d79a856d95fd993284193810352272d68c61cf574ebbd04db9b2df9c2260b9db2362bdb63
+DIST elisa-19.12.0.tar.xz 1386020 BLAKE2B c16e27fd85f7a73e264873a2b8926c9bc820885b5e40b88f271c6e70303365f34380d880d972d0bfca67d2c49f57c4ef6e895e798aeb844e729a475b3a398d40 SHA512 bac5693e10d0db4389aeb7fcf555914d5613ec29549b5de6dbcc16b4d2d07d513157c819525f2fad61864adf7da37ad1b0ee1294e09eda79a2953e199767b14f
+EBUILD elisa-19.12.0.ebuild 1621 BLAKE2B 23db01fd5105ce769e85e740adcf1f85239efce7fec5ea874c22133936dd6896c3fda875d16fdb3d1820a0283977d85822765dfb029343f7aa6b089cb48f5bb9 SHA512 71acf6539c622b24430aa93753113ed511fdc06ceacc0462f14e7e14c5f3ad0d3bfd2632c8976219c82934d959de8386faa5f5c8ec4a052b2c57c6f335f53fde
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-0.4.2-r1.ebuild b/media-sound/elisa/elisa-0.4.2-r1.ebuild
deleted file mode 100644
index f6e273800590..000000000000
--- a/media-sound/elisa/elisa-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
-LICENSE="LGPL-3+"
-IUSE="mpris semantic-desktop vlc"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kfilemetadata 'taglib')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	mpris? (
-		$(add_frameworks_dep kdbusaddons)
-		$(add_qt_dep qtdbus)
-	)
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( $(add_qt_dep qtmultimedia 'gstreamer') )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package vlc LIBVLC)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-sound/elisa/elisa-19.12.0.ebuild b/media-sound/elisa/elisa-19.12.0.ebuild
new file mode 100644
index 000000000000..d353e579539f
--- /dev/null
+++ b/media-sound/elisa/elisa-19.12.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KDE_RELEASE_SERVICE="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="Simple music player by KDE"
+HOMEPAGE="https://community.kde.org/Elisa"
+
+LICENSE="LGPL-3+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64"
+IUSE="mpris semantic-desktop vlc"
+
+BDEPEND="sys-devel/gettext"
+DEPEND="
+	>=dev-qt/qtdeclarative-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtmultimedia-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kirigami-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	mpris? (
+		>=dev-qt/qtdbus-${QTMIN}:5
+		>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	)
+	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
+	vlc? ( media-video/vlc:= )
+	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
+"
+RDEPEND="${DEPEND}
+	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
+	>=dev-qt/qtquickcontrols2-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package mpris KF5DBusAddons)
+		$(cmake_use_find_package semantic-desktop KF5Baloo)
+		$(cmake_use_find_package vlc LIBVLC)
+	)
+
+	ecm_src_configure
+}
diff --git a/media-sound/flac123/Manifest b/media-sound/flac123/Manifest
index 56501df0289c..f2cd839793ff 100644
--- a/media-sound/flac123/Manifest
+++ b/media-sound/flac123/Manifest
@@ -1,3 +1,3 @@
 DIST flac123-0.0.12-release.tar.gz 129795 BLAKE2B 6c73cdcb350de6431d15af846af4aefc8beafdf9137a31144a7869acca0f5383aeae110ef81165c98a188af7580fff5ad27836955cd9729deca14a4465aa8b0e SHA512 4bfabecae86cf11a13bd45025d7fbdee189918e0cd4eee0128856897710b44afd19df5675cae9426d30e9d8cd09b358333438cd05701fa0a7a00a8493a77e1f7
-EBUILD flac123-0.0.12.ebuild 556 BLAKE2B a16f8aa7f6a7030f08712521ad27c675ef33380c95af088723998da94f37af87a9be929f67e064c5ebf234d675518525272c8ac3c1b2d0748241469fe020fc42 SHA512 f19901f64faa4fbe9c3ea76a78b70a95fbea39f2000cc9f9c3f316c65bd9ea6a3155f424176b6ea32ca26cb65e3af4600be4405820454afb1a8dad513541051a
+EBUILD flac123-0.0.12.ebuild 527 BLAKE2B 27fc336d5aaaf964376dd78e12cb2ef894c712460e0c02970ab8754525a0a1d8f5ad0b2025581f4d4b3b3641807e2de615d581047dfd1fd391f58420d2629db4 SHA512 34108ac8602936d71d237d63fc3390dde9ed38151aeff2a5df2012222b477d30be2c2da58370b3c53560e837843f8bd3c2d9120e733745b88b4f07a8f8a16c5d
 MISC metadata.xml 333 BLAKE2B 195afe4f3f4f40699bb7a17bd691d387762eed0ef675455dbd78153638c81077910505fa77c845db4ae0121ace103d4df98fc21304b3b5994e1969ccb49ed25f SHA512 33515fc05332bf95b555a3748ae1e766d6fdfd401599f79a1668dcac1f0434fe8d70fa50e8111a1a76f6d689a13b37e8e7cc314913744c983baf188999559f08
diff --git a/media-sound/flac123/flac123-0.0.12.ebuild b/media-sound/flac123/flac123-0.0.12.ebuild
index bf451bafd806..c9c1814ac3e7 100644
--- a/media-sound/flac123/flac123-0.0.12.ebuild
+++ b/media-sound/flac123/flac123-0.0.12.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit autotools
 
 DESCRIPTION="console app for playing FLAC audio files"
@@ -13,14 +14,14 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ppc ppc64 sh sparc x86"
 IUSE=""
 
-RDEPEND="dev-libs/popt
-	media-libs/flac
-	media-libs/libao
+RDEPEND="
+	dev-libs/popt:=
+	media-libs/flac:=
+	media-libs/libao:=
 	media-libs/libogg"
 DEPEND="${RDEPEND}"
 
-DOCS="AUTHORS BUGS ChangeLog NEWS README*"
-
 src_prepare() {
+	default
 	eautoreconf
 }
diff --git a/media-sound/flack/Manifest b/media-sound/flack/Manifest
index 234c24c6ae63..22f04d82b877 100644
--- a/media-sound/flack/Manifest
+++ b/media-sound/flack/Manifest
@@ -1,3 +1,3 @@
 DIST flack-2.0.6.tar.gz 16273 BLAKE2B e56955b6e15bdf8d1652c318d048cbaae7a6f7b52a611b5196228aab3c0c4f66edf653f7b8b0e9b15769f3cd93d2e8ca259f19d9997f31dc5c11e4cac488973f SHA512 64b9bf75aa24e3ee2cbebdda91ed6a6326b88107c1d0ef3f407a9e4d8a30af63b828ec8f52fb91d3788fab3f4bc73043e68c56650defa26042292c4dd4165c9f
-EBUILD flack-2.0.6.ebuild 528 BLAKE2B b7a592e66337c2b3e82ec1d75b79b61523c50c603b2293a91c1ed96b1838c5b11685b68329df12343a07a4cd79a40427940ef1187788db2619eaabddcea54bab SHA512 c165725335a72c505c3ec3f290d15448c04443e363ce861431be04c51940effe1d4ad29507cee57b6b4e4d09cdaeee28f2e547746d8f6ec93c2c606907db0eb7
+EBUILD flack-2.0.6.ebuild 502 BLAKE2B f2ca2baf7a2ddaf0d246e483284b826d3dbeb90eed144fd5cd94b76a871870fb7b5ce2568dcc8c400cd4bf10316190042e7c3a07da47a816c1e19c5dd31d7a77 SHA512 aa4ec0d3787124822223c99699b2c541ffaabbbb00b476aff7d8ade75e66c14f4d13bf523dbbbb80e17bc364c7b0c4b60936ac7d193969d370a27ace3a2f5f53
 MISC metadata.xml 502 BLAKE2B de5cb3d98f785bf01e507faf0dd4cfa0e88d90b35b93f79148cef51ffe86d1aa50da3928d01d4a372c9456bb41ef696d123f2361925edc9a041954377735ff86 SHA512 9e95da323bb6af545f8686f7437249106207d14d5c114c67733a917090536fe497404d32354f825cf704021af2471a45f19dfebe63986e8a7a1cb7b792608f5f
diff --git a/media-sound/flack/flack-2.0.6.ebuild b/media-sound/flack/flack-2.0.6.ebuild
index 189070829b3f..41d8ac316e8d 100644
--- a/media-sound/flack/flack-2.0.6.ebuild
+++ b/media-sound/flack/flack-2.0.6.ebuild
@@ -1,13 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils
-
-DESCRIPTION="flack - edit FLAC tags from command line"
+DESCRIPTION="edit FLAC tags from command line"
 HOMEPAGE="https://sourceforge.net/projects/flack/"
-SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-1"
 SLOT="0"
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 891640d69164..f7f5e97eb402 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,3 +1,7 @@
+AUX flacon-5.5.1-ninja-warning.patch 2227 BLAKE2B 07957a0d79d3c6d8c228ba00f1232c5e2071f6868097ff891ee00473ade0f01f32ec8a9ea8fdf55ea7681d82e9c023382dcf978d828a7a0c0a2b05053b36d070 SHA512 77755301347b562f1f0003d13cd933f98e3bd9041ec9e1f8c6d4daf6e4185197cbec7f7c9ee584ef3948594c98eba13ddc509350f3329c5753430d12090b1d31
+AUX flacon-5.5.1-no-man-compress.patch 1089 BLAKE2B e4757b39f3ccbfb60e0298ed091718c809fa224d53d4cc0e15ae1f65e11d8698a5434bd3099bae3932b4931a7624ce9c00334e8503c2131a0d61d075642dc730 SHA512 a975329808a5642d4684d03c9261073633f394d789ac5b28dd30e0028a7ee8503a447644d5911a1bcd24c89fbab6279e3228dc21462f277aec9ef040b784703f
 DIST flacon-4.1.0.tar.gz 1579869 BLAKE2B 6e0bf31f0eb47bf594d74e0f058f333daa9ee84f9313e75e059f1568386c20f79482926f6f786d332ecfbb72c3991e346a7b98ab8f27a2a4b4ce5c195c23d6bb SHA512 4e786571ba3e157aad2dc27523f8b9de259b44b84c7b054124a610199ef19855832000e4499d18bd6f725f2133bbbbf8d0d75f1cafbdce918605c3b407f6b0ef
-EBUILD flacon-4.1.0.ebuild 2487 BLAKE2B 6d785d27fd85a20e1fce1c825af29c94c10f38b47fb2e005c5d56f6bf0d3514b894d1668e120281b45ef432112f1d02a70a885b2400696cf2ee98379e12298ea SHA512 8625a895f8cadce399892eb931ae3b851d4496a26f2faec61f6e480eb8f1415035140854d0de9adab753a685eb601453c82b95493d7b7f256e3e52daff7bb9bc
-MISC metadata.xml 306 BLAKE2B 2ac342c7a4c650d7a02d359e8e30daf71d3a8001b1a104bd51dbece75211a74a6aa459edb914ee843d5d37c81f187ec7a1c43cee796b835941b8c3a30965089c SHA512 ebd3af9217f23911f93ef04d7176dd1524e31ac5e2842a51e1efa3e025c9d864cc71070adea0287ea1b465dd15cf17ba47e3bcfc1b96b5c9ceb5962b177f7e5a
+DIST flacon-5.5.1.tar.gz 2336502 BLAKE2B 524fe5fa28126f56452515ca1ce1572343dad8b06c28fc8e3a22a11e9ad8f3a51a25b3c19ddd29a7e3c658f1d7fb3316a2554a12a4ba3dd22370fc1394d38022 SHA512 36900b011135b61cf3cc1f05d94f852fc7e127972f3fed09e0fb7e66fec944ed1c3bfc61307494aff87c2fe24e16479605043a79e0634bc23940d01fc337c6c1
+EBUILD flacon-4.1.0.ebuild 2511 BLAKE2B 92ca36c74b7f0ce0db0c6bb8fdb4f6dfd04335e13e5fa7d7b952d1c89e8b8313744eb20b62c6c4043183c36936ad855ada0b7f9062667e53834ae744a20a22a6 SHA512 5de628e97ae4f9d2e7a7f746d9835e96c1451bb3eb5a3bfb93f0628d2ae7e7013152163f74caa09c38a8c49036bef4cca4b9b2c19fb083f021e90fe677d53002
+EBUILD flacon-5.5.1.ebuild 2064 BLAKE2B 35467ab737b7db36875d3b7c9c244da2ec9f187f96dd45b658096b5ce534ab3c86023c760d8f36b09f2c145e673962340532e507e23256ed23d33966b551c57e SHA512 ff565ccca8a127ac4b7fca1785b47e562c3cd10409d45d73b63e1496d3fcc60c8dca0e3cf2bb380d2ed4deb0ea7afa80dc052fa8388633151993c35bc31026e5
+MISC metadata.xml 245 BLAKE2B d65195b37ab70bec146facd788d5a6239a7795c578130cb5703bf89e7a92da8acf8f4840e7f867d61359b57f0b002396a9e959cb9d2bbee2654003bc8ee061ff SHA512 be2b5dde02a39ab7345c9918796ce93c2356899fed6beb96b43f93b81eeb96a74020d2e606a5a33f95dfafa1bdef23620ab3214c2744c5e418beb7e8df1e9ae1
diff --git a/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch
new file mode 100644
index 000000000000..358e0464c80c
--- /dev/null
+++ b/media-sound/flacon/files/flacon-5.5.1-ninja-warning.patch
@@ -0,0 +1,63 @@
+From bc6346175db9f89777141b6d17b52143b3caafeb Mon Sep 17 00:00:00 2001
+From: Alexander Sokolov <sokoloff.a@gmail.com>
+Date: Mon, 21 Oct 2019 22:08:18 +0300
+Subject: [PATCH] Fixed issue #104. Correct CMake policy CMP0058 warnings.
+
+---
+ CMakeLists.txt                     | 10 +++++++++-
+ translations/translatorsinfo.cmake | 10 ++--------
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1fbbca2..95f25cd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -244,7 +244,15 @@ include(FindPkgConfig)
+ pkg_search_module(UCHARDET REQUIRED uchardet)
+ 
+ include(translations/translatorsinfo.cmake)
+-create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations)
++add_custom_target("translators")
++add_custom_command(
++    TARGET "translators"
++    PRE_BUILD
++    BYPRODUCTS ${TRANSLATORS_INFO_FILE}
++    COMMAND create_translatorsinfo_qrc(TRANSLATORS_INFO_QRC translations)
++)
++
++
+ set(LIBRARIES ${LIBRARIES} ${UCHARDET_LIBRARIES})
+ include_directories(${UCHARDET_INCLUDE_DIRS})
+ link_directories(${UCHARDET_LIBRARY_DIRS})
+diff --git a/translations/translatorsinfo.cmake b/translations/translatorsinfo.cmake
+index b439a05..650174b 100644
+--- a/translations/translatorsinfo.cmake
++++ b/translations/translatorsinfo.cmake
+@@ -23,13 +23,11 @@
+  #
+  # END_COMMON_COPYRIGHT_HEADER
+ 
++set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info)
+ 
+ FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR)
+     get_filename_component(srcDir ${_DIR}/ ABSOLUTE)
+ 
+-
+-    set(TRANSLATORS_INFO_FILE ${CMAKE_CURRENT_BINARY_DIR}/translators.info)
+-
+     file(GLOB IN_FILES ${srcDir}/translators_*.info)
+     file(WRITE ${TRANSLATORS_INFO_FILE} "")
+ 
+@@ -42,11 +40,7 @@ FUNCTION(create_translatorsinfo_qrc _qrcFile _DIR)
+ 
+     configure_file(${srcDir}/translatorsinfo.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
+ 
+-    if(USE_QT4)
+-        qt4_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
+-    else()
+-        qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
+-    endif()
++    qt5_add_resources(__qrcFile ${CMAKE_CURRENT_BINARY_DIR}/translatorsinfo.qrc)
+ 
+     set(${_qrcFile} ${__qrcFile} PARENT_SCOPE)
+ ENDFUNCTION()
diff --git a/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch
new file mode 100644
index 000000000000..191d863fb310
--- /dev/null
+++ b/media-sound/flacon/files/flacon-5.5.1-no-man-compress.patch
@@ -0,0 +1,23 @@
+--- a/CMakeLists.txt	2019-12-07 15:55:24.155414989 +0100
++++ b/CMakeLists.txt	2019-12-07 15:56:38.266998439 +0100
+@@ -341,11 +341,6 @@
+     @ONLY
+ )
+ 
+-add_custom_command(TARGET ${PROJECT_NAME}
+-    COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
+-)
+-
+-
+ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+     set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
+     install(TARGETS ${PROJECT_NAME} RUNTIME                 DESTINATION Flacon.app/Contents/MacOS)
+@@ -357,7 +352,7 @@
+ else()
+     install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+     install(FILES   ${QM_FILES}             DESTINATION ${TRANSLATIONS_DIR})
+-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
++    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 DESTINATION share/man/man1)
+ 
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop        DESTINATION "share/applications")
+     install(FILES   ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metadata.xml DESTINATION "share/metainfo")
diff --git a/media-sound/flacon/flacon-4.1.0.ebuild b/media-sound/flacon/flacon-4.1.0.ebuild
index 446aeca8ef6e..82b17e271799 100644
--- a/media-sound/flacon/flacon-4.1.0.ebuild
+++ b/media-sound/flacon/flacon-4.1.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
@@ -18,6 +18,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-i18n/uchardet
diff --git a/media-sound/flacon/flacon-5.5.1.ebuild b/media-sound/flacon/flacon-5.5.1.ebuild
new file mode 100644
index 000000000000..e6310352d358
--- /dev/null
+++ b/media-sound/flacon/flacon-5.5.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests require lots of disk space
+CHECKREQS_DISK_BUILD=10G
+inherit check-reqs cmake-utils eutils virtualx xdg-utils
+
+DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
+HOMEPAGE="https://flacon.github.io/"
+SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+BDEPEND="
+	virtual/pkgconfig
+	dev-qt/linguist-tools:5
+"
+RDEPEND="
+	app-i18n/uchardet
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? (
+		dev-qt/qttest:5
+		media-libs/flac
+		media-sound/mac
+		media-sound/shntool
+		media-sound/ttaenc
+		media-sound/wavpack
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-man-compress.patch"
+	"${FILESDIR}/${P}-ninja-warning.patch" # git master
+)
+
+pkg_pretend() {
+	use test && check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	use test && check-reqs_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	virtx "${BUILD_DIR}/tests/${PN}_test"
+}
+
+pkg_postinst() {
+	elog "${PN} optionally supports formats listed below."
+	elog "(List will be empty if all extra packages are installed.)"
+	elog "Please install the required packages and restart ${PN}."
+	optfeature 'FLAC input and output support' media-libs/flac
+	optfeature 'WavPack input and output support' media-sound/wavpack
+	optfeature 'APE input support' media-sound/mac
+	optfeature 'TTA input support' media-sound/ttaenc
+	optfeature 'AAC output support' media-libs/faac
+	optfeature 'MP3 output support' media-sound/lame
+	optfeature 'Vorbis output support' media-sound/vorbis-tools
+	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
+	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
+
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index 1b0223c33976..ef795ca97504 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<upstream>
-		<changelog>https://flacon.github.io/changelog/</changelog>
 		<remote-id type="github">flacon/flacon</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/fluid-soundfont/Manifest b/media-sound/fluid-soundfont/Manifest
index f6750ca9f276..d6ecf444b7bd 100644
--- a/media-sound/fluid-soundfont/Manifest
+++ b/media-sound/fluid-soundfont/Manifest
@@ -1,4 +1,4 @@
 DIST fluid-soundfont_3.1.tar.gz 134835922 BLAKE2B e280d64e977b290e7b6512b6781631c7e3dd08aa37a8c934243b4569b3b59810640153b03405d5845c76b7c4701ffe9d528a81d8101d9668af0c95df8c0a180e SHA512 014394752ac50d3162c87903d9dd6b38d199ddfab10e2dea3b2a96d02ddcb876a792cc20bc0e83be5ac15eb0c7e261612eedcd792a3f0ff85a7d032a7dd24f29
 DIST timidity.cfg.bz2 10667 BLAKE2B cdcbf9eed076c6ed210f90f7c592a830e53c6d253eb2b13c3aba00b6040aed946af59981707e3e55a0757fb76b30b5ba0676b9cffdc433c58975b38702cd98b2 SHA512 def3ba456c040a010e7e5d22eed1e1674f8b50853c5771085a16eced47e9a8e429b34564218df6a4a16f697eda69365afe51a0d158b0672a66fdf1b0284c50f5
-EBUILD fluid-soundfont-3.1.ebuild 670 BLAKE2B fd83d341c90a40ae223d9d165328130e7618919b7afe6b4de95ff586047c8db034bc96658b8e00da14665621a591ace35871c870f4ad58a509ab9fff9ed49cf7 SHA512 b15c11a6f51d3890af3d373c9ca445bd5d5224bffe9769329798328b94c3867632c138625115864f6690199b9af2c995778d0d3b8f7dbf239b21d68301b3b648
+EBUILD fluid-soundfont-3.1.ebuild 668 BLAKE2B 007743dc91c1b145937894c98cf7547c11e28456d31cc949e998d3a1a8e75847026af9d50cd99caded621bc69b5208123140e11a142c00f2efc1995a0951ba5a SHA512 20f9167c11210abc3173cf7b6fc8d70cab448d542970fd00ebee0c5e4bad9a8cd33d5984ecf1f7db684354c38e2355ed1e7cdc57e530b88caa759958dd1a5949
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
index dd602b835a27..ab000cfaa15e 100644
--- a/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
+++ b/media-sound/fluid-soundfont/fluid-soundfont-3.1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="The Fluid R3 soundfont"
 HOMEPAGE="http://musescore.org/en/handbook/soundfont"
-SRC_URI="http://prereleases.musescore.org/soundfont/${PN}_${PV}.tar.gz
-	 timidity? ( https://dev.gentoo.org/~hwoarang/distfiles/timidity.cfg.bz2 )"
+SRC_URI="
+	http://prereleases.musescore.org/soundfont/${PN}_${PV}.tar.gz
+	timidity? ( https://dev.gentoo.org/~hwoarang/distfiles/timidity.cfg.bz2 )"
 
 LICENSE="MIT"
 SLOT="0"
diff --git a/media-sound/galan/Manifest b/media-sound/galan/Manifest
index 517cb3f7935b..c722e1694999 100644
--- a/media-sound/galan/Manifest
+++ b/media-sound/galan/Manifest
@@ -1,3 +1,3 @@
 DIST galan-0.3.0_beta7.tar.gz 1138937 BLAKE2B 6f132a7371890d95f15bb06862d50ac556009ec778c536fd0da978ce6e6118c53ef81ed43cf62bd593253164aef526a3f9440ddd505a78f08bf16b72adce1772 SHA512 86ef525785c77c068146ea2cc4992091ad623bc43fde3603b00d9e8ef4583c0ecf60d061ab47386eb67dc7ef269a4631cdeb19317f3eeebf2fb2fc82c5b825a8
-EBUILD galan-0.3.0_beta7.ebuild 1030 BLAKE2B 00e0729b3c51c3c5f67b9eb54c62ca3ccca98868feb87218d8657de73142984d16f139005be6fb8313731a7043936bba7aa96448c456bc5db2f2aa61cfb0d4af SHA512 0b0931f4171c30491bb2d192c7f4f45b6075c363654222b7b646040059386444a484732e969b4ab227c27c3aab3801e5d560819c67af059b64d8a3f46f8fc148
+EBUILD galan-0.3.0_beta7.ebuild 1031 BLAKE2B f908321cd1b7ba46989f220a3a257d3e30bc1f337a05539d27f4aecd70af8d3ee71bf6206ab876f8209064ca5f99fd69a9a1e3efa9f410bf2395044753ecd438 SHA512 e5e2d2ef20f85982fc7c3e33ebc4b5db3a54b22b85685f8e68f5e991c42092886a70f8e4bce4fe08f95b85f71f1dfdbebd2319bb5d70352c65a4b858ce108658
 MISC metadata.xml 328 BLAKE2B b628739d94ad742582e586d759f3a39ee4280cc63eb9f0ec8a009f46b029cecbe153b299f582380b230d54839aec9b7a8afde4a199db773b3969fca91eeed45d SHA512 3f4ada42f2d3b5ada8158c07eaa57170369e9cae6d410d4d6c2320d5c4189712a218095375c1052f72aeebf3140581f6203d773fa2df43d0da79b7a216bb3b12
diff --git a/media-sound/galan/galan-0.3.0_beta7.ebuild b/media-sound/galan/galan-0.3.0_beta7.ebuild
index 174e6f949b23..1ab365fd9a33 100644
--- a/media-sound/galan/galan-0.3.0_beta7.ebuild
+++ b/media-sound/galan/galan-0.3.0_beta7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="gAlan - Graphical Audio Language"
@@ -11,25 +12,29 @@ SRC_URI="mirror://sourceforge/galan/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="vorbis alsa opengl jack"
+IUSE="alsa jack opengl vorbis"
 
-RDEPEND="x11-libs/gtk+:2
-	vorbis? ( >=media-sound/vorbis-tools-1.0 )
-	alsa? ( >=media-libs/alsa-lib-0.9.0_rc1 )
+RDEPEND="
+	media-libs/liblrdf:=
+	media-libs/ladspa-sdk
+	media-libs/audiofile:=
+	media-libs/libsndfile:=
+	sci-libs/fftw:2.1=
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib:= )
+	jack? ( virtual/jack )
 	opengl? (
-		>=x11-libs/gtkglarea-1.99.0:2
+		x11-libs/gtkglarea:2=
 		virtual/glu
 	)
-	jack? ( >=media-sound/jack-audio-connection-kit-0.80.0 )
-	media-libs/liblrdf
-	media-libs/ladspa-sdk
-	media-libs/audiofile
-	media-libs/libsndfile
-	sci-libs/fftw:2.1"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	vorbis? ( media-sound/vorbis-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS NEWS NOTES README TODO )
+src_prepare() {
+	default
+	rm README.w32 || die
+}
 
 src_configure() {
 	# Use lrdf.pc to get -I/usr/include/raptor2 (lrdf.h -> raptor.h)
@@ -39,5 +44,8 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -exec rm -f {} +
+	dodoc NOTES
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 37f74117b91f..7a5ea68ba761 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,3 +1,4 @@
 DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
 EBUILD gigedit-1.1.1-r1.ebuild 1117 BLAKE2B c15ccf312b1c77059612918838603a991cdea09e288eb764a8665677d34b609e4bf90b7a19f8288f19f752608cd41192627a6d959abcace73ddb187a636f2b45 SHA512 36087dfed26f0c719cfc10ffad147eac8215f45001fde959366540c6adb1dc51e9ac355fadfe8ca5f22b9ab2a128cef0442f4e159bbe06174364c761a214a89e
+EBUILD gigedit-9999.ebuild 1115 BLAKE2B 0d6810d5be6f9fd11a455ead8309fe8162e60b65248bdf65e54c5dc8102cb19a6ab8e46cbeda46f076990fcfbc2e0fbc2225671e363a0b83195d11f2c648c8de SHA512 3473db34c63055bfde0fae8c713117a9334a08b4a683673217d482fc13896701d8c546b16b3f42f2b1c64a6ea94ff96fe8d79eb36cf37679e0bfb0eaadac3529
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
new file mode 100644
index 000000000000..cba33cb715bb
--- /dev/null
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools eutils desktop xdg subversion
+
+DESCRIPTION="An instrument editor for gig files"
+HOMEPAGE="http://www.linuxsampler.org/"
+ESVN_REPO_URI="https://svn.linuxsampler.org/svn/gigedit/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+"
+CDEPEND="
+	dev-cpp/gtkmm:2.4
+	>=media-libs/libgig-3.3.0
+	>=media-libs/libsndfile-1.0.2
+	>=media-sound/linuxsampler-0.5.1
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${CDEPEND}"
+
+src_prepare() {
+	default
+
+	# docdir is not propagated there
+	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
+}
+
+src_install() {
+	default
+
+	einfo "Removing static libs..."
+	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
+
+	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+}
diff --git a/media-sound/gimmix/Manifest b/media-sound/gimmix/Manifest
index 91c74dcc6627..2134e52e43f6 100644
--- a/media-sound/gimmix/Manifest
+++ b/media-sound/gimmix/Manifest
@@ -1,5 +1,6 @@
 AUX gimmix-0.5.7.1-curl-headers.patch 655 BLAKE2B 77cea14b06d3e36933510e7e32a75fe2a5485fd2a21e4326f968027b6eee8951e2412330168149416b4f7caa7f504f8e2fb5bc1cb8a3cf72a07ab588272a17ef SHA512 9b0665e8de4670b2dc58940215b883549bddd6d7abd26f604f334034d604689063b3347ba81651b804a430b31ff235c9b65c33ee0d3115c4e2fba2d48d3c56bb
+AUX gimmix-0.5.7.2-QA-desktop-file.patch 231 BLAKE2B 62bb0bd4df813f3f438383ff1e2c046735c868ddc4ea0312c6b3786b918ce42e1062c71d43acd8ba71cf9c4094d8f6d947dc39e003adf854633e0e7987369b24 SHA512 0e0da637d78afb03a3511b1ea4d25c8fb1a6f234ea516ee1eed71d58960e7ac04c042ff9a368463fc1556df85cf6b19d97af30d274ea799600b94805528379ef
 AUX gimmix-0.5.7.2-format-security.patch 285 BLAKE2B 4399e9fc6b570ecaa11443dddf7605644ce98cf67f5649ad89384dd1d763b20e2e345ca50ef9405b49fef2f55affa983aa854abff699487f6fa319d64511836d SHA512 a5dcc28dfd454377eaae36ff904260b942dd1174c8af55f63739a9565efdd03b4e848ac297b45d5de167cd51e737e8cb5034178c9831d8b8f120af0b59cc82af
 DIST gimmix-0.5.7.2.tar.bz2 497249 BLAKE2B 06397e0bb13d8844c033bf1f17c7014be67783bb3b690bed387c84a7ddb6b58bb54ecdb45bcb57667a3d93947810b0e6797866ff1bb9f4b38a83574088ee826c SHA512 1e2df9bb4ad8286d6a03d6ab41a231f1a994df5eb4e0190ace83bc5683c69c9a6ff8fae1da473be2c0c050461c9a24e2fc1e111027ea7ce21a7c12472a761b21
-EBUILD gimmix-0.5.7.2-r1.ebuild 1035 BLAKE2B 733cf9a07de09f761bf352a0090d0b812ba6812fe63ba0cbbf8c5a6545d952bdbd2c103a4cd1ec890ebc4210746b485e2c5eacaaa1dd32d8240faa315f9a5fab SHA512 10d8bd8f1f7fbd172050aed9b334938f2c28a6e82ca3f3e03a8bda7ed142e620664d8ed4e285d898e376356f306a84bf2768fe779d058b5df4587154b3582ccd
+EBUILD gimmix-0.5.7.2-r1.ebuild 948 BLAKE2B d7277f961bec8cef6d17a0234a0398f1beb3b9117393e6d66f3150780720ec1b9c1ef299f3f77e0bb4862f5f4164f3e28f0cd43347cfc6efca61a77789a1ce1f SHA512 859ca3b1dab09181bd37a29fadbf7f0d91355fa03abbdf5b8e20f2e6030392941375b4445c3fb68a184b6efcc5d1bf5bde2b074311e872d9f899f3c501a5b0c0
 MISC metadata.xml 447 BLAKE2B e925d9268e0b7dfbd8592fcd83f5ff2f7ab86eafd625831592c14b1772f343bfb8d1eab4f711e2b1090c053e92e968e9f35bc6ecab046fb2f2df148129b1b0f0 SHA512 f186c67facf87d3e06be7d5bd5b42bf144a5cc6e9f3826d870dc11814a0547ccc366a87610f92966e6c8858d7987d450dc07a89ada961212d3f05aaeade14c57
diff --git a/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch b/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch
new file mode 100644
index 000000000000..1a0b3d0105a2
--- /dev/null
+++ b/media-sound/gimmix/files/gimmix-0.5.7.2-QA-desktop-file.patch
@@ -0,0 +1,11 @@
+--- a/data/gimmix.desktop
++++ b/data/gimmix.desktop
+@@ -5,6 +5,6 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Icon=gimmix.png
+-Categories=Application;GTK;AudioVideo;
++Icon=gimmix
++Categories=GTK;AudioVideo;
+ MimeType=
diff --git a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
index 0b9ae98c4bb2..7d875e3d3fd6 100644
--- a/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
+++ b/media-sound/gimmix/gimmix-0.5.7.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="a graphical music player daemon (MPD) client using GTK+2"
 HOMEPAGE="https://launchpad.net/gimmix"
@@ -13,25 +14,32 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="cover lyrics taglib"
 
-RDEPEND=">=media-libs/libmpd-0.17
-	gnome-base/libglade
+RDEPEND="
+	media-libs/libmpd:=
+	gnome-base/libglade:=
 	x11-libs/gtk+:2
-	cover? ( net-libs/libnxml net-misc/curl )
-	lyrics? ( net-libs/libnxml net-misc/curl )
-	taglib? ( >=media-libs/taglib-1.5 )"
-DEPEND="${RDEPEND}
+	cover? (
+		net-libs/libnxml:=
+		net-misc/curl:=
+	)
+	lyrics? (
+		net-libs/libnxml:=
+		net-misc/curl:=
+	)
+	taglib? ( media-libs/taglib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	dev-util/intltool"
 
-DOCS=( AUTHORS ChangeLog README TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${PN}-0.5.7.2-QA-desktop-file.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.7.1-curl-headers.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-	sed -i -e "/^Icon/s/\.png$//" \
-		-e "/^Categories/s/Application;//" data/gimmix.desktop
-
-	# broken build system in tarball
+	default
 	eautoreconf
 }
 
diff --git a/media-sound/glurp/Manifest b/media-sound/glurp/Manifest
index 6bb43254e11f..81bc40247611 100644
--- a/media-sound/glurp/Manifest
+++ b/media-sound/glurp/Manifest
@@ -1,4 +1,4 @@
 AUX glurp.svg 2674 BLAKE2B 859d95badd36389f899f43483971c72c0723e47932dd9b4ed2bd78b587bdf4b869acf820ea08904799f0474d90099917faa49fc61ad135a1457a075c91d54538 SHA512 ffbdf0d75db4d2fbeff8f185092fa53b7859be83b14862a8a9c7795bf41aef8158cf881f5bb10c7a8bf83a2fe87f0718b86473922559cdf05016f1925525801d
 DIST glurp-0.12.3.tar.gz 166976 BLAKE2B e57c3dbed58998ab1ce983d06946bfb337b0ef626d1189955423b52535321b0b0e9bb5f8f0f8638fe8ae8847d42ef6fc71c12886f42b0989d50146ce915f9b40 SHA512 cb2592b9667aa45fd7053315c284fde568bdd84953f902e53754b8ba8c1941408b5ab6904d6ca72595f28978f413141d3de988f4d325f899c1d0da93e1b2657b
-EBUILD glurp-0.12.3.ebuild 681 BLAKE2B 3d0d1feae46fb5c430989602204cae89a31a8d231b59330c59be8921621875317d9914da1c9fd4cd13789fe407979a4250c0024d30d8f084355c57eb9c4beb57 SHA512 da7134e865d28c80e1220571b23d9a5655395e42587c9d93ba3ed495738488e27d35feca6ad365f853b247bc3261b0bcdea3ab87130e9f46cde697ae0fbea141
+EBUILD glurp-0.12.3.ebuild 649 BLAKE2B 9fad3c860934de2d82432982410228786b53bd10b0ed5c2a42635e5a740d230a3aacfb73ef9c42761c7f87c0d1fd5bf201b645d5ab426d2afef17a30a77e0c58 SHA512 60a64c5f27671cd618224a320dc1ff7f28fe067748e2214e6a2060162e532cda37a0d24f23804ad31213e9adef6cd07585b8c2a1ee93da587e12ddc62fc31f18
 MISC metadata.xml 328 BLAKE2B 721aa82e6f5691c01a3672bd08d37850811f72982cea756ba8ad4250cca91ed96a9943aacbf4c411076a43eb9b842d6488a055254cf9f15b1025254e5cd0134d SHA512 4006072b21fda24e4f8bc12683ab69f0ccc4838fba5743659aa82a62334d11dcd21c9ae8a19caf308966d21ab0362e02bfdefa1225d8d6d19a2e87f3b6c9627e
diff --git a/media-sound/glurp/glurp-0.12.3.ebuild b/media-sound/glurp/glurp-0.12.3.ebuild
index c0654e6cc246..61c10412e28c 100644
--- a/media-sound/glurp/glurp-0.12.3.ebuild
+++ b/media-sound/glurp/glurp-0.12.3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=7
+
+inherit desktop
 
 DESCRIPTION="Glurp is a GTK2 based graphical client for the Music Player Daemon"
 HOMEPAGE="https://sourceforge.net/projects/glurp/"
@@ -13,21 +14,20 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug"
 
-RDEPEND="x11-libs/gtk+:2
-	>=dev-libs/glib-2.4:2
-	>=media-libs/libmpd-0.17"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog )
+RDEPEND="
+	x11-libs/gtk+:2
+	dev-libs/glib:2
+	media-libs/libmpd:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	econf \
-		$(use_enable debug)
+	econf $(use_enable debug)
 }
 
 src_install() {
 	default
+
 	doicon "${FILESDIR}"/${PN}.svg
 	make_desktop_entry glurp Glurp glurp AudioVideo
 }
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index c122de6aec58..ed82e73403c1 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -1,5 +1,6 @@
+AUX gmpc-11.8.16-AM_CONFIG_HEADER.patch 170 BLAKE2B 2b359e328445c00d63591e8b0f475784d4d7866dab3c5c8a7fd70694d0263c9a2ed3e1ff09c9973c4956818a93fea0813acdd7a7e31b455112e19da1cf579d99 SHA512 0b8c41b0b11b06f8aaac5a9be454243777da2b6c3ee1e1fa25471e72a2a6f9ae4c72d7567e30280de9fd0626a7eeb1314261ba381c4d667233124ab56563a4c3
 AUX gmpc-11.8.16-icons.patch 7380 BLAKE2B bd546a009efc5c37eb50593763fc39231f07c611805aac08b2353ad3ce283e6b948c49b0be0f232e81d94ee717a4a3b1dd7c19177659aabe5554caa873c9b672 SHA512 cabee4790552b22e31873fdd0b2c786743fdb9fe3b5eb613ec85e83e27285116e6f05c1d8ac7013d9d2b17ec765876a276804c08b1ccc6d78051991c50b769d8
 AUX gmpc-11.8.16-underlinking.patch 241 BLAKE2B 69400fae94f780e81bdf078b26c2bdca69fe03fbff42a3600a9cba2310981a94ddd01c07f418571a6168108fde11cfd02e4a40230fbbde25d4b3868e09decf19 SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576
 DIST gmpc-11.8.16.tar.gz 7082909 BLAKE2B 913b7b55029f6fe78dcae7355bd571f4d6e95c4d1891e12251717b7fe846a69b52ba9cf2c65042a36295830dbec65128d0aa119d8503c934a3f09b86b42a0409 SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623
-EBUILD gmpc-11.8.16-r1.ebuild 1415 BLAKE2B 112f7a4dde75db6de18ef93449b0d9b9a2c9d45c34c0ca84135416f7bd68e19c689cbdd93be87db53f012996d6c4936d379e0e356ebbc11e863d86290437c669 SHA512 75aa3f72fdbd9a380278f482d50cf3423d1a026197844191a1ccd98b98e3b0e70e702e0a2da27d4d3483dbe8bfced1fc616ce82c1feeeb390556eecb382b54e9
+EBUILD gmpc-11.8.16-r1.ebuild 1196 BLAKE2B f60a99ebd5982b34a5dbe2199f94439685eb024bf0d857d3fccbead3210f54b5293de641ce8169e14a685bf6a05170cc44a70e66d72d60cc80892d7e9a9775a0 SHA512 ad21f5638ae6111fc8d53974049d552a232c767bc39eae3bb8102a7e05ca69b72d795a987988bc741dc3aa5a1bd959789bba7b4456edf61e30f417224849af70
 MISC metadata.xml 436 BLAKE2B 7707a0a903f8e5ce1102c1e971013a81e5472a4c998ab400df73ba200b0bd45401574a4b1314d513485d893f0ea02a4774f21220336fb1e8aa38684feba7d50d SHA512 c3c04eb47a7d3ad5eee60e3c28ce2279bdf73aa9537c351279c1a8a4efd6340dbbc74d7044edd8eac317c48a355f5a8f676b736a2447c434ff75a833af9d9a34
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch b/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
new file mode 100644
index 000000000000..336891716b1e
--- /dev/null
+++ b/media-sound/gmpc/files/gmpc-11.8.16-AM_CONFIG_HEADER.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,7 @@
+ 
+ 
+ 
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_MACRO_DIR([m4])
+ AM_INIT_AUTOMAKE
+ 
diff --git a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
index 9629d477e07a..0fcbc8fbc67f 100644
--- a/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-VALA_MIN_API_VERSION=0.12
+EAPI=7
 
-inherit autotools eutils gnome2-utils vala
+inherit autotools vala xdg
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
@@ -13,32 +12,38 @@ SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="nls xspf +unique"
-
-RDEPEND="dev-db/sqlite:3
-	>=dev-libs/glib-2.16:2
-	dev-libs/libxml2:2
-	>=media-libs/libmpd-11.8
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-2.18:2
+IUSE="nls +unique xspf"
+
+RDEPEND="
+	dev-db/sqlite:3=
+	dev-libs/glib:2
+	dev-libs/libxml2:2=
+	media-libs/libmpd:=
+	net-libs/libsoup:2.4=
+	x11-libs/gtk+:2
 	x11-libs/libX11
 	x11-themes/hicolor-icon-theme
-	unique? ( dev-libs/libunique:1 )
-	xspf? ( >=media-libs/libxspf-1.2 )"
-DEPEND="${RDEPEND}
+	unique? ( dev-libs/libunique:1= )
+	xspf? ( media-libs/libxspf:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	$(vala_depend)
 	app-text/gnome-doc-utils
-	>=dev-util/gob-2.0.17
+	dev-util/gob
 	virtual/pkgconfig
-	nls? ( dev-util/intltool
-		sys-devel/gettext )"
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)"
 
-DOCS=( AUTHORS README )
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-icons.patch
+	"${FILESDIR}"/${P}-AM_CONFIG_HEADER.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch \
-		"${FILESDIR}"/${P}-icons.patch
-	sed -i -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac || die
+	xdg_src_prepare
 	eautoreconf
 	vala_src_prepare
 }
@@ -53,7 +58,3 @@ src_configure() {
 		$(use_enable unique) \
 		$(use_enable xspf libxspf)
 }
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 07fb85df56c8..0b6802118841 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
 DIST gnome-music-3.32.2.tar.xz 1391112 BLAKE2B ec64d48bcc137c69df77d9d9fadb3fa5c1809850e7a434d501cf6fd680500e57a4e6946ab591db9b715e728f0274f37b659afce53fd9213b3cf74f329f4373f3 SHA512 633748dcb5cf839f29059fd9bdd5283c455a4157d6c004168d9ef80352b83be3db547377034d0d78af0b6a84fec6fb941888bd53aa14c8bf51da880f04170a23
 EBUILD gnome-music-3.30.2.ebuild 1875 BLAKE2B f3152d6664dc5f7b9166d86d3adf88be1eb5d87454a50729451eb0a55fb4951057202f086549b6a7cdaaf439a7751f7dc16dc3f67918bae2cd53fa79d05a7a58 SHA512 00716b316ea3af6cd4928a2a9d659bae0d2a94b44807eca9cc1b6470b9334fd029000a03569e9fd16cdc3671156b342da0c1eeba02fa1bb078186c10eac669a0
-EBUILD gnome-music-3.32.2.ebuild 1971 BLAKE2B 1720f095eb449238fe1096f256e76e835cb8876fcd633bb1d72983c9c643760c89fbcbb5f1bb37aa991f25cfd23bf0f3d71d7a6363258247e925996471537161 SHA512 e076ef2aebb06ea4075852943a72e88daeb4c39c8bca9e5257333ea14900b0ef6023801b3f7d995e513281b1cc2e7ef357aa179c1ff75074beb89daa40622f0a
+EBUILD gnome-music-3.32.2.ebuild 1969 BLAKE2B 15e5ad9e12c8610fc7ba52690a607ee283087fa45534ac69a8439433d9cdecdfa38a8f21ec5ee569f3ba6ad5b9fcca8005937128b9749dde4034c59ad083a937 SHA512 d5997aed49f389d1a44538d5a82bc9371838d6f93bb1da3f6209ed0eccb15b5c5e745c3320c06db6e883f1186e6b88771ee1cd9d2ede78f55eb981ea6c52dbd7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.32.2.ebuild b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
index 49e7450a357e..dacfd8ea8571 100644
--- a/media-sound/gnome-music/gnome-music-3.32.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.32.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="${PYTHON_DEPS}
 	net-libs/gnome-online-accounts[introspection]
diff --git a/media-sound/gpodder/Manifest b/media-sound/gpodder/Manifest
index 069ee2c1449e..43a06ef8bbf1 100644
--- a/media-sound/gpodder/Manifest
+++ b/media-sound/gpodder/Manifest
@@ -1,5 +1,5 @@
 DIST gpodder-3.10.5.tar.gz 1000492 BLAKE2B d3c1381fa613e018c79995a5b5d95958096dab49d4b4d9012e8741efe754f7f9db82e7fc46527e1fb837ce8fbfd3c14d58f8af64f96e51c5750b56402767ddca SHA512 056375d7a21f64e691bd62676d575dfaa8a32e715dc4f7ddf7b0c1cb9e99f07cef5972de812765874afd5a8e8adf220eb7b969afcc8dea1e2e3a76be8886c9cc
 DIST gpodder-3.9.1.tar.gz 996497 BLAKE2B ac50cba8d5bf459361c592e579cc9e5deafa3a1a7517f0f5e1f07faa1eaea6456b35451ba2c21def390f85c38f4a95c46cb17a7db4ae4e56c58f79fae6413b11 SHA512 d32405ac1d0aa7943b58d73f806a0d28e68bce541a1947c08d9cb69a763eda311816c059019e43eb3dea6ce08fc1cb4f0bd39cc44933114e51a036cb603d3be3
-EBUILD gpodder-3.10.5.ebuild 1563 BLAKE2B 807255f00028c8477e3d3edc4f1e7f5683aefda32fa3783221e9bc7e533529b2dff857a23b31bee6e4784d7bb7d0b4095e9c787e488ce8e1fb0d519fdc9a0042 SHA512 920f57be208759166362f18b309825521dda05678e9780a7866467be1d52b7142565384f384b4d6c62b4a4154dd07a00c68ddbd06510d07b5476dc39ab84e56b
-EBUILD gpodder-3.9.1.ebuild 1495 BLAKE2B 57d16103e9b037a3f846f98f5f756f0872972bf813d7fbb4195108bdffd73f68471e09f4420bc5256be7b8362af9e2f1cd202fd774ca5d0e8079e61719a9f355 SHA512 ef8fc4a57fdd5b266dbe99db91b35cb05b093b7e58083553b81150cffeda48750f5297cd2d3ca133358f2371393653e4cc0f08f406bf38d3cc9cd4268333eb72
+EBUILD gpodder-3.10.5.ebuild 1590 BLAKE2B 260a65e14435dd8439f83293f51c4524ea782267716e6bb370b61b0a72e3992856bd7dd305573704ce772125da0f20500a20cf3cf8470022b928ed7b4c575263 SHA512 a6f5934545a29a8c2b80c8726bcf42ed4ef468f2d625ae4fd2e9ee390cc015b10e67eced4525eba49c579f0bbece7d461e0253d2f7520b36d8ff5bfe3c6af9e2
+EBUILD gpodder-3.9.1.ebuild 1519 BLAKE2B b71fa22df771e3fc33b0810c123c5665b298f976b30075319d1865064fd4f333de14b9bd9717ba009853ab35eede7312630d50769382b4776b6b2b7b75b1b318 SHA512 c9419bb149270a6c04edb7699705bf638b63997cc24a1f8c05bb08c96ca7e2b4bf0f346549bdf88ca583d5be9c8a3aadf95239ecf69c35e172c0fe82748d738f
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/gpodder/gpodder-3.10.5.ebuild b/media-sound/gpodder/gpodder-3.10.5.ebuild
index 6cc2606c98ba..bb7216eba8f5 100644
--- a/media-sound/gpodder/gpodder-3.10.5.ebuild
+++ b/media-sound/gpodder/gpodder-3.10.5.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
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus bluetooth kernel_linux mtp test"
+RESTRICT="!test? ( test )"
 
 # As in Fedora: re-enable >=dev-python/eyeD3-0.7[${PYTHON_USEDEP}] and
 # ipod? ( media-libs/libgpod[python,${PYTHON_USEDEP}] ) once they
diff --git a/media-sound/gpodder/gpodder-3.9.1.ebuild b/media-sound/gpodder/gpodder-3.9.1.ebuild
index 9f1d60ab836c..851a7af6e50e 100644
--- a/media-sound/gpodder/gpodder-3.9.1.ebuild
+++ b/media-sound/gpodder/gpodder-3.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,6 +17,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbus bluetooth ipod kernel_linux mtp test"
+RESTRICT="!test? ( test )"
 
 #TODO: Make pygtk optional, see README
 COMMON_DEPEND="
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 0f33594d1d0b..4f7393359485 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,7 +1,9 @@
 DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
 DIST grip-4.0.0.tar.gz 1004651 BLAKE2B c6f4e5be8a3635be9445b9ad215e0629697ac31f71e92fa68ceffe5396acd6a1fc19597ed6f6f8ced4d350e30484f6cc12ceb6e35fc15ec3e905c5bd2ec81877 SHA512 1e17cc81b2fc9063edacbcbb1cd23ea2c55ac013a3dc57f754e267ef7a3a62f44b4e11561f05ec8534f02ae6543aafecd8882d25bf6b843d01f5cddf05618319
+DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
 EBUILD grip-3.10.2.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
 EBUILD grip-3.9.0.ebuild 1208 BLAKE2B 4b0840d67f852edead6ed6e52e7290df4cbfcef116ea7f6a9473d6eb49f80498d0c9e004e468a97cbf7c5572987049795e312b69eeaca3f8cf3e307888a5aaa7 SHA512 4ca022cb15eda867d1efcfa476d782894094d401a26a98469b27739ca9d5a9778a9bed61f970f8270951915d3fd73bfc76bb29053cd65991fa1f17288ed826fe
 EBUILD grip-4.0.0.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
+EBUILD grip-4.0.1.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-4.0.1.ebuild b/media-sound/grip/grip-4.0.1.ebuild
new file mode 100644
index 000000000000..1c4858f20805
--- /dev/null
+++ b/media-sound/grip/grip-4.0.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs libtool
+
+DESCRIPTION="GTK+ based Audio CD Player/Ripper"
+HOMEPAGE="https://sourceforge.net/projects/grip/"
+SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="vorbis"
+
+# lame and vorbis-tools are no real RDEPENDs. But without them
+# grip cannot convert ripped files to any format. So use them as
+# a sane default.
+RDEPEND="
+	dev-libs/glib:2
+	gnome-base/libgnome
+	>=gnome-base/libgnomeui-2.2.0
+	>=media-libs/id3lib-3.8.3
+	media-sound/cdparanoia
+	media-sound/lame
+	net-misc/curl
+	>=x11-libs/gtk+-2.2:2
+	x11-libs/libX11
+	x11-libs/pango
+	vorbis? ( media-sound/vorbis-tools )
+"
+# gnome-extra/yelp, see bug 416843
+DEPEND="
+	${RDEPEND}
+	sys-devel/gettext
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
+}
+
+src_configure() {
+	# Bug #69536
+	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
+
+	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
+
+	econf --disable-werror
+}
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
index 0d50c7aad519..eef347236c31 100644
--- a/media-sound/gstreamripper/Manifest
+++ b/media-sound/gstreamripper/Manifest
@@ -1,3 +1,3 @@
 DIST GStreamripperX-0.2.tar.gz 187186 BLAKE2B 66beccb382316331efcea25b5c97d31a3a7c8e59c3f50026909872f761704182bdca1ec919a4350d8324688634c3b9e654e86db1c750cf0992aa538db9c7939a SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c
-EBUILD gstreamripper-0.2.ebuild 793 BLAKE2B a2db6abddbfe6abce1c58c4a983f11ab16d400d5fc853eefc0e55917e38a218dd6e6f6eb9b0f88df2c5791027a82e84edfac456ad3fc99d6e68b612474916288 SHA512 684a8bd2d7f47910b55f6dc6c083c0a1b86cc6e1de1b5fde35ace07fc99d7213173293ac8dacf4c961753468c0df9f6f4ceb644b65a65bf2bd62dca444eb2cb3
+EBUILD gstreamripper-0.2.ebuild 834 BLAKE2B 2dfd1606de689dc0b72af92a57956c7bc868ac66ea70876d978f8217d49d7db16ee8cd73cf7fcb65d140f4b9a3bd32e9877ba35a8e597c47dd77ec8d88647973 SHA512 9adcff6ee8bcabc51d59f504b932131e26828660a5cf75d7f3ebb5130f5cce602f6fabd64c272c440d682b40d483f7014370a155e297c9004a2bab5e3d9e9fab
 MISC metadata.xml 336 BLAKE2B d3da99e54752acee38135b0eeac55d1aa5148c2ad67440b7f7264e84cb07ac519f0312ea61cc73a7f8cbe7002b304870ffb9fff79144e4eabf207f1b0dab1a0d SHA512 62020c37a8649f01b5dafecc35d4bf614c1628e725713f36923b58956a1461ba6f83c8a64fd714b895ff759c105d9ff0069e85a41a72e2fbf5da7e01aeed8f1c
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
index c418b4dad9ef..04fce64ff8b1 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils
+EAPI=7
+
+inherit autotools desktop
 
 MY_P=GStreamripperX-${PV}
 
@@ -15,23 +16,27 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
-COMMON_DEPEND="x11-libs/gtk+:2"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	x11-libs/gtk+:2
 	media-sound/streamripper"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_install() {
-	local docdir=/usr/share/doc/${PF}
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
 
+src_install() {
+	local docdir="${EPREFIX}/usr/share/doc/${PF}"
 	emake \
 		DESTDIR="${D}" \
-		gstreamripperxdocdir=${docdir} \
-		install || die
+		gstreamripperxdocdir="${docdir}" \
+		install
+	einstalldocs
 
-	rm -f "${D}"/${docdir}/{COPYING,NEWS,TODO}
+	rm "${ED}"/${docdir}/COPYING || die
 
 	make_desktop_entry gstreamripperx GStreamripperX
 }
diff --git a/media-sound/helm/Manifest b/media-sound/helm/Manifest
index 52a6dfe6ab76..beb4b64561b5 100644
--- a/media-sound/helm/Manifest
+++ b/media-sound/helm/Manifest
@@ -1,4 +1,5 @@
+AUX helm-0.9.0-fix-gcc91.patch 6514 BLAKE2B 54c3c5baf336ee1c2739922be6040d69309db94394967be335103fe325c96afe69f05fbdde0516c153bc47763fc3686c9e0461c6b12dbec59476c85a003e4397 SHA512 4c12575c6a58c6a03644b9c7d560e3a794fa3575ac10eb9301ca911a58a86eb5c721f0e4c8c1c5bfcf81b6efba25ed7bdba2a12fe68ec49eb18581067cec06bb
 AUX helm-0.9.0-nomancompress.patch 698 BLAKE2B 3b68312c117fb8c1e8496ae02145a66466849de77d51159064b65e51b208b503530ac5b92c1a50e4e8fdc6113121bd26ca20e491adde72f1f1b5b626258c92ec SHA512 e2b0143be141e26a093369c151a87d002508442543482d81e4b67f67475232ec53bc80e11ecad096952e4941efc82889b8cf267a0bfebb13104204b02a50aaed
 DIST helm-0.9.0.tar.gz 15544141 BLAKE2B 1b6811f32cf36a1c1f954cc071cd64f3dca656ee0bd420c01d0be3db516210a92adc3694ac49731cf2d7cf057a9eccf2c2dcefc14d24cf8582a3eb69efe1d0e1 SHA512 241c6bf3aec422e9ccaf7c7113eec7e30a11baadd30fe8f05f0abfac9c41d0c8a9fb284f0cae49bcaf0d3d08aa952737f6ff3eb7d48c2b2e22c60932738aeaa4
-EBUILD helm-0.9.0.ebuild 1042 BLAKE2B a9445bba5f248a64e666a36f28cbce575733546aa879768c4c38d0e2b913f813f75bb09c0400647a09508488a153bde64c47917d21c2098c342ddaac693892df SHA512 eacde54921ac3998f582dc901598d935b5a8cfa34c99c1e225c81b73b3670e90503c41d8a713f98ce0f0c9b3e0bffd3f35b89f2e35a2750db64f4725ee3a5e3d
+EBUILD helm-0.9.0-r1.ebuild 1083 BLAKE2B 38b265a113f4d5c58ed5cfdf3b3417c73e3b4574ecf3c1459bdbde0d3101eea18722aac7c8f094ec32a446c894c9ded20e3c6ba032d7b485e14f3bc57e2b3631 SHA512 1127924b80d77682b174b9fb0e0e91b39061fe05a144e25b98e38da2c0175dbef7057658595e68cea6322bfa215d87c1ad15f74d0bb0d8523d2238b8bae0d022
 MISC metadata.xml 345 BLAKE2B d09e73c628cf4bd16d554753a7dd3b46be36821bed7e601ab0b2e73ef49a5c102b9330379ec24409c6b724f05271b5319a7fe334b800dd8f8e8baa8aa2b58c03 SHA512 108d91618be46a32b2c316336b1a109494a19882ca250d92a0c189093ebae632729bc67cb023370ae0fc7ff5f32d5d6bd32a2d64a985f1c66c7eeed1eec12176
diff --git a/media-sound/helm/files/helm-0.9.0-fix-gcc91.patch b/media-sound/helm/files/helm-0.9.0-fix-gcc91.patch
new file mode 100644
index 000000000000..f623fef203cd
--- /dev/null
+++ b/media-sound/helm/files/helm-0.9.0-fix-gcc91.patch
@@ -0,0 +1,140 @@
+From cb611a80bd5a36d31bfc31212ebbf79aa86c6f08 Mon Sep 17 00:00:00 2001
+From: jikstra <jikstra@disroot.org>
+Date: Tue, 20 Aug 2019 03:00:51 +0200
+Subject: [PATCH] Backport
+ https://github.com/WeAreROLI/JUCE/commit/4e0adb2af8b424c43d22bd431011c9a6c57d36b6
+ to the bundled JUCE framework to make helm compile on gcc 9.1 again
+
+---
+ .../juce_graphics/colour/juce_PixelFormats.h  | 25 +---------
+ .../native/juce_RenderingHelpers.h            | 48 +------------------
+ 2 files changed, 4 insertions(+), 69 deletions(-)
+
+diff --git a/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h b/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
+index 9be9ba09c..3535eab80 100644
+--- a/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
++++ b/JUCE/modules/juce_graphics/colour/juce_PixelFormats.h
+@@ -105,23 +105,9 @@ class JUCE_API  PixelARGB
+ 
+     //==============================================================================
+     forcedinline uint8 getAlpha() const noexcept      { return components.a; }
+-    forcedinline uint8 getRed() const noexcept        { return components.r; }
++    forcedinline uint8 getRed()   const noexcept      { return components.r; }
+     forcedinline uint8 getGreen() const noexcept      { return components.g; }
+-    forcedinline uint8 getBlue() const noexcept       { return components.b; }
+-
+-   #if JUCE_GCC
+-    // NB these are here as a workaround because GCC refuses to bind to packed values.
+-    forcedinline uint8& getAlpha() noexcept           { return comps [indexA]; }
+-    forcedinline uint8& getRed() noexcept             { return comps [indexR]; }
+-    forcedinline uint8& getGreen() noexcept           { return comps [indexG]; }
+-    forcedinline uint8& getBlue() noexcept            { return comps [indexB]; }
+-   #else
+-    forcedinline uint8& getAlpha() noexcept           { return components.a; }
+-    forcedinline uint8& getRed() noexcept             { return components.r; }
+-    forcedinline uint8& getGreen() noexcept           { return components.g; }
+-    forcedinline uint8& getBlue() noexcept            { return components.b; }
+-   #endif
+-
++    forcedinline uint8 getBlue()  const noexcept      { return components.b; }
+     //==============================================================================
+     /** Copies another pixel colour over this one.
+ 
+@@ -340,9 +326,6 @@ class JUCE_API  PixelARGB
+     {
+         uint32 internal;
+         Components components;
+-       #if JUCE_GCC
+-        uint8 comps[4];  // helper struct needed because gcc does not allow references to packed union members
+-       #endif
+     };
+ }
+ #ifndef DOXYGEN
+@@ -429,10 +412,6 @@ class JUCE_API  PixelRGB
+     forcedinline uint8 getGreen() const noexcept    { return g; }
+     forcedinline uint8 getBlue() const noexcept     { return b; }
+ 
+-    forcedinline uint8& getRed() noexcept           { return r; }
+-    forcedinline uint8& getGreen() noexcept         { return g; }
+-    forcedinline uint8& getBlue() noexcept          { return b; }
+-
+     //==============================================================================
+     /** Copies another pixel colour over this one.
+ 
+diff --git a/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h b/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h
+index 1c4cd31ef..29519cb5a 100644
+--- a/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h
++++ b/JUCE/modules/juce_graphics/native/juce_RenderingHelpers.h
+@@ -581,18 +581,10 @@ namespace EdgeTableFillers
+             : destData (image), sourceColour (colour)
+         {
+             if (sizeof (PixelType) == 3 && destData.pixelStride == sizeof (PixelType))
+-            {
+                 areRGBComponentsEqual = sourceColour.getRed() == sourceColour.getGreen()
+                                             && sourceColour.getGreen() == sourceColour.getBlue();
+-                filler[0].set (sourceColour);
+-                filler[1].set (sourceColour);
+-                filler[2].set (sourceColour);
+-                filler[3].set (sourceColour);
+-            }
+             else
+-            {
+                 areRGBComponentsEqual = false;
+-            }
+         }
+ 
+         forcedinline void setEdgeTableYPos (const int y) noexcept
+@@ -643,7 +635,6 @@ namespace EdgeTableFillers
+         const Image::BitmapData& destData;
+         PixelType* linePixels;
+         PixelARGB sourceColour;
+-        PixelRGB filler [4];
+         bool areRGBComponentsEqual;
+ 
+         forcedinline PixelType* getPixel (const int x) const noexcept
+@@ -658,43 +649,8 @@ namespace EdgeTableFillers
+ 
+         forcedinline void replaceLine (PixelRGB* dest, const PixelARGB colour, int width) const noexcept
+         {
+-            if (destData.pixelStride == sizeof (*dest))
+-            {
+-                if (areRGBComponentsEqual)  // if all the component values are the same, we can cheat..
+-                {
+-                    memset (dest, colour.getRed(), (size_t) width * 3);
+-                }
+-                else
+-                {
+-                    if (width >> 5)
+-                    {
+-                        const int* const intFiller = reinterpret_cast<const int*> (filler);
+-
+-                        while (width > 8 && (((pointer_sized_int) dest) & 7) != 0)
+-                        {
+-                            dest->set (colour);
+-                            ++dest;
+-                            --width;
+-                        }
+-
+-                        while (width > 4)
+-                        {
+-                            int* d = reinterpret_cast<int*> (dest);
+-                            *d++ = intFiller[0];
+-                            *d++ = intFiller[1];
+-                            *d++ = intFiller[2];
+-                            dest = reinterpret_cast<PixelRGB*> (d);
+-                            width -= 4;
+-                        }
+-                    }
+-
+-                    while (--width >= 0)
+-                    {
+-                        dest->set (colour);
+-                        ++dest;
+-                    }
+-                }
+-            }
++            if ((size_t) destData.pixelStride == sizeof (*dest) && areRGBComponentsEqual)
++                memset ((void*) dest, colour.getRed(), (size_t) width * 3);   // if all the component values are the same, we can cheat..
+             else
+             {
+                 JUCE_PERFORM_PIXEL_OP_LOOP (set (colour))
diff --git a/media-sound/helm/helm-0.9.0.ebuild b/media-sound/helm/helm-0.9.0-r1.ebuild
index 5ca560251ae0..96d0ee253468 100644
--- a/media-sound/helm/helm-0.9.0.ebuild
+++ b/media-sound/helm/helm-0.9.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop xdg-utils
+inherit desktop xdg
 
 DESCRIPTION="Open source polyphonic software synthesizer with lots of modulation"
 HOMEPAGE="https://tytel.org/helm/"
@@ -31,11 +31,15 @@ RDEPEND="${DEPEND}
 
 DOCS=( changelog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-nomancompress.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-nomancompress.patch"
+	"${FILESDIR}/${P}-fix-gcc91.patch"
+)
 
 src_prepare() {
 	default
-	sed -e "s|/usr/lib/|/usr/$(get_libdir)/|" -i Makefile || die
+	sed -e "s|/usr/lib/|/usr/$(get_libdir)/|" -i Makefile || die "Failed to fix libdir"
+	sed -e "s|^\(CHANGES.*\)/|\1-${PVR}|" -i Makefile || die "Failed to fix doc path"
 }
 
 src_compile() {
@@ -46,11 +50,3 @@ src_install() {
 	default
 	make_desktop_entry /usr/bin/helm Helm /usr/share/helm/icons/helm_icon_32_1x.png
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/id3ed/Manifest b/media-sound/id3ed/Manifest
index 4d20147275f2..2fa9d98cad46 100644
--- a/media-sound/id3ed/Manifest
+++ b/media-sound/id3ed/Manifest
@@ -1,3 +1,3 @@
 DIST id3ed-1.10.4.tar.gz 31610 BLAKE2B 4bb013fe8205a91fe9b25012390707c25b1879ef34322ce85430dcd4fcfc4545e2d2637c113d4779a054815d90951052db4ec4c4b16f0ab7658ad5bbc70a6d4c SHA512 c96716dd24e8fc0aafbb5f0befe1a401ff7ed13821c71470945a5251a553316d17d5eeca3df5d3bd9775d12386078ab2b88d47a7ab9e9f32cd3d209934e31d56
-EBUILD id3ed-1.10.4-r1.ebuild 727 BLAKE2B e58dab0a56c7798234a2095b0599a3382f1657d097d868730bc5c8227c0d71e39e6fb162bff8fe7ab744f33bc13e03de026caaf536539a419d32aedc627adc20 SHA512 ad52b51f4850c4b54355ac99bd7162e01ce5595d8b7943257bc5d0a592676fb8126613d15600a0197336fb1a8b7399b607faf833d3941652f24d1bce29b613c5
+EBUILD id3ed-1.10.4-r1.ebuild 720 BLAKE2B 87bd5c7bbf2da974d8fddbeee3bdf6594109e4904f417f717690ff5b12245f86fde7b5bb18f95e06e13f55bb1f8b1469374798c0ab3ac126e73dd8c2ee127f73 SHA512 ae67fdb7fa00f49b78711d0718fa62f5638ae4419a1386e1d0c53008ee7a088f5cbd4ecb9efa9f23b4840e2f859af68d03c266f139d9fb9af090b5dfab07bc49
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
index 45fd013ab93d..047402e4be69 100644
--- a/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
+++ b/media-sound/id3ed/id3ed-1.10.4-r1.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./" || die
+	emake CXX="$(tc-getCXX)" CFLAGS="${CFLAGS} -I./"
 }
 
 src_install() {
diff --git a/media-sound/jack-rack/Manifest b/media-sound/jack-rack/Manifest
index 57e94a346384..e7213981531b 100644
--- a/media-sound/jack-rack/Manifest
+++ b/media-sound/jack-rack/Manifest
@@ -1,9 +1,9 @@
-AUX jack-rack-1.4.5-asneeded.patch 355 BLAKE2B 5845d402169f07f5be8c9d52ab2e354b8a39fef64d5c653b4ab5ac19ff2a0bd50b51124b5be1d9a8f31f9284666adc2ab18ea6696319dba186114e3f83286394 SHA512 96b0122e47e87926f1193c803465d3941ae257cd348c3f816807dfdefd98310347185fb659207b98ecb9d36ae05c0bc75db7158f9769d8760caba2251b8193e4
 AUX jack-rack-1.4.6-noalsa.patch 580 BLAKE2B c7ec6d1273e5b37761ba44f773a48a15d948e2e0df9013a4d5ed5e74ae6d219cbbb5dd9e6b60accb6b700381da2189107975600a5832655966f84a642ee68d6d SHA512 5b066700ef863abfc3a308b6a784beedebf85f0fa9327e2c6515a82982ef8806bcbffb765a03c52bc779fa80ee5e7ac7fd276aa89743c235fff016270b775eb8
-AUX jack-rack-1.4.7-disable_deprecated.patch 432 BLAKE2B 8cb95e17b2f31c6c861526eaf34833cdc62971776230e6ea3fd2e1241880dad98e5e6951a5988b9ed706a68e32fa32c4c174171a84ef44d38c82bcf558181535 SHA512 ce4f145a6589cf5a3fd5369f662ea56e2b53e2a77ceba6c91166b952c4fe5690207ea4394da3c6bf54ce52324cef9ee2e7b3258741ce3d4f58f97af7f8d55855
+AUX jack-rack-1.4.7-disable_deprecated.patch 415 BLAKE2B cd383c948cd470efdf850a417f2043fdb4302f410284b8c8fbbbb141021ce2015c871f2dd8f496a6a690995be9c27284126b2f8b7f35f013aaece9d71cdce320 SHA512 21ac1e848c64194f560eda4e57176d4deb0c307604c8d6ca758e922d68cc3cee206a4276fc97c9716460fe0c559bddb3ef443db7b7e1a2fbde4de1f1a2e8856a
+AUX jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch 322 BLAKE2B 75222724383cc41f6746004c6479236c2e24f3302b9b4c119d5a31765e21f2a46dc7f7a65d3d659337421afbc59af93c427b7338aa19fcc58ebc651fe9043789 SHA512 d3d6146bb9ab8d742ca580aa07a6b7c44baaf851465d3bf589cdf8229fdf3a1b7938beb12b35bfbddd0a0dbe4f044389886adf54ee55489c4c9683223e1be9a2
 AUX jack-rack-1.4.8_rc1-noxml.patch 492 BLAKE2B bfb74018767f8e08dd27b93531e848d5fbb0a552c296ce1463d67f0dc83ec1b37b19e0ef17ad15020a797f1fd6d9fb0d65872fb7a9353ce2b57c811334e4e8b5 SHA512 79f1406003006ef0956ae08a53d9aefbeeb9ba97308217bd3c6610a854e4e905cd972e1431ea21dc3f938efd21120bf45b7dfc55993858d7c3e2304ffde3909d
-AUX jack-rack-1.4.8_rc1-underlinking.patch 288 BLAKE2B 6ed7445017cf15064aae5b4a0db63be74f338d448b474e28424df3b4a461b0557659894cfb051b90bce5169c41187ceb19143d22f52ebf9429084dbb1f3a83f3 SHA512 90c7c91c681ca6037aa4a9ae7d9491fbdd7d5a8404e580ed6cd2d1d4d1101c7dd8cea005231c63ec5384d301dbe56f966607fb714c5fecb4e2258502fbba1b10
+AUX jack-rack-1.4.8_rc1-underlinking.patch 315 BLAKE2B 656898ba9367cd0eeecc1f4183c852676cff35de4350e42db75c8dbede502511b94fa34813e8fd5b5281e04d1d9df684a2c1e5c4bc61e92147c478f3910f3203 SHA512 db0353aab452a5f59b411085740f8fd2a115afb690c481eb2dd2ea6609887ad36114bea9148c73ff1bfea2cd04a34f01d2c5b16a4f8a411f854d53431df31163
 DIST jack-rack_1.4.8~rc1-1.debian.tar.gz 6742 BLAKE2B 51d5336878b7a6957822395dd282872c1681dfce9c54af569d311c40f612240f0db90812fc6dc2364c0a259f6c1ed8623e9fe5be6dd21fc4574674048d6b13f6 SHA512 4e0503a0b1fa080bed0f9730929d820d173d886f4d4801016419d33729ec453f1f4e0f96fe102d83731169b91c54939663e9529516fdc09bca5d347be3e18715
 DIST jack-rack_1.4.8~rc1.orig.tar.gz 122400 BLAKE2B 93367eb01c5079a855a55f976205901b0f9536929424e04b1c4a7c6d620d2d7e93c3475cd46cd6bd17995d2c2b77ca5b1b342166c7098b817a3a53843b48a51a SHA512 8c7be402b6c8ad02a6ad7379d98c49a00bf5a3c70e5e5c174d786e77bf72592cf2eec6b346ce77d1dabb3787a6d028f4d02a1dd18daa5bf3daa297ac7bd7ad38
-EBUILD jack-rack-1.4.8_rc1.ebuild 1645 BLAKE2B a4fc62f44dccc46bd35e684e31a0396dc8f10b56f8cb4d582742990371eea4d07affd5703c06ae1158104ffe819790400a5284f761e5fc3944326d9fcbcf82c7 SHA512 84aa31b81be7f79fcf49db72d774c136794b0769ed44a261198e8f7a067df38db781dee0bb1968502172068eaef41b77cb740d088e977058985d6575dd809a29
+EBUILD jack-rack-1.4.8_rc1.ebuild 1583 BLAKE2B 082d8840b6f5bddb4575efe246e0e8eb98b0872f1cd2c9caf6029cca24949f447a9b83dad0ae6b854e7d47e94da303a622bd3ff4079fe939dcc5cdb2738450f2 SHA512 dcd83c9992147ac9e72cd7796c1ff90df12bb8c9c9870856ed62e2d96b6f241d1ed91055083dee6601d730950b4d88d342b0564ed5a7813caf6ce8fe9bce0906
 MISC metadata.xml 338 BLAKE2B 0f7169d20fe0dd2ebd07b886c6f3973283e61e0ccfcfba61a9065209666d3ec1e0b14f3367f283d57d320f4006ae8b9ffc454390e2d5f5df494b691b74eaa23a SHA512 5274213ba5e9a2710d7e0d1e11150e45d902e2ac263ef21359046afc774d7fc4b7aea86705a49a0ae39b9adfd6c4103d450ccb737defe2eee1078bf3d3819c51
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch b/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
deleted file mode 100644
index 4a07049f0603..000000000000
--- a/media-sound/jack-rack/files/jack-rack-1.4.5-asneeded.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: jack-rack-1.4.5/src/Makefile.am
-===================================================================
---- jack-rack-1.4.5.orig/src/Makefile.am
-+++ jack-rack-1.4.5/src/Makefile.am
-@@ -60,7 +60,7 @@ jack_rack_CFLAGS = \
- 	-DGNOME_DISABLE_DEPRECATED=1
- 
- 
--jack_rack_LDFLAGS = \
-+jack_rack_LDADD = \
- 	$(JACK_LIBS) \
- 	$(GTK_LIBS) \
- 	$(GNOMEUI_LIBS) \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
index 1ddd318235ef..fa5e1b646f77 100644
--- a/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
+++ b/media-sound/jack-rack/files/jack-rack-1.4.7-disable_deprecated.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/376899
 
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -53,13 +53,7 @@
  	$(XML_CFLAGS) \
  	-DPKGDATADIR=\"$(pkgdatadir)\" \
@@ -15,5 +15,5 @@ http://bugs.gentoo.org/376899
 -
 +	-DDTDDIR=\"$(dtddir)\"
  
- jack_rack_LDFLAGS = \
- 	$(JACK_LIBS) \
+ LIBS = \
+ 	-ldl \
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch
new file mode 100644
index 000000000000..f5d845b6ffe0
--- /dev/null
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-QA-fix-desktop-file.patch
@@ -0,0 +1,12 @@
+--- a/jack-rack.desktop
++++ b/jack-rack.desktop
+@@ -3,7 +3,7 @@
+ Comment=Stereo LADSPA effects rack
+ Comment[ru]=Стойка эффектов LADSPA
+ Exec=jack-rack
+-Icon=jack-rack-icon.png
++Icon=jack-rack-icon
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Application;AudioVideo;
++Categories=GNOME;GTK;AudioVideo;
diff --git a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
index 5c96c01bde57..9948df4effbe 100644
--- a/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
+++ b/media-sound/jack-rack/files/jack-rack-1.4.8_rc1-underlinking.patch
@@ -1,10 +1,10 @@
 This should be applied after Debian 02-gcc45_binutils_gold.patch which adds -ldl, but
 we need also -lm wrt http://bugs.gentoo.org/463696 for exp(), log() and logf()
 
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -62,6 +62,7 @@
- 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -56,6 +56,7 @@
+ 	-DDTDDIR=\"$(dtddir)\"
  
  LIBS = \
 +	-lm \
diff --git a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
index 7dc77e26f482..002b6ccc6f6d 100644
--- a/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
+++ b/media-sound/jack-rack/jack-rack-1.4.8_rc1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils flag-o-matic toolchain-funcs
+EAPI=7
+
+inherit autotools flag-o-matic toolchain-funcs
 
 MY_P=${PN}_${PV/_/\~}
 DEB_URI="mirror://debian/pool/main/j/${PN}"
@@ -16,40 +17,38 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa gnome lash +xml"
 
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=media-libs/ladspa-sdk-1.12
-	media-sound/jack-audio-connection-kit
-	alsa? ( media-libs/alsa-lib )
-	lash? ( >=media-sound/lash-0.5 )
-	gnome? ( >=gnome-base/libgnomeui-2 )
+RDEPEND="
+	media-libs/ladspa-sdk
+	virtual/jack
 	virtual/libintl
-	xml? ( dev-libs/libxml2
-		media-libs/liblrdf )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib:= )
+	gnome? ( gnome-base/libgnomeui:= )
+	lash? ( media-sound/lash:= )
+	xml? (
+		dev-libs/libxml2:=
+		media-libs/liblrdf:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO WISHLIST )
+S="${WORKDIR}/${PN}-f9fb65d"
 
-src_unpack() {
-	unpack ${A}
-	mv ${PN}-* "${S}"
-}
+PATCHES=(
+	"${WORKDIR}"/debian/patches/01-desktop_file.patch
+	"${WORKDIR}"/debian/patches/02-gcc45_binutils_gold.patch
+	"${WORKDIR}"/debian/patches/03-remove_midi_when_replacing_plugin.patch
+	"${FILESDIR}"/${PN}-1.4.6-noalsa.patch
+	"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch
+	"${FILESDIR}"/${P}-noxml.patch
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-QA-fix-desktop-file.patch
+)
 
 src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}"/debian/patches
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.6-noalsa.patch \
-		"${FILESDIR}"/${PN}-1.4.7-disable_deprecated.patch \
-		"${FILESDIR}"/${P}-noxml.patch \
-		"${FILESDIR}"/${P}-underlinking.patch
-
-	sed -i \
-		-e '/Categories/s:Application:GTK:' \
-		-e '/Icon/s:.png::' \
-		${PN}.desktop || die
-
+	default
 	eautopoint
 	eautoreconf
 }
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 21d1462efdc9..e6c9721799a2 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,4 @@
-DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
 DIST jack2-1.9.13.tar.gz 6485870 BLAKE2B 7acc0a1389af133dafa7368b4285c2a06607d84015601f2d8afbd63a9a08f40210f8206f2febbd0e5cc651513a59419e1d948a56163d2074c4b77da5edd84a52 SHA512 dd83a6535cf92a3c45b5ed31edda5f1cb4a6c1db2ac683d4ea709e226bc30d55b366ce80ee543dfaa600f871079f3754e9314124093e230dc7deeceb828de8aa
-EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
-EBUILD jack2-1.9.13-r1.ebuild 2333 BLAKE2B a0af3c55f071e3decef515a2958fd5e3eab280d61108570c74550a3007db584a6373122d2cf1312ad0c565ac42192345d912d53a45c0c8132ad627c6252fe6a4 SHA512 ae6bf28f27478d0c122e5840c619b02172b3b30012069960a83362652121d2b8ffbb0774676b115166b8284fef80e757663c96a22cf5a3ba32b7b64ae0286fdb
-EBUILD jack2-1.9.13.ebuild 2264 BLAKE2B 159e3a74eb6f3cebfdac5eb9597efc14b434c410e2b9d2191ca198b98d6edf8a8b4801831769382012cfd5226bcd53674d8576389f7be24ff54d1be847e3f5f7 SHA512 585e808d0a967e9cdd2f544f42b8c808dd6cc61f14ddf13806d63a948e992fc49aca1cb965d900c2b41646c9b57f3db71980bd63892be1650d000f3177429f43
+EBUILD jack2-1.9.13-r1.ebuild 2331 BLAKE2B 0de07b59986cee15647d4026fb1fa1c89bda70a95d5706edf1d95afd421e62e8b4b37f008abb46a760db3c748700fdc573d50c01692b4118eaec2da23ddded41 SHA512 f94e6a0f15389c7d8b9da9f28dae757d77513d4f6cf6e2b7f3b7d96122554038de89d4cc0aefd5cf27f5b4c40686fb7c0e602abd0f3a4b28a10bb50c9bfb2a2c
 EBUILD jack2-9999.ebuild 2351 BLAKE2B a226227c67bd6b7630b8dbab44b33a50a5732dbe4181f64d630fd03bc613d78429cab6d07ea91b34e5adecb4f693e341c0b3d88c92a52b1e8f65954a1959d4c3 SHA512 ba3e3abe0a631e4d275d9f13b9bbe32bdd35925914c91c0f16d6426609ac1aa0c901bed47c483870ebfde97b81a74e4704f3fcf06f2c76e2b7f9affc93211ada
 MISC metadata.xml 557 BLAKE2B dea6632bcf5640a2863136ac154eb795b8f147edbe29656192311b2b28f4632d4b661ea90cd9cd282e165953aa8db71306e9fcc64efd6ad4f7450525e6817e0b SHA512 bfcbb285075e0459a3afe2cbc50505e51ec50b4509df0d10d521d15fa83a30e46548bd68cf23df00f43ef336979e6fd92ed27e5f8016fc9a28d80431df6e58f5
diff --git a/media-sound/jack2/jack2-1.9.12-r1.ebuild b/media-sound/jack2/jack2-1.9.12-r1.ebuild
deleted file mode 100644
index 31014abf76d3..000000000000
--- a/media-sound/jack2/jack2-1.9.12-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--freebob=no
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.13-r1.ebuild b/media-sound/jack2/jack2-1.9.13-r1.ebuild
index 0f479c637fbb..faa8575e4689 100644
--- a/media-sound/jack2/jack2-1.9.13-r1.ebuild
+++ b/media-sound/jack2/jack2-1.9.13-r1.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P="${PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/media-sound/jack2/jack2-1.9.13.ebuild b/media-sound/jack2/jack2-1.9.13.ebuild
deleted file mode 100644
index 54bed398c30a..000000000000
--- a/media-sound/jack2/jack2-1.9.13.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="${PYTHON_DEPS}
-	media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog.rst README.rst README_NETJACK2 )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=no
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=$(usex ieee1394 yes no)
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack_capture/Manifest b/media-sound/jack_capture/Manifest
index 87a5c84bd935..81a4ef42ab14 100644
--- a/media-sound/jack_capture/Manifest
+++ b/media-sound/jack_capture/Manifest
@@ -1,5 +1,5 @@
 AUX jack_capture-0.9.73-Makefile.patch 1148 BLAKE2B d9ce171dacfb69077ae46e70c6649b4b6938ffdb928506c7c45fe84928b6464a6ee29640ac02a181bb0dd36a7171314c7bb1c5961736feef30687b931183ad35 SHA512 5d158f05a491fa97b7aa62b63c98ce1429682f81c0e8f77043dc75fe93bd1adda5d11125033e25187c23cb259c089249b4d2e3a672c29f21f659b358833cbd1b
 DIST jack_capture-0.9.73.tar.gz 63676 BLAKE2B 0ea944dc544f237501485c5d89299c2d1e202da2d1e3c4ef7922f4d2d49af7f0c871f077613da63ee3cb1a457a2a4edf4c1ab4b6b0625b4cb455db56d880e6f5 SHA512 eecab2e26d5e83b65adf386d6fb38f2d9169cf1574e462ec455367f7d98f4f4d5a9d0766b9c572cfdcb43c55ae914bb8a2222267842c9912e2afe13c1f7b0038
-EBUILD jack_capture-0.9.73.ebuild 1073 BLAKE2B cfcb17bf249312e4f6d771a13a057a8275c6d02a3fb117c104b849b3214961434c151dbfc8e61bb506ceabe96fe8d4d4fa0d743623da5e6bb14b70eec7484b5e SHA512 c8bdc0348511846547db5dc41904ec82528f3761a64001dda472e01172277ea4b008c12fbccec8c5af486990275cf4a92b6f1d9b2d0dfe22ef4a96affa89fcca
+EBUILD jack_capture-0.9.73.ebuild 1072 BLAKE2B 43eb497975a4f4eaee689a86f0dd1f05faece3e6bb1b15db8bf90a2cf62aa067bb5de9017bff97264a28024536b7419b9bf95f84a116284a518ae28d38f9935f SHA512 88348bd76396947a17e5f9cd9ea91b57c717794e4f33caeda6d61b9951a1924d94155e1ee40020af9bd5738e59dab19d27cdd20558067f5df74611c702e1d6a8
 EBUILD jack_capture-9999.ebuild 1063 BLAKE2B fc70e432a3c4dfb5825b28c3467dbdb165d970da74d3dd86c1ac5aa4d8b95784c6e5dd0aa5e759ad596bc8fba24ddcd6917fc2d87ff63002eeea371044310e7d SHA512 e6c0eb29c8a0c393baddb4bc93455db96bb826709326bbcc2aaf30681f55ca6d7531264bfea65467011eb63f0cdb26487403fd3e6a5bad363a429c6cc973acbf
-MISC metadata.xml 368 BLAKE2B eeadd7ce43e144ac8baaa0d55a1943cee1b277d2a9bb1a79977c86603035f12d40489c2ae7c6771f36dabccc29ce6b86b66b4f1f6ddefb08cb29d0977794153d SHA512 e851ae0de3b73af5ecc7be20d4dec0fc74bd6c5d976001cfcea1af0a0a79db294b95ca82454efa9883b4a9a6ae2f538b3cd51f77e34032efe8162186f73562da
+MISC metadata.xml 361 BLAKE2B 87172f0c67cc6e071e287d233f2fcb91be1d7207fb7c321b002145cf0812a3b44cf317c0797aa281d199639d1a57670e5a1eb16d50160997882beece3e2539af SHA512 b410a8813b1a48dfc920e97401bd31f38349ef588e9fa770da53ed541b87a7da895465712d679bca09c4e27b2caf9ed84a553c330e48f6307fa91471de514513
diff --git a/media-sound/jack_capture/jack_capture-0.9.73.ebuild b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
index 380d35b59e82..6131ce16cd9c 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kmatheussen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="mp3 ogg osc"
 
 CDEPEND="
diff --git a/media-sound/jack_capture/metadata.xml b/media-sound/jack_capture/metadata.xml
index fd782eeb253b..ff35dc3000fb 100644
--- a/media-sound/jack_capture/metadata.xml
+++ b/media-sound/jack_capture/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>miroslav.sulc@fordfrog.com</email>
+	<email>fordfrog@gentoo.org</email>
 	<name>Miroslav Šulc</name>
 </maintainer>
 <maintainer type="project">
diff --git a/media-sound/kmetronome/Manifest b/media-sound/kmetronome/Manifest
index 7b895b9bd496..e1ef5b966e30 100644
--- a/media-sound/kmetronome/Manifest
+++ b/media-sound/kmetronome/Manifest
@@ -1,5 +1,3 @@
-DIST kmetronome-1.0.0.tar.bz2 225715 BLAKE2B f8d7d7307f61d1359a16902246ba3e4e64b39bbc2b982f4147fc9f08bdf0b78134c8b9e7c6ad487553d63db30fae007e6e2e6c8d888359be7554f2861bbb5192 SHA512 69290c56119de78a75863c8afd891fbff2d26eeb739a5e65938ba6238e522b1fb79edc6ac0264b912cb70bc3028a6245ab16cc3d22f19e30ea9a33817589f426
 DIST kmetronome-1.0.1.tar.bz2 226758 BLAKE2B 9a9e7070f78fe109dce18d3fb66c29e1819f443bc578f03ec31670c994377d7f760367c0c6eb8edc40b2f64b58f2b461beed19b02eadc6dfc9762be537f9f196 SHA512 b5d4c290bb92cdc531ad432dda6ad21ea6c7ec9a144e0482aa4219293e2bc515dbb68ffdbbd4e552daf425c5206636c378e587adfc7029f7bc67d902b591897a
-EBUILD kmetronome-1.0.0.ebuild 620 BLAKE2B e6c234996e4f34733bcf1f36151beae296d2e2fc4dd1e0e0fbb91e25f796880edde58db8bff7408e8cfd8123cc572e277b799703cd337197385019d6be28a031 SHA512 6a6e5d4c9c4ded7cd9b91ed603e72339843a7eb599d0fd28f2f78e6c1b434fdcb531a8a3965f710080e29ad9d0f9aade9049003ff71e8f62685bce58d56bb56e
-EBUILD kmetronome-1.0.1.ebuild 622 BLAKE2B cd7c595331b04ef5001842eac2b60b80fc8f510abf5bc0c961a8a19ef4e04885aa663b6f5b9a78f8697ba17a3945e8ee4404fd1b285c3b528a56de8834f3670d SHA512 04ac2e3326bf20c128b470669a2386854539f26a0a58760130f4d9247e00fc67e32f5ec05b271e4ae854fcf48e910de7f9cedafd6f48d93b44cdabc4fc828f3b
+EBUILD kmetronome-1.0.1.ebuild 620 BLAKE2B e6c234996e4f34733bcf1f36151beae296d2e2fc4dd1e0e0fbb91e25f796880edde58db8bff7408e8cfd8123cc572e277b799703cd337197385019d6be28a031 SHA512 6a6e5d4c9c4ded7cd9b91ed603e72339843a7eb599d0fd28f2f78e6c1b434fdcb531a8a3965f710080e29ad9d0f9aade9049003ff71e8f62685bce58d56bb56e
 MISC metadata.xml 443 BLAKE2B 876e9d079153472e0e765f0071063bd904b9ca42252af016611512091634add2a7adf2742217c424f8b7280eb11569f3cb97bf26b4f0652d1d072fa5c7b23739 SHA512 7c8104d0ad8340cea75364d5688924517c6b1f3d9ef7c71b73d8c9f6188ebc7aa22f366777a3e7395e55493a630610e674b5bd2e26f4d6a0fed13cedc4dac38b
diff --git a/media-sound/kmetronome/kmetronome-1.0.0.ebuild b/media-sound/kmetronome/kmetronome-1.0.0.ebuild
deleted file mode 100644
index 8adf01c87da4..000000000000
--- a/media-sound/kmetronome/kmetronome-1.0.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="MIDI based metronome using ALSA sequencer"
-HOMEPAGE="http://kmetronome.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	>=media-sound/drumstick-1.0.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
diff --git a/media-sound/kmetronome/kmetronome-1.0.1.ebuild b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
index de0c537d90a0..8adf01c87da4 100644
--- a/media-sound/kmetronome/kmetronome-1.0.1.ebuild
+++ b/media-sound/kmetronome/kmetronome-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 BDEPEND="
diff --git a/media-sound/lame/Manifest b/media-sound/lame/Manifest
index f7954c9fdce3..8fe45979b12d 100644
--- a/media-sound/lame/Manifest
+++ b/media-sound/lame/Manifest
@@ -5,5 +5,5 @@ AUX lame-3.99.5-msse.patch 557 BLAKE2B 76b1201e0909ee408a9556ffeb3d41b4bd749407b
 AUX lame-3.99.5-tinfo.patch 768 BLAKE2B 3fbbd31b0b5752ee4c2dad573d053edcbfb80d24b68a876c2092cae37d3450ac6044ec14d26b180a46197093151d614be8400f33ff7b1f6968130412daacefa5 SHA512 504428e0a0b43c467848296c219ac855ffc9bd83fadb54107e8f6b99290b91bc36457635a092fc121972a3c89918f2d81b42f98f6d007f9b571c7bc3f9c2895e
 DIST lame-3.100.tar.gz 1524133 BLAKE2B 6954d30cfd3951ea07762ba5dd7ff27038b78455f423099a225ebf748abddf9970e444456ca5a6179bd381e2205b32293392cb757c203901674860710fe2c183 SHA512 0844b9eadb4aacf8000444621451277de365041cc1d97b7f7a589da0b7a23899310afd4e4d81114b9912aa97832621d20588034715573d417b2923948c08634b
 EBUILD lame-3.100-r1.ebuild 2105 BLAKE2B e4531b3ab55b89738a81c2fd62f202134ef55929395de7612df961cda81b8e680fb5be002bacb9dc11722d5168a1b5975cf629bbbcb675aa2e7227c26a944056 SHA512 2c5e77d2fe681c742d5da11dec93ae688d29acfb9280a87513989b8100f2e586c6f4daa8662b2da9959b0c6f612daa99333c4bd36308547cf5400f592d84e070
-EBUILD lame-3.100-r2.ebuild 2228 BLAKE2B 685c53fc9ee0914f25ba8bc69b76afe120bcbb1eb20231b8644b175e6c90f162ae4e64d370539dd35a473b81cfb5c040222cb2ce2a3383a23c06fcc33a25678d SHA512 19707a01db95bbec816a3b7d971881b2435a2c46bcef927b83b38f7b0db454bb1642bc6ab7dc6664394b5a39140993d0d8eb49f2477973cc6e80402a2de900ca
+EBUILD lame-3.100-r2.ebuild 2220 BLAKE2B c0facab7481f68f6ff8fa5aeea5f3ded8f6344d0042d8f02f1af07b84ab1ab7453096079791ffe2d4d9c946ed3601aaf513131d554c4e808c46009988e7ff98e SHA512 54d8896ff09131c48b69b20ba01fa4acc982c4488e90935da3f9b987112fb10dc670fb64cb28745ebfac075b82e6b8f6ca393c578fa8318bf9169b7ee0d65578
 MISC metadata.xml 542 BLAKE2B 726f3dfefda9c1905739448f1a3124e05ddc90e261d147da12a7839185ef3eeb440678d185510a6bdd4bb71ab987b7a24f52ed108f7c646ca6b651434f9fade1 SHA512 8fc2e2658ae34d146894786f1c66800eecf818e2bd9bb807c6b32a8e132340c1568e9f47220be3daaabce2ab6e1e1d5aa817157f2c0131ed01944abbab6593fb
diff --git a/media-sound/lame/lame-3.100-r2.ebuild b/media-sound/lame/lame-3.100-r2.ebuild
index b0ad4bce4411..680c136642db 100644
--- a/media-sound/lame/lame-3.100-r2.ebuild
+++ b/media-sound/lame/lame-3.100-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug cpu_flags_x86_mmx +frontend mp3rtp sndfile static-libs"
 
 # These deps are without MULTILIB_USEDEP and are correct since we only build
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 1f7b9fa8c3e6..a4fd3140250a 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -5,10 +5,8 @@ AUX lilypond-2.19.80-fontforge-version.patch 503 BLAKE2B ff0565562e2156aa833d0de
 AUX lilypond-2.19.80-remove-ly-protect.patch 1534 BLAKE2B fbb07b254ac8c41ac3db4c00203efd46fa48b0d3157d0ac57f60587bacae6d0cee6d1694f7a1a74b4fc1d31b338f31dd55daf294872cf8cd85d090683853cbcb SHA512 ec74abc959b569ef43eae0709ea62f012d41700dcebcb9cb4ece551b0095e593e6ac579520a3be3bef648e04ee69b3549f9152158c705ebb615ecb66f0f4d0fd
 AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b8f1a5f106642c9edff2dd35ccb5793e88cd5bc512bbc47ce9636d2536cef18b76bbf5e38325c635377405a277ac405d741c6ed SHA512 4ef02c68b919792199142e83607409f6e3037367e090540a257d611ce7ebe1620c586bbeaaef2d5a953e71074ecbf92cef9710bd4bda9ebfee0ab93ca6f59c9d
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
-DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
 DIST lilypond-2.19.83.tar.gz 17996428 BLAKE2B d6048bfa0dbfbb08c25c5c11287f971936e82d30d88d80deb7fca8fe8d7c8d3d517c37a24b1d52e592c15e166e04eb79d99b4c64ddd4b7f392ec69bff0259d89 SHA512 c8a6acbff055196aba015ecd4786bed25934f04f3718ae9dd9a0dc49d2954f348806874cfe350903cd8bb2b25a0d05700ef5947cac180b20a8a355033ff98604
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3343 BLAKE2B df34e0e524e87f4db5d6653dbaae54350e1d57503a1b8aeffd8689af4e35904506f63c14d1973073110119395941064c4c5443370380d9258bc45219911c7302 SHA512 7a4e88ca41f372ee5bdbfc31dbd905e89f91d470097da54b1fcf9d2e865ac72b7007794e492ed99777a3b177d6870ca343b991601b1c6a68b97ebf446ffa19af
-EBUILD lilypond-2.19.83.ebuild 3380 BLAKE2B 6e27d1d0e9aebadd107778c730c4997444e4f8587f39cfff60a00fbfc264889c5db01706e99619077ea5c9ced4920aa24bde007bd1def20d8f86f690fdf1e863 SHA512 4deeef41a1af273e8b52deeaac8f3dc5abc89cf2a0cc50499ea4e7fe82015bad3e7902401d40a6c56d3d333a21d94dc80c183bb102998351203f78d903453dba
+EBUILD lilypond-2.19.83.ebuild 3377 BLAKE2B 13d7efc403fb44ab97f69cce5b42c10e2361d82a8cf3f6d5476b460b7f3b60291446381585168590e8d819295fb289a00883ac35ded5d7d1c0b6a4774cc51dd8 SHA512 f0a71bdb7b8163c677d724a5069cf35d89b20b1a1c78506af84af47d7e8565affeadbd5493b9bad671c85390538a3614c8bdcbea4cf01a90c94527cb0a2d29a2
 EBUILD lilypond-9999.ebuild 3521 BLAKE2B fba802b73675eed22ebb2d9bdd05a8fa7ff7ccb66c7d8cf7f70d141b540234b1bf21fd74d19d740fe04ba345f4d5dc263eba2710663651f43ac59ad92a25c90f SHA512 28f0b9038116fc5eae0c0b35e7f353ce14fea0aee7fa9f09f503e9582ab1de06dfe48fa2c6fb97ad5362b30eeb5d4b4dc02f017cc19a5135c77b5ba0f1be7393
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
deleted file mode 100644
index 3e23b2dfe640..000000000000
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-[[ "${PV}" = "9999" ]] && inherit git-r3
-inherit elisp-common autotools python-single-r1 xdg-utils
-
-if [[ "${PV}" = "9999" ]]; then
-	EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
-else
-	SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
-fi
-
-DESCRIPTION="GNU Music Typesetter"
-HOMEPAGE="http://lilypond.org/"
-
-LICENSE="GPL-3 FDL-1.3"
-SLOT="0"
-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]
-	media-fonts/tex-gyre
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=x11-libs/pango-1.12.3
-	emacs? ( virtual/emacs )
-	guile2? ( >=dev-scheme/guile-2:12 )
-	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
-		<dev-scheme/guile-2.0:12
-	)
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	app-text/t1utils
-	dev-lang/perl
-	dev-libs/kpathsea
-	>=dev-texlive/texlive-metapost-2013
-	|| (
-		>=app-text/texlive-core-2013
-		>=dev-tex/metapost-1.803
-	)
-	virtual/pkgconfig
-	media-gfx/fontforge[png]
-	>=sys-apps/texinfo-4.11
-	>=sys-devel/bison-2.0
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/make"
-
-# Correct output data for tests isn't bundled with releases
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove-ly-protect.patch
-	"${FILESDIR}"/${P}-fontforge-version.patch
-)
-
-DOCS=( DEDICATION HACKING README.txt ROADMAP )
-
-pkg_setup() {
-	# make sure >=metapost-1.803 is selected if it's installed, bug 498704
-	if [[ ${MERGE_TYPE} != binary ]] && has_version ">=dev-tex/metapost-1.803" ; then
-		if [[ $(readlink "${EROOT}"/usr/bin/mpost) =~ mpost-texlive-* ]] ; then
-			einfo "Updating metapost symlink"
-			eselect mpost update || die
-		fi
-	fi
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if ! use vim-syntax ; then
-		sed -i 's/vim//' GNUmakefile.in || die
-	fi
-
-	# respect CFLAGS
-	sed -i 's/OPTIMIZE -g/OPTIMIZE/' aclocal.m4 || die
-
-	# respect AR
-	sed -i "s:^AR=ar:AR=$(tc-getAR):" stepmake/stepmake/library-vars.make || die
-
-	# remove bundled texinfo file (fixes bug #448560)
-	rm tex/texinfo.tex || die
-
-	eautoreconf
-
-	xdg_environment_reset #586592
-}
-
-src_configure() {
-	# documentation generation currently not supported since it requires a newer
-	# version of texi2html than is currently in the tree
-
-	local myeconfargs=(
-		--with-texgyre-dir=/usr/share/fonts/tex-gyre
-		--disable-documentation
-		--disable-optimising
-		--disable-pipe
-		$(use_enable debug debugging)
-		$(use_enable guile2)
-		$(use_enable profile profiling)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile elisp/lilypond-{font-lock,indent,mode,what-beat}.el \
-			|| die "elisp-compile failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" vimdir=/usr/share/vim/vimfiles install
-
-	# remove elisp files since they are in the wrong directory
-	rm -r "${ED}"/usr/share/emacs || die
-
-	if use emacs ; then
-		elisp-install ${PN} elisp/*.{el,elc} elisp/out/*.el \
-			|| die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
-	fi
-
-	python_fix_shebang "${ED}"
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/lilypond/lilypond-2.19.83.ebuild b/media-sound/lilypond/lilypond-2.19.83.ebuild
index b86d49030a18..f4e9eb984de2 100644
--- a/media-sound/lilypond/lilypond-2.19.83.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.83.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="amd64 ~arm arm64 ~hppa x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 6bbd22db4a71..70b0bb445d30 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -1,5 +1,6 @@
-AUX linuxsampler-2.0.0-lv2-automagic.patch 727 BLAKE2B 23d836320c5bdd8e022599c65d26c3c757828a348e9ce87d158e1bdc9f3fb82ae174cc08a7ee4b4981378c4fd556fb932b2dcd4cf7bdb88c27920fb8a2033f8f SHA512 95f7b2bf01b293c58dc673cd40d6846d50d3a430a2874260fc268de7afe414a4970d4a443801f5d16417c14c6c16732e4bfdc58f7f997b7a3dd0bc1dc7ac8ddd
+AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9cfbf60defe7c3fdcac0f3e943c54dfc38e152df3beb71c5453c7e1df126a3415aa9ea9d75b2abba80efbbf65e64b10388f195c4 SHA512 4d7204b567e578efb3370e11ae69c631c49b01e864c7fb59d6eed309c7ff9ad9d2aa7832ef233f4c5b8e6a26af06c2d9d239cb361d69966e2556cb2816415de2
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
 EBUILD linuxsampler-2.1.1.ebuild 1678 BLAKE2B fd23baae3cb8bb26635e960bee6a2e3703970e50c117fc3078d4f0135aaabf3347753a6e489d99f134546249cec019963b0411239a7346ab4107b1ed378e93e2 SHA512 e18cdfbd824290b269081552f30bd72a3de4f2b0afeb3514c252cebb7413ebfb31ac2ad18d69cb0e3087283cef1d5a8e7077f392410f362b84de873ecad0cda6
+EBUILD linuxsampler-9999.ebuild 1577 BLAKE2B e79cae44e8560f0e4790e595d77e34adf9d9c74f2ad99ac20c681a632adc5bb0ee38faf5d2af8c4893322548fb0d2ea4a1b3a25bce439ca766f679b493ff53c0 SHA512 016ac964bfb4eac8d3f32596d684e1e7432eabf53f4f8968ee33eec7a311fdbc71311c4040f1597ecee0a1a3487ec36cc313939c38a22938358fbfa3003cd8da
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
index a5b9f8d71efa..522882abf5c4 100644
--- a/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
+++ b/media-sound/linuxsampler/files/linuxsampler-2.0.0-lv2-automagic.patch
@@ -1,6 +1,8 @@
---- linuxsampler-2.0.0/configure.ac
-+++ linuxsampler-2.0.0/configure.ac
-@@ -532,12 +532,12 @@
+diff --git a/configure.ac b/configure.ac
+index c0a37e9..44348ad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -535,12 +535,15 @@ AC_CHECK_HEADERS(dssi.h,
  AM_CONDITIONAL(HAVE_DSSI, test $config_have_dssi = "yes")
  
  # LV2
@@ -14,7 +16,10 @@
 +	AS_HELP_STRING([--enable-lv2], [Enable building with lv2]))
 +config_have_lv2="no"
 +AS_IF([test "x$enable_lv2" = "xyes"], [
-+	PKG_CHECK_MODULES([LV2], [lv2 >= 1.0.0 lv2core >= 1.0.0], [config_have_lv2="yes"])
++	PKG_CHECK_MODULES(LV2, lv2 >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
++	if test "$config_have_lv2" != "yes"; then
++	    PKG_CHECK_MODULES(LV2, lv2core >= 1.0.0, config_have_lv2="yes", config_have_lv2="no")
++	fi
 +])
  AM_CONDITIONAL(HAVE_LV2, test $config_have_lv2 = "yes")
  
diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild
new file mode 100644
index 000000000000..bd097fd3cce7
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools subversion
+
+DESCRIPTION="Software audio sampler engine with professional grade features"
+HOMEPAGE="https://www.linuxsampler.org/"
+ESVN_REPO_URI="https://svn.linuxsampler.org/svn/linuxsampler/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="alsa doc jack lv2 sf2 sqlite"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="
+	>=media-libs/libgig-4.2.0
+	media-libs/libsndfile[-minimal]
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	lv2? ( media-libs/lv2 )
+	sqlite? ( >=dev-db/sqlite-3.3 )
+"
+DEPEND="${RDEPEND}
+	media-libs/dssi
+	media-libs/ladspa-sdk
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
+	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+
+	emake -f Makefile.svn
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-arts-driver
+		--disable-static
+		$(use_enable alsa alsa-driver)
+		$(use_enable jack jack-driver)
+		$(use_enable lv2)
+		$(use_enable sqlite instruments-db)
+		$(use_enable sf2 sf2-engine)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# lscp files conflict with nilfs-utils, bug #556330
+	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
+	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
+}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 658fc3e30da5..367000bf1fb0 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.1.4.16.tar.xz 455312 BLAKE2B 358fae45a4332c10ba59d65d09ae51f28fb7fc026e137289c47951536753796e0b7efa9f3713bccde68e6260f79b1132eb00357be8c53fba04f3c827e97851cf SHA512 08b8ec7c1fbe5f1b8f95f95677012eeb9bd83951ee320470a0da852e0a446818e48ede7de045f6d7b98dff8be139fa69d780dbf03e65904c773f8ec1493f9915
-DIST lollypop-1.2.12.tar.xz 481528 BLAKE2B 973aa62130d566759327ec303a0063a8739dbbd4df718490c96d25bd6f5d5dd6eb3120dc33e38e91d29358dab9f0e5ed337d461877563f92b0663985f4d5ecc8 SHA512 1945275a4b962e90a498cb7a08693395cb750535e4028880911928d05c381fc1914a6ffbbac65246ae835edd1b3225373cf8679fd553b25991d92989ce458b95
+DIST lollypop-1.2.16.tar.xz 484704 BLAKE2B fd6c37690301eff22b52865df1e2d65108c0a25c3ff08d0960e5b09213cb21b2af62886e6cbcaff051a01c5084129dbe38832ac25ff4bb9a60d00566e60e7d38 SHA512 5912f7b09ec166f9680815293be3e7b3cc9ceedc9e12156715b908f4905ee937afb7eecc2b32c70108cfdac4a06abe450415b7c90e6a3e3ef641a1f846ef39e2
 EBUILD lollypop-1.1.4.16.ebuild 1402 BLAKE2B 5481a031876dea76a7591479fc79cf6af819ac55c0cbb8a1fab2ffa6dcee1efa24f72fb6b3e51e6f6184de2f2a31aeb92b93323e8a0cb51396b540708f75a985 SHA512 31f72c147a4c921475bff48dab39bc4adeed3df559775138ed378d0cba64b965af88c8d985cc7b35b0bb9e101d2c06ca5a54d03bb3291db101551911e8772f03
-EBUILD lollypop-1.2.12.ebuild 1403 BLAKE2B 31be87be9aea246efd866633ec601fd3a961a3e4655266ee2c0c5125bb630bf091cf8dac296441a886e74b24be30bdac5ccffa20303fb9b3601a03c255f9b851 SHA512 fc230b95034cd359a61bc652854897d7aeabf786f2767254cda1537f55be9c5b506f7663bdb7d5aa2b6192a076a28d3dcbe038a90446e92ed7a7e3083e93a3b4
+EBUILD lollypop-1.2.16.ebuild 1403 BLAKE2B 98b707d63869dc0f48059800a549c35b8fd75f7446a769f76766152008d5e17f587efda6e8247487d4bd550a1e9b54f21c1c6ea6641a5063837f807f03708fd5 SHA512 6e55a150616e355c6c2487953d36bdf3fe390b2804417c2f2c4c24c1c666f43d4e2d94400e031eae255a7cbe00775365362eedc70af196595613367068f778b2
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.2.12.ebuild b/media-sound/lollypop/lollypop-1.2.16.ebuild
index 4352df9f2188..d7e95275746a 100644
--- a/media-sound/lollypop/lollypop-1.2.12.ebuild
+++ b/media-sound/lollypop/lollypop-1.2.16.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="f10cc2e8d6da6bac3490a43429a592c1"
+HASH="70aab11cf17a8966a5bb188b4173b240"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
diff --git a/media-sound/madplay/Manifest b/media-sound/madplay/Manifest
index 64f7986e7391..5cbb0ed7c6ff 100644
--- a/media-sound/madplay/Manifest
+++ b/media-sound/madplay/Manifest
@@ -1,4 +1,4 @@
 AUX madplay-macos.patch 593 BLAKE2B 306d4013251f9abf1791c8115f1ccdaf06c706ebae4ec073ff1a6f8f09086c80fc5b3a64d923f9818967f01f2793916ea301b7a078fac5bb879b8d0627180ae4 SHA512 d8989ed522212e984f0173dbb346ed624a2e8664a4c06d2186238018baf20c1f67d4109baa866ccb13cec6695db751be9ab6ac81466e3c786b13a89de4e066a0
 DIST madplay-0.15.2b.tar.gz 590929 BLAKE2B 93a62d04a36247ae8e1f4a63fe183735a2b5a7cd75fcde1ff2261222fad08ec96069b3fe5b7f06ad78a37d5060cff1d233d8139d7d0ff02c5231d2c384fb1a22 SHA512 0e79cdf0c32f48599083ec7a0716d816e3f03254705b7225b1ea9008d53eefd48342dd687b0507f0ff15942218fc07ad1e38c4172508c27755f3e9a0e5412f34
-EBUILD madplay-0.15.2b-r1.ebuild 868 BLAKE2B 4ae44cafe9b6290a87152c755d5b4ac546ee4818729df04dd19afba94fa74fbab2006a0356585d763e03857037bddb5a2d5edfcc5deab183393a63f3ace25060 SHA512 db56558bc77af4c894a6dbce9c52680c7f4e2602a7594a56b43dce0c2fefb08a16f713b29472037ea49138d21c604231890967b6ce7a8d49200c2d2fdf58b231
+EBUILD madplay-0.15.2b-r1.ebuild 776 BLAKE2B bee4f8a6721338cdb5e5f26242089f62f987d6715df831f2a9188894695d7c6ae56bc578a6f9613099c7147b3d9c09650d15c7f3a8cd6a7810afa12a9eb3be49 SHA512 6c94d8442b3dbe94aa26c205d9006256db132028736a10188a1de9590052321843972b93724a51aab33a3bc4505576816a980ee22b6097836392154cceb08575
 MISC metadata.xml 326 BLAKE2B a9064ce28313804fb873d3e0b4fcb96681a2fcdcf60011d629268f73ab47f6c00ff6e0d95d2d075ec6af89bbe7aea4b6346ef2500815f08a69318a8736e7201d SHA512 b6c3a0765c5d00fd44caf7266edb75a373d8d4e813ac7f68507067f57713090fdc84f95886e73401d9c912f7f64453c975117030692526a49aebd6f5276751c9
diff --git a/media-sound/madplay/madplay-0.15.2b-r1.ebuild b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
index 7a464f05ec31..742c63d7d8a4 100644
--- a/media-sound/madplay/madplay-0.15.2b-r1.ebuild
+++ b/media-sound/madplay/madplay-0.15.2b-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools epatch epunt-cxx
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="The MAD audio player"
 HOMEPAGE="http://www.underbit.com/products/mad/"
@@ -13,18 +14,18 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="alsa debug nls"
 
-RDEPEND=">=media-libs/libid3tag-0.15.1b
-	>=media-libs/libmad-0.15.1b
-	alsa? ( media-libs/alsa-lib )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+RDEPEND="
+	media-libs/libid3tag:=
+	media-libs/libmad:=
+	alsa? ( media-libs/alsa-lib:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
-DOCS="CHANGES CREDITS README TODO"
+PATCHES=( "${FILESDIR}"/${PN}-macos.patch )
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-macos.patch
-	eautoreconf #need new libtool for interix
-	epunt_cxx #74499
+	default
+	eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/mcdp/Manifest b/media-sound/mcdp/Manifest
index c45ea3204080..9516d5e20626 100644
--- a/media-sound/mcdp/Manifest
+++ b/media-sound/mcdp/Manifest
@@ -1,5 +1,5 @@
 AUX mcdp-0.4a-dietlibc-fix.patch 464 BLAKE2B 6660bba10dc650d0ce9727bdfbf353427f19cddf672290163dd30b847434020610eb66c376feb7f0919fdd021eb556c6286b038ee1cc72e2cf48a9ac4cd8d4a8 SHA512 f20c9cc828017f149e9618eb9b8c22ff6d02c48a2c71cbebf15a6a4d2010e95aaba7bc0961f947d48acda746e5d34997ea55eca62d5a66d822bb83073f105267
 AUX mcdp-0.4a-makefile.patch 343 BLAKE2B fadbe306ed674276296dc5157c126b2576d966e1c366a6ea7ab71d6d803ea1db57209b2963bc690108f3b3c8d3c24917b9077c8824898cd6f863bb383345c61b SHA512 b0cf13475b05ac6f11f0eedd64368db2275e461eeebcc96b3fd006869e77c79a2388753c4bc2f8b9e0b8982c6cce7ee25b9d15aa9f94f5258faab29fcd4a2ca5
 DIST mcdp-0.4b.tar.bz2 29940 BLAKE2B 711822257664e21ff3b56eed415e57abd8eee3dfd1912bfa2a88c58b525239c6c30d958c15dd705cdf8d10e56a75d9f0a6c33d35d62e1279828e32343811eb24 SHA512 af7042794ed36c1cfdfbf8ad3299ca377942c67f3eaaf0778ef368e29288945331f753dfdd320e667f499c8229cf770dc8d6149ef6214d76b7eaceff54203b6d
-EBUILD mcdp-0.4b.ebuild 676 BLAKE2B 13cd4d46e0c2059bdda9df7f072f16d7e095fb1f4d7e9b4aeb7a739dbab149648e7bbb2bf76eb19f6091acfd92fa2ecf99a2afb0f4cbd048c7e4ebec11b21502 SHA512 430535ba0646b01357252823b34280dee0e611e74d745e7253cbd8a3b28de8c69a39578c104ede13ddd2d608908dd4c870dbbd5baf586f27d032fc4d62486cc5
+EBUILD mcdp-0.4b.ebuild 650 BLAKE2B 2cd181d6ef8f578722c833713f0b9c498b83358f74378b43f47a461ac32d49c028b9ed6e1f6ada5bd992bbbe4f8c68636afffb2421774859f61f77eb75ad5980 SHA512 025a254d39065edde7da2b8fa387bc3b4edfab7b41a9e2c8d814d131560cfc3d76deb630a153cfaa4139ad58849a6bd62f3d238852352f77c7ad3d6591769730
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mcdp/mcdp-0.4b.ebuild b/media-sound/mcdp/mcdp-0.4b.ebuild
index 5bf75f1b2e19..81afdbc08af0 100644
--- a/media-sound/mcdp/mcdp-0.4b.ebuild
+++ b/media-sound/mcdp/mcdp-0.4b.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A very small console cd player"
 HOMEPAGE="http://www.mcmilk.de/projects/mcdp/"
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.4a-dietlibc-fix.patch" \
-		"${FILESDIR}/${PN}-0.4a-makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4a-dietlibc-fix.patch
+	"${FILESDIR}"/${PN}-0.4a-makefile.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/media-sound/mhwaveedit/Manifest b/media-sound/mhwaveedit/Manifest
index b860853a5ed1..652cd9defa0b 100644
--- a/media-sound/mhwaveedit/Manifest
+++ b/media-sound/mhwaveedit/Manifest
@@ -1,5 +1,4 @@
-DIST mhwaveedit-1.4.22.tar.bz2 640430 BLAKE2B 58d642264756c5120832ce73aaac1ec0459270429e19861297719bc7782e50068e8326c053b91b538f349d2c2cc820a2e355db677f4632350823ade38ab0a154 SHA512 c44428dd4f848fda08aaff351380163697504d0ac133ab78d34817d974111719d724e985539d85c5bda23eda2fdb4fce3c1c680b5a8fa673f8d37a9d4fbcf590
+AUX mhwaveedit-1.4.23-missing-include.patch 205 BLAKE2B 1178613dd16aab62a4ada0937666671ff3275063a47f1e21662cc9ff10e3a6b2119bafa0e82b15e0c989b8d2294ae003f503e5c47b16c9bdcdcadcb62c7d4933 SHA512 b38349cca41b0ba97358c3b580ea904615e2a415d7f7efe08c3fc8bd1769dfed3945b1e321f5595afd47f292dcecd2a779a66bcb385a85b0f828c1bb137be1bb
 DIST mhwaveedit-1.4.23.tar.bz2 642042 BLAKE2B 9d2d4ae201034df09f46a85c0b3d42978a294e888e175c18aeb02433d6f22246602cd7aaae004cdd13d24bc6e21fcb2cc2cb739bb0509476f8510603bfd42517 SHA512 c8b3f1ca2c573e03bbe8e2c61c80d8bae0f9b9ec99fff0110119698f95328d1ab86eb4641d582865cd091f2955388343cbd912fd5f0b15f2a937b88cc01b974f
-EBUILD mhwaveedit-1.4.22.ebuild 1166 BLAKE2B be40609c7bdfa8c837be54d546b3f3bfc8389d77af402c2226180b0f6af56f632a722600aea6d91b8650bb573558970724fee68398e6be10eaf04d29114b4e40 SHA512 0897bb4641e765a513497a5b66a88cff6708e7251ddf55cf7ae044e9921a0a88b3f843470612c52afe1d3134b4124880e39fc502791ff82bb2d350375783ee46
-EBUILD mhwaveedit-1.4.23.ebuild 1168 BLAKE2B 842f1f3af0922a5dc467a1aa489ad8dd1aa3a104df1d709124a76d56db4e9e1b60f758fea0adf30606bfb541b99a1bfd2ec8cb17aa51c0f1f40e733162d88b3b SHA512 9b839f5a1c919a5302bb8b9740c68495f9d20bba7aecdca6a9380803b4d78023f92a15511f05cf9a60fbb0ea599a6fbb865b1b2fb3fac2670f5b93f67bb77bc2
+EBUILD mhwaveedit-1.4.23.ebuild 1151 BLAKE2B 050f03f07d951a0a6af17e5b58f8d63ca8663d0fecbd81b6526758442349c240c35a9827b02235ac92351e22bb15f4217b09379ef2ff9a35f7422955842156e5 SHA512 7a61a4b7c9e4bbb2068aca4a727ba5c02725b917f93926561e3a785e877a4bceb09be1152038c410978ef4309c6764f4a372f47a4a2f852e662f22424308c5d7
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch b/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch
new file mode 100644
index 000000000000..6da9db146330
--- /dev/null
+++ b/media-sound/mhwaveedit/files/mhwaveedit-1.4.23-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/sound-pulse.c
++++ b/src/sound-pulse.c
+@@ -21,6 +21,7 @@
+ 
+ #include <poll.h>
+ #include <pulse/pulseaudio.h>
++#include "int_box.h"
+ 
+ #ifndef PA_CHECK_VERSION
+ #define PA_CHECK_VERSION(a,b,c) (0)
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
deleted file mode 100644
index 6b195a79c274..000000000000
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
-HOMEPAGE="https://gna.org/projects/mhwaveedit"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
-
-RDEPEND="x11-libs/gtk+:2
-	x11-libs/pango
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
-	ladspa? ( media-libs/ladspa-sdk )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
-	sox? ( media-sound/sox )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-src_configure() {
-	econf \
-		--without-arts \
-		--without-portaudio \
-		$(use_enable nls) \
-		$(use_with sndfile libsndfile) \
-		$(use_with libsamplerate) \
-		$(use_with sdl) \
-		$(use_with alsa alsalib) \
-		$(use_with oss) \
-		$(use_with jack) \
-		$(use_with pulseaudio pulse) \
-		--without-esound
-}
diff --git a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
index 4ed52f0b3b53..c6117c93bd72 100644
--- a/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
+++ b/media-sound/mhwaveedit/mhwaveedit-1.4.23.ebuild
@@ -1,35 +1,37 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="GTK+ Sound file editor (wav, and a few others.)"
-HOMEPAGE="https://gna.org/projects/mhwaveedit"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/magnush/mhwaveedit/"
+SRC_URI="https://github.com/magnush/mhwaveedit/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="alsa jack ladspa libsamplerate nls oss pulseaudio sdl sndfile sox"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	x11-libs/pango
-	sndfile? ( >=media-libs/libsndfile-1.0.10 )
-	sdl? ( >=media-libs/libsdl-1.2.3 )
-	alsa? ( media-libs/alsa-lib )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.98 )
-	libsamplerate? ( media-libs/libsamplerate )
+	sndfile? ( media-libs/libsndfile:= )
+	sdl? ( media-libs/libsdl:= )
+	alsa? ( media-libs/alsa-lib:= )
+	jack? ( virtual/jack )
+	libsamplerate? ( media-libs/libsamplerate:= )
 	ladspa? ( media-libs/ladspa-sdk )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.10 )
-	sox? ( media-sound/sox )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	pulseaudio? ( media-sound/pulseaudio )
+	sox? ( media-sound/sox:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+PATCHES=( "${FILESDIR}"/${PN}-1.4.23-missing-include.patch )
 
 src_configure() {
 	econf \
 		--without-arts \
+		--without-esound \
 		--without-portaudio \
 		$(use_enable nls) \
 		$(use_with sndfile libsndfile) \
@@ -38,6 +40,5 @@ src_configure() {
 		$(use_with alsa alsalib) \
 		$(use_with oss) \
 		$(use_with jack) \
-		$(use_with pulseaudio pulse) \
-		--without-esound
+		$(use_with pulseaudio pulse)
 }
diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
index daaa7f1807b1..f029f438bd8a 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1,4 +1,5 @@
+AUX milkytracker-1.0.0-cmake.patch 6172 BLAKE2B d0ee8dd866ff5d9b7c7558f5ca5d7b2f75a4b3e37abba2b7798816a8131ea24e250fccdd405bb48f1effb363d437115f89d7b44aae87fdbe21234b1ad08c544c SHA512 395d93dab58a9a5a7c000382ea946b1e28eecf55d3867a7acf07cef7ee2bbb7ea90ff5946125c5bf16c2ecd658f7711859e02b7058c19dbaaea39c9b3ee8c881
 AUX milkytracker-1.0.0-docdir.patch 2319 BLAKE2B 256f8f2eba611e2a6f19df117e2b4ccf6057f4de380a2098f48b0cbf4a136f7b5d45eb203990b8de36407765b6f4a9547f1801d50dec7400a55917bf286a9193 SHA512 f5e44258717a9b84956c29506c27e97e72cd50092ac179c328f3773f07f0573ac77aa50e4a27cea62f23b4f6318e1132fac2a0a039e3cf604efd1d595b357173
 DIST milkytracker-1.0.0.tar.gz 3749140 BLAKE2B 5bf1e374c8d51e7f65a222c46b4cb3e26dd88ba5be304af540d3af4f5123179a2496d0b5eb87021d2dc0f12e7fab3f55e9ad06573aa5fb3a8842d9b743e6c948 SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
-EBUILD milkytracker-1.0.0.ebuild 1085 BLAKE2B 2a06770c8a9420bee964ded3acf7cfaf700698385d97d09a5cbbda648c01c81d1e5581ca16e9c398b18e85b3ede9459b968f8812030380e5235745d500c1cf51 SHA512 b0341d628a83ad235c0b8ac1a9c92125bb5e18c2f8dd78ad8a0212b09a0e9adfb2475cea6598829755e09a6e9cf826eab64a9a68a313bf3fd1cd220701851ac8
+EBUILD milkytracker-1.0.0.ebuild 1111 BLAKE2B b3f5fb99df3a3f5efe9342b832f961ad9543c4112174087bdc155b00348f4f4a0f1974489aca694315a29c02c94f27e0203c30d070074e948c9d8ff4ab1e9546 SHA512 71d67645d2c7460e5a8ca871e4d635ea47d854d06b4dc220d9a1d1afde77c7bdddbc2cd72b81a3f1edce1dc0953ba451b1bb54ac3521ee15faa5840c2cb54ffb
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
new file mode 100644
index 000000000000..391ec55c7d8d
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.0.0-cmake.patch
@@ -0,0 +1,148 @@
+From 87d0f55cd8868d91472f96cccafaf6fdb9e0cbbc Mon Sep 17 00:00:00 2001
+From: Dale Whinham <daleyo@gmail.com>
+Date: Thu, 31 Oct 2019 21:21:28 +0000
+Subject: [PATCH] CMake: Use SDL2's official CMake package mechanism
+
+We shouldn't need to rely on a FindSDL2.cmake, as SDL2 comes with a
+CMake package definition that should be installed by the distro into a
+location where CMake can find it.
+
+Fixes #168.
+---
+ CMakeLists.txt       |   4 +-
+ cmake/FindSDL2.cmake | 104 -------------------------------------------
+ 2 files changed, 1 insertion(+), 107 deletions(-)
+ delete mode 100644 cmake/FindSDL2.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 27ad4a18..5b6ed9f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,6 @@ if(FORCESDL)
+     unset(APPLE)
+     unset(WIN32)
+     add_definitions(-D__FORCE_SDL_AUDIO__)
+-    # Frameworks not supported by findSDL2.cmake
+-    set(CMAKE_FIND_FRAMEWORK NEVER)
+ endif()
+ 
+ # Lowercase project name for binaries and packaging
+@@ -166,7 +164,7 @@ else()
+     # https://bugzilla.libsdl.org/show_bug.cgi?id=3295
+     cmake_policy(SET CMP0004 OLD)
+ 
+-    find_package(SDL2 2 REQUIRED)
++    find_package(SDL2 REQUIRED)
+ endif()
+ 
+ # Prefer static linkage under OS X for libraries located with find_package()
+diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
+deleted file mode 100644
+index 27c78f05..00000000
+--- a/cmake/FindSDL2.cmake
++++ /dev/null
+@@ -1,104 +0,0 @@
+-# - Find SDL2 library and headers
+-# 
+-# Find module for SDL 2.0 (http://www.libsdl.org/).
+-# It defines the following variables:
+-#  SDL2_INCLUDE_DIRS - The location of the headers, e.g., SDL.h.
+-#  SDL2_LIBRARIES - The libraries to link against to use SDL2.
+-#  SDL2_FOUND - If false, do not try to use SDL2.
+-#  SDL2_VERSION_STRING - Human-readable string containing the version of SDL2.
+-#
+-# This module responds to the the flag:
+-#  SDL2_BUILDING_LIBRARY
+-#    If this is defined, then no SDL2_main will be linked in because
+-#    only applications need main().
+-#    Otherwise, it is assumed you are building an application and this
+-#    module will attempt to locate and set the the proper link flags
+-#    as part of the returned SDL2_LIBRARIES variable.
+-#
+-# Also defined, but not for general use are:
+-#   SDL2_INCLUDE_DIR - The directory that contains SDL.h.
+-#   SDL2_LIBRARY - The location of the SDL2 library.
+-#   SDL2MAIN_LIBRARY - The location of the SDL2main library.
+-#
+-
+-#=============================================================================
+-# Copyright 2013 Benjamin Eikel
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions are met:
+-#     * Redistributions of source code must retain the above copyright
+-#       notice, this list of conditions and the following disclaimer.
+-#     * Redistributions in binary form must reproduce the above copyright
+-#       notice, this list of conditions and the following disclaimer in the
+-#       documentation and/or other materials provided with the distribution.
+-#     * Neither the name of the <organization> nor the
+-#       names of its contributors may be used to endorse or promote products
+-#       derived from this software without specific prior written permission.
+-#
+-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+-# ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-#=============================================================================
+-
+-find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_SDL2 QUIET sdl2)
+-
+-find_path(SDL2_INCLUDE_DIR
+-  NAMES SDL.h
+-  HINTS
+-    ${PC_SDL2_INCLUDEDIR}
+-    ${PC_SDL2_INCLUDE_DIRS}
+-  PATH_SUFFIXES SDL2
+-)
+-
+-find_library(SDL2_LIBRARY
+-  NAMES SDL2
+-  HINTS
+-    ${PC_SDL2_LIBDIR}
+-    ${PC_SDL2_LIBRARY_DIRS}
+-  PATH_SUFFIXES x64 x86
+-)
+-
+-if(NOT SDL2_BUILDING_LIBRARY)
+-  find_library(SDL2MAIN_LIBRARY
+-    NAMES SDL2main
+-    HINTS
+-      ${PC_SDL2_LIBDIR}
+-      ${PC_SDL2_LIBRARY_DIRS}
+-    PATH_SUFFIXES x64 x86
+-  )
+-endif()
+-
+-if(SDL2_INCLUDE_DIR AND EXISTS "${SDL2_INCLUDE_DIR}/SDL_version.h")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
+-  file(STRINGS "${SDL2_INCLUDE_DIR}/SDL_version.h" SDL2_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MAJOR "${SDL2_VERSION_MAJOR_LINE}")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_MINOR "${SDL2_VERSION_MINOR_LINE}")
+-  string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL2_VERSION_PATCH "${SDL2_VERSION_PATCH_LINE}")
+-  set(SDL2_VERSION_STRING ${SDL2_VERSION_MAJOR}.${SDL2_VERSION_MINOR}.${SDL2_VERSION_PATCH})
+-  unset(SDL2_VERSION_MAJOR_LINE)
+-  unset(SDL2_VERSION_MINOR_LINE)
+-  unset(SDL2_VERSION_PATCH_LINE)
+-  unset(SDL2_VERSION_MAJOR)
+-  unset(SDL2_VERSION_MINOR)
+-  unset(SDL2_VERSION_PATCH)
+-endif()
+-
+-set(SDL2_INCLUDE_DIRS ${SDL2_INCLUDE_DIR})
+-set(SDL2_LIBRARIES ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY})
+-
+-include(FindPackageHandleStandardArgs)
+-
+-find_package_handle_standard_args(SDL2
+-                                  REQUIRED_VARS SDL2_INCLUDE_DIR SDL2_LIBRARY
+-                                  VERSION_VAR SDL2_VERSION_STRING)
+-
+-mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY)
diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
index cf204b74101f..f2fac2cf6422 100644
--- a/media-sound/milkytracker/milkytracker-1.0.0.ebuild
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -22,7 +22,10 @@ RDEPEND="
 	jack? ( media-sound/jack-audio-connection-kit )"
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-docdir.patch
+	"${FILESDIR}"/${P}-cmake.patch
+)
 
 S="${WORKDIR}/MilkyTracker-${PV}"
 
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b89f6049f69f..4a4a0671d6f0 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,10 +1,10 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.0-lilv_include_fix.patch 1006 BLAKE2B 1541ecc32cb20d02d71577615b96605938a2d38e40e04fc43e864c8a85722475b795c807ccda1df0ff86c6268d1d1425934e3b413fdedc2effcbd6a2ab584ad6 SHA512 e15980f9861a61bf965636182fe3f0d41d25d569d2d4b43e167e53e33fe7e8f533878e93db237e90551ac409811de497e3313e32fc62462bf963b7f1f29c4a11
 DIST mixxx-2.1.8.tar.gz 34652727 BLAKE2B d996bb07a5914e5a3b8f276130e1f8fb46a9493e192e45a1b65cdb961b1a7ca0e98fed69d894ace8e61ee72231a1d8ba731921e46d3601ad0d41a79aa04a47ab SHA512 c1423bec9b3a9654ece5ae68c0f72975dcd2a9cee377520e56d4f35366a3bb23157c9c64f0f2b8a61d36e5d818216b64cb6aae53ca2b8e3dfa865b8911a7e1eb
-DIST mixxx-2.2.1.tar.gz 34763333 BLAKE2B 246bd01fe346298ea27d1cf64a597ddf009f31fe7edb004a2b5ffd4a2c4a09843e5c47d38acb6428ed2b8f3bb4e5618b1e97d64ff1b9721682a6b34fbd49b73a SHA512 16f0f4f6a83cd18501fdba3cb8d4f7fe4ac14b980d390406cb61acb889647ba89bc4051bb342d73081f940166f1689027f47fe6928e36c72babc18bf2a0d9bf3
 DIST mixxx-2.2.2.tar.gz 35050389 BLAKE2B 7d1f7fa3de7aa31bdc4e13110ceec4a07ae776aa995c191e467ece403b66dc930ab2632fb0705d204a416b3e64b87af13583f307b227626facb02a88f777c259 SHA512 3b9365bd9d9a7d387cd8791d7d9f6315116e04322370db103998d5e055a6de5e159a4605c7de96cbcf13e7d0653cbe53140dca18a8c3f1b688b227be2c4aeb6f
+DIST mixxx-2.2.3.tar.gz 35060366 BLAKE2B eb21f86f5330749add8a80328985d385a0a6f49f35f8be2a34e006e8c05f306aa1463be839208fe9c86396ea8b598002bd042fdb09ca93e2378e97c834a50d35 SHA512 dfa4f9ccb7d8aa486167a01e54ee5ebeb3655a4f63c7c163b66f0dd25a21f309eae3a213d253cc37ef501777961028932a9d4ac71f5befd54daca2bd2326b395
 EBUILD mixxx-2.1.8.ebuild 3001 BLAKE2B e1812e508163883035ad68d507c9b186646fd8d49801cef7948dbeb3b6c3b4312285ad71ec8dd85966ce875f2706d3ee31f6233689327600f23a13eaafbda37d SHA512 858f7b5f84d9a95f48541da198d89691dae24267a3efc4846ec950602d4106a4f46df9387ca97fc6305c85fdd8b492bad48a57029f267c22b6700ad6a8351d61
-EBUILD mixxx-2.2.1.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-2.2.2.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
+EBUILD mixxx-2.2.3.ebuild 3159 BLAKE2B ab14ada19b18cf85144ac82b915ce3b16e2df4516587d7b11765f2f8c7d13db2c342d1a3e6d3f79b66a58a9a1dfddd1fcaf6b8a34f2f7d3179d61c73fced3f8b SHA512 8a124c7d2fa60b726707bf181f38193f36cf77ce6608343d13bc9ef9c78e32318837dccc8115233f44da637699327a9cd6aac2f8697c04d0fd466ded07ed9622
 EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-2.2.1.ebuild b/media-sound/mixxx/mixxx-2.2.3.ebuild
index 87572640dcad..87572640dcad 100644
--- a/media-sound/mixxx/mixxx-2.2.1.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.3.ebuild
diff --git a/media-sound/mp3splt-gtk/Manifest b/media-sound/mp3splt-gtk/Manifest
index ec1b6fcb2cf8..3423aa86f4b0 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 1144 BLAKE2B c43cc8ec5dd140e5acb10cd3060a1dcd44c5d1f9a4c2fd3a5359c7dcfadc8af8ca99c693ea1481c273c7243eabe4cccde02d4d36e04bdca57f5f0e8503e3b4cf SHA512 00b6bebd9461917b73b1d3ea3708240f398625935487b13cf0c6fb298e8abbbfff86aa146945794c75f9a0771dfa5bc4105b6be269653220b46888ff887f2b0d
-MISC metadata.xml 426 BLAKE2B d40b4d17f8b9b613f30a83b785db5728b5d1c3485594a470758e1be644dab472d3c4130d36631f0f3dc48db14dedd673afd36142b9f33cd9f7c8e5c50f7b8ce7 SHA512 bdb4ccec57ed706d1bec69d42ae6dc1f4c5aa59155cb671df061632155d8aacceb83ec3e1c66702176d4be5a462a31d30153e32696bcf28dc6a9b2eb137f9de9
+EBUILD mp3splt-gtk-0.9.2-r1.ebuild 930 BLAKE2B 3086bf682804c6d753bcf37947f4ed35203ff6059dc133560279ee1b430145e6329c65303fe29e687a8da11467cc743f6da31e4e830b3718dd62307f7019b232 SHA512 21f1e13f2db7580dacc15700a12d80f04f47b49be5eba538077be671e1bbcb469f625d0284a27469d3954ee3730fe2355b5c1d96fbdea19c461ff0bb7933a803
+MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index 19ed72cab9b7..fa7e71f336a3 100644
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-gtk/metadata.xml
@@ -5,9 +5,6 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="audacious">Include <pkg>media-sound/audacious</pkg> support</flag>
-	</use>
 	<upstream>
 		<remote-id type="sourceforge">mp3splt</remote-id>
 	</upstream>
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 741682ebf20c..d0f02f52dc94 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
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit versionator autotools multilib
+
+inherit versionator autotools
 
 DESCRIPTION="a GTK+ based utility to split mp3 and ogg files without decoding"
 HOMEPAGE="http://mp3splt.sourceforge.net"
@@ -11,13 +12,12 @@ SRC_URI="mirror://sourceforge/mp3splt/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="audacious doc gstreamer nls"
+IUSE="doc gstreamer nls"
 
 RDEPEND="
 	>=media-libs/libmp3splt-0.9.2
 	x11-libs/gtk+:3
-	audacious? ( >=media-sound/audacious-3.0 )
-	!audacious? ( dev-libs/dbus-glib )
+	dev-libs/dbus-glib
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-plugins/gst-plugins-meta:1.0[mp3] )
@@ -29,13 +29,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	default
-
-	if use audacious; then
-		sed -i \
-			-e 's:@AUDACIOUS_LIBS@:-laudclient &:' \
-			src/Makefile.am || die
-	fi
-
 	eautoreconf
 }
 
@@ -43,10 +36,10 @@ src_configure() {
 	local myconf
 
 	use nls || myconf+=" --disable-nls"
-	use audacious || myconf+=" --disable-audacious"
 	use gstreamer || myconf+=" --disable-gstreamer"
 
 	econf \
+		--disable-audacious \
 		--disable-gnome \
 		$(use_enable doc doxygen_doc) \
 		--disable-cutter \
diff --git a/media-sound/mpc/Manifest b/media-sound/mpc/Manifest
index 061932efac4e..50dae6264ae3 100644
--- a/media-sound/mpc/Manifest
+++ b/media-sound/mpc/Manifest
@@ -2,7 +2,9 @@ AUX mpc-0.31-nodoc.patch 403 BLAKE2B d829c6f40005531ec7657054549b5fa9acd32d15d41
 DIST mpc-0.30.tar.xz 41968 BLAKE2B e7d1156f4fe933c360196a1fdaadeb7b51f12b3c6d7bd2f98f80359485acb9d55ea7afb98c82696078b325ab3662bf33b20653d5e0edf0f52c64624c679dd0b6 SHA512 72d6f742de87ca1a9a09c73987786fa7c93b2829242135b210a9a2269e0319ba9e37367dae1043461ea870087faf5c349425025ce6c02aa9dd513ae90cbe8221
 DIST mpc-0.31.tar.xz 43896 BLAKE2B 2b65307983dfd0bc2738b3e4b1379b43b6fec712352f25a6158adefd2065eb3ff8be194e482fc441c74b69feeb8fba277d7061fb80ee6d7d72432f3284f61fb2 SHA512 48df7d85df704ae901ee0a07193daf9738b682b71a24ebd5bf4458aa562acd11b582f83adcfca814faa9a014ef565cb6c23df837b83a569fd6050f9f3802e6fe
 DIST mpc-0.32.tar.xz 44716 BLAKE2B 66fbbfe886b16382d13eb9409746cd40ed9d01ea422c18d609f956fe9b1d1ae9434aa8ae65a60ce0cfc791141e3b9630adabc2fb0bd0b8bdc61b67b2e5b2e3b3 SHA512 1913249da8b29123005a9877ff2e68f9469f8fd48f5411ea0e651255c93fbe14ef6029dadc7d256a99b566085dc19f4c62bdcf55260b27de3d088b8e9c17fcde
-EBUILD mpc-0.30.ebuild 821 BLAKE2B 11cb4a54988476db7b20eb7ea4c79cc0c974146bbb0dfa1a991cb2abbb26b68e19ad2256c44b87ad0baf061a66c97bb8ec249d4fcaf5a286ee2424ab8c2db4e6 SHA512 7cfb2d1d2c06181f5205b34f4c5f8a184c34995eca8107336e2268569a195e807f7910d1f5588523e5bbe6442724e430f7cdcc2f0fecee0fe6dab62104e607cf
+DIST mpc-0.33.tar.xz 45044 BLAKE2B 220848e088964297fbaddeedf61d5ddc90386df360a6af81b2d3753517f7ee36ff3d9462242f38b17c991996927a7d1fc253e1006253f2f875023ddb75a800c2 SHA512 d3247dfb54ac3c95caf5666088968a952b33eb7e8f941bca4f3715603839cf5a1bc5300488c78fdce6e38f612b243f2252ea682b8d0fec9f230acd760bf3560c
+EBUILD mpc-0.30.ebuild 848 BLAKE2B dfcbc54b6c767644c98e4c1f9cd876e3dccfb802fb113d522c0ca9196e4a65e7d692fb6cdbc68ce8dff23ed36e1c7b775a42c9cf91d65870b7309204dce33b1a SHA512 eba9f4939a527d5275a5ea771669bd67865642cb3c3a2996c2f6aef51a6aae0d3bfef74a8eb67c945443559cafe56df74be5f2d51db1d3d2b0f04817880ef935
 EBUILD mpc-0.31-r1.ebuild 1230 BLAKE2B 8d02b8ea0e981d176afef99720f01c41f6840a2a98c5a670abc88a3239bb0e16c71f33af1082736eeed5b2f524970921c83ae20ff8fec4eb3b4c1bffeefca089 SHA512 10ac37d0f8aae691029961586e8c42ee3ae39386fd823a91d26549efbb9b3ee82284764c5960b84fb22b394d5b16229f079db05e803e53953ef98e063f340653
 EBUILD mpc-0.32.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
+EBUILD mpc-0.33.ebuild 1241 BLAKE2B a430ac51b51bf35c99be8ec27e450ab2b5b241dba262a37c91167e40417c912a4f912aa899049f67b096ab3240185f53eb3613a0481d8acf13016540ecc8812b SHA512 a80b698e42d22744d481329024ef534d163d27352752ed266bc009535345ead3d633b97e2f89870e9b32b75bbe494b1303217f513a29a4bbf138905a7a2dbbe9
 MISC metadata.xml 252 BLAKE2B 1b1288d9f4dd3db772b8fb0fedeaa7eade5e741424e44bbf206e13adc7917181f47e8c0cd76a19f6e115ea34d1da1cd5c5f0eef9e19e141cc79a903fd8a4f961 SHA512 8e302ca809c5fd04740c71e5d9e53786edbe46c487fcff77625a027b7922c099a4d187e853ad76965567e1d5a201ac98c6f3cef9ffe7e285b6dfde0c6df0cbdb
diff --git a/media-sound/mpc/mpc-0.30.ebuild b/media-sound/mpc/mpc-0.30.ebuild
index f37f250a2c9d..70cabfb92a48 100644
--- a/media-sound/mpc/mpc-0.30.ebuild
+++ b/media-sound/mpc/mpc-0.30.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
@@ -13,6 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
 IUSE="iconv test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="media-libs/libmpdclient
 	iconv? ( virtual/libiconv )"
diff --git a/media-sound/mpc/mpc-0.33.ebuild b/media-sound/mpc/mpc-0.33.ebuild
new file mode 100644
index 000000000000..ef6640ae1878
--- /dev/null
+++ b/media-sound/mpc/mpc-0.33.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc iconv test"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx )
+	iconv? ( virtual/libiconv )
+	test? ( dev-libs/check )
+"
+DEPEND="media-libs/libmpdclient"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.31-nodoc.patch" )
+
+src_prepare() {
+	default
+
+	# use correct docdir
+	sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
+		-i meson.build || die
+
+	# use correct (html) docdir
+	sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+		-i doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Diconv=$(usex iconv enabled disabled)
+		-Dtest=$(usex test true false)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 6ddddd4d7032..2ff7f540e874 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,10 +1,6 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 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.21.14.tar.xz 673036 BLAKE2B 73eed90c0d48e26d747e26b0cd000d3e0a12dfebb015f865fe9d3ddbe5f7fa564b1655b7e0639951e9aeb2554185063b11d6bc818813ca6366688ea05705ba4a SHA512 d5ce06741444d545c7334f4c4ab32dbfacaa264df5a1ac61b73d951e0a6f952c8ea1e4df1b5bfc827e7faa35a6b8026e78cbf3a057ee35adf448fa7204389cd9
-DIST mpd-0.21.15.tar.xz 673056 BLAKE2B e399c0439e790ac62525b33c5d2d26b47d36687edc877169934dd5379646d1d38ed7fec75532498a4c0f6e51e355e872847873045ae2446d037cce8781be3067 SHA512 c67ebdb7609b36b4b8504ce0751ca2dcc38a2fba03a5b8419185e8be64bce7e19560347a600773b65f55ba0a3cedeff051117071db8e7fe0a90c9771de8bd37e
 DIST mpd-0.21.16.tar.xz 673732 BLAKE2B ed43ae9d5d40fcac0d035c24161c4db3a1b6df2b05f6a006a47beb7f7ba8ec198cbd20e34c9fcaf4e9832dbf13c57a77a9e5864d7f16de2bdd1c414d41ce391c SHA512 bb7587acd03d675ae3127ab4e196d549170551ac643e5134baa2bccaf8d7c9bba6c9a9edec9bcb61a2ec3a6ce26f4d77190323ef0329033d0cd8c1f8964be05c
-EBUILD mpd-0.21.14.ebuild 8191 BLAKE2B 9851cb110f9059babe6e5095f87a79a769871f755c78439b01fbde57a0c8fde354a1318e0d2da9b0ec1df3c4964ed3b23eede05cd17d1727380ffeba282911c0 SHA512 2ac00aa81d9d3ae49f65ec77d73d798d7d3170823039ab50e2c5735c7e454b8fcc9647cb5e37afc8a900ce3a456aca2536b0e861a2f9587f78c430696b8aa0cc
-EBUILD mpd-0.21.15.ebuild 8194 BLAKE2B 312fddb816b472d5851c34249d10f78bb03f0b22d622f1c6719acf46de05767b6b36671ccfab8e93c8402004ecf439f6d3ad5cd0b9ed00298f9d765fba9956cc SHA512 b2c2fe8011db9aae9721e9314d5888fb5a7d3b10503f0f8a53b2f44d4af10a7ca4cfa4ae8d7fa05600094f0600fc2de204ceb2540ba7935e16315d9f716480c8
-EBUILD mpd-0.21.16-r1.ebuild 8138 BLAKE2B 9def46e3d226593a26cc400a262f6b624925c3f0fd6648c372f2b0c490189d6232491c120fa99298b5e7aa27a0eb8466b230a281218ce18118474b4ab497d49c SHA512 d039efbd925364a8f21092a255bc0ad4c508041b1d8c6b5f6bc488b253d3c68fa642442a54589728bd669fb5633dd1c1c62b98978ee2cc9051d4235b80810e36
+EBUILD mpd-0.21.16-r1.ebuild 8088 BLAKE2B d720d1fe08a6e71366459e04a16a085bd3ea81e4d0ca621e17d59a0e582f6f74eb4909de6180dc54a353aef6c8b8dfdaf33622d86813202d9a4619a0eac96d16 SHA512 c1fe6b917446381be31131b8773950bb10b4379d77072e6fee5d982e95091cefb9841504e8971bc493a1d751fcdcdfe2e6de33da573ddbbcb7c92be9eed79db5
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.14.ebuild b/media-sound/mpd/mpd-0.21.14.ebuild
deleted file mode 100644
index 603f91529c25..000000000000
--- a/media-sound/mpd/mpd-0.21.14.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# 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 xdg-utils
-
-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 ~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
-	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 )
-	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)
-		-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"
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.15.ebuild b/media-sound/mpd/mpd-0.21.15.ebuild
deleted file mode 100644
index a5cdc87afb48..000000000000
--- a/media-sound/mpd/mpd-0.21.15.ebuild
+++ /dev/null
@@ -1,299 +0,0 @@
-# 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 xdg-utils
-
-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 ~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
-	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 )
-	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)
-		-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"
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-sound/mpd/mpd-0.21.16-r1.ebuild b/media-sound/mpd/mpd-0.21.16-r1.ebuild
index e2533be2192c..9911b4df7e6c 100644
--- a/media-sound/mpd/mpd-0.21.16-r1.ebuild
+++ b/media-sound/mpd/mpd-0.21.16-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic linux-info meson systemd user xdg-utils
+inherit flag-o-matic linux-info meson systemd xdg-utils
 
 DESCRIPTION="The Music Player Daemon (mpd)"
 HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
@@ -11,7 +11,7 @@ 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 ~x64-macos"
+KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~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
@@ -119,8 +119,6 @@ PATCHES=(
 )
 
 pkg_setup() {
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
 	if use eventfd; then
 		CONFIG_CHECK+=" ~EVENTFD"
 		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
diff --git a/media-sound/mserv/Manifest b/media-sound/mserv/Manifest
deleted file mode 100644
index 8c3a3cd0c8c4..000000000000
--- a/media-sound/mserv/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX mserv-0.35-acl 52 BLAKE2B ab09a0b22b911ad98d2104d588ff0937452d7d92f0dd5d3b3e1ec32f1dfe0f94a39a2d780110d87199eb843000b32863ac45511260cecf6a4bf9381a37c0a66d SHA512 2fbe26f0ccbe9d0ccc815d3430989fa7c38cb976289419c46fb7980e386258cd5ddb52214b4b0a11333bb6cbc8a2e29386efbba455839acbe844ad9b2371b2dc
-AUX mserv-0.35-confd 230 BLAKE2B a7492bb809a219e5eda428e71abcd927a5f6340e5ad2e54ab32383a86e6cfc70f81a641fc90facf90f7f45a6869d77a5f3e9f1f0b55fa6f2a712fd6bddc78dbc SHA512 99e7f18d8a31a6636dd2c9517e9d0329698f4fa960b416c8ad23b30236bb36442fac3d0b870d938ea1229602b2116c081319dd1fe96a425da011cdd2effe5ead
-AUX mserv-0.35-config 1515 BLAKE2B ea3eda980e55d869b7fc5c246b9104527e30e07c56d85d417799de9dd578b82e9e03ad676a0e3020d78e37d4fc4f6a850bec5bdc3f415468fc84ecd12390dde5 SHA512 a0593e3c99057ad0ea2f774405c010652b25484fa7d4352348d6188cd1fc330687a6e20b7cfb06e836f0f84e878398e4042fe30a93b28b836a4d4dba89b25ea3
-AUX mserv-0.35-initd 464 BLAKE2B a671eecad39a6725ab168dc927637aecdb8686f6343e28427ec744feb2c6651465695be7cf5e29f613253a8be8d7a6ead3b8af0cff0eb2b514ead25f44a5bb11 SHA512 4a6d95ea43a585372b4e0a6c80673a6d849a09a3649b706b0413ee6182ee10b891d0af32c423e524b845657226fec7b792ec3f1fc6c59c016417dce96610be98
-AUX mserv-0.35-mservplay.patch 430 BLAKE2B fb9b5e8f5a790f8d90fa5da58a04f55fe2a88325428a2362028d204e372bbbac37706a34dcce4f8367f9cf38394e4b3163d68983ec28d284030ab6a0de3ba171 SHA512 5cdda97f70608899229ec595edfed5eb163f1abed2fb50e169c970c954b3adf85b7433789958ff4d4a66e877724a9623d056244e6642a07c989c0111b9fc060d
-AUX mserv-0.35-paths.patch 2673 BLAKE2B 6fe483fd35a94df2801fd4d2b651d4eea1a5749d47750e260c4ed899a70e96af40ded48991839f6c4e03eb95f451ddeee498e3d97729318b009db33f6a8062b7 SHA512 4534aa9a5bd1ae36ec08c53cf5e37e35e2dada8986130065610a89b0d42be60a05d04ce521007f0a55975e042b2cb8f431df2060e7d9f8469ed70254c56c130d
-AUX mserv-0.35-webacl 39 BLAKE2B f50f31713b76c1ba22af1bc747a60f4db008ad4457c563475ef6ab5a7e6c3669c1ecd098bbc3dd62bb07187443af1ca88bf60ca14816eb7abece4bd14752664d SHA512 e0d6a549265bb4e5568ec4cfa2fd003799002e6772f6a8e966510e0f7c7c6f1b2d16cec8ef9961207bf7c4db6973ff954261bd3d89ad2fab47f5b5c183d3f452
-DIST mserv-0.35.tar.gz 280299 BLAKE2B eb4ffe612b4373b1b381286b3f5e865393ac2a5a77c2026bace2fbde0caf8407c9750fb0d88d855cc56875df988ed7b54b91b67166e1cc890d8c0b6e4bb1ceec SHA512 a79340fc6ea02cf14dd0c223cf0d9feb5805b9e88d3dc1f4c854edbd9b8fe98c60b89c10555aa4214e153b17452c088dfde7700a5357a2c1a43c22af5d44255f
-EBUILD mserv-0.35-r1.ebuild 2667 BLAKE2B 0fc51caa5f5c0520ef3560edf5463679c02cd10b77b1ff9c348046ed5d11c82ade12892100dd88399131abc636c59b93b132f6c84c6ed31810e4264d08981149 SHA512 8f80efd86ec783771f5cc5e78b78f2b819afa17c029c55d8eddc83082597a6c1c6768d8469474fe65c59b1b8496a3e9814da224c3e7cf2a0d5922d9b383f1567
-MISC metadata.xml 328 BLAKE2B 5a73791c8fb38325a26db1222dc36b68982365ce93f8e2a53469d028817ef91e156b25a7497190f888a32d5a0b562759832f1fbfa4a74d31afb1f9c97569cb9d SHA512 56f37df3967c0d5572bd5811d03b2d0304a90aeb59f4e994dd21adb63b36eec8301cf4b4e1a1e9de81a2a29ac59a8fe33136a8d1a878385f77ec9b72325d91c0
diff --git a/media-sound/mserv/files/mserv-0.35-acl b/media-sound/mserv/files/mserv-0.35-acl
deleted file mode 100644
index 201913ef2177..000000000000
--- a/media-sound/mserv/files/mserv-0.35-acl
+++ /dev/null
@@ -1,2 +0,0 @@
-root:a16aKMw/UDpfc:MASTER
-guest:ax/jGzB/YyIVk:GUEST
diff --git a/media-sound/mserv/files/mserv-0.35-confd b/media-sound/mserv/files/mserv-0.35-confd
deleted file mode 100644
index 5d4feef5e05b..000000000000
--- a/media-sound/mserv/files/mserv-0.35-confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Set the port mserv listens on.  By default, this is 4444, but
-# Maya's document server uses this port also.
-#
-# If you change it here, make sure you change it in:
-# /var/www/localhost/cgi-bin/mserv/mserv.cgi as well.
-
-PORT=4444
diff --git a/media-sound/mserv/files/mserv-0.35-config b/media-sound/mserv/files/mserv-0.35-config
deleted file mode 100644
index 95afad8522d6..000000000000
--- a/media-sound/mserv/files/mserv-0.35-config
+++ /dev/null
@@ -1,49 +0,0 @@
-# Mserv configuration file for 0.33 and later
-
-# File locations, / at start is absolute, otherwise relative to mserv root
-path_acl=/etc/mserv/acl
-path_webacl=/etc/mserv/webacl
-path_logfile=/var/log/mserv.log
-path_tracks=/usr/local/share/tracks
-path_trackinfo=/var/lib/mserv/trackinfo
-path_playout=/var/spool/mserv/player.out
-path_idea=idea
-path_mixer=/dev/mixer
-path_language=/usr/share/english.lang
-
-# Define player invokation methods
-# mservplay is our special wrapper, the first parameter is a 'nice' level
-# play is part of sox
-prog_mpg123=/usr/bin/mpg123 -b 1024
-prog_freeamp=/usr/bin/freeamp -ui mpg123
-prog_mservplay=/usr/bin/mservplay 0 mpg123 -b 1024
-prog_play=/usr/bin/play
-prog_ogg123=/usr/bin/ogg123
-
-# Set players for each file extension we want to support, unknown extensions
-# are ignored by mserv
-player_mp3=prog_mpg123
-player_wav=prog_play
-player_au=prog_play
-player_ogg=prog_ogg
-
-# Set default random mode, either on or off.  You must still tell mserv to
-# start playing (PLAY).
-random=off
-
-# Set whether or not you would like play to start as soon as mserv has loaded.
-play=off
-
-# Set default random factor, 0.5 is completely random, 0.6 is less random
-# and takes into account your ratings, 0.4 plays your worst tunes. 0.99 max.
-factor=0.60
-
-# Set default filter, leave blank for off.  Example: "!classical" to
-# not play classical genre, or "year>=1980&year<1990" to only play
-# 80's songs.
-filter=
-
-# Set gap between songs, in seconds.  0 to start the next song as quick as
-# possible.
-gap=1
-
diff --git a/media-sound/mserv/files/mserv-0.35-initd b/media-sound/mserv/files/mserv-0.35-initd
deleted file mode 100644
index 86a5a4049562..000000000000
--- a/media-sound/mserv/files/mserv-0.35-initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-	after apache
-	after apache2
-}
-
-start() {
-	ebegin "Starting Mserv"
-	start-stop-daemon --start -o -b --chuid mserv --exec /usr/bin/mserv -- \
-		-r /var/spool/mserv -c /etc/mserv/config -p ${PORT}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Mserv"
-	start-stop-daemon --stop -o -q --exec /usr/bin/mserv
-	eend $?
-}
diff --git a/media-sound/mserv/files/mserv-0.35-mservplay.patch b/media-sound/mserv/files/mserv-0.35-mservplay.patch
deleted file mode 100644
index 45beafe68551..000000000000
--- a/media-sound/mserv/files/mserv-0.35-mservplay.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mserv-0.35.orig/support/mservplay.c	2003-08-28 20:10:17.000000000 -0700
-+++ mserv-0.35/support/mservplay.c	2003-08-29 15:16:13.000000000 -0700
-@@ -43,7 +43,7 @@
-     fprintf(stderr, "%s: setuid: %s\n", argv[0], strerror(errno));
-     exit(1);
-   }
--  if (stricmp(argv[2], "mpg123")) {
-+  if (strcasecmp(argv[2], "mpg123")) {
-     fprintf(stderr, "%s: Unrecognised player type, must be 'mpg123'",
- 	    argv[0]);
-     exit(1);
diff --git a/media-sound/mserv/files/mserv-0.35-paths.patch b/media-sound/mserv/files/mserv-0.35-paths.patch
deleted file mode 100644
index dca7560ddcb7..000000000000
--- a/media-sound/mserv/files/mserv-0.35-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- mserv-0.35.orig/mserv/defconf.c	2003-08-28 20:10:17.000000000 -0700
-+++ mserv-0.35/mserv/defconf.c	2003-08-28 23:04:14.000000000 -0700
-@@ -16,11 +16,11 @@
- # Define player invokation methods\n\
- # mservplay is our special wrapper, the first parameter is a 'nice' level\n\
- # play is part of sox\n\
--prog_mpg123=/usr/local/bin/mpg123 -b 1024\n\
--prog_freeamp=/usr/local/bin/freeamp -ui mpg123\n\
--prog_mservplay=/usr/local/bin/mservplay 0 mpg123 -b 1024\n\
--prog_play=/usr/local/bin/play\n\
--prog_ogg123=/usr/local/bin/ogg123\n\
-+prog_mpg123=/usr/bin/mpg123 -b 1024\n\
-+prog_freeamp=/usr/bin/freeamp -ui mpg123\n\
-+prog_mservplay=/usr/bin/mservplay 0 mpg123 -b 1024\n\
-+prog_play=/usr/bin/play\n\
-+prog_ogg123=/usr/bin/ogg123\n\
- \n\
- # Set players for each file extension we want to support, unknown extensions\n\
- # are ignored by mserv\n\
---- mserv-0.35.orig/webclient/index.html	2003-08-28 20:10:17.000000000 -0700
-+++ mserv-0.35/webclient/index.html	2003-08-29 17:02:10.000000000 -0700
-@@ -9,7 +9,7 @@
- <tr><td>
- <center>
- <table>
--<form method=post action="main.cgi">
-+<form method=post action="/cgi-bin/mserv/main.cgi">
- <tr>
-   <td>User</td>
-   <td><input type=text name=user size=10 maxsize=10></td>
-@@ -23,6 +23,6 @@
- </center>
- </td></tr>
- </table>
--<p><a href="main.cgi">GUEST ACCESS</a></p>
-+<p><a href="/cgi-bin/mserv/main.cgi">GUEST ACCESS</a></p>
- </center>
- </html>
---- mserv-0.35.orig/webclient/margin.cgi	2003-08-28 20:10:17.000000000 -0700
-+++ mserv-0.35/webclient/margin.cgi	2003-08-30 16:14:27.000000000 -0700
-@@ -15,11 +15,11 @@
- <head>
-   <title>Mserv web interface - margin</title>
- </head>
--<body bgcolor="#ffffff" background="back.gif">
-+<body bgcolor="#ffffff" background="/mserv/back.gif">
- <p align=center><center>
- <table>
- <tr><td>
--<p align=center><img src="mserv7.gif" alt="Mserv"></p>
-+<p align=center><img src="/mserv/mserv7.gif" alt="Mserv"></p>
- <p><font size="2"><a target=main href="mserv.cgi?user=$user&pass=$pass&page=status">Status</a>
- <br><a target=main href="mserv.cgi?user=$user&pass=$pass&page=albums">Albums</a>
- <br><a target=main href="mserv.cgi?user=$user&pass=$pass&page=queue">Queue</a>
---- mserv-0.35.orig/webclient/mserv.cgi	2003-08-28 20:10:17.000000000 -0700
-+++ mserv-0.35/webclient/mserv.cgi	2003-08-30 16:14:47.000000000 -0700
-@@ -3,7 +3,7 @@
- $guestuser = 'guest';
- $guestpass = 'guest';
- $host = 'localhost:4444';
--$mservcmd = '/usr/local/bin/mservcmd';
-+$mservcmd = '/usr/bin/mservcmd';
- 
- use POSIX;
- use CGI;
-@@ -34,7 +34,7 @@
- <head>
-   <title>Mserv</title>
- </head>
--<body bgcolor="#ffffff" background="back.gif">
-+<body bgcolor="#ffffff" background="/mserv/back.gif">
- EOF
- 
- if ($page eq 'status') {
diff --git a/media-sound/mserv/files/mserv-0.35-webacl b/media-sound/mserv/files/mserv-0.35-webacl
deleted file mode 100644
index 9e438c085d5c..000000000000
--- a/media-sound/mserv/files/mserv-0.35-webacl
+++ /dev/null
@@ -1,2 +0,0 @@
-root:a16aKMw/UDpfc
-guest:ax/jGzB/YyIVk
diff --git a/media-sound/mserv/mserv-0.35-r1.ebuild b/media-sound/mserv/mserv-0.35-r1.ebuild
deleted file mode 100644
index 4c5deb1947b4..000000000000
--- a/media-sound/mserv/mserv-0.35-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit depend.apache webapp eutils toolchain-funcs user
-
-DESCRIPTION="Jukebox-style music server"
-HOMEPAGE="http://www.mserv.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="mserv"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="vorbis"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-
-RDEPEND=">=dev-lang/perl-5.6.1
-	media-sound/mpg123
-	media-sound/sox
-	vorbis? ( media-sound/vorbis-tools )"
-DEPEND=""
-
-need_apache
-
-pkg_setup() {
-	webapp_pkg_setup
-	enewgroup mserv
-	enewuser mserv -1 -1 /dev/null mserv,audio
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Adjust paths to match Gentoo
-	epatch "${FILESDIR}"/${P}-paths.patch
-	# Mservplay uses stricmp - should be strcasecmp
-	epatch "${FILESDIR}"/${P}-mservplay.patch
-}
-
-src_compile() {
-	econf
-	emake || die "emake failed"
-
-	# Optional suid wrapper
-	cd "${S}"/support
-	$(tc-getCC) -I.. -I../mserv ${CFLAGS} ${LDFLAGS} mservplay.c -o mservplay || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dobin support/mservedit support/mservripcd support/mservplay
-	dodoc AUTHORS ChangeLog docs/quick-start.txt
-
-	# Web client
-	dodir ${MY_CGIBINDIR}/${PN}
-	cp webclient/*.cgi "${D}"/${MY_CGIBINDIR}/${PN}
-	cp webclient/*.gif webclient/index.html "${D}"/${MY_HTDOCSDIR}
-
-	webapp_src_install
-
-	# Configuration files
-	insopts -o mserv -g mserv -m0644
-	insinto /etc/mserv
-	fowners mserv:mserv /etc/mserv
-	newins "${FILESDIR}"/${P}-config config
-	newins "${FILESDIR}"/${P}-webacl webacl
-	newins "${FILESDIR}"/${P}-acl acl
-	insinto ${MY_HOSTROOTDIR}/${PN}
-	fowners mserv:mserv ${MY_HOSTROOTDIR}/${PN}
-	newins "${FILESDIR}"/${P}-config config
-	newins "${FILESDIR}"/${P}-webacl webacl
-	newins "${FILESDIR}"/${P}-acl acl
-	fperms 0600 ${MY_HOSTROOTDIR}/${PN}/acl
-
-	newinitd "${FILESDIR}"/${P}-initd ${PN}
-	newconfd "${FILESDIR}"/${P}-confd ${PN}
-
-	# Log file
-	dodir /var/log
-	touch "${D}"var/log/mserv.log
-	fowners mserv:mserv /var/log/mserv.log
-
-	# Track and album info
-	keepdir /var/lib/mserv/trackinfo
-	fowners mserv:mserv /var/lib/mserv/trackinfo
-
-	# Current track output
-	dodir /var/spool/mserv
-	touch "${D}"var/spool/mserv/player.out
-	fowners mserv:mserv /var/spool/mserv /var/spool/mserv/player.out
-}
-
-pkg_postinst() {
-	elog
-	elog "The wrapper program 'mservplay' is disabled for"
-	elog "security reasons.  If you wish to use mservplay"
-	elog "to pass a 'nice' value to mpg123, you must make"
-	elog "/usr/bin/mservplay suid root."
-	ewarn
-	ewarn "Please edit /etc/mserv/config and set path_tracks"
-	ewarn "to the location of your music files."
-	webapp_pkg_postinst
-}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 4d44853c4cfb..e1df233164a4 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,4 @@
-DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
-EBUILD mumble-1.3.0.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
-EBUILD mumble-1.3.0_rc2.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
-EBUILD mumble-9999.ebuild 3781 BLAKE2B d81a5dd96991202f1c5b2a5a6e9086ef60df87ab8f87ff33d3588c008d17f6a0f59e2d3298e5a7b74ccc2ae9eea5a47b9b96a29de622a6edf29b5efe1c08e95c SHA512 cbb20c9b5be3b36fc112631eecc9b29ae9c251fbd3e6d606a28e98ed0444f441c2fe3962e401f9689733b1ba50f76762307db16ad2209d4cdaee26406f49a64d
+EBUILD mumble-1.3.0.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
+EBUILD mumble-9999.ebuild 3786 BLAKE2B 73d5297dc30e4e7572259aaab5572b5e6286a0c470a5f7984079b11eb933b6b6d09eb02af75b8c4a04ec2f13c8499c6b9325934555457dd82b32036a76f15980 SHA512 ef72f808721781497a09bdfc332ff60bbc47ce9c4b05ae4e13ecb720d7c2f1fc3b6f00ad6b97263b636605722610aaa68c69ac11907109bcba5489f639099df4
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0.ebuild b/media-sound/mumble/mumble-1.3.0.ebuild
index ca1f49e6d6bd..7f2856cbf127 100644
--- a/media-sound/mumble/mumble-1.3.0.ebuild
+++ b/media-sound/mumble/mumble-1.3.0.ebuild
@@ -31,7 +31,7 @@ IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rn
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
diff --git a/media-sound/mumble/mumble-1.3.0_rc2.ebuild b/media-sound/mumble/mumble-1.3.0_rc2.ebuild
deleted file mode 100644
index ca1f49e6d6bd..000000000000
--- a/media-sound/mumble/mumble-1.3.0_rc2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop multilib-build 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
-			https://dl.mumble.info/${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
-"
-
-# NB: qmake does not support multilib but it's fine to configure
-# for the native ABI here
-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"
-}
-
-multilib_src_compile() {
-	local emake_args=(
-		# place libmumble* in a subdirectory
-		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
-		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
-	)
-	# build only overlay library for other ABIs
-	multilib_is_native_abi || emake_args+=( -C overlay_gl )
-	emake "${emake_args[@]}"
-	emake clean
-}
-
-src_compile() {
-	multilib_foreach_abi multilib_src_compile
-}
-
-multilib_src_install() {
-	local dir=$(usex debug debug release)
-	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
-	if multilib_is_native_abi; then
-		dobin "${dir}"/mumble
-		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-	fi
-}
-
-src_install() {
-	multilib_foreach_abi multilib_src_install
-
-	newdoc README.Linux README
-	dodoc CHANGES
-	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
-}
-
-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 ca1f49e6d6bd..7f2856cbf127 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -31,7 +31,7 @@ IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rn
 RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
+	dev-qt/qtnetwork:5[ssl]
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 54cfe8d0a119..a6114b69b068 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -2,9 +2,7 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137
 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653
 AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
 DIST mumble-1.3.0.tar.gz 8788587 BLAKE2B cb870b043506eaa0fb15a21c95c125eb49082dde55b9c1a49e3ffff318477b27b45d75d18d3db83e247446efaddb2253ff520ec19da04b465a7e9a33b22064d1 SHA512 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
 EBUILD murmur-1.3.0.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
-EBUILD murmur-1.3.0_rc2-r2.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
 EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild
deleted file mode 100644
index bd399783509e..000000000000
--- a/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd 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
-			https://dl.mumble.info/${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="
-	acct-group/murmur
-	acct-user/murmur
-	>=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="
-	acct-group/murmur
-	acct-user/murmur
-	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.
-"
-
-src_prepare() {
-	default
-
-	if [[ "${PV}" == *9999 ]] ; then
-		pushd scripts &>/dev/null || die
-		./mkini.sh || die
-		popd &>/dev/null || die
-	fi
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-
-	# Adjust systemd service file to our config location #689208
-	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
-		-i scripts/${PN}.service || 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="$(usex debug debug release)"
-	dobin "${dir}"/murmurd
-
-	local etcdir="/etc/murmur"
-	insinto ${etcdir}
-	newins scripts/${PN}.ini.system ${PN}.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
-
-	systemd_dounit scripts/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
-	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 ${etcdir}/murmur.ini
-	fperms 640 ${etcdir}/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index c0f3030ed1d6..90bef7128fbe 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,10 +1,11 @@
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
-AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49cf6f92ad8da3d16a897f4fa854e9638826fc1bc66a79e1d0032020b8217b9d65b4d9272ce0018effacb439ee64a4b63 SHA512 a3379adb9b8adc5fb6c430694bb34cd832948c68a5cdc2e3ddc148f34e8367ec7674c679da5881a417bdb90f8cec1415d41fefb7a5dd420c298b4bfa2ffb2a15
-DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
 DIST MuseScore_General-0.1.6.tar.bz2 35109226 BLAKE2B 62a22e50d4c10ab08f0affd728f020e092378410e3258e862d054d1e7cde8fc6bda89deafed63b7f08dcd9737fa3c62f5331da34237239cc79147065f171737d SHA512 81c3f4d003005c8d4ded41cc758e2c8089acbd53f085efa158844c32c2411d4d636a524d6b43297bdc1f92dba9e1ec1227d3e565ecc2486fdc5b8a7c7d3d19a5
-DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
+DIST MuseScore_General-0.1.8.tar.bz2 35107290 BLAKE2B 65a0f78077a89fbf590fc47e83009f1029492ddb5a6bc411798c141903dbeffc5aa8b32fcead672e886878d2c9134c33c3c38e438e293a8135eca8394f880b32 SHA512 bdc706139309524841fdfe738e156f95d2d4c1716c09ce2984f9de5f205f39d3adffd7327a3957727015b7a612bab99c228ca26d9b0dcaf077991794585169c9
+DIST musescore-3.3.3.tar.gz 62820760 BLAKE2B e6daf1ba4ea62dc04598461ca31290548ef14d0252084ddfd6a9945d0850cf8700fc1eadea683a67415fe5a71a61310cd7bf08640b354e8e4d60967ad8ca0605 SHA512 ed2b29e450ca8440e8073b9f7b1c3ae2c373d6f26963bd3bf5032156f6ed30100f4993c4c6637e292b6939c69cd592ec2d2f008d37b917f6af3bcc640ccf2910
+DIST musescore-3.3.4.tar.gz 62827836 BLAKE2B 55e4c14539ac6227f0cc2dfb50adae920e63f9cf054a90a4c39f92c608a3ccb17c395070f77380997b367b48db72d96104117e02f486dcad26c0ea08aedce329 SHA512 c224e391daadf8d33cbf9d42e6a055290d7821abe7141e4927a77f1c7df6a57cbcbe5277248deb39d368547f17423ee9a4b5bc6cde8f27bc5646e83c6c4ff082
 DIST musescore-3.3.tar.gz 64453809 BLAKE2B 278ca68e3a2432750356902360ac6882abaf763d3e512aa588e2b0eb7c58f8ffdab111ec3edaa9bf058a41ab5bce26f05a9a618def0c094376a6a4dbea7340ef SHA512 b7d228d957d674868474ae6a94afbeaa530d2d2e7688b9be91b77237066071920034a3b5e2241399543b4fe8d73d97ba605584cb0c0f67d2026ca212a13dbaea
-EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2
-EBUILD musescore-3.3.ebuild 2637 BLAKE2B f85431f1cf5e86df9ce62e2e5766fb470420fa226544f95541a270a81477c786d0dcb5186800803badb1a88a3beddd9d5495b56d6c95a7b596a82d12fe7f0979 SHA512 38158e7f2935383823947a61cf00c81e52c498e099b727afb0524e07d4538a45f7aed38b1d0e8935615036202a2d03de31ad8a16181ad2c103eb395f637728f0
-EBUILD musescore-9999.ebuild 2629 BLAKE2B dec041350e036cfe620cde6203f56df3c36fbf0912327efbc59d5d72e0a2e364fbe23426e4ba8017876d1c07ad8e9bd87f17612798f61773f782d603516e55c0 SHA512 d0fd199a02cffe02cb440d2710b96af5e4642ed6745860b9c2fc477d82137c55add1b8b2fef5db8cacadfef55ef58fb63f1f8d97d5fbb8880a52c7a470d9b8f9
+EBUILD musescore-3.3.3.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
+EBUILD musescore-3.3.4.ebuild 2456 BLAKE2B 08c1527c0ef8177bbb6993d0bca83bb1b3b2daa20c1267945c9d18ccf77181ae03dc6cf9ce63c9aedb4d8ba6c9ac90e627cc37c52644780b0e7f698e63f69eb7 SHA512 2103096bbb8e39127f5eb13b1d0c110587ba07e3a294bfa2a288b42df9152dd75e5664b723e61241ea2ae0f9c2ec46f91a0f0b9fbe8849177e9f6b0c49617058
+EBUILD musescore-3.3.ebuild 2454 BLAKE2B 3c8ab351b7e781448b3ee732c31e70f37e1f01bcc8ac418fa233f9d12c66a50b748971bef2c427d5dee5c9fd42d1a2a047fcd1a296f8148d721defbaf8fc97af SHA512 d2be78de11ec4756bb35466476d01a33b87d209a647f93542df6142c44e6c9c7bdc54f6e5876b8ffb7c04c0462b38b9b445af90e1ccc98b7210c10622a5a70ab
+EBUILD musescore-9999.ebuild 2448 BLAKE2B 477b9897f891b5c885f8485eac6d545b6c5c5e2e6d4ac59108b4ba77df3f36a0169078732ced3f55ede4792b7597480a1c1d7d979e35e824d68f8e244975f66d SHA512 2c7bd0523e4b14f601437ec0fa2d1bbb090da1702137d8ca7ff74aff27da817b63b57a6070e1171c03fac418fea34a6eb45980da5eae5e483e409311fe2b6ba6
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-3.0.1-porttime.patch b/media-sound/musescore/files/musescore-3.0.1-porttime.patch
deleted file mode 100644
index b9bddf1d9d97..000000000000
--- a/media-sound/musescore/files/musescore-3.0.1-porttime.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/mscore/CMakeLists.txt b/mscore/CMakeLists.txt
-index fcf9332..59db47a 100644
---- a/mscore/CMakeLists.txt
-+++ b/mscore/CMakeLists.txt
-@@ -715,7 +715,7 @@ else (MINGW)
-            if (APPLE)
-                set(PORTMIDI_LIB portmidi)
-            else (APPLE)
--               set(PORTMIDI_LIB -lportmidi -lporttime) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
-+               set(PORTMIDI_LIB -lportmidi) # Remove -lporttime on RPM-based systems where PortTime is part of PortMidi.
-            endif (APPLE)
-            target_link_libraries(mscore ${PORTMIDI_LIB})
-        endif (USE_PORTMIDI)
diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.3.3.ebuild
index 379a593d84d6..3055267da6e9 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.3.3.ebuild
@@ -3,21 +3,21 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION="3.11"
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils xdg
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
 # MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
 SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.3.tar.bz2"
+	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis webengine"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
 BDEPEND="
@@ -33,16 +33,17 @@ DEPEND="
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
-	media-sound/lame
 	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
@@ -52,8 +53,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-man-pages.patch"
-	"${FILESDIR}/${P}-porttime.patch"
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
 )
 
 S="${WORKDIR}/MuseScore-${PV}"
@@ -74,7 +74,7 @@ src_configure() {
 		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME=ON # bug 678234
+		-DBUILD_LAME="$(usex mp3)"
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
diff --git a/media-sound/musescore/musescore-3.3.4.ebuild b/media-sound/musescore/musescore-3.3.4.ebuild
new file mode 100644
index 000000000000..3055267da6e9
--- /dev/null
+++ b/media-sound/musescore/musescore-3.3.4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CHECKREQS_DISK_BUILD=3500M
+inherit cmake-utils xdg check-reqs
+
+DESCRIPTION="WYSIWYG Music Score Typesetter"
+HOMEPAGE="https://musescore.org/"
+# MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
+# It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
+SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+REQUIRED_USE="portmidi? ( portaudio )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
+	>=dev-qt/qtsingleapplication-2.6.1_p20171024
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	dev-qt/qtxmlpatterns:5
+	>=media-libs/freetype-2.5.2
+	media-libs/libsndfile
+	sys-libs/zlib:=
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( virtual/jack )
+	mp3? ( media-sound/lame )
+	portaudio? ( media-libs/portaudio )
+	portmidi? ( media-libs/portmidi )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-man-pages.patch"
+)
+
+S="${WORKDIR}/MuseScore-${PV}"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Move soundfonts to the correct directory
+	mv "${WORKDIR}"/sound/* "${S}"/share/sound/ || die "Failed to move soundfont files"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DDOWNLOAD_SOUNDFONT=OFF
+		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
+		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
+		-DUSE_SYSTEM_FREETYPE=ON
+		-DBUILD_ALSA="$(usex alsa)"
+		-DBUILD_JACK="$(usex jack)"
+		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_PORTAUDIO="$(usex portaudio)"
+		-DBUILD_PORTMIDI="$(usex portmidi)"
+		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
+		-DSOUNDFONT3="$(usex vorbis)"
+		-DBUILD_WEBENGINE="$(usex webengine)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cd "${BUILD_DIR}" || die
+	cmake-utils_src_make -j1 lrelease manpages
+	cmake-utils_src_compile
+}
diff --git a/media-sound/musescore/musescore-3.3.ebuild b/media-sound/musescore/musescore-3.3.ebuild
index 436f8021bc15..0533ecb9ffba 100644
--- a/media-sound/musescore/musescore-3.3.ebuild
+++ b/media-sound/musescore/musescore-3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit cmake-utils xdg-utils check-reqs
+inherit cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
@@ -33,6 +33,7 @@ DEPEND="
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
@@ -88,15 +89,3 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/musescore/musescore-9999.ebuild b/media-sound/musescore/musescore-9999.ebuild
index 15619c44fed6..f55fab5973b2 100644
--- a/media-sound/musescore/musescore-9999.ebuild
+++ b/media-sound/musescore/musescore-9999.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CHECKREQS_DISK_BUILD=3500M
-inherit git-r3 cmake-utils xdg-utils check-reqs
+inherit git-r3 cmake-utils xdg check-reqs
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
 # MuseScore_General-0.1.3.tar.bz2 packaged from https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General/
 # It has to be repackaged because the files are not versioned, current version can be found in VERSION file there.
-SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.6.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/MuseScore_General-0.1.8.tar.bz2"
 EGIT_REPO_URI="https://github.com/${PN}/MuseScore.git"
 
 LICENSE="GPL-2"
@@ -33,6 +33,7 @@ DEPEND="
 	dev-qt/qthelp:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtprintsupport:5
+	dev-qt/qtquickcontrols2:5
 	>=dev-qt/qtsingleapplication-2.6.1_p20171024
 	dev-qt/qtsvg:5
 	dev-qt/qtxml:5
@@ -91,15 +92,3 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-sound/normalize/Manifest b/media-sound/normalize/Manifest
index fe54523e7579..e1da58a051dd 100644
--- a/media-sound/normalize/Manifest
+++ b/media-sound/normalize/Manifest
@@ -1,5 +1,5 @@
 AUX normalize-0.7.7-audiofile-pkgconfig.patch 1865 BLAKE2B 4a03c449e218300328297d30229b26b425e65ab4f7a05725bea78c19ea3e6556bbf3dd9dacf1c73c064a6912120772754e65aee00af8a2f016b9bb2750b2ca2b SHA512 bf8b4fdd3ba9629cefba6eecc3db21b3fe9129429a8df1fcc7794f3eb6e802f1939d0ec23863bf91edecd94651a70f798d6888f0b94b39664b53acf68b737967
 DIST normalize-0.7.7-m4.patch.gz 5078 BLAKE2B 6bb0979c1a94b7bd52ea01cfcfbd715772fb5cd92c46124a43ff6982cc0e369c86a43c836354ea10e1f613274cb58afa4dad6c1d6656393edadc1b7e029f35a8 SHA512 a06d3a51557a0c54e1ff2d0eaec0a8ad51b0faf1457393f2c9207fd428d58e21ecbcbfbab59a15e9fcc59d6ec2dbf91fe78802a67d533a1f90cc6e46205d39f7
 DIST normalize-0.7.7.tar.bz2 388777 BLAKE2B 3ac7be8b86ada8899661d7012d7a60e4a41fcf2c510c302069d1b9ab54efd50e7e042fd5c1365bed1c28fe15b6bc804e605ea7b5f1fd7f96047a70c335275324 SHA512 5fb2265eac93b243682cedb955d2ddfe05f55cafdeb1d757aaef0afb36bc9907ea3321b8554e128f6228bdeeaeef96e3e9ba000d0ad84282cc76a50b3e460ce4
-EBUILD normalize-0.7.7-r1.ebuild 906 BLAKE2B cebe8daf495100143975d501fb040efb13a82d0f56726169352a49aa017acac5e1993c7837ab502e7dd12f1009c43b04668b6bf7ae58f87e91a32d6f2a6674f7 SHA512 a5eb5ff826d68d7a762a9dbc9a63ad94a9ed6136ae11fea33ee0ca036ec6c06081be438bb02f54e637005232aa4dbd433cd077e00be006b1375feb6bc1dbd9dc
+EBUILD normalize-0.7.7-r1.ebuild 848 BLAKE2B 043dbde73b794036107ed29cdf79de76d1f51e253632c1a79c0ca772a1b27e5756227b5c9058df33aba3d28d7d4b33f221e5599439645a233a80dcad2465d11c SHA512 8531086804bff285491be625b784149faead26e22579e591cdc23056d78dcf3a767e243ce22470a64008e95a9d771ea83022bf6f29cc96303dba565b40736045
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/normalize/normalize-0.7.7-r1.ebuild b/media-sound/normalize/normalize-0.7.7-r1.ebuild
index 6058be69c6e0..dbc8ff6009f1 100644
--- a/media-sound/normalize/normalize-0.7.7-r1.ebuild
+++ b/media-sound/normalize/normalize-0.7.7-r1.ebuild
@@ -1,32 +1,37 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Audio file volume normalizer"
 HOMEPAGE="http://normalize.nongnu.org/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
+SRC_URI="
+	https://savannah.nongnu.org/download/${PN}/${P}.tar.bz2
 	https://dev.gentoo.org/~radhermit/distfiles/${P}-m4.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="audiofile mad nls userland_BSD"
+IUSE="audiofile mad nls"
 
-RDEPEND="mad? ( media-libs/libmad )
-	audiofile? ( >=media-libs/audiofile-0.3.1 )"
-DEPEND="${RDEPEND}
+RDEPEND="
+	audiofile? ( media-libs/audiofile:= )
+	mad? ( media-libs/libmad:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( dev-util/intltool )"
 
-src_prepare() {
-	use userland_BSD && sed -i -e 's/md5sum/md5/' "${S}"/test/*.sh
+PATCHES=(
+	"${FILESDIR}"/${P}-audiofile-pkgconfig.patch
+	"${WORKDIR}"/${P}-m4.patch
+)
 
-	epatch "${FILESDIR}"/${P}-audiofile-pkgconfig.patch
-	epatch "${WORKDIR}"/${P}-m4.patch
-	eautoreconf
+src_prepare() {
+	default
+	AT_M4DIR="." eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest
new file mode 100644
index 000000000000..7d78dba225eb
--- /dev/null
+++ b/media-sound/openmpt123/Manifest
@@ -0,0 +1,3 @@
+DIST libopenmpt-0.4.10+release.autotools.tar.gz 1471662 BLAKE2B c20ef4d26b583f5cbbed5e6d108ce6f55fef74726997267a56d16b8508fb46f26f62f934a98bcc20749da2ed2aef0bdd22931cc785806ec0b6c5daef593d196d SHA512 d7c46016eea59c21e3f948d8538a747d5fa6b29f160841b688878d8ce48859d014c3a036738074b3d260af6e662c36b03391aef511c1817a5ace81f60bf27dfc
+EBUILD openmpt123-0.4.10.ebuild 1722 BLAKE2B 1a46c7b124b4f082126240ca40cad681da9cbe6efaa75f2bef54b11d1f00efe759451ad4d15c28a6557e53c21dc395bc339084fff989d8e3c850f1a2e7fdba52 SHA512 524a929b41feb0b335bf57774d4b42a28badd6a8dc13e9334265e7131d72be05935e60107d83545fe396d965617abc36b79496fb1ca5f4d19fd7daa80f4e108b
+MISC metadata.xml 327 BLAKE2B 586d07f006d87d8e0dc4c0be387cdbe4fadaabad3d9fb985f9d6c8afe77ca9686773c2eed48defbe85da365f0256efa3337f32a9e913d61fb8a48781236ce185 SHA512 52b1f22ca0b08f9d6201ec44718875f6c3b4de31703f55ebc22a516e574eeeba7ac8d0d06425e624b258b4658d0d164d1a1b7b44b2e049e151fcb390cfbeb297
diff --git a/media-sound/mserv/metadata.xml b/media-sound/openmpt123/metadata.xml
index f90a8229753f..334feada06c3 100644
--- a/media-sound/mserv/metadata.xml
+++ b/media-sound/openmpt123/metadata.xml
@@ -1,11 +1,11 @@
 <?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 type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">mserv</remote-id>
+		<remote-id type="github">OpenMPT/openmpt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/openmpt123/openmpt123-0.4.10.ebuild b/media-sound/openmpt123/openmpt123-0.4.10.ebuild
new file mode 100644
index 000000000000..e7c6d6f4b4b7
--- /dev/null
+++ b/media-sound/openmpt123/openmpt123-0.4.10.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+MY_P="libopenmpt-${PV}+release.autotools"
+DESCRIPTION="libopenmpt-based command line player for tracked music files (modules)"
+HOMEPAGE="https://lib.openmpt.org/libopenmpt/"
+SRC_URI="https://lib.openmpt.org/files/libopenmpt/src/${MY_P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="flac portaudio pulseaudio sdl sndfile"
+
+RDEPEND="
+	~media-libs/libopenmpt-${PV}
+	flac? ( media-libs/flac )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl2 )
+	sndfile? ( media-libs/libsndfile )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Normally libopenmpt is built alongside openmpt123. Avoid the
+	# internal dependency and link it externally.
+	rm -r libopenmpt/ || die
+	sed -i \
+		-e "s:libopenmpt/libopenmpt\.pc::g" \
+		configure || die
+	sed -i \
+		-e "/_${PN}_DEPENDENCIES/s:libopenmpt\.la::g" \
+		-e "/_${PN}_LDADD/s:libopenmpt\.la:-lopenmpt:g" \
+		Makefile.in || die
+}
+
+src_configure() {
+	# A lot of these optional dependencies relate to libopenmpt, which
+	# we package separately, so we disable them here.
+	econf \
+		--disable-static \
+		--enable-openmpt123 \
+		--disable-examples \
+		--disable-tests \
+		--disable-doxygen-doc \
+		--without-zlib \
+		--without-mpg123 \
+		--without-ogg \
+		--without-vorbis \
+		--without-vorbisfile \
+		$(use_with pulseaudio) \
+		$(use_with portaudio) \
+		--without-portaudiocpp \
+		$(use_with sdl sdl2) \
+		--without-sdl \
+		$(use_with sndfile) \
+		$(use_with flac)
+}
+
+src_compile() {
+	emake "bin/${PN}$(get_exeext)"
+}
+
+src_install() {
+	dobin "bin/${PN}$(get_exeext)"
+}
diff --git a/media-sound/peercast/Manifest b/media-sound/peercast/Manifest
index f77483617e59..3b1a25e71eb0 100644
--- a/media-sound/peercast/Manifest
+++ b/media-sound/peercast/Manifest
@@ -4,5 +4,5 @@ AUX peercast-0.1218-CVE-2008-2040.patch 4545 BLAKE2B 5b19e15f2d1daa9b727e6121e8e
 AUX peercast-0.1218-glibc-2.10.patch 3332 BLAKE2B 63743c672e5f58a43d0e23f81f0384546ad1f7dbdba98079d2eab138e6e8b5d3a9e13c4e5b422d98adfc9ba11dfb2916071b9336e434165b5de7ade2ee30aac5 SHA512 26fa888300a4e4f9934bf3bfbeaad35cf05ff677b7e417fbb0e1ca0163af5091b883264de151c46f9acf01f70ec5cf6f0faba886462d0593e05dbb314fbda27b
 AUX peercast.initd 591 BLAKE2B 3a612afed70c268e79b6c865400df98acd633f8971300b80326d22d65230c167edcea3da3d17f2c8b55752a620c906d1b2d4f98f5495f8becabc60ca127f31dc SHA512 85352d87c40d468f324e179078b30412a96c0fac39f012f74c32a6509c3066729145b5df27da06eb1bce80306eb62800d0f6b0d8307021e3cadd67158760e1f2
 DIST peercast-0.1218-src.tgz 557909 BLAKE2B 5d449f56a97df8b6adce320c6517c6ee66a30e68cd1fe9f2e6dc73953ac0a81b1bd8d245135966f463bd061ff15140449e7fff782906a31f6496310fbd985640 SHA512 b9233fd12b8f2e7a89faa1df0e61a4cdeddede23fb56b03ff0d92614a6b43300fe683636d92ca97f200e1b066c2eda79d8d7e56597d81fe2f3766ccd6e199253
-EBUILD peercast-0.1218-r2.ebuild 1162 BLAKE2B 4b90f529101878b43a8199fa31aa3488d4b311e9536a117f2c9a42490ac2c9a480e6b8c1c718ba28846e5f558e09266b566cb1644056fedd64a305f549f96846 SHA512 03d692b4d6194e1fa56a3d7f63d4be663aa87ec804304c3fb21bde501d2412c5a0d718ce18fd22dcb3963acd1b4a5cf1b63c0f769e204ce25c66da40fc3d3cbb
+EBUILD peercast-0.1218-r2.ebuild 1140 BLAKE2B 608135ca0f31e0983d4a1f98139f43f4e74af8b25ce9a93e20cadbc90e411c238f3267c55e1f5087a3ba7eacd21944200896c183bae605a61741f3b260888f71 SHA512 b0186001996b115dc298ac4bd910226406855813b14c30d88980978a930a360eed898247e9834e3328a3a65b9348a0d2c958a581e602940b0cb7f3aa6b12aa3f
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/peercast/peercast-0.1218-r2.ebuild b/media-sound/peercast/peercast-0.1218-r2.ebuild
index 8034fe6aef9d..463ecc557718 100644
--- a/media-sound/peercast/peercast-0.1218-r2.ebuild
+++ b/media-sound/peercast/peercast-0.1218-r2.ebuild
@@ -32,7 +32,7 @@ src_compile() {
 	cd ui/linux
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		AR="$(tc-getAR)" LDFLAGS="${LDFLAGS}" \
-		LD="$(tc-getCXX)" || die "emake failed"
+		LD="$(tc-getCXX)"
 }
 
 src_install() {
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 44e77c08e735..ac9e4645f9a3 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,4 @@
-DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
 DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f
-EBUILD picard-2.0.4.ebuild 1754 BLAKE2B bdccd3bc45d0f800379a38872bbd5667b20f0a32605816e3879efea7619891cb99f72f773c72d9ff1da08bfd9a9209a4fef3a95d2eaa5c7538be57fa26c7f2e1 SHA512 194a79fd4f7f467802e14f2919b647ef98bc34b5b9445a68359db86d9a8db264516411c75ddbe4389a8ea528410da588886c32b750a59016d7db0612cb17afde
-EBUILD picard-2.1.3.ebuild 1625 BLAKE2B 24bcce91d6f62becd6a88ec3f674daabcbd965b22416d89c75a439b485ef78d815a03384e5d5689715375cad7c0ce0b78aa0530e9d1cae9d35de207315ff198f SHA512 0cfe695a8986cd51e075ea0658b2a7a61f65e6c375863f725d2282fe000061359692bb6cdf5be8ec0c20a2a62d22ae08f2b3370e2082580b07a6127155233896
+EBUILD picard-2.1.3.ebuild 1623 BLAKE2B d12a91115d530491bcc1f4193baa28458a96418055f35d8189861921542ff8820955d485e20d158f574f7ea75b3fc1832db6d83552601255c3a17975f83a4167 SHA512 f2c1aa2fa117afdc83394cf079285ea6df29e43e05c56ac0caff33507d7efdb6927eb7536cd5470cc778c899365cbf94866281315e38eb6f4a1a3c213822e33d
 EBUILD picard-9999.ebuild 1704 BLAKE2B 74df8c8bbde14f9399da4a4bf837d47982244f5f4294c2478fcd2fc2ddee9b2fd905533e74a5930833056f7cf5d3c82f17d2f99d719632b0def87211c0c5dfdc SHA512 8a743c0a66a747387d52b7eed15e5f0e90f2007f5926a87a69162cf0b60fe8a73efbbf9c6be554cb74641162f6959a8e1e3ab41deb971f53b8956707ce5da1ae
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.4.ebuild b/media-sound/picard/picard-2.0.4.ebuild
deleted file mode 100644
index 595f0dcd659b..000000000000
--- a/media-sound/picard/picard-2.0.4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3.ebuild
index 4b01165a046f..030e1709208d 100644
--- a/media-sound/picard/picard-2.1.3.ebuild
+++ b/media-sound/picard/picard-2.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/podcatcher/Manifest b/media-sound/podcatcher/Manifest
index 17cffc8edd65..f7e8806bffed 100644
--- a/media-sound/podcatcher/Manifest
+++ b/media-sound/podcatcher/Manifest
@@ -1,3 +1,3 @@
 DIST podcatcher-3.1.6.tar.gz 22260 BLAKE2B 84864a162521ed3d8ca467c5e5f3686ac8107bc263f3ff49fbf88636326049e64b5903c9987459ae29a5a64cebcf5421ea565b5fce57cea5a11b8896397e891c SHA512 5e1ac6771a4d81d2bfbc77c4a89861a976329a77144b630aaa7f6a1663a0dd9021acc71cfd44e6373bdaf4562718bbb3c19ff7cda56be1c7624cf389ff293599
-EBUILD podcatcher-3.1.6.ebuild 482 BLAKE2B 8d002cf9b4cb15585fa1f37d4c8e3c29047631eeba59733d80f8d7604f65022456cb1a94df58e798386f8f8c71a9418259544ba6dd9a4c5cf5e04ccb1c265360 SHA512 edf255bca7b9f4ae85d25455cb972fea09b9fa7177530f5acaee51de4d2e31825a191959720ad6d62a50fa87e8fecec84c431875958de9f9cbeb4306e7bfb021
+EBUILD podcatcher-3.1.6.ebuild 476 BLAKE2B b9d19c0825a1f30c4822b37fb406c0652aff67ca5dd65943fad4c988893d1e6addad4d6dc217d580299cd3ce34f7effa7e24e5f7b4a2242b32f3c62771bb90d5 SHA512 8b6619afbda65c60ed49463daaebc12e2e0e50225b1c61bf8ccecce9634f4f066fe215776f89bafc78422cffaefaf3b15ea01bba923541cb798486698ba5fc70
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/podcatcher/podcatcher-3.1.6.ebuild b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
index 9392e126842e..454b549b1920 100644
--- a/media-sound/podcatcher/podcatcher-3.1.6.ebuild
+++ b/media-sound/podcatcher/podcatcher-3.1.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Podcast client for the command-line written in Ruby"
 HOMEPAGE="http://podcatcher.rubyforge.org/"
@@ -12,12 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-lang/ruby-1.8.2"
+RDEPEND="dev-lang/ruby"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_install() {
 	dobin bin/podcatcher
-	dodoc demo/*
+	dodoc -r demo/.
 }
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index ea5d759825a4..e1b62b71727d 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,7 +1,5 @@
 DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
 DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
-DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.4.ebuild 2311 BLAKE2B 8fdb4c4d4675a77e540b4dbec42e8eb9ea25363d1433251f8ed0725dd9f2a0ad38c1c493bbf270e8834f55efcf2283794c44ab1a7ccb23d68989f9bc1bf9d5b7 SHA512 a5d800c276c0da3eb781ff92472c1aa7dd08477b64ecbc849d1348240c59987973cc6127be07c447550557575e514709c022cf296862e010df278eb8193971fe
 EBUILD pragha-1.3.99.1.ebuild 2556 BLAKE2B 43d9cbcc86a67aeb76f76b438d841ded5e193135e069b19deb04bf1859cbb73011dfa9ec254abf87beeebd474d6d2cb92c7a8040bb519ca9f2066e7bb8da9a20 SHA512 73f5178af2c82094ac599bb8096caa56d0f14ad5c506aab806dade8820d2b466c96b7e0e5af771365e7110b100a0c5a73ce6dfba98f7f0d5a1b0dda6ec06bc37
-EBUILD pragha-1.3.99.ebuild 2589 BLAKE2B 34c988b47cff4a563c41c18215286de0c213e9d2e78fb704bf4b4fcb47079d7fd103d81a5a8a22ff98f27ac755020d84ec2b7af4577641b3919aa44727bd8efd SHA512 e2eef37dd9e0009116419a26903a0fa09eb1682ffdb0480e7634a5fc3d228c3bae620d583f45e18011027149046f0fe32b61e854194b335c97c4ef4ab89371f3
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.99.ebuild b/media-sound/pragha/pragha-1.3.99.ebuild
deleted file mode 100644
index 10930450160f..000000000000
--- a/media-sound/pragha/pragha-1.3.99.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="A lightweight music player (for Xfce)"
-HOMEPAGE="https://github.com/pragha-music-player/pragha"
-SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
-
-COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
-	>=dev-libs/glib-2.42:=
-	media-libs/gstreamer:1.0=
-	media-libs/gst-plugins-base:1.0=
-	>=media-libs/taglib-1.8:=
-	>=x11-libs/gtk+-3.14:3=
-	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
-	cdda? ( >=dev-libs/libcdio-0.90:=
-		>=dev-libs/libcdio-paranoia-0.90:=
-		>=media-libs/libcddb-1.3.0:= )
-	glyr? ( >=media-libs/glyr-1.0.1:= )
-	grilo? ( media-libs/grilo:0.3=[network] )
-	keybinder? ( >=dev-libs/keybinder-0.2.0:3= )
-	koel? ( dev-libs/json-glib:= )
-	lastfm? ( >=media-libs/libclastfm-0.5:= )
-	libnotify? ( >=x11-libs/libnotify-0.7.5:= )
-	mtp? ( >=media-libs/libmtp-1.1.0:= )
-	peas? ( >=dev-libs/libpeas-1.0.0:=[gtk] )
-	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
-	rygel? ( >=net-misc/rygel-0.26:= )
-	soup? ( >=net-libs/libsoup-2.38:= )
-	udev? ( dev-libs/libgudev:= )"
-RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta:1.0"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.10
-	sys-devel/gettext
-	virtual/pkgconfig
-	xfce-base/exo"
-REQUIRED_USE="glyr? ( peas )
-	grilo? ( peas )
-	koel? ( soup )
-	libnotify? ( peas )
-	mtp? ( udev )
-	rygel? ( peas )
-	soup? ( peas )
-	udev? ( peas )"
-
-src_configure() {
-	local myconf=(
-		$(use_enable peas libpeas-1.0)
-		$(use_enable glyr libglyr)
-		$(use_enable lastfm libclastfm)
-		$(use_enable cdda libcdio)
-		$(use_enable cdda libcdio_paranoia)
-		$(use_enable cdda libcddb)
-		$(use_enable playlist totem-plparser)
-
-		$(use_enable libnotify)
-		$(use_enable keybinder)
-		$(use_enable udev gudev-1.0)
-		$(use_enable mtp libmtp)
-		$(use_enable koel json-glib-1.0)
-		$(use_enable soup libsoup-2.4)
-		$(use_enable rygel rygel-server-2.6)
-		$(use_enable grilo grilo-0.3)
-		$(use_enable grilo grilo-net-0.3)
-		# avoid trying to use 0.2 & 0.3 simultaneously
-		# https://github.com/pragha-music-player/pragha/issues/124
-		--disable-grilo-0.2
-		--disable-grilo-net-0.2
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/ptabtools/Manifest b/media-sound/ptabtools/Manifest
index dbc01400a121..2f8fbc8d40a2 100644
--- a/media-sound/ptabtools/Manifest
+++ b/media-sound/ptabtools/Manifest
@@ -1,4 +1,4 @@
 AUX ptabtools-0.5.0-makefile.patch 778 BLAKE2B c921d0e5c6a5a38119d0c984dd5208d069c59855da9b1ab7cabdfcd8e251bf989137f420d9b91c61240d81f28ff1fef18c0b68848e2e2c02a59696b8ce80c34a SHA512 d68a8791e3ec053ed557db0dce4de6bf07e91017e416a11cb131a5786ef66957cf2ea955a77fd8d009ab6d5b20ed6b044abe805994f4342a00fe84a3392f0dab
 DIST ptabtools-0.5.0.tar.gz 116083 BLAKE2B bdf1c39ca94d445f3488fd67eaf343c44d7924f22f1de3adaa06fcf8af3b188beb599518c718169e664b28ae2c9c10f31246c3b620671e0b0a953da161022c50 SHA512 c0028daec1587b190692b8aa8d9002063022ff7516d99e9fae3fd01f25d27ce4230cb2b15ecf4652fd4b902de27bd8ae4b63af248e950ac8e7c1f277da37cc93
-EBUILD ptabtools-0.5.0.ebuild 704 BLAKE2B 7b94eac09199b07661771ef9f1cf8b12c559c24740ecbda0581b253fd11e9e1191c7194fcfde918b4dc3b3da2944672ae356e8be6ccc765968dbd62ba324e1e7 SHA512 be8658375af305a57456a766809d30e732d7ba8c635a367dfc3bfd3da6701e7b2140094474186fa6bad5e35e650ee97db22739661d34e501b88346f30fc5df62
+EBUILD ptabtools-0.5.0.ebuild 877 BLAKE2B bf5919b99e2ccd24f6444780f6b56535a11a1072507a4ff58b5cd0f1d61438af44c9f9d93a1d4306777c01075045a20cdd6689be2aefed7064234dbf609f4204 SHA512 a520b6655be6c083667fcc976dd45d10b025fd01f607de5fe40173f11282f17b0f4305c30c37fd198949184f63e683bc6437af4bd1dc73f0db2ee99827f71094
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/ptabtools/ptabtools-0.5.0.ebuild b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
index 350f55fb39e8..55e4bca6c2ea 100644
--- a/media-sound/ptabtools/ptabtools-0.5.0.ebuild
+++ b/media-sound/ptabtools/ptabtools-0.5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Utilities for PowerTab Guitar files (.ptb)"
 HOMEPAGE="https://www.samba.org/~jelmer/ptabtools/"
@@ -14,15 +14,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/libxslt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/popt:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
 src_compile() {
 	emake AR=$(tc-getAR)
@@ -30,5 +29,12 @@ src_compile() {
 
 src_install() {
 	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" install
-	dodoc AUTHORS NEWS README ROADMAP TODO
+	einstalldocs
+
+	# QA Notice: Missing soname symlink(s):
+	#     usr/lib64/libptb.so.0 -> libptb.so.0.5.0
+	dosym libptb.so.0.5.0 /usr/$(get_libdir)/libptb.so.0
+
+	# Don't want static archives
+	find "${D}" -name '*.a' -delete || die
 }
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index b3fd86f37490..1ed8b1f75b54 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -8,7 +8,7 @@ AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
-EBUILD pulseaudio-12.2-r1.ebuild 11524 BLAKE2B e5bc795b25e2168669f7cbfdc8c0978e0cbe4505303e7fcaf6880be67863e7c0adef2f1191eb0f87526bac69bfebe75890e0d57931b3738b62214c74b64f461d SHA512 c5d49ef2a1cca32102f7115892a5047af11a09edeef0653610c5d1e1ddf385fe781496929d3d2f150f9aa210ac4e6ea7fd5927b639f5416827f82b39583e20a0
-EBUILD pulseaudio-12.2-r2.ebuild 11704 BLAKE2B f8f305be0bcd2cd11509573e0b26f17437383932ff3f811a609b618cb6b3eaed2ff5917d2ffbc5ff10277b893543636dd3d4b85872066ea5a6eab06a146adba9 SHA512 ac82b022d9b5b0d0a6ef2f62fc712b7718c3e534e11e22505f2527cc52b7fb2c56ae8668ef92ddcd51f93b67a5a1b031f1964c78680b2a5835a9e904d7f30eaa
-EBUILD pulseaudio-13.0.ebuild 11546 BLAKE2B e8b0ff927a906f63ac0d721814430c160036ce21385dd6fcbe678e581b550712d66b5a569b3e4816dcd94b56c9f49e3c181d013046c0039ecef02da04cf32d2d SHA512 250d2aeb6c5a05eaf489e975e7588f9baf45a103d392207b5bd1a39b62986fc659694e3331afa63745a75e295c89e36ab44646e7a7c6489fc3fdb49035550363
+EBUILD pulseaudio-12.2-r1.ebuild 11551 BLAKE2B 71e97675f3754cdb2e423eddb94b0a5d2dceb18915487616ad63a44a925d7fd294fc70dc242839f3340d015ade8d4488d28537c12d29a5efdec35b841f6b3b4b SHA512 d223d8d86e896e614469e829bfc86a160ae3e77311118dce91648feca6e6b29cf0d653e7867dd502ea57df85579950d984afeaf40d6cfe134ba6672ea96a4eed
+EBUILD pulseaudio-12.2-r2.ebuild 11731 BLAKE2B bba3e3d5e16eaaf9db831cc85e1c2e2c9538bf8a57ad7aac56fead074ed8c5f46c3354e817b549a59f183eacedf3694486cb0585087ecb04e75bc88edf0f5a79 SHA512 379e4b83adee85b8fffeab8378216501085cfc21507777e28b261383f23d61614db469d2f01310328c47a1fbc4e5e475e3335c713c6674765a6e8113f9230f22
+EBUILD pulseaudio-13.0.ebuild 11566 BLAKE2B 6f913726cc54432176b0f89c4d2a8d5664d2dfa675c1522a0de4833a2991a767daaf1ef034633f2daa573670cbcec6aaf3f0765b43df35e321f29f83db41e82b SHA512 21be09963def71c08150c8dece1e7bb0fd9ba83f0f6eefc336994b1ac2f19b638c74e25d7a9f15d594e33872a783d5e43ccd4924a80dec9c96fb47c2ad82e562
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
index c4c92bb67f48..10ddfaa15a63 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
@@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco
 ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
 +udev +webrtc-aec +X zeroconf"
 
+RESTRICT="!test? ( test )"
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
 REQUIRED_USE="
 	?? ( elogind systemd )
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
index 990985e38c2e..d4986cdfa889 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r2.ebuild
@@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco
 ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
 +udev +webrtc-aec +X zeroconf"
 
+RESTRICT="!test? ( test )"
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
 REQUIRED_USE="
 	?? ( elogind systemd )
diff --git a/media-sound/pulseaudio/pulseaudio-13.0.ebuild b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
index 0fb8e6e4a0ce..471f5342c275 100644
--- a/media-sound/pulseaudio/pulseaudio-13.0.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-13.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
@@ -23,6 +23,7 @@ IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gco
 ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
 +udev +webrtc-aec +X zeroconf"
 
+RESTRICT="!test? ( test )"
 # See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
 REQUIRED_USE="
 	?? ( elogind systemd )
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 1a4523eb6d21..b069263942b0 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,6 @@
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
-EBUILD pulseeffects-4.6.8.ebuild 1805 BLAKE2B 7c3bf1f63c9bf98a5e71e0d9a5ebc5bddb0717b1a6844a33685526ddd6df97b44ef7fb9517b8b6b9ccab48ce3f56f0f7f1098a72b93259662d02c3eed57ef562 SHA512 3c9402a75d3df0d1a9f0b847289204cbc35dd97d9e362c6fa20e304b4fb93fa0fdebeaa21fa8109afd5f37dd196884f554140769a88f2155815f0b9eda533267
-EBUILD pulseeffects-9999.ebuild 1807 BLAKE2B 5389ef0fd7ccb4d962ce6e7d0b84c0f4dde6909da572d6773f4dcb6b48e0e4d8259f6a0db0c6664ba55b4ce3d1fbc728aedc8b32f9589379308fa4ee35d11cdd SHA512 df833234b07f09b26ae04f25bcc096d8467b720c3eb1475c662eb1e4c51e4bffcd811bb95c4053f5416e234baa8b7bacf220ce4f6d69d2de3cf23223161a48d9
+DIST pulseeffects-4.6.9.tar.gz 1925035 BLAKE2B f059169721e643cb3e3a6db42d3a0fef0bb7696c6b2a5583e69573e7620f87d4a06ed448e298e0ca4e9868dcdd8cec8bbf71e7fb83c094d3840a9f90919ea571 SHA512 c767508ae3d9fb8df3e8d27a05bfa908e6c0862514a20b81fbc3ea8680c9d6ca20bac8d90d513494aaccbda29104e0dc015b81dab0bee5a40b708c415246ce3e
+EBUILD pulseeffects-4.6.8.ebuild 1855 BLAKE2B feb368814eb1124176505d2db6589d1177afe8dc09c8c4f44baddd24984c4f41c89b1e77c3159e7c9eeff4379c3a77e23e409ba1d85ec6a116dd713f9adff1e6 SHA512 c3a45f3c2ae1d3ac82b58110c1529f596e1c367bf66efa5692702e877d11af596da62bb20fb20a69ebb4e0edc6120f8652b801ad6eb43e40238d4297dd630691
+EBUILD pulseeffects-4.6.9.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
+EBUILD pulseeffects-9999.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
index 99f2cc7fb0fe..32e5898ad2d0 100644
--- a/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.6.8.ebuild
@@ -11,9 +11,9 @@ HOMEPAGE="https://github.com/wwmm/pulseeffects"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
 else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 x86"
 fi
 
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild
new file mode 100644
index 000000000000..ab95a499cd73
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.9.ebuild
@@ -0,0 +1,72 @@
+# 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="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+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
+	media-libs/libsamplerate
+	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/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 1fffc7eaa9da..ab95a499cd73 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -11,9 +11,9 @@ HOMEPAGE="https://github.com/wwmm/pulseeffects"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
 else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/media-sound/pulsemixer/Manifest b/media-sound/pulsemixer/Manifest
new file mode 100644
index 000000000000..c5b5c647e35c
--- /dev/null
+++ b/media-sound/pulsemixer/Manifest
@@ -0,0 +1,4 @@
+DIST pulsemixer-1.5.0.tar.gz 21557 BLAKE2B 4c6cb9a3f9701301223c259532a0803a5c3e5f3abbce6f2763b6fd987f85aba56549e66861e9b69d0bf89c116c6c7e221d11cc65eb9a531402f74e8d63e9d824 SHA512 e07556a0cf2c9f660764977158cf1e338f7d8a92eae639c4a8f355847840e3aa9fb65adf553dbde905b64f2eff57c630bbfe19cfd5420b6205b1e2f688a6de64
+EBUILD pulsemixer-1.5.0.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc
+EBUILD pulsemixer-9999.ebuild 577 BLAKE2B 8b73807770eb336446a579febae9a28e0037f06e4fd99bd59d91bf1a0a5e9b601e0adae4494a51b128fdb679971b01baf177f6efcbccad2f37b4c169b285bfbb SHA512 2693ca3bf3366dbc9889fb40f4382cd9ab58de3a78e277aa0e73c8d90b512a226d62e0f24987ea0b6620fd687df22274efaf17b2d81cf547e64bfefe38f7adbc
+MISC metadata.xml 539 BLAKE2B 3c4aeb04befd6535d90492837abf142f83ca907b9d158688488537b9edea29f00973763a8d59ca3deb5bfa34a0949d1e57fa7251f014f1750f854b5ebd3044b0 SHA512 9bf6daf8ce060e87586f3c2abfe56631785624d7e449cddca3d488ec298917da2413d28db0ada915bfda40d75715a07f17db5413890fbe6a3667c34599818e0d
diff --git a/media-sound/pulsemixer/metadata.xml b/media-sound/pulsemixer/metadata.xml
new file mode 100644
index 000000000000..8878000e28fb
--- /dev/null
+++ b/media-sound/pulsemixer/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jchelmertt3@gmail.com</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">GeorgeFilipkin/pulsemixer</remote-id>
+		<changelog>https://github.com/GeorgeFilipkin/pulsemixer/releases</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild b/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild
new file mode 100644
index 000000000000..45f1ee6b0c9b
--- /dev/null
+++ b/media-sound/pulsemixer/pulsemixer-1.5.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="CLI and curses mixer for PulseAudio"
+HOMEPAGE="https://github.com/GeorgeFilipkin/pulsemixer"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
+else
+	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="media-sound/pulseaudio"
diff --git a/media-sound/pulsemixer/pulsemixer-9999.ebuild b/media-sound/pulsemixer/pulsemixer-9999.ebuild
new file mode 100644
index 000000000000..45f1ee6b0c9b
--- /dev/null
+++ b/media-sound/pulsemixer/pulsemixer-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+DESCRIPTION="CLI and curses mixer for PulseAudio"
+HOMEPAGE="https://github.com/GeorgeFilipkin/pulsemixer"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/GeorgeFilipkin/${PN}"
+else
+	SRC_URI="https://github.com/GeorgeFilipkin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="media-sound/pulseaudio"
diff --git a/media-sound/pwavecat/Manifest b/media-sound/pwavecat/Manifest
index bd816f5c04a5..5005c00e910f 100644
--- a/media-sound/pwavecat/Manifest
+++ b/media-sound/pwavecat/Manifest
@@ -1,5 +1,5 @@
 AUX pwavecat-0.4.5-overflow.patch 1255 BLAKE2B fba5c647534041b1e22884422dcc09d540d706ca716fa0b640061b12839cbe910d17bd1099bfed78e4633cc415855778290fe10afe1fe3441969d7c6d6f5277b SHA512 560281481a1de5550f8a491d77aed483a297c5d192d71d75d0aca2274c7afb15fa7ebe01070a07961f05c15fc0adbff41548e9722d9a94b369120b8ffea225c5
 AUX pwavecat-0.4.5.diff 823 BLAKE2B c6cbd638495c8dc1bf011c26fb6ee2bf07cfb3ca77b1c29fed56585f1680c0514055f1f3b446f7b57a30682d874b729b20af1aa76e0db2d04cb9f2df5d5c0f17 SHA512 a92e9f242cb79af4392f099b2fc2014c97676e679e2646cfb5eeb5fca8173e953c031eeee8e72de08efe68750773fae77d8009ee12a43ed8be7eff6d57818336
 DIST pwavecat-0.4.5.tgz 13110 BLAKE2B 084286e2e056f73ed410f23ecea245466934f8475bd4143d216df312a51c62335155381ddfa1db2e9d5fcacd35dfd9fbb27d8b8cf0af5d4cdc110b64e03a57d5 SHA512 3faa03d08cc1cde47294837c0295eeabb8461327c9e13caa317b985fc12bdc8d00ec7207411aad1325a54c7cc63cca5f5638db5c988c7e6887f3a0d77b5ace55
-EBUILD pwavecat-0.4.5.ebuild 662 BLAKE2B 8ce3b8d33b0f374d271ad608700de71883263b6de3417449b7dfdac57b629ac1ca3661e81520126f6a843803c62abdf942d3c90a4eee54fc00bb55646222da09 SHA512 c33a9c55d151749b2c8a89460e1260d265c06f07622102142618be1b7ae65b86bb36625512e780eb367dc3d13add6fc710f8161fc65dde4cb9c320d952a8c84f
+EBUILD pwavecat-0.4.5.ebuild 633 BLAKE2B efb22190797d5e304f300c2e2c3a28d48c411ce2253ecb394960e869f7d7f370863fe2e44b41726fa249a099ef93c8ed75b71dded7113cbbec687d8755ec2d57 SHA512 62148f51efb4b5f08e4c12f04b00a6dd891ff5d1308ca81e73dfbe1de893c487d3992a87a6c9165c2821a6eee5ab9ac18d69966b2d97c68a3cc7690332ed93e3
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pwavecat/pwavecat-0.4.5.ebuild b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
index 91a5792d8a0c..21a4580caba4 100644
--- a/media-sound/pwavecat/pwavecat-0.4.5.ebuild
+++ b/media-sound/pwavecat/pwavecat-0.4.5.ebuild
@@ -21,10 +21,10 @@ PATCHES=(
 
 src_compile() {
 	append-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE	-D_LARGEFILE64_SOURCE
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin pwavecat || die
+	dobin pwavecat
 	default
 }
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index c422b716cb08..3e8d847a8395 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -1,6 +1,4 @@
-DIST qjackctl-0.4.5.tar.gz 832932 BLAKE2B 9e47ce1bb0439e62b8922b2a39650410b96ffa6f13489042fdd8909152d31b2a8f5b1a7ee73cd8a85b10aec776175a9c6a3782b0ab592c5196e7352b106b53ee SHA512 251b7275fd6cb13c91420b7c11d5d2a1d9b7c5b11b78a4b5ba41955b4bbaa3c4f4721123f3375c2ce4a243ee9defc69c982cc93796e17e01e096e1228c4fe5fd
 DIST qjackctl-0.6.0.tar.gz 933416 BLAKE2B 116a6a71ab0c0974ff5109c5ae34c47fb4706e3e051d7bfc9daec74f952304606f5a790e03d3b97bc2c68968ac6a09ad885c4dd4c774b2454c9a7af8ec6c997f SHA512 f1cd281f67a764f12301c6b58644aed2419d2c82696a24bd9980aa7ea42a266ff5e4aa6247b0b6ac78cb01afc34219c7de8c0657cfdf0fa9858a52d1f84b8fea
-EBUILD qjackctl-0.4.5.ebuild 947 BLAKE2B b6b5a59d3c7b1da0a5d19384815ea6c46ba0bf83d52fe053bb2ecaaa7cec71f68a2772415b98a15d18cacf521f15b6240f7bc28a0c08b2c5b7bbc28a2aac36f1 SHA512 573bef057913955d4596edaddc1db55b2239bac6eb79de52f6926a9c63a611372f9932bce01ee7a5bf90299041f5fc000d72fb2f2b80e86037222f45a43b3e5a
-EBUILD qjackctl-0.6.0.ebuild 1174 BLAKE2B dca45c45f48c87e7af6262a2b2800c20cdc3e24bc8f9c5ab605f5bea97ee7186866b4ec35c4f6bc8ff59756161cea1de654cb7fb2d0428d95c80af9876f9600b SHA512 a26d27bf71190900dd32aaf8e0c17fbb35a5080b0cc3118e157d514464128cba41a264175da9671ae7695a562b442f7c21db74da177a6a906fb91411d3fa0776
+EBUILD qjackctl-0.6.0.ebuild 1172 BLAKE2B bb25295260ccc1913c50ca1b46ace584a9d93e2ae95027e7387b2798cb5d568c44a4212934d08cd3b98a896ce46c517ed59d16dc304ab703c8fe12850e2fc521 SHA512 3a1e5600be51033776d634d5e1aaf05ab13f84362450e700d0b5ac2f64f35e31473669efb943a781d6a71bc474230b3c66bf5cef594b42c83a6dde06d1cf0b90
 EBUILD qjackctl-9999.ebuild 1226 BLAKE2B 4c340d964561fa9c34635d02220a7139882283ab5cd9a8b4ce0e0f799aea6c0116d2f2d3482f1febb234f7044c63a0dddd8b63da064238f4013f0e81c0f9f0b4 SHA512 f9f277ec117e06a8c1ef8f2210e6943c62141367c1328eb68d25af401749c180d84b4e54b4a8cb027d985415f93698bf6c7e6ad0d422d00107fdbcefdffc90da
 MISC metadata.xml 337 BLAKE2B 3e5fbbef544d83a92cee554b5704a648f10e326495e2091875d269b362201d2baff179db87cb36b602c474bb8750b63883440f3af8a8e75c71f66043cc39fdb9 SHA512 63b453a4eb2ebea78d8b2ce9d8f9ec8db5706d7605bd5bc8c2259a1179925c2aa7fcae0a221118b39a03030d8bf2a5df772b59d35be9e3ae7d602dc068b3baa9
diff --git a/media-sound/qjackctl/qjackctl-0.4.5.ebuild b/media-sound/qjackctl/qjackctl-0.4.5.ebuild
deleted file mode 100644
index 18a1fac09117..000000000000
--- a/media-sound/qjackctl/qjackctl-0.4.5.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic qmake-utils
-
-DESCRIPTION="Qt GUI to control the JACK Audio Connection Kit and ALSA sequencer connections"
-HOMEPAGE="https://qjackctl.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="alsa dbus debug portaudio"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtxml:5
-	virtual/jack
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	append-cxxflags -std=c++11
-	econf \
-		--with-qt5="$(qt5_get_bindir)/.." \
-		$(use_enable alsa alsa-seq) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable portaudio)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_compile() {
-	emake -f ${PN}.mak
-}
diff --git a/media-sound/qjackctl/qjackctl-0.6.0.ebuild b/media-sound/qjackctl/qjackctl-0.6.0.ebuild
index 264583c2f70f..4fa3df425ad2 100644
--- a/media-sound/qjackctl/qjackctl-0.6.0.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="alsa dbus debug portaudio"
 
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 3d593e785e1a..80ae1ac1fc36 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,4 +1,5 @@
 AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 EBUILD qsampler-0.5.6.ebuild 1019 BLAKE2B e27455ebbc11e71e5b6434b3874f47450ad52b220e6c3e976bffb45e228f123f2cd20d2351334e329596110514e546611c881f1cac9686ef23500cdec7d8f7ff SHA512 e241032ee18e36c5f0a8436757159656ac8d98b35b881511bac38f41636e6c70334250d6590aff6b79d4283c8a7be5e820fe708a3b691927568d2dabb5c34317
+EBUILD qsampler-9999.ebuild 1487 BLAKE2B 9f32ce93540c9d950cdf387fc1f56adb06d8355a03460c82825eaed29063a8803af61b6af0fe038a7ccecf307f00ad272bb5f61714335ef452cbc03d468b43f8 SHA512 9fa25733d27e38651250277e2c8206da6c9f480c3fedfc712458f713af2a1ab45d0f004c90af12415ea2e1a9f2beb2133c7f14279bf3e3519f44218137a9ec07
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
new file mode 100644
index 000000000000..1aa007e1579d
--- /dev/null
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg autotools subversion
+
+DESCRIPTION="Graphical frontend to the LinuxSampler engine"
+HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
+ESVN_REPO_URI="https://svn.linuxsampler.org/svn/qsampler/trunk"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug +libgig"
+
+COMMON_DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	>=media-libs/liblscp-0.5.6:=
+	x11-libs/libX11
+	libgig? ( >=media-libs/libgig-3.3.0:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=media-sound/linuxsampler-0.5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
+
+src_prepare() {
+	default
+
+	emake -f Makefile.svn
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(use_enable libgig)
+	)
+	ac_qmake="$(qt5_get_bindir)/qmake" \
+		econf "${myeconfargs[@]}"
+
+	cd src || die
+	eqmake5 src.pro -o Makefile
+}
+
+pkg_postinst() {
+	# these are not run automagically in live ebuild for some reason so running them manually
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	# these are not run automagically in live ebuild for some reason so running them manually
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index a3f9f4245895..fd2abaf36481 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,7 +1,5 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
-DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
 DIST qsynth-0.6.0.tar.gz 316308 BLAKE2B d414c73d5baf3be1563c45390735de964c79774a4d7cc37ff4bc609a7fa4d291a5b0cba7f3b8ed52649c50325a3ba2fba7baad3943122cc76a98aa6cfdf2cb0f SHA512 34e15d283f403ec6633fef911285dc2d4d4b2c5a0cd3614bd38feefbf68cff5fd8e296f47d1bcd527658b8a9dab212106aa63ca71ea60cf49f8126adb7d28591
-EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 23515c33c27d2768151b0cec68f74e3675734a97e3ae8b019e1e0aef9ae2e5cce2803cdc66235b31b29008eea3efd3d5933f64528ee2405aa8c76e863f24acd9 SHA512 3a062d818ba1c41a0731b97edd3f6c77e3706ee458155455677a73304e50ea9fdf9391156405459613b9fa635265cdcb8832047f765bcfea02ca7e1a9846c0d5
-EBUILD qsynth-0.6.0.ebuild 1398 BLAKE2B 4b092fd3449076f2a0367748ccba30bd248f19920c523f19fad6500b54c32ace09c7d7cd1ec80d0a8fb702c96a67d139e1b61abde3d4aacd6565d187b6636edc SHA512 c98170ff62b167524bbe0f7d2c8919205b2333f18eab12d160de3b21052089d1205bbfdf41da9d3ff8579dc6444ffb2a68f5019605ab437a52adc2270ddf773b
+EBUILD qsynth-0.6.0.ebuild 1395 BLAKE2B 90c4b832fe74a7540eaea0910aefe50238ff9cef3bac5feeb6365bc5ff3378710eb33f665bf1e07cd4d1db6b3a3cdfc246407cf142e120e39c7f6d32426433d8 SHA512 bea5867750df5fde2892cfd40a81e940c1505d51ec414be7cb7e691320bea76826264542e9f42b838a5c9133129bc2bc18c8e3d57910ff08ea8f93c413eef170
 EBUILD qsynth-9999.ebuild 1445 BLAKE2B 300936cbdee4140ada6df996741f2eb73850de8784e9f2eab596b16cdcae614d5cad3f448cdb32d405ebb7504b5db4ce1f4ee592c57940dbc553bfadb4c1051b SHA512 58da89e2efd524f4b522a136cba6ec536bc04ff0cd2fbdc30fcba0a4bc8757887b2749bd22432740d1f1bcd87da32032449aa698d578402cf557f9c3e4e55a2c
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
deleted file mode 100644
index d6e9dd919db4..000000000000
--- a/media-sound/qsynth/qsynth-0.5.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop flag-o-matic qmake-utils
-
-DESCRIPTION="A Qt application to control FluidSynth"
-HOMEPAGE="https://qsynth.sourceforge.io/"
-SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="amd64 ppc x86"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-sound/fluidsynth:=[jack?,alsa?,pulseaudio?]
-"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="|| ( alsa jack pulseaudio )"
-
-PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
-
-src_configure() {
-	append-cxxflags -std=c++11
-	sed -e "/@gzip.*mandir)\/man1/d" -i Makefile.in || die
-	econf \
-		$(use_enable debug)
-
-	eqmake5 ${PN}.pro -o ${PN}.mak
-}
-
-src_install () {
-	emake DESTDIR="${D}" INSTALL_ROOT="${D}" install
-	einstalldocs
-
-	# The desktop file is invalid, and we also change the command
-	# depending on useflags
-	rm "${ED}/usr/share/applications/qsynth.desktop" || die
-
-	local cmd
-	if use jack; then
-		cmd="qsynth"
-	elif use pulseaudio; then
-		cmd="qsynth -a pulseaudio"
-	elif use alsa; then
-		cmd="qsynth -a alsa"
-	else
-		cmd="qsynth -a oss"
-	fi
-
-	make_desktop_entry "${cmd}" Qsynth qsynth
-}
diff --git a/media-sound/qsynth/qsynth-0.6.0.ebuild b/media-sound/qsynth/qsynth-0.6.0.ebuild
index 466ded54ecf1..e26a5f1d04b4 100644
--- a/media-sound/qsynth/qsynth-0.6.0.ebuild
+++ b/media-sound/qsynth/qsynth-0.6.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 4d57888b062e..af76cc31f112 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,4 +1,6 @@
 AUX qtractor-0.9.4-dont-compress-manpages.patch 801 BLAKE2B 27ee7fd8711b87e8e8b32e3f40ed37c890c072e9d071d2011041af7b4d9bd1c1763f6b0f8326ee3a9e6a780f6abf418d52f8bcc894490adddcac05ef973eb86b SHA512 bd78649eb6f0616a4129d5851c997cc3fa233a86d9b7f98f5685b0999bfd25d536b38b539a9a7b2589d709004bd63042c41eae35fcdaa78167f071b0b8a2e5b9
+DIST qtractor-0.9.11.tar.gz 1849813 BLAKE2B 747916fe45285b00c837af5868ebdaa6b9bf5812b8fa58c4bfbd8662c5519106cbb0a9708121f3391ca4f45bf0af0715994ad8400edf01fa8bd0dcec848aa438 SHA512 8c6cb7ce5f5b5162c4a233aa733f0cb8424f4f84a91546fbbe7af35d534ffc3db6a583712d8ca906adc7edd5e92d28cce6927b340ec4750eafe14500eb8dd8c6
 DIST qtractor-0.9.9.tar.gz 1831016 BLAKE2B caef9b7a29ae30661dd08c302b16a2f12c66e2f1ffd63ca847ffd4272bcd114ecf74f1dddde1c37788e635896f25ca62283adc773734754d65ea12618248368b SHA512 151a3a92cfb98b9c9b19d18730109bce83744d4c24d3ca200f53a04938cbab1f33dd8080d3faae47b5026eebbbb750a74f64a5a046b0967278e848f424ff962a
-EBUILD qtractor-0.9.9.ebuild 1759 BLAKE2B 1e7c104e43e86d71fab24ef151a3654a31597ea479a0fd719d59291d826f6c82d4c26dd6173b6f5eddf20e82a6c83e3c8bc26860aa752d61ed7943e864519ca4 SHA512 6828ff6c280ebd1dfc670f91d5378c482c24a6156b8ffc5d0ebca856efb7bf79dba395ccf7c9f312f3c99a2205cef1a499d1b86de0fe3f627a802725bf4dd6cd
+EBUILD qtractor-0.9.11.ebuild 1551 BLAKE2B 665ec33050b6cc226278b0b06a12c0d219fac871d5a9fe45f58e34e3bbea0ca0f82919196ad33caf00ee48fc111d732cd2767bed53212db2fb21cf919f2137e6 SHA512 2f06e4884397579384388c96e72d40bfab3e2cd0d1d8ba5ec12d1245e651b064029ecde89fb2e9e7266135ffef778a15caf5f5ccd75605f655f94e598ec84a4d
+EBUILD qtractor-0.9.9.ebuild 1758 BLAKE2B 0caf6a27abce6c3a8c6642d7cd05127007f8723cbd94dd2750923e6c4118728d0b6fb847e5daadfaa18f47de65e182e14d04a338ed980741449555ab15116119 SHA512 340212f098de8d29e69caf2e5f635d038a2411a72b91b9008a2ee533959db2e71e3d0c86caeaa5c7b4dfa18138e659dcc7ea08216363d5d39b6c994bc3f0d6d7
 MISC metadata.xml 860 BLAKE2B aa27e27262c24903643b09cced6d78b2e460d030ecfc420ea4f2feeb1056600e64a08ad4b750925a67a18fcb44929169cb2461f2a277713a5bc56948b83e28e3 SHA512 fe3eb53d21b4595741f6c7f8dd8b290012db53ad843727fde8df513b5c0b599f1964b6e0603c9ba152e683a0df68a332ccff4c2274409c17a1c0fe1e74949249
diff --git a/media-sound/qtractor/qtractor-0.9.11.ebuild b/media-sound/qtractor/qtractor-0.9.11.ebuild
new file mode 100644
index 000000000000..341ded2f9c0e
--- /dev/null
+++ b/media-sound/qtractor/qtractor-0.9.11.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic qmake-utils xdg
+
+DESCRIPTION="Audio/MIDI multi-track sequencer written in C++ with the Qt framework"
+HOMEPAGE="https://qtractor.sourceforge.io"
+SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/ladspa-sdk
+	media-libs/libsndfile
+	>=media-libs/lilv-0.16.0
+	media-libs/lv2
+	media-libs/suil
+	virtual/jack
+	aubio? ( media-libs/aubio )
+	dssi? ( media-libs/dssi )
+	libsamplerate? ( media-libs/libsamplerate )
+	mad? ( media-libs/libmad )
+	osc? ( media-libs/liblo )
+	rubberband? ( media-libs/rubberband )
+	vorbis? ( media-libs/libvorbis )
+	zlib? ( sys-libs/zlib )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.4-dont-compress-manpages.patch"
+)
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		--enable-ladspa \
+		--enable-lilv \
+		$(use_enable debug) \
+		$(use_enable aubio libaubio) \
+		$(use_enable dssi) \
+		$(use_enable libsamplerate) \
+		$(use_enable mad libmad) \
+		$(use_enable osc liblo) \
+		$(use_enable rubberband librubberband) \
+		$(use_enable cpu_flags_x86_sse sse) \
+		$(use_enable vorbis libvorbis) \
+		$(use_enable zlib libz)
+
+	eqmake5 ${PN}.pro -o ${PN}.mak
+}
diff --git a/media-sound/qtractor/qtractor-0.9.9.ebuild b/media-sound/qtractor/qtractor-0.9.9.ebuild
index 762a38ad8b74..fe6da1df5a68 100644
--- a/media-sound/qtractor/qtractor-0.9.9.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/qtractor/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 IUSE="aubio cpu_flags_x86_sse debug dssi libsamplerate mad osc rubberband vorbis zlib"
 
diff --git a/media-sound/retrovol/Manifest b/media-sound/retrovol/Manifest
index e30e40314b5a..4d3ec2bd25d9 100644
--- a/media-sound/retrovol/Manifest
+++ b/media-sound/retrovol/Manifest
@@ -1,3 +1,3 @@
 DIST retrovol-0.13.tar.gz 210929 BLAKE2B 72b59cbae3b290ef32ed07bd80bacbd512d6594fa859df576505d8257529af93bb5135a8a843998d47e7a935411dd9541ac1747cf6b072f33f612c823a07e00c SHA512 a2e21ae70b1be7c824061a7118b331558dd27f5d93861d509ac03fd85856661555880ad592eb1fb4750eebeac7f1930aebc3c1f64b31ce6983b993098b509ce4
-EBUILD retrovol-0.13.ebuild 939 BLAKE2B 3519ecf865a38c52ff0166d54f5c8d812fd9d902a45d7bd43ee4532e59a55660e497a39113f1ea613e2d55f66891a7773bb80cbe931e2a2a004e6ecf8dba58be SHA512 3a2e7bba3a60a4d0b30de4aab28594d4bc19627541daeeb7b404ad35237d73db33e6ff9302415a0a9135614d3d3d58ba2633c0965cb84350bdfcd82158d4bfb8
+EBUILD retrovol-0.13.ebuild 744 BLAKE2B ba5317dc706e7e1aed99a2c3adfebe7d1aabf4cabe86c57187d30989264e28adf61714ef658f410463c88cc3b6d494d90dbf51e6c38d736b0bc322854aff5826 SHA512 a7dded999ea42b3ea5dc5c5969aeef24adb45f343a8741f932bad5782df822d13b1cd79506276e01d579eaaaaa509aacda2f475d8d122a66d27357867071633b
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/retrovol/retrovol-0.13.ebuild b/media-sound/retrovol/retrovol-0.13.ebuild
index d42288adcdb2..e1956bda5b8a 100644
--- a/media-sound/retrovol/retrovol-0.13.ebuild
+++ b/media-sound/retrovol/retrovol-0.13.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-PLOCALES="de fr"
-inherit base l10n
+EAPI=7
 
 DESCRIPTION="Systemtray volume mixer applet from PuppyLinux"
 HOMEPAGE="http://puppylinux.org/wikka/Retrovol"
@@ -15,19 +13,11 @@ KEYWORDS="~amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-DOCS="ChangeLog README TODO"
-
-src_prepare() {
-	# Check for locales added/removed from previous version
-	l10n_find_plocales_changes "po" "" '.po'
-
-	base_src_prepare
-}
-
 src_configure() {
 	econf $(use_enable nls)
 }
@@ -35,7 +25,7 @@ src_configure() {
 pkg_postinst() {
 	echo
 	elog "You can find a sample configuration file at"
-	elog "   ${ROOT%/}/usr/share/retrovol/dot.retrovolrc"
+	elog "   ${EROOT}/usr/share/retrovol/dot.retrovolrc"
 	elog "To customize, copy it to ~/.retrovolrc and edit it as you like"
 	echo
 }
diff --git a/media-sound/rhythmbox/Manifest b/media-sound/rhythmbox/Manifest
index ad5dff2f45d6..67902bff33ff 100644
--- a/media-sound/rhythmbox/Manifest
+++ b/media-sound/rhythmbox/Manifest
@@ -1,3 +1,3 @@
 DIST rhythmbox-3.4.3.tar.xz 6410600 BLAKE2B 0df8ac37ac0815468414c5b8118da6d07276e0c15f08812a46af7f377c29418416e1a24d7398aec10772887ae98922f6fb9fa9eaecc6ae15115cd7ca1c4b67a4 SHA512 a3585c026037674345909e2050a4ccb22a75084f830f351b926f7fbfc84d200c8246b8da4bd72804e595929ab06d3c7b53d362675dde193746f40b0f38b7c493
-EBUILD rhythmbox-3.4.3.ebuild 3372 BLAKE2B f2219fbda44529bb7507b9ccff4e270640c15f79b696b9a4bf6210d972a07f4788a449080f9e5351a0697c9d6f272f6ff060325b1a72d129d3d600d84912f66d SHA512 cda5541861b9be91b6113fa6e34ffdac5cb1b2bf946a214b1654d528a4c0b3a49c01e52c59c671ebf7dc09605a334b568584de1a5750dc448df38d328a316f06
+EBUILD rhythmbox-3.4.3.ebuild 3403 BLAKE2B 31afe5440371ae7a20488a95a6830902bbf541dacb7711ebe6cb3cfb622284f9a00f76f6c0c1757a362efb051dedab1e61bf74f4911d0153cd37b896f65ee6cf SHA512 ad1feace9a565d5d4af334354150cbfa34dbed00928bf5aee14e9a89d0c381373ae8ccb9c3bf99443d384548aaae5bb179dfa0a4f86d664943434a8232149eed
 MISC metadata.xml 545 BLAKE2B 541f660e1607a2e02779487edf290dbd8d8262184c2b0f245eabea4490165a0b019b1a989ad9a27acea26a15edc1ba39b4669756a9b17464b9592191e4498a99 SHA512 a734430876806e8bc114e3058c6b5cdabe87372af71a478f333dd7449faa63af011dc2c7115293049e74da8df742ed6a03f03c8e2a56a2d56b2aa4c547bd6065
diff --git a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
index 5e1ce69f5026..60e0573eb65d 100644
--- a/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
+++ b/media-sound/rhythmbox/rhythmbox-3.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 PYTHON_REQ_USE="xml"
 
 inherit eutils gnome2 python-single-r1 multilib virtualx
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="cdr daap dbus gnome-keyring ipod libnotify lirc mtp nsplugin +python test +udev upnp-av"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	ipod? ( udev )
 	mtp? ( udev )
diff --git a/media-sound/rosegarden/Manifest b/media-sound/rosegarden/Manifest
index dea6683bf00c..cd2bd74023e0 100644
--- a/media-sound/rosegarden/Manifest
+++ b/media-sound/rosegarden/Manifest
@@ -1,5 +1,5 @@
 DIST rosegarden-17.12.1.tar.bz2 6692715 BLAKE2B 698ecfb58754ee292e589e0fb3618e2076a6e59dde1f06d15ed3bad43313cc79ed03307364350f5cd2323350173119ccc71b42c839d8498d360461a19801a96a SHA512 8bd4a464bbf2825d6c2fb8d36123e68d94de7f4e997c6ed8efc5670e87799781eb8251995890979c9d107d4fc58c636fe73e699c859c8e95aa567c4289958495
 DIST rosegarden-19.06.tar.bz2 6667374 BLAKE2B c204a99dd46a0dcbfda6afc361ec31b7f211d2b95a8d171ff3fb06e37b3dbabc2b36fdbc04a3dfc821a9e331681d2a1e2395e91a86fe9d9fecd3af173f5b675b SHA512 13eddd4ec88662f3275d83bf40471ca0a34d43b3c9c9f07cf46b891c74f087ec7fe0d4b8ffe8204f2f3a30829352f4d952bb035a5bd09a7b6bdeb41ff5d1e8d8
 EBUILD rosegarden-17.12.1.ebuild 996 BLAKE2B 955ae5c825df0b675211d7fae021280f7ea8896bd3dde778fb847d02cae59291e8ed6f382d87e1bf39f125564626e5b72aa68fbe477bbd7e5bd745f1a0627a39 SHA512 52527e0803bc198cc7f6167091aad55317e6dfcda6d2322e90932b4ef8d66713455bc57117c6fd83212955243fe52c98aeb5faf7993c2c87bbddb5b76e962952
-EBUILD rosegarden-19.06.ebuild 998 BLAKE2B 49ee99784594c188f2a896f186ff9d8cbceea7b459737ffe2bdb88a9d387ac7f282c1ec312b3d81f78e9dea21f90a0e8771affc439009d5c8e474985aa9b31c8 SHA512 cf4cad1a1146c4dca6c1190e8d05e1f4704e04fba3f9b998ab2d8159c20e52c211626873a161ef601043fcac543065e01bb2fd7c562c61f67f426e39e1812a30
+EBUILD rosegarden-19.06.ebuild 1078 BLAKE2B 9a4739be44afd83a54f3443581472dfed2fd71914ffdee54edf96b143a0bfe48f0fcc7842eada3b68361d87988d8d0c5a7be4197210957213465bc80915b2f80 SHA512 7d97ea4c05943250bac50838bc82ecc2e8b8eac3124d527f7d5d6882a7a40710152bcebf9867d02df02812a521a60013f3f89dc18f5ffc4b37b3f14885178b01
 MISC metadata.xml 349 BLAKE2B 0f31b6c7f0aef5e0b487ddcdf963c1701cc3429870464de30409dd788422964adbf05172089315a6543ac858f4d5ae64773c52728f24da4dc06dfe9b1dcabf9e SHA512 1790ba05a4f13f358de6890c908b2f1eb0581143063b7237220dd05aba31d16d68f2cf6c4712a08894909b7de5306d592807e9f3171b66b72fd867bd339a0cee
diff --git a/media-sound/rosegarden/rosegarden-19.06.ebuild b/media-sound/rosegarden/rosegarden-19.06.ebuild
index a62b21c7fa70..eaedb77e1951 100644
--- a/media-sound/rosegarden/rosegarden-19.06.ebuild
+++ b/media-sound/rosegarden/rosegarden-19.06.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake-utils xdg virtualx
 
 DESCRIPTION="MIDI and audio sequencer and notation editor"
 HOMEPAGE="https://www.rosegardenmusic.com/"
@@ -11,8 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="lirc"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
@@ -52,3 +53,7 @@ src_configure() {
 	)
 	cmake-utils_src_configure
 }
+
+src_test() {
+	 virtx cmake-utils_src_test
+}
diff --git a/media-sound/scmpc/Manifest b/media-sound/scmpc/Manifest
index bef578e28a46..bd34850a51f4 100644
--- a/media-sound/scmpc/Manifest
+++ b/media-sound/scmpc/Manifest
@@ -1,4 +1,4 @@
 AUX scmpc-2.init 317 BLAKE2B 4b6f9aad5b4f993b5e34ec35aaf1af67a2407e815ba51942e3634451b0bb814e6dec10004e9df43df5aa3ffae4f1ef84899438dd704748d0e5925e4a6156481c SHA512 58cd9269acbdb92bd4ab0ae23c1f5a07909debf9b37131824827089aece9552493b984f5d73c654a7f6ef47e7bb496e424cbe3885db932ab5554bee9f296f0df
 DIST scmpc-0.4.1.tar.bz2 88288 BLAKE2B 6502b21b512604e611f2d6a3210b3f5d64d3dd476b5c17e7e92480478b1488220147ccaa3b43f838fcae646c6c501f6b4bdaaf543df05151782f46bf689cd25d SHA512 7d9f8aad29d58f2227a6149a6b4c9bfc4d400946ac316cbb34482feffd71619c1f311cb1ce6f02c22912793e866661e4d976c8f4ee99ffd1e76be65c9a06d876
-EBUILD scmpc-0.4.1.ebuild 663 BLAKE2B 31dc582fbd0bb73fe5379bdb3de06594d63174051b7ccdc5ea4f592916d998caa960de09c34ea6b097eda8fc29d93fa81ff73c039c58050dde8ee9098c88a999 SHA512 964e38c230f79930c210f481cf0227ea7a3136e7b98b4feabe0eb2ef3164fd4cb639178efc0a713f1ed5b0085e1844ff28e40ce585e2bac163daf3377d3d1bfe
+EBUILD scmpc-0.4.1.ebuild 633 BLAKE2B 1c610892a7f1ba3e68fc3f57f0e5a4095fe3a32de4dbd6a16cb6696dce01a14d5de25a83c2707e3c52a7b778223c56a8bcd38f1e36fed64769b9c11175a15f87 SHA512 a08429f1c4f8e7da4b8b7e9b1050f36978feef9c450f75015f53638540b5b7d304e881b15b1cfff64018e6e833643afe21a3646648228bd34d2cc256b1ec9c08
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-sound/scmpc/scmpc-0.4.1.ebuild b/media-sound/scmpc/scmpc-0.4.1.ebuild
index 714a7b51ba2a..7eee1b1aa5be 100644
--- a/media-sound/scmpc/scmpc-0.4.1.ebuild
+++ b/media-sound/scmpc/scmpc-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="a client for MPD which submits your tracks to last.fm"
 HOMEPAGE="https://cmende.github.com/scmpc/"
@@ -10,19 +10,18 @@ SRC_URI="https://dev.gentoo.org/~angelos/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="dev-libs/glib:2
-	dev-libs/confuse
-	media-libs/libmpdclient
-	net-misc/curl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md scmpc.conf.example )
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/confuse:=
+	media-libs/libmpdclient:=
+	net-misc/curl:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_install() {
 	default
+	dodoc scmpc.conf.example
 
 	newinitd "${FILESDIR}"/${PN}-2.init ${PN}
 	insinto /etc
diff --git a/media-sound/shnflacverify/Manifest b/media-sound/shnflacverify/Manifest
index cab9872bb090..6748b4db5823 100644
--- a/media-sound/shnflacverify/Manifest
+++ b/media-sound/shnflacverify/Manifest
@@ -1,3 +1,3 @@
 DIST shnflacverify-0.3.zip 11845 BLAKE2B cbc4cfcdaf54c91572a6b6b4a9ebdb002b1a04cb6a9029e8bfd92c227e9177d646bab25515f2a855aa504dcde256733b68dc4c1a4195fd6b0ca3bc0dce274f02 SHA512 8d05d476d7c89ca7f93f3d4b12d6bdb8c197e87c9c400e12f39ad3fd9b8b2a2b8d158baa0e663a98a898f732694c16064c8ba2996101d4b74d173a3ca13942b0
-EBUILD shnflacverify-0.3.ebuild 874 BLAKE2B 01876f231b8ffb31367fd294ad787502471fffb9276bb2bfb911276ee6e053e3f68331547081c428b295d5dd054aff5648de9a2aca26ed0c08892c0f2f6aff6f SHA512 130f9e97262cc212d7717b15c5576a993b5b7a000c2265c014b502f89852aa29c91ca712022f6bb4bc6afc80b4fb30c19f9ec97f22eca83a91e061beaf68812a
+EBUILD shnflacverify-0.3.ebuild 862 BLAKE2B 92c4ce062043aee5d50d063857db44a4aeba4cf7b5b6cda31706573d163b28ac9c4ab270dbd55d367dd051a845c835079665edb889c6c0e1830efd90e69dbfe6 SHA512 315676ee36e3d6cfd9662d383cea2c1cd2e117a1e5f6c1e9a33925b99ebb2125217902e6dc8aa8a318ba2ca42b01321a25b2d079a9483f9d1b6b37aeca98277e
 MISC metadata.xml 481 BLAKE2B 2457fff7ebc37ea1224f8273e1c986ae0aab8d0f2665641ce1d828325a7d20ddf2fd0f5180d49955a439cdc356f4ad78ec7beb2e0cc4d1e5a3d285db51254af9 SHA512 5d48ebcf1bba0a93b1c6fbe03bab7262c75d8c23d8cb404261f51e3d242b3f906aeb780ce6dd3bae521f6d40bf22b3a383b7224bb8f0a5fe75eab94acddd2a22
diff --git a/media-sound/shnflacverify/shnflacverify-0.3.ebuild b/media-sound/shnflacverify/shnflacverify-0.3.ebuild
index 80e08a78f3bb..7f5b5eb1bf00 100644
--- a/media-sound/shnflacverify/shnflacverify-0.3.ebuild
+++ b/media-sound/shnflacverify/shnflacverify-0.3.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=4
+EAPI=7
 
 inherit eutils
 
@@ -12,12 +12,10 @@ SRC_URI="http://downloads.sourceforge.net/project/${PN}/${PN}/${P}/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-lang/perl
+RDEPEND="
 	app-arch/unzip
+	dev-lang/perl
 	media-libs/flac
 	media-sound/shntool
 	sys-apps/coreutils"
@@ -25,11 +23,14 @@ RDEPEND="${DEPEND}
 S="${WORKDIR}"
 
 src_prepare() {
-	local X
+	default
+
 	edos2unix *.txt
+
+	local X
 	for X in flac md5sum shntool metaflac; do
 		einfo "setting \$${X}_cmd to $(type -p ${X})"
-		sed -i -e "s|^\(\$${X}_cmd\s*=\s*'\)[^']*\('.*\)|\1$(type -p ${X})\2|g" shnflac*
+		sed -i -e "s|^\(\$${X}_cmd\s*=\s*'\)[^']*\('.*\)|\1$(type -p ${X})\2|g" shnflac* || die
 	done
 }
 
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index 49f4f0eaea60..f6258b12fb6b 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,3 +1,3 @@
 DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d
-EBUILD shntool-3.0.10-r1.ebuild 778 BLAKE2B 8dd9c0a67bc2fa0f5ff32d995f169abf6720d63dec8feb7fcd5556de0f6faba3935c789db74302d480b0c93846070784bf7483c315f60b1943a92148afb93253 SHA512 13ee328557b2f40c6177cf8b230eb55a3335b59102df8238490e6fd98d3d72a9c0779a4024bdd7d68743b28ab21e8a8ac47f37e5e40d0668a4c999298c338c16
+EBUILD shntool-3.0.10-r1.ebuild 777 BLAKE2B 02a73b4603d28ed7e077b99878d9e283ede402486a438ec43ab7919e0097329bb73cbc3aa81483657608ecb9cb76ed2bbbf8098a99e3e87cdfedc7513e641258 SHA512 c254d110f3bbb2f86f243870f353c921d31feea3557318dbb7ac3f47dedb6a53956d948ffd66b157af2fe105894a456c7e5f3574da0496068c1801941299b5a1
 MISC metadata.xml 496 BLAKE2B 2a2e3262f4ff6fc070d1f4693db8610e00c85317232b21799b897a40f353f15d5b8effcace525c99ea556ff51316d8d40da923c9372684510247d48f316f3e2d SHA512 81a78997d73d8356ccfa4d2a8a37b8c114cd80e6ccafd4705be1741e5ee7abdbf3eb77373f45c529dcf1bc67c4ba3f4ed147cffd790606189a233daac66dac66
diff --git a/media-sound/shntool/shntool-3.0.10-r1.ebuild b/media-sound/shntool/shntool-3.0.10-r1.ebuild
index 69859ce07241..15e78ed34413 100644
--- a/media-sound/shntool/shntool-3.0.10-r1.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r1.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=4
+EAPI=7
 
 DESCRIPTION="A multi-purpose WAVE data processing and reporting utility"
 HOMEPAGE="http://www.etree.org/shnutils/shntool/"
@@ -12,17 +12,21 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="alac flac mac shorten sox wavpack"
 
-RDEPEND="flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	sox? ( media-sound/sox )
+RDEPEND="
 	alac? ( media-sound/alac_decoder )
+	flac? ( media-libs/flac )
+	mac? ( media-sound/mac )
 	shorten? ( media-sound/shorten )
+	sox? ( media-sound/sox )
 	wavpack? ( media-sound/wavpack )"
 DEPEND="${RDEPEND}"
 
-DOCS="NEWS README ChangeLog AUTHORS doc/*"
-
 src_configure() {
 	export CONFIG_SHELL=${BASH}  # bug #527310
 	default
 }
+
+src_install() {
+	default
+	dodoc -r doc/.
+}
diff --git a/media-sound/smixer/Manifest b/media-sound/smixer/Manifest
index 469279bb2ae1..1d463de2c718 100644
--- a/media-sound/smixer/Manifest
+++ b/media-sound/smixer/Manifest
@@ -1,3 +1,3 @@
 DIST smixer1.0.4.tgz 11245 BLAKE2B 292deb588716abdf41d9daf48421741bba03e3ea77fec33c02560a685844245f85256483a0c12a4052cd03206a569f9f721b67b076d7fb2bc27f53c39069abe2 SHA512 3c589487cfd246b68d54abe9ce9dbddd9aae539b96a0d464f3194f5931819c85923e13b4fd5b947bab35d32403bd7609fef33ff966a1d20d3fb465eb0bb184aa
-EBUILD smixer-1.0.4.ebuild 592 BLAKE2B eb1fbb1d882191f917f2c6a9901478f8898813a1ba7b4d5d6ccb0a5889e14770c2fcb56f14ee1a192ccd4b22b37e0c1369737b2c153c7848da28c58297969540 SHA512 0a5422b7d8cb8a60167525844d9ccdc9c59469a24a8cf22556e65b888cae5522016ab1a9bff6b10fa5b019b8163061008685d45404aa2a1a2c0bc9fc9ab6a5eb
+EBUILD smixer-1.0.4.ebuild 591 BLAKE2B 81693c680f31e441924845d348f4b8c76e12a59cf2a15098e575bab81585650f5fbc83a5e0dcdc3926184255b1347c55d5e6e5a0b8af5cf091097eb1e2d45725 SHA512 7a0c4a72152aa3725a70e9919a9b3de22e612ddf321fc0cd68cf5dfb34de567d22a793c069acb47878d306e03b5e630e090743f22fb781ffac211754139f1b62
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/smixer/smixer-1.0.4.ebuild b/media-sound/smixer/smixer-1.0.4.ebuild
index 4cff0e5b2d1b..0b5bc7d65560 100644
--- a/media-sound/smixer/smixer-1.0.4.ebuild
+++ b/media-sound/smixer/smixer-1.0.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,16 +14,17 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc x86"
 IUSE=""
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LFLAGS="${LDFLAGS}"
 }
 
-src_install () {
-	insinto /etc
-	doins smixer.conf
+src_install() {
 	dobin smixer
+	einstalldocs
 	doman man/smixer.1
-	dodoc README
+
+	insinto /etc
+	doins smixer.conf
 }
diff --git a/media-sound/sndpeek/Manifest b/media-sound/sndpeek/Manifest
index ef3b09eea160..06dc0cc3bff8 100644
--- a/media-sound/sndpeek/Manifest
+++ b/media-sound/sndpeek/Manifest
@@ -2,5 +2,5 @@ AUX sndpeek-1.3-makefile.patch 7578 BLAKE2B b06da3d723a0d49e5e8ca058b7622f6b34c6
 AUX sndpeek-1.4-gcc.patch 315 BLAKE2B 782db101136b691904424dea1d72c02a4308ce99018868d6831be978029be4a51ace611f41e36e91b2f70add83c3269722e1a5061e7fb267a63cce5772f3b1b1 SHA512 184f4e39b033aed7f7ce49e5e15ee2bda016bc56b0f5fba05ab52a13f40e0c957a0a8c2754f0437b782556de9d0a5bb2a3694bb107261b4c80fda07a4b228d18
 AUX sndpeek-1.4-ldflags.patch 2255 BLAKE2B b78a6a15228e7c5d0a38b4ed1bdc86c6e6ec540099e6ac4e066135b9fcb53a3ac307a3239022fda14ec596b9e145317c2e61e65dec26e9940fbc37f3515c1b93 SHA512 36c8f4dd7a63c06a7cbefd66e1f2eca39cf7567ddfb8a76e6d50de7808086b17cdd3f4028e4d5ca458edbf6d257d75bce8d40538d865151d0ce11283b2cf3991
 DIST sndpeek-1.4.tgz 311174 BLAKE2B 8f75aa90e71c4b12e15da68774a357ecaab61dea64071b5276ea1fe5311c1e937350a8e46f6a8c4714a43f7174145881fa9be04c80c54ede351e0ece08de88ca SHA512 f44c2474828ccbd783d69cf14c5c63ab9c52e1f32fd3bdeb2b4e0c6c5dc83d5f88c2b4e27d48824b1acb29c730c1320953ccadf5635f61a9f93487bbcd821bcb
-EBUILD sndpeek-1.4.ebuild 1681 BLAKE2B 3938287c0b22b3cf0e8baf33bd3489911b9f6fda85b57d2810195e7832fd0dbef280593ce9b94f2b257b61fee178131f71b4245849c3af349dcf139107e42bfb SHA512 3c84228a75004a068078bca980413a6063c9ea7be10cb05a097abfaa0e8f1d960910fb13ebc0827ada5f2d6bb0cae193658b15215af9ab9dff2bdccc888871f6
+EBUILD sndpeek-1.4.ebuild 1659 BLAKE2B d3c15cd95858558c86d06829f54cba9ba4eb48206ab63dce3b707ba39c3dbe37b0ba3b1184008a18c76a8f0b77d8f260fb54a764c4f0c1124e783a2b0e571070 SHA512 40701ac8ce7f4299f8081746ad1ec1396ebc3e58a194fc5ca982be1fc1a812bbeab6d34d66ecb669b4749b57ce7a42d6f8930b27e04e306325ecabde32fc3226
 MISC metadata.xml 334 BLAKE2B d0828ab0ff2b5bc3a88013773a5653206e57420f5d0eceadcfa7db7e587d24e12ded0edd775123ecdb887b3adf8f357599f59a6b0997667346ab846d6656bd52 SHA512 13ab3514fb82b417aa9b69680d3370a9f674c307a10a289de8b370c9cbd7e8a6b3aa14a00b2d69885e8805473940cf0dbf1606571827e021c5245c20e0078fa8
diff --git a/media-sound/sndpeek/sndpeek-1.4.ebuild b/media-sound/sndpeek/sndpeek-1.4.ebuild
index 854e6e44670c..b60e397e0d76 100644
--- a/media-sound/sndpeek/sndpeek-1.4.ebuild
+++ b/media-sound/sndpeek/sndpeek-1.4.ebuild
@@ -37,7 +37,7 @@ compile_backend() {
 	cd "${S}/src/sndpeek"
 	einfo "Compiling against ${backend}"
 	emake -f "makefile.${backend}" CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) || die "emake failed"
+		CXX=$(tc-getCXX)
 	mv sndpeek{,-${backend}}
 	emake -f "makefile.${backend}" clean
 	cd -
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 4dc04cd9f740..1c601913f12c 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
-EBUILD sound-juicer-3.24.0.ebuild 1485 BLAKE2B 8f47a8198a79cba4f7b37e0895bf8ef4597899b7904c79c79f27ffb1e9781a1c67b4f7ebe3829cf9e39996ecc66d0e0f20421fa590f0c27a97d9701a518fef01 SHA512 5c781c5a8729f0998a3a123f660f2ed5b3f946cfdf12c40fe6e6c2bb5027657fa0a265405525070b313abe39af1463d572ff3573c3e6fb45fb6a6b239d35da73
+EBUILD sound-juicer-3.24.0.ebuild 1512 BLAKE2B 933447422932c677b7801e909f88fb34f50682d247e808db05675555144efde242eebe25c88e9d1d4faef25214c7a18787bc986fbd41c26988d0b3072cfc00ae SHA512 bc2e44b3b21b2c032c932d959157a7ead461e78119bc60d97aa694d9fb22a8d2a7161b0f484ccce9d3c63cd5be39070df1f2e9a7791e8470a904d5a2c6143ad9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
index 0af3611a9e9f..ed690672588a 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug flac test vorbis"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	app-text/iso-codes
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 9b5d3537db58..ec4e4eb65aeb 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
 EBUILD spotify-1.0.72-r1.ebuild 3210 BLAKE2B cd775bd0a132bd9a32e64445f815e42fb271d4f30025b65d33efb6013049005749e60e309daea7031cbe1bbb1afc16fd94f5a12e283d28d3e56051541d60ba40 SHA512 d21a4c6bfa78352f3dc0679373fca05eaef3043c8d77611f9b9c6b789f42964f95492d8e6530f012df32eba364772abd9ce0d25f68ce1205003892beade2db81
-EBUILD spotify-1.1.10-r1.ebuild 3142 BLAKE2B d75a9f42f9c2870d4fc2159bb6a9009fdae9880e8be52b77738bf895805d8d14be388ed349049710dfeffd5a31b5b00511e49983564031022c0a716e6624ac02 SHA512 f2558d039f2e0261d0ff74780e5519001dfdb9612da935a2619c678047b5154f955ccdc4d2b65d229d1191cf1360d4b1db1056d29fe5407e50a818b0bc776b37
+EBUILD spotify-1.1.10-r1.ebuild 3124 BLAKE2B 8f316d1b0786d13315791ef989eeec232a7cae2b0caabcd048dc2f3f9f6027ea72272cb23be13e66253e07e1b9d55c0d9a187904a414f3d31482a0ea7d8bc005 SHA512 baf29212dee7ec0336706e46f467c18f838e3fb3628aa1c13ef4ed418de21f22984cb35f295765ff2e36f14c8d44d192d8910cc8090247282e509b0ab1bb6ef3
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.10-r1.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
index 3089e3b8847a..56c8b2a3fa7f 100644
--- a/media-sound/spotify/spotify-1.1.10-r1.ebuild
+++ b/media-sound/spotify/spotify-1.1.10-r1.ebuild
@@ -20,7 +20,6 @@ RDEPEND="
 	dev-libs/nss
 	dev-python/dbus-python
 	dev-python/pygobject:3
-	gnome-base/gconf
 	libnotify? ( x11-libs/libnotify )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index a050e67612d8..4bb277716648 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -2,5 +2,5 @@ AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f25
 AUX ts3client-bin-r2 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.3.2.run 95632176 BLAKE2B b1a418e6af6c364050a532063b3129e27d03ac36ec325ab5f2044896f5eae02fb4a251e71b23bc125d41f169aa35d8dde340b333a67b845ebaca7faefa49fe70 SHA512 1dd8912120ba0e9e84849fd793d54aee56e98396f6228a4bcec5c79485b9902398eeefb8f276abd46bbe627e7bd3c8fc5d740d05807342f837ac226f475510d7
 DIST TeamSpeak3-Client-linux_x86-3.3.2.run 94323084 BLAKE2B f3b0317e8cbc7143d9814a52c8a8c9cd04aa012a40172aca59e6d4db956a19ae5752bffa102f06e34ad0dd5b211082e00ca06056c05a4a2dbbd8adfd76a0c0e7 SHA512 56b7b231ffa5195418823da435fd4daef2cbdbc653d3cfd328f60881a1370b9dd6f99479e9093216d0768ddb04bdd6c6cf1a7019d836abd89806518eeee23496
-EBUILD teamspeak-client-3.3.2.ebuild 2481 BLAKE2B 07274018c9ef5225c94b9cb0db323e0e958899fbd33d95baf8697c2749fb7a26e0afffc9ba9361bcd3cec99cb4b87cc3d74ca707094e866b273ece85b4776f0d SHA512 f5534ff9060c6ff371ffb6fdb1bd1e2cdd0ad4e0145058e71321135b4d612a5302037f23649f17079b136d83dfa28efd52098c12733945cb7d17fe784412c760
-MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
+EBUILD teamspeak-client-3.3.2.ebuild 2480 BLAKE2B a04519b5165c32748c2d16c5903312d3298dd430117dd74e3c4ff3d1dab93c6ebdd23d7cb8b87f7a1c3457dc94ec4469e9679562d774fb7b22c4b5bf8c25f195 SHA512 c73638cecb40848eddf35fe3cf1d3c6d2a8378240df132027a488193a77d1ccd22291139b141517424b2eb867fe966c39159e902990df4968e8ec423fdec8ff1
+MISC metadata.xml 637 BLAKE2B 996d3156ecf21c789e3a7017d7922f7fae257722021bc4ff968ec3c9863df61f9631fe83e3482781f78ede7b91f2138b4510473d8654063347037031812758fe SHA512 934068091ef8dce4652021965a99d50c4df0a426a7a1d1f26adeca776a73e7f1150d976bf44b704905aa0877d8844dd5d53bfa71279f5126e00dec924f3afc5f
diff --git a/media-sound/teamspeak-client/metadata.xml b/media-sound/teamspeak-client/metadata.xml
index 9c659d70a2cf..f16b483f34b4 100644
--- a/media-sound/teamspeak-client/metadata.xml
+++ b/media-sound/teamspeak-client/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		TeamSpeak is a proprietary voice-over-Internet Protocol (VoIP) application
 		for audio communication between users on a chat channel, much like a telephone conference call.
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild
index 88a750e33f60..e98bb9cc9e7e 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 	x86? ( https://files.teamspeak-services.com/releases/client/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )
 "
 
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 LICENSE="teamspeak3 || ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="0"
 IUSE="alsa pulseaudio"
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index 521ba12fcf27..709f41cb1648 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.10.0.tar.bz2 9242882 BLAKE2B 0315c438305827a4bddd73f07a4f813e2268ec5eefa6f89e45de43afe61b4d8c0e17e0d45317b485472aae5a60ce9afcd393ecd31a9d43304c466eff7db918d6 SHA512 d847fbe18ab2676bcd299773f4070a6e58ba86784f18c9cf9e843cd28adbcdbebff69c9bdc8a5f46f714913f657d8fd603fe1b8c90a938d9e49b06ed0ce0bacb
-DIST teamspeak3-server_linux_x86-3.10.0.tar.bz2 9047531 BLAKE2B 8fa0eba5b9dd4a5274b8b4b626c85326d1d6a8b9d00c17d9b26ac558dd4bfc233e09863bea01a590a0273e5d20c7b1513f0cc80df82366f9c327cf85173e553c SHA512 42baa7ef4d1451c9e4533ef186b0b48a92619a673bf11c4876b0caa908e7e8846fc7307eb01b220a6d12f62273ae7a3c3b5c90f3cf891e490554d254fd552c5e
-EBUILD teamspeak-server-3.10.0.ebuild 3081 BLAKE2B 4ffaceb76c6059ec173428206e9bfcd20dc8082dc2b3423dd64bc8a19dd42cca9e76b701d68bbdcbd15431570391146dd8d86c90bc86307d28fc25b1c7f97f04 SHA512 fc6ca1e7cb834d4e86c8ebda0ebc1337f00c73b93d3f94bf4a2c45f48f4a3323dbb0fc6f9f633fa858c9a8ff9af8f1a8114a653af5ffe420dfce37cea3ff65f5
-MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
+DIST teamspeak3-server_linux_amd64-3.10.2.tar.bz2 9242362 BLAKE2B ad275eac241182aa15410ba32983bc1e598f55090eb35559fe6cf3f18fd6b3a1395a36f320dd36ea3fa44390afd698f6734b034536cd48d049028e09943df7f4 SHA512 3be39004d557fb58efd272dac3e005c08db8ae05e04cc5cfdc146296bca7b0a02d7011bb77d6d45074056b458e14111dbd79882603b4be9fba58de7c9b384b84
+DIST teamspeak3-server_linux_x86-3.10.2.tar.bz2 9049720 BLAKE2B 86f854c2b18397bde3cbb02b9d0024af8d3fbbdc695dae0f7f950fb5670cc6c983e8eb20dee97409a87b6cd572772cf72cfddee0254857023aa4e8446ea71068 SHA512 5ad16efc1a0b8dad6696d4121560cc793a35b15473391fcb18a8edd72031415775fb10d0c686a2af550f36748c17db03ac8caae76b0ef7e4ffa528d3ab416951
+EBUILD teamspeak-server-3.10.2.ebuild 3084 BLAKE2B 6bc6609e73d914bb918110c5429481f0662e4474c2bd7965192466b11f44949e108fe66357b4904f25dc7320ef5bb4dcc4f1cdce382f42760b8d468b360327ef SHA512 894f41d0a5528b6172f07e2e754dadf61b4c5fe42c5df790b1abb5bb3798aa707c9479dd20cd9940f83c2b7aa483ca016f21ed903881468d718924222b376cef
+MISC metadata.xml 703 BLAKE2B 854016d14783720f4467dead33469909e5777915947a72a03d0c2789fe37633cd93db11fdf2c59429e7a58f44825ecde3094c1dab7dd765634f46b80894b5af6 SHA512 959deb886af18a0260a0a0530eb914a42a21acac711cfd3ca6c2724ee78e3b697786e85a387ce7c9dae34b1922d3d96953265c80497602a4e94b05988d776a9c
diff --git a/media-sound/teamspeak-server/metadata.xml b/media-sound/teamspeak-server/metadata.xml
index f5abe25d7214..18a7d2a8f802 100644
--- a/media-sound/teamspeak-server/metadata.xml
+++ b/media-sound/teamspeak-server/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		TeamSpeak is a proprietary voice-over-Internet Protocol (VoIP) application
 		for audio communication between users on a chat channel, much like a telephone conference call.
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.10.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
index 034c317b9ddb..f44420257f34 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.10.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.10.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0 Boost-1.0 BSD LGPL-2.1 LGPL-3 MIT teamspeak3"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE="doc mysql tsdns"
 
 RESTRICT="bindist mirror"
@@ -113,7 +113,7 @@ src_install() {
 
 pkg_postinst() {
 	elog "If you have a license,"
-	elog "place it in /opt/teamspeak3-server as licensekey.dat."
+	elog "put it in /opt/teamspeak3-server named as licensekey.dat."
 	elog "Please note, that the license must be writeable by the teamspeak user,"
 	elog "as it will be automatically updated every six months."
 }
diff --git a/media-sound/ttaenc/Manifest b/media-sound/ttaenc/Manifest
index 6c5017165175..726708140b6c 100644
--- a/media-sound/ttaenc/Manifest
+++ b/media-sound/ttaenc/Manifest
@@ -1,3 +1,4 @@
+AUX ttaenc-3.4.1-fix-build-system.patch 460 BLAKE2B c6b8ff7b908364a0052b8b32c5ed424e998a600449c9f04bf52a7d2fc1cb7221b7eacf3f542f102b15b08a1208a3fd7b75b3c1b590986e1bea56d2bef899cd12 SHA512 4d36ac15f22dca57bbb1c83f94a6279dff56607c428eea56b4aaef9ca4405233653c28a7df924f36da60b60c6cd54226ae70553f81f996ae796fed1ed8deee33
 DIST ttaenc-3.4.1-src.tgz 20835 BLAKE2B 9eb2a52b67874c1b44b092c6f665c8105b86f05b69be10aea1a0b196487e0d950dbc174385dd686c4574abdcd77c2945f441b672a77e9c9a48bfa822ccdc1a01 SHA512 489f9a2e0f94a82f12302f076e33062104e58688ffde97e742ad3c8c226bd0000133c539e9111e10f2d24c176e0b7ddd0a76e60bd3baafa53c29b3cd89ada06d
-EBUILD ttaenc-3.4.1-r1.ebuild 585 BLAKE2B 62136ff78348a44061ab7f0d57fa2e72c355f3c07aa2aa447e84f762430b806aefc566d60d3fec6b96771272c19b8ded782df0d2928979a363682b9c51675ede SHA512 8deda5e07a81c5007e7b69eb58a3e27a3af2108ef053cbbb7469ef9102ae88e38a1da596aa4a7ea028cc8824d4bd38509fa9860661302df7a4dfdf1baced8ed4
+EBUILD ttaenc-3.4.1-r1.ebuild 493 BLAKE2B 05dd271171e8e8bbded6c23bb19ebeb76de0cd89d981a728c37cae86bc0b1a7b221ec24139ea7b49abebbc94cf619d050f6f35643161211eec3bb0cfc52a9885 SHA512 9cec57c6c403d94edeab729c4cb46fe67148941be9b63e8ab53ae039822247d2da81895a44e7e79895f4db9b8be85f466d2c77bdf93435716fb2deb87a335d30
 MISC metadata.xml 326 BLAKE2B 9ca570aaafb07e124bf9ea766b9eb51537cb9d8f1abc8cf22021db7aae18719c4d52213f2ce074cb5e31a25cf6596747048e958db9eef6d4f67962c2c49b143a SHA512 cbf753d8944172edfe707a17f07936cf5af413721a7f657262fd4a4c65d001a39ea13069fc16d6ea5248e0025ad7c5b1852b36baeb1e1be53787ae1f4d9f8536
diff --git a/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
new file mode 100644
index 000000000000..794316d24899
--- /dev/null
+++ b/media-sound/ttaenc/files/ttaenc-3.4.1-fix-build-system.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -2,16 +2,12 @@
+ # $Id: Makefile,v 1.4 2007/04/04 00:00:00 root Exp $
+ #
+ 
+-CFLAGS	= -Wall -O3 -fomit-frame-pointer -funroll-loops \
+-		  -fforce-addr -falign-functions=4 -msse
++CFLAGS	+= -Wall
+ TTAENC	= ttaenc
+ INSDIR	= /usr/bin
+ 
+ ttaenc: $(patsubst %.c, %.o, $(wildcard *.c))
+-	gcc $^ -o $@ $(CFLAGS)
+-
+-%.o:	%.c
+-	gcc -c $(CFLAGS) $<
++	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ install:
+ 	[ -d "$(INSDIR)" ] || mkdir $(INSDIR)
diff --git a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
index d7697469bc3e..34f01191dd63 100644
--- a/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
+++ b/media-sound/ttaenc/ttaenc-3.4.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,23 +12,15 @@ SRC_URI="mirror://sourceforge/tta/${P}-src.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="sys-apps/sed"
+S="${WORKDIR}/${P}-src"
+PATCHES=( "${FILESDIR}"/${P}-fix-build-system.patch )
 
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
-	sed -i -e "s:gcc:$(tc-getCC):g" \
-		-e "s:-o:${LDFLAGS} -o:g" \
-		Makefile || die
-}
-
-src_compile () {
-	emake CFLAGS="${CFLAGS}"
+src_configure() {
+	tc-export CC
 }
 
-src_install () {
+src_install() {
 	dobin ttaenc
 	dodoc ChangeLog-${PV} README
 }
diff --git a/media-sound/tudor-volumed/Manifest b/media-sound/tudor-volumed/Manifest
index 3c225d941546..4eda606c8f6d 100644
--- a/media-sound/tudor-volumed/Manifest
+++ b/media-sound/tudor-volumed/Manifest
@@ -1,4 +1,4 @@
-AUX tudor-volumed-0_pre20110427-build.patch 829 BLAKE2B c96b5ef46d148c2311529f18f80309e4c43acb8ea06a05e696b9cc2415669c66c83d50c97f75b70c8097a92fa089578ed93c4e9648021b2829affe4384a97f1d SHA512 3cba0bd7ebf2a08e3fd44cca80436c1c4884f014759f0cb770d9af1612340795c282455be8b6cf9822fa746998ac1b4a28374dc88767d5e350d5036c7d9d6829
+AUX tudor-volumed-0_pre20110427-build.patch 837 BLAKE2B 7dcdfa55fff48fd11acd1bce00e05c5c900ef18f61460e70f4f5b9790a2d63de9b3f305d1e63a91b770d6a0a84ad646b1caac0cec4415cbbcb729b17bc25aede SHA512 51e5d6581564c448702d5bd363ef880bbb83fbe1b36dda0d8dee08cd9e4d71f4f9f131be3369a95901437526581d905940b2866d788e7819361c1f36e2bf4403
 DIST tudor-volumed-0_pre20110427.tar.gz 5651 BLAKE2B 7e64a90ab0e7f6b6907392b6bc8fd8fc18c4ccd0d252478121b9188b9d6c61e3f7196e73a0b4016a8067ebcf64cf3e4f67b167a0d01e8c2f5d63de8c209706c9 SHA512 e05e8fef96985355b2e12b34a8858b98fd508e1849bff377c96593a5fee6cdf542decae2b9f1292c25b886cdd44545d99350c4c614553665fa3c7ea21ce5bd51
-EBUILD tudor-volumed-0_pre20110427.ebuild 647 BLAKE2B 019a90ea391a3648276071d33641e29855615c0c4f4bc4ece5ffeba84326cf2b0b83823e6baf7883e74b13595c8dd44816561d0f7e49dd588e0fb5a6967fe1dd SHA512 d4ee33c242c33142d3e25ff30e293bdac018cb39217c3e06f0ce24ed3692dfa499511520ee5530bf2ecf82df527819924acbbdd954aaa98ad66ae7ab9768e066
+EBUILD tudor-volumed-0_pre20110427.ebuild 639 BLAKE2B a0e19b0f769f39fbce3d4838d9708b52c138c2bc7195ba6ef779eefa4c7bcc09ec1e8543f9e58557da4475fd6d90495bd557f95166ef253bbbb136ab6fa59de7 SHA512 8b50345b7b030d1022f24807a769f5208f8fc4241dc1a3a0c2931e8aa1fe5cb6b1964ef18dfddd45f07c79117880133f2fdae0bd9fc644c70366680b333ea58b
 MISC metadata.xml 338 BLAKE2B a70756929374370b4176d8dd13c9f71b0f3b2d12b3a4e02198db5ced3d10e4d28b8c688be8bb7df26a47e55e52563234db3996801f98db9f190107899e4be0fd SHA512 9ea28dbca9978bead16d9d0d0292ed5a6791af0d6a0e7a2608fa165762436bfa6649f304c032c0e51bd6cd7cfd28ec60c25660f1f78191686f4bf381b0bf9641
diff --git a/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch b/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch
index 73a5090665e7..e73be69a29ba 100644
--- a/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch
+++ b/media-sound/tudor-volumed/files/tudor-volumed-0_pre20110427-build.patch
@@ -4,8 +4,8 @@ Subject: build system
 
 respect LDFLAGs, CXXFLAGs and CXX
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -3,12 +3,12 @@
  all: $(BIN)
  
@@ -23,8 +23,8 @@ respect LDFLAGs, CXXFLAGs and CXX
 -.PHONY: clean all
 \ No newline at end of file
 +.PHONY: clean all
---- config.mk
-+++ config.mk
+--- a/config.mk
++++ b/config.mk
 @@ -2,7 +2,7 @@
  
  NAME := tudor-volumed
diff --git a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
index 4a36941b17d5..aa7e1f4e018b 100644
--- a/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.ebuild
+++ b/media-sound/tudor-volumed/tudor-volumed-0_pre20110427.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=4
+EAPI=7
 
-inherit eutils vcs-snapshot
+inherit toolchain-funcs vcs-snapshot
 
 DESCRIPTION="Lightweight, desktop environment agnostic volume management daemon"
 HOMEPAGE="https://github.com/darvid/tudor-volumed"
@@ -12,19 +12,17 @@ SRC_URI="https://github.com/darvid/${PN}/tarball/7fc04cb2fb71e6f8815ddd87fd7ef5d
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="media-libs/alsa-lib
+RDEPEND="
+	media-libs/alsa-lib:=
 	x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
 
-pkg_setup() {
-	tc-export CXX
-}
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
diff --git a/media-sound/vlevel/Manifest b/media-sound/vlevel/Manifest
index e760054dd0bd..4cbc3be72c4c 100644
--- a/media-sound/vlevel/Manifest
+++ b/media-sound/vlevel/Manifest
@@ -1,4 +1,4 @@
-AUX vlevel-0.5-makefile.patch 996 BLAKE2B e278be31a58f5bbee740fda9da4eb5f74ea3c1553c935f95b9876364aab3f172bf23c41b14144ced9dca1fe3740c1600dd4cfa75bbd32e97a9f558f3a427d841 SHA512 fad6590578cc4727c61e423260028369f0e44feafc8634d8ac25b5de259eb82c6471d31bb6c4da6008a42bf25e10352b5b395cbbbb1afced000d15f3968feb14
+AUX vlevel-0.5-makefile.patch 1425 BLAKE2B 7f10ad7fb7c6d7d15a00ab06123466e1d4cf104517664f376fe5a04d9597fce6438b1a8e534d33305370f932104a95d20c50e2ecb239d855773c24c288fb7681 SHA512 3a929054951117cd245b753073e025000c0cf97d933eeec23f23964facb5864b44e12485c7551bc3968cb04b0a2e4c0874dd8ed19d0aa14a91b81506fe3981cf
 DIST vlevel-0.5.tar.gz 25873 BLAKE2B f5edbe219864f4eb34d0eb73a4f131c4a44eafe66ae9652495fc220c70dfc845b3a66b6f5b47305ffe26d8434b195358deb4382f2686a3acf90b4c885ec3b361 SHA512 b84a989f7493f6f008134408fcdc235980c2ef71069125399c67a6144a6f86863d795f1c7b8c10ac21d126e2e819ba117578f3da9bcac29025cfc6580ff3e8f4
-EBUILD vlevel-0.5-r1.ebuild 900 BLAKE2B 765efc14671dee2aeaecb721a76a92220b297f91240b06df4d2227d9f072a0e2271cc97a6e31dc77b67fde71780e1086591edba78e6e28085272acb73bf38aec SHA512 575a5a5871949c5d58616473ea9e27552438281ca84ffc13856e92938537f1fad60993b4ee5ea6a71f92e8d0c6bfaa1770edb34bcbc42e94a18de832e13638b9
+EBUILD vlevel-0.5-r1.ebuild 741 BLAKE2B fe6f40dfca67638f6bb98c4ba3dcbfc0efac6fc58795256ce104c9cbc1271a13128b4c7e67e234c1218a14beaf3ac79abedbe826c99f8ee9e7685cfe012a46e5 SHA512 b465c6ba5d1a65372ca6cb45c3fdb96e8dec58956b180d08964dc19f2bb07b25cc3daa88f701ec89c8fba3582e397037cc3c629c921bec7e906ce977ddfc33d8
 MISC metadata.xml 329 BLAKE2B b51dd0e7151cf74a8b76183ea66baea7ccd271c3ec4d274d88b4135a4ebb0e8fa0ccba071bea50b37ad32627310e826108a84f43bd5c01c5e850f84021f78f85 SHA512 d3272d4cc86186bfc2b08cee68f27cdbb139ea2eb04557977aa9d4088716e1a6d0755bca4ec63363fe83d333198eb9b249359bd191847021438b962548266fcc
diff --git a/media-sound/vlevel/files/vlevel-0.5-makefile.patch b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
index af50f1e3c08c..d7f5d80ebb46 100644
--- a/media-sound/vlevel/files/vlevel-0.5-makefile.patch
+++ b/media-sound/vlevel/files/vlevel-0.5-makefile.patch
@@ -1,6 +1,16 @@
---- vlevel-0.5/Makefile.orig
-+++ vlevel-0.5/Makefile
-@@ -30,6 +30,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,8 @@
+ # User-editable options:
+ 
+ # Change this to suit your preferences (maybe add -march=cputype)	
+-CXXFLAGS=-Wall -O3 -fPIC -DPIC -g
++CXXFLAGS+=-Wall -fPIC
++CPPFLAGS+=-DPIC
+ 
+ # This is where it will be installed
+ PREFIX=/usr/local/bin/
+@@ -30,6 +31,7 @@
  all: vlevel-bin vlevel-ladspa.so
  
  install: all
@@ -8,19 +18,26 @@
  	cp -f vlevel-bin $(PREFIX)
  	mkdir -p $(LADSPA_PREFIX)
  	cp -f vlevel-ladspa.so $(LADSPA_PREFIX)
-@@ -38,13 +39,13 @@
+@@ -38,20 +40,7 @@
  	rm -f *.o vlevel-bin vlevel-ladspa.so
  
  vlevel-ladspa.so: vlevel-ladspa.o volumeleveler.o
 -	$(CXX) $(CXXFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
+-
+-vlevel-ladspa.o: vlevel-ladspa.cpp volumeleveler.h vlevel-ladspa.h vlevel.h ladspa.h
+-	$(CXX) $(CXXFLAGS) -c vlevel-ladspa.cpp
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared -o vlevel-ladspa.so vlevel-ladspa.o volumeleveler.o
  
- vlevel-ladspa.o: vlevel-ladspa.cpp volumeleveler.h vlevel-ladspa.h vlevel.h ladspa.h
- 	$(CXX) $(CXXFLAGS) -c vlevel-ladspa.cpp
- 
  vlevel-bin: volumeleveler.o commandline.o vlevel-bin.o vlevel.h
 -	$(CXX) $(CXXFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
+-
+-volumeleveler.o: volumeleveler.cpp volumeleveler.h vlevel.h
+-	$(CXX) $(CXXFLAGS) -c volumeleveler.cpp
+-
+-vlevel-bin.o: vlevel-bin.cpp volumeleveler.h commandline.h vlevel.h
+-	$(CXX) $(CXXFLAGS) -c vlevel-bin.cpp
+-
+-commandline.o: commandline.cpp commandline.h
+-	$(CXX) $(CXXFLAGS) -c commandline.cpp
+-
 +	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o vlevel-bin vlevel-bin.o volumeleveler.o commandline.o
- 
- volumeleveler.o: volumeleveler.cpp volumeleveler.h vlevel.h
- 	$(CXX) $(CXXFLAGS) -c volumeleveler.cpp
diff --git a/media-sound/vlevel/vlevel-0.5-r1.ebuild b/media-sound/vlevel/vlevel-0.5-r1.ebuild
index d25eb4ec8439..3878e4aedc2c 100644
--- a/media-sound/vlevel/vlevel-0.5-r1.ebuild
+++ b/media-sound/vlevel/vlevel-0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Dynamic compressor to amplify quiet parts of music"
 HOMEPAGE="http://vlevel.sourceforge.net/"
@@ -12,27 +12,22 @@ SRC_URI="mirror://sourceforge/vlevel/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE=""
 
 RDEPEND="media-libs/ladspa-sdk"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-src_compile() {
-	emake CXX=$(tc-getCXX) CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
+src_configure() {
+	tc-export CXX
 }
 
 src_install() {
-	emake PREFIX="${D}/usr/bin/" LADSPA_PREFIX="${D}/usr/$(get_libdir)/ladspa/" install
+	emake PREFIX="${ED}"/usr/bin/ LADSPA_PREFIX="${ED}"/usr/$(get_libdir)/ladspa/ install
 
-	dodoc README TODO docs/*
+	dodoc -r README TODO docs/.
 
-	exeinto /usr/share/doc/${PF}/examples
-	doexe utils/{levelplay,raw2wav,vlevel-dir}
 	docinto examples
-	dodoc utils/README
-	docompress -x /usr/share/doc/${PF}/examples/{levelplay,raw2wav,vlevel-dir}
+	dodoc utils/{levelplay,raw2wav,vlevel-dir,README}
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index 0554bd5e1201..d0d84df60752 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,6 +1,3 @@
-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.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
-EBUILD volumeicon-0.4.6.ebuild 774 BLAKE2B cfddaabcfc08da4f95d45e739f1d12ea6925ebe51b7bfa8805f8631685a7ddad9454835de5ce9bd8526646fff0f814cfc5f8ac8c9ae0903e300450cedb69b148 SHA512 0d8635e822f5053b0cfd1ab15e045eaa787d179fe7311145cc839b437507ff88304e55e185a5ce78a510f0af25e677f2e6a35b0045869457334dd8b3f813b33a
-EBUILD volumeicon-0.5.1-r1.ebuild 678 BLAKE2B 06c404d234fe0911ada7d2e481715df34d4278c4800ddc95b087659b9b1676335de9e6dbbb163fdff6679b3d4aea6ca42306a0bf52c0eb367c65cbe425446e29 SHA512 3c63b16fa3b558a477bca8710146e93622f0ec4c0346b99499300dde878edd62324ee23959fe329b1d72d4885fc2584ce487718f906e287cde56711348d37e11
+EBUILD volumeicon-0.5.1-r1.ebuild 677 BLAKE2B e17088fe69455d2e5f02165879004e28a2e67c382028a136a00bc5fdf2b3924e3c255c436f7128773575f13fa10fd3e1ab147519384583376f59555da10827bc SHA512 93f442e2fac1ab27abe20bbda6f09ee8310e41324408250acac05c922a0be88528694e3bb321c6d2ea086d5c91d1126dcd28a2fe5060051da91ce866814d1971
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch b/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
deleted file mode 100644
index 6eeda5135f34..000000000000
--- a/media-sound/volumeicon/files/volumeicon-0.4.6-glib-2.31.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-http://bugs.gentoo.org/412473
-
---- src/alsa_backend.c
-+++ src/alsa_backend.c
-@@ -22,10 +22,8 @@
- //##############################################################################
- 
- #include <alsa/asoundlib.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
--#include <glib/glist.h>
--#include <glib/giochannel.h>
- 
- #include "alsa_backend.h"
- 
---- src/oss_backend.c
-+++ src/oss_backend.c
-@@ -26,10 +26,8 @@
- #include <fcntl.h>
- #include <assert.h>
- #include <stdlib.h>
--#include <glib/gstring.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
--#include <glib/glist.h>
--#include <glib/giochannel.h>
- 
- #include "oss_backend.h"
- 
diff --git a/media-sound/volumeicon/volumeicon-0.4.6.ebuild b/media-sound/volumeicon/volumeicon-0.4.6.ebuild
deleted file mode 100644
index 9abb83f16dcc..000000000000
--- a/media-sound/volumeicon/volumeicon-0.4.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils
-
-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+-2.16:2
-	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-glib-2.31.patch
-}
-
-src_configure() {
-	# --enable-oss --with-oss-include-path=/usr/include/sys #419891
-	econf $(use_enable libnotify notify)
-}
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
index 05daf8638a3b..9843572f6c72 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="libnotify"
 
 RDEPEND="
diff --git a/media-sound/vsound/Manifest b/media-sound/vsound/Manifest
index 0eece256ce66..a5615e7012a1 100644
--- a/media-sound/vsound/Manifest
+++ b/media-sound/vsound/Manifest
@@ -1,4 +1,5 @@
+AUX vsound-0.6-fix-build-system.patch 541 BLAKE2B 6f0c69bddb7794b8a87e9bd11b5baf011da75d2b065ecd308f8855350668458f0d13a14cac6d5da3e8211a3b285d31375675829175c357c60fc509f96baf7d55 SHA512 9b4cad5715b9a6cc3e8b8a410575ce0d652a37eb477025994be317bacf6a19705211c57f7d9b134e0a6fa460ff22daef5434a737280854a74c778b166be8facf
 AUX vsound-0.6-stdout.patch 466 BLAKE2B 8359af22043fc8cca71c16eec20ec75369bac88dbb5a6e74530b908a95f7ef0f136530849b6f7b8a4b790a5f3c739037817d6257fc4986fdafbd840c659016e6 SHA512 da3c03794a655ab55e03f158e7249871115936d45a7a535caa5311e0fddbf53b896d367032f2762b7fd721df829da42764a31b1cfe273c245139b09959d9e21f
 DIST vsound-0.6.tar.gz 118026 BLAKE2B 96441e1068a593a550c324faba20e5b4ca515370f13dc667bbfa13781f924de56804e058be192033963e6ee7300b2363611998e4eba75c179302a0181a70799f SHA512 82ce11aa98310eafd999d24ec1d060518fa4adc68c949e5c612ec36a340e29304c6f6d6be36fef2b45599bd5134b5c949a1b282268fee25792da4c7a68ff3d6d
-EBUILD vsound-0.6-r1.ebuild 949 BLAKE2B 1b78eef8953decdcdaad097a2df47dbb38908f722c874559f8aa056a7641559ba8f4abbee21624ec3a600151391d405f56ce3bda58320142af615da3bd003cfa SHA512 b381453788e3adfdf00cc373cde36b2b6729d77b292ce98992777b25e4e3edb73d613f98bc1ac7f2fee9ee7954c15ea7ac06fdcb5d185e1fae8bdcba7e766694
+EBUILD vsound-0.6-r1.ebuild 936 BLAKE2B f0f6260c967d1a068f7ed14a344390a287488d886d8adb615f1e0e9b6af11f5896c9cfc59abb947f7377081cbb5fd03e7a132ee2ab253efc5743faf122d04983 SHA512 0eb653e1efb678a0ebc69c73e24b9cdb6d66ae0f1621c2400212152359590c03637bbe09e4b97449ddec77c2fba12028aee8a1884ce039c483432a2ada2f73d8
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/vsound/files/vsound-0.6-fix-build-system.patch b/media-sound/vsound/files/vsound-0.6-fix-build-system.patch
new file mode 100644
index 000000000000..7e653b6197ca
--- /dev/null
+++ b/media-sound/vsound/files/vsound-0.6-fix-build-system.patch
@@ -0,0 +1,28 @@
+--- a/configure.in
++++ b/configure.in
+@@ -3,7 +3,9 @@
+ AC_CANONICAL_SYSTEM
+ 
+ AM_INIT_AUTOMAKE(vsound, 0.5)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
++
++AC_CONFIG_MACRO_DIR([.])
+ 
+ AC_PROG_CC
+ AC_PROG_CPP
+@@ -45,12 +47,12 @@
+ fi
+ 
+ if test "$ac_cv_prog_gcc" = yes ; then
+-	CFLAGS="-g -O2 -Wall -Wstrict-prototypes -pipe"
++	CFLAGS+=" -Wall -Wstrict-prototypes"
+ fi
+ 
+ if test "$ac_arg_debug" = yes; then
+ 	echo "enabling debug"
+-	CFLAGS="$CFLAGS -DENABLE_DEBUG "
++	CPPFLAGS+=" -DENABLE_DEBUG"
+ fi
+ 
+ AC_OUTPUT(Makefile vsound)
diff --git a/media-sound/vsound/vsound-0.6-r1.ebuild b/media-sound/vsound/vsound-0.6-r1.ebuild
index fad961ebbceb..90bd0fd78986 100644
--- a/media-sound/vsound/vsound-0.6-r1.ebuild
+++ b/media-sound/vsound/vsound-0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils toolchain-funcs autotools
+inherit autotools
 
 DESCRIPTION="A virtual audio loopback cable"
 HOMEPAGE="http://www.vsound.org/"
@@ -14,22 +14,23 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
-RDEPEND=">=media-sound/sox-14.2.0"
+RDEPEND="media-sound/sox:="
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-stdout.patch
-	AT_M4DIR="." eautoreconf
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-stdout.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
 
-src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {
 	default
-
-	find "${D}" -name '*.la' -delete
+	find "${D}" -name '*.la' -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 4725ab4749df..97e3626bb40c 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,4 +1,5 @@
 AUX wavbreaker-0.10-pkgconfig.patch 350 BLAKE2B 85657b02fcb5b6f7c9be8e81217bc02c816732f57cf51e3cde17179dd71d62df46f05d378910e06702419a822a050a4840b6c5433628e6f56dcc791f9d5e67c6 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45
+AUX wavbreaker-0.11-QA-desktop-file.patch 211 BLAKE2B 64b1f3198a0cafb45b1d81978e1b61e06140f97aa4f01145513d8f2e8361b90d918fb299fa5318031b902d0c89695a93cf882794d8a35ea2b177197649636cb0 SHA512 375cb7f844726439ea06feee9360029d59de86ca1eeef8bf9b312e1a4b2207841ca6a6fa6dd8f947481fc74c45f44587adc1dc1f01d3e0485f783cdf872cc548
 DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
-EBUILD wavbreaker-0.11.ebuild 843 BLAKE2B 4c9937d592fac1be8ce8fe0c079b7ec631282f60ad1954cf098383c40535388442defb61aab8efc9e2fa694d0db37bec47b007187523d64c771c58b7394db54e SHA512 3f7ca2662350449372db81125d22646f4bb4a8fa1dc70d5194b4202a3ab196bea349ff25e2705ad1c6db81558002b98aef6e1cfda288cfced6455f396712f1a6
+EBUILD wavbreaker-0.11.ebuild 884 BLAKE2B 90309d5788813766429b9c383c60d49e62ce5533b06270418963f7dd79144aa4030e7bc9b12d1f52b976f2612f8001489b88d83f7270902e7215db984b5d0f82 SHA512 44b2de9b8409befd228aea6c7e2759461062ed3a2abca139a9696d066dc6d2993f7b355575c922f024ab0be60dec506d5c21f6fb451b5fc4faf5d2be6b635b08
 MISC metadata.xml 333 BLAKE2B db08ea8f604d1e01bd8da72c1a8a907a8fc528d3384fd5a33d9584c6aace01ec7d972fa37c9f75d3898ee5d064adae7ce5d01eeb48bb85486afaf5330418860f SHA512 d96b3c68abb0afe8c0821d0c9d5b48089e201dcdffffedcc41ee93d44fa3cc11b22eb782b13ded1fde4bfe2187aa2b371a2167d7305ade2bfeff0d201657ac98
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
new file mode 100644
index 000000000000..c382e5e5dd19
--- /dev/null
+++ b/media-sound/wavbreaker/files/wavbreaker-0.11-QA-desktop-file.patch
@@ -0,0 +1,9 @@
+--- a/wavbreaker.desktop
++++ b/wavbreaker.desktop
+@@ -9,5 +9,5 @@
+ Icon=wavbreaker
+ Terminal=false
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+ MimeType=audio/x-wav
diff --git a/media-sound/wavbreaker/wavbreaker-0.11.ebuild b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
index 482c8096fc2d..6ab4036ae813 100644
--- a/media-sound/wavbreaker/wavbreaker-0.11.ebuild
+++ b/media-sound/wavbreaker/wavbreaker-0.11.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
 HOMEPAGE="http://wavbreaker.sourceforge.net"
@@ -13,18 +14,24 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="alsa nls oss pulseaudio"
 
-RDEPEND="dev-libs/libxml2
-	>=x11-libs/gtk+-2:2
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+RDEPEND="
+	dev-libs/libxml2:=
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib:= )
+	pulseaudio? ( media-sound/pulseaudio:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
 
-DOCS="AUTHORS ChangeLog CONTRIBUTORS NEWS README* TODO"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10-pkgconfig.patch
+	"${FILESDIR}"/${PN}-0.11-QA-desktop-file.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.10-pkgconfig.patch
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
diff --git a/media-sound/wavegain/Manifest b/media-sound/wavegain/Manifest
index 7440ebcc40ad..a7f36ea94672 100644
--- a/media-sound/wavegain/Manifest
+++ b/media-sound/wavegain/Manifest
@@ -1,3 +1,3 @@
 DIST wavegain-1.3.1srcs.zip 72180 BLAKE2B 99cccf2f2845ddb9109dec9eefc99a656ffe71f89be761db59c154c54512cac454663c669b2e586af2cdf7c9f5307e2d5335b75999e6d2284dcd799523572761 SHA512 5d0d589259e362a415a5cd5e42464b5e7c7e79c62082ebd423457b6e2d9c3d15300d854e57e2c51c66f1579394bbcdc3d754bb8363d809c2d8d5f03b09dce054
-EBUILD wavegain-1.3.1.ebuild 583 BLAKE2B d76fbe2db98128f6c091da690ea64b0c8176478ac665cd0ba0309cdb63ac4d75174766c2adb9f600c9b0771976fdb31dc506c4d68aa853f5e9b3a02804cf12bc SHA512 a1f1bd47e7f79b04182b522359bb4b611fd8679d94995f570499989cf30c6764ae1fbc9445b43d11be9b5aecb14c8e4b25b53877c66cb916468ded1a4804fa6a
+EBUILD wavegain-1.3.1.ebuild 560 BLAKE2B 53b55446a5322bcbc468c6da0a52f117ee2921c5e98af6044dac8bca29d1398abfd230bd888b58e96c646ca2b454f765f104d9c4476e4d67e858a45f31525372 SHA512 1f15d7e75b5a7c5b22aa05a066e74733ba59a2c3f3c48a4396402a77a31255411d1b128827bb45732f6a22ffac8305125802cad22d181e46102ba336a5b773cd
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/wavegain/wavegain-1.3.1.ebuild b/media-sound/wavegain/wavegain-1.3.1.ebuild
index 82d8dd18cfcc..8e51ee45a376 100644
--- a/media-sound/wavegain/wavegain-1.3.1.ebuild
+++ b/media-sound/wavegain/wavegain-1.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -14,17 +14,15 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=""
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${P/wavegain/WaveGain}
 
-src_compile(){
+src_compile() {
 	$(tc-getCC) ${LDFLAGS} ${CFLAGS} *.c -o ${PN} \
 		-DHAVE_CONFIG_H -lm || die "build failed"
 }
 
-src_install(){
+src_install() {
 	dobin ${PN}
 }
diff --git a/media-sound/wavplay/Manifest b/media-sound/wavplay/Manifest
index d81e7f252f51..1d201284ec19 100644
--- a/media-sound/wavplay/Manifest
+++ b/media-sound/wavplay/Manifest
@@ -1,3 +1,4 @@
+AUX wavplay-2.0-pkgdata-install-fix.patch 151 BLAKE2B 0230c5af35a83b3f7b3a65290cf295479978b03548dea9ff9d025fe1958963e07333631dd144e7f611df66008b9c8ff5993ceada930bc9ad3f466993061f4f47 SHA512 9a7c78e3a83de7567033d021e0fd4e411ea321ee97961aa22f616642105a5f380f04b40245c959ffe76493b5ead8884107d8c92c4a182ed48595bc2c93340b37
 DIST wavplay-2.0.tar.gz 368945 BLAKE2B e6b09202e5772105587e76c619d7ddf8982ea7e2984507f4a3f3ac300b1ca1bb326be0c89b2fb8970cf22bd7ced13f132648d64babe9fbe376df8148580d37b5 SHA512 f0edfac9bee534da00bf10cb1c07a15ba2df92a680b4632b7e721345c0e6644ddb090d29e23735a020d454de1d559ef2e053f2e481818ec56dd6afd8db009e15
-EBUILD wavplay-2.0.ebuild 470 BLAKE2B 7740e4b5ca764544c449dacb4a2f6f4dfbd55296b9095c36fc3a292125c2f9b117915ab3fc8d1a635bd5a656e69971e9052abaffb92a7223cae93186b26656fa SHA512 8c47144e257ac97b2c93874de8c7cbe1f36b3df4a32a0785a8c72f54e25c20598eb62bb71d7b600c7f0dd1b44dca05e6bbb92d3d7904355f372870bcbc963e88
+EBUILD wavplay-2.0.ebuild 494 BLAKE2B 5b79878187627e23577b69f0cb1ab2c9fee982779ffc128ede3b43dffabcf1377b8b101183669ccec0e5d686b0cc62008672a1a61690c9a02e468928d883ec55 SHA512 d987e58c1d7dc06b48d5e5001a75de4591dee7e740675c5b308dbd08d780e9a00a1f90fbd371331003e138692ac7e17fa5336b1f59a6e1d8d2942c69fee2afb5
 MISC metadata.xml 330 BLAKE2B c7b8bb70354a40217f3b1984f4767ef4f162e398c03ac6d20bc68fa32788541293efec8c2bcb8a24ae076f84aad913a8ec89aa3bf6bc47301b2d860e68ccf4bb SHA512 2a64a5c1a4c2905d1debb8b24c2c04e77112f253edb247b53c3fdd8d26cc530473f7af20d86c70eae8a7da79ad8a2a0c6d00b4727ca17f64a9af209c2ee0609c
diff --git a/media-sound/wavplay/files/wavplay-2.0-pkgdata-install-fix.patch b/media-sound/wavplay/files/wavplay-2.0-pkgdata-install-fix.patch
new file mode 100644
index 000000000000..2862af6acff9
--- /dev/null
+++ b/media-sound/wavplay/files/wavplay-2.0-pkgdata-install-fix.patch
@@ -0,0 +1,9 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,6 +1,5 @@
+ # src/Makefile.am for z9basic
+ 
+-dist_pkgdata_DATA = wavplay.1
+ 
+ man1_MANS = wavplay.1
+ 
diff --git a/media-sound/wavplay/wavplay-2.0.ebuild b/media-sound/wavplay/wavplay-2.0.ebuild
index a60eb094a6de..4abbf1af7f6b 100644
--- a/media-sound/wavplay/wavplay-2.0.ebuild
+++ b/media-sound/wavplay/wavplay-2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 inherit autotools
 
@@ -14,8 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
+PATCHES=( "${FILESDIR}"/${PN}-2.0-pkgdata-install-fix.patch )
+
 src_prepare() {
-	sed -i -e "/dist_pkgdata/d" src/Makefile.am
+	default
 	eautoreconf
 }
 
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 7d49c28d3ec3..68df1b254602 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,5 +1,5 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
-DIST whipper-0.7.3.tar.gz 168393 BLAKE2B b34151ede7c867dbbca34fcec3d8ef81cb50d66abc760fa54bec880f8f1186faf3e0f5298c2890501b9bd2f586b80d2cdc45a0755b6fe12fc1a2215e9ea9ecbb SHA512 ac96393471a6b4c40f5870f6e3183b65d43229314e2a1eacbf065c51ac61cbc772f2de3bde9f20ee1f7ffec427cd03c31f27df60eb6c621a699927646080c0ab
-EBUILD whipper-0.7.3-r1.ebuild 1500 BLAKE2B ef788965cfe9699e09141e83ec02c0b552d747f0132bc65686621df578e4292fa7735a18314de1d64202cd23d7c22a16ed134028afc388277547d284262768e0 SHA512 bbf1bd8d4be78491ddf5ef2ccdec781ff96d7af25d09e1df986f091124d3c7cd1e9ca9bf6d9278c1cf8ea9406dfe5c0c92ecf6f68c75b4658b884836f30659b6
+DIST whipper-0.9.0.tar.gz 200836 BLAKE2B 197567d476bcfa448bee7d6ba2d1b980355f792e6591840d1291800c3ae205496dc58579394870adf171f11f31d7042b48d070cf03d203e45e7c369500c500ef SHA512 49e66ad2c6e8450199a53a28bb71725704daac86ce2cbf68080d4dee1c2357cf8367ddb4735a07f2ffe612d84f016661e5b6f94efa9d5a7d6b8cf56ee32b0ae7
+EBUILD whipper-0.9.0.ebuild 1281 BLAKE2B 694cedbf147e060019c23fa24ce13c1e02a202dc76dcf381cffaa84bb33910b8aabb9aeccea0c807f1bdcf1f91c2b26f41f8b1823225491e75b9fb26bfcbdd83 SHA512 29daecfa45df1ac6f021952f76ead81e8c3a37ec7fb9ea55eb1274f337e92b1a43cc9bf1040df3a103ee4918638191eee1a2f55f8e7119fa9b202a547a13fac7
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.3-r1.ebuild b/media-sound/whipper/whipper-0.9.0.ebuild
index 9491ea390da1..c89a9f317c12 100644
--- a/media-sound/whipper/whipper-0.7.3-r1.ebuild
+++ b/media-sound/whipper/whipper-0.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
@@ -14,49 +14,33 @@ SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libsndfile
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
+DEPEND="media-libs/libsndfile:="
 RDEPEND="
+	${DEPEND}
 	app-cdr/cdrdao
 	>=dev-libs/libcdio-paranoia-0.94_p2
-	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:3=[${PYTHON_USEDEP}]
+	>=dev-python/pycdio-2.1.0[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/flac
-	media-libs/libsndfile
 	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]
-"
+	media-sound/sox[flac]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
 
-PATCHES=(
-	"${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch"
-	"${FILESDIR}/${PN}-0.7.0-src-Makefile-respect-CFLAGS.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-0.7.0-cdparanoia-name-fix.patch" )
 
-src_prepare() {
+python_prepare_all() {
 	# accurip test totally depends on network access
 	rm "${PN}"/test/test_common_accurip.py || die
 
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C src CC="$(tc-getCC)"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
-src_install() {
-	distutils-r1_src_install
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
+	distutils-r1_python_prepare_all
 }
diff --git a/media-sound/xmms2-scrobbler/Manifest b/media-sound/xmms2-scrobbler/Manifest
index 034d28688bf0..d38b0a38dc55 100644
--- a/media-sound/xmms2-scrobbler/Manifest
+++ b/media-sound/xmms2-scrobbler/Manifest
@@ -4,5 +4,5 @@ AUX xmms2-scrobbler-0.4.0-ldflags.patch 685 BLAKE2B f3cf24b772c857cfbcd9c19e9836
 AUX xmms2-scrobbler-0.4.0-libs.patch 621 BLAKE2B 78ecc5b4bcf8e16607dfed56345ed8c47d29610a81fc47b3377b7c32dac2b3b76224921398efdf879444468ee723ac202259c3a7879496a857f9a29d340f9888 SHA512 7156685a51aa4283dbc584b04c0c68925a5720cb92c3dd1b7d4356336e946d2e162d17a5408e45eebaf9ec2878f77c162f3a540c225a0d27f5662c58edb2e407
 AUX xmms2-scrobbler-0.4.0-no-XPTR.patch 618 BLAKE2B 33a3e91cce78e7f9c6c2cff237643b8aae57be6efda47a114c1059211ac66dbfa9d426c90b6b9bab45f27410df5501b32ad148b99344ad59ce6f87389cbbe3af SHA512 24b7e3b0472cfd277ba3bba8f0bd3fd11de43c7c6d3cfb117d142d4950fd820acfafec7df0a3f17889f847437a29521a786441272a59d599986c5d0a6179fe09
 DIST xmms2-scrobbler-0.4.0.tar.gz 19831 BLAKE2B 84194a2359b825c5571637e4d875003262235f8bce550ffeb54a123c53b1aeee49b7fd21c5549903e24348869abba96ba9b7e78cade4dc44dcbb798f4604d8fa SHA512 2df20693479413a18e487f16e87f0a711866221dcbc8f96c970be55aac2c495fcb84e9e3ea754473c747d33d5d1ef54823f6a050d5054581454f956c86f6236b
-EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1295 BLAKE2B 20a1a52b8623d0289fed00615bf6edd68f5a0205c2248323c1e5393bf26b6b6fc6b3de263d6e0f8efe61294af08ffb0d8b8050a7b39587b7e21be802c1e614fd SHA512 8790c750c04698027452121f487ff129858b5ef4e2a6ce1836e3780459446e393974458fe703bb3919e0c89ddce54cc9bf2fbd3cee5982f8d32ea132c605e3d1
+EBUILD xmms2-scrobbler-0.4.0-r1.ebuild 1296 BLAKE2B 5a8dc323dff6b45e5ede47cf3937efb19098a3bba0c40e4b9c9349825ba9020fbe438749dfdb6e6119004e446c3c732d9510f375c6f43d2056e2de2e277c86a5 SHA512 f8951d35f0366ac5f66226ea3b80ce77e2850e551c21b586860bfc7bed144c5f6fc75e781db8b436f9afa7b9b0fcbb097ec81bf66f85332d0304d62204649f74
 MISC metadata.xml 534 BLAKE2B cba02182ace8baaf5933ba4e01464e323ea0c6dc58c575ebea0850808429f45df267c55d4856394885dcb4f8c69763f1c8aacec5ab401b079c8cee893d8e5f61 SHA512 ee2450fc9a95750c4c86c4413ae4b3a560952a6fcee22f5d27f5ac5ff0388deb8e71131a92972e15415cea0f736be554db3c9c607ac374cddfb9b46ba181da76
diff --git a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
index f343e1164471..52966af24d73 100644
--- a/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
+++ b/media-sound/xmms2-scrobbler/xmms2-scrobbler-0.4.0-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="XMMS2 AudioScrobbler client"
-HOMEPAGE="http://code-monkey.de/pages/xmms2-scrobbler"
+HOMEPAGE="https://code-monkey.de/pages/xmms2-scrobbler"
 SRC_URI="ftp://ftp.code-monkey.de/pub/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/media-sound/xnoise/Manifest b/media-sound/xnoise/Manifest
index aee060a69fa3..541633c94912 100644
--- a/media-sound/xnoise/Manifest
+++ b/media-sound/xnoise/Manifest
@@ -1,3 +1,4 @@
+AUX xnoise-0.2.21-QA-fix-desktop-file.patch 1054 BLAKE2B b5d218b4657a440407e8a4fd83e553959abdf2c92979fe1fcd27499fa8f5eeea46f97b41d3eb98f158ee5cb085b94be13b84dacac8afe9afd9e71e71c3993466 SHA512 b8849ae122ee54c47c5d703cddfa86f0abb141fe997f1a37d5a3692bb3d5cddc0a86cc57865f4535cc5787863914fc38ce32762d2a1058646ed5b4f4226ec06b
 DIST xnoise-0.2.21.tar.gz 3222030 BLAKE2B c58561f4e042ccf7d7fdeb271801ccc2d447138cf5c1afb2f8f0bb098135d957aa289799e59f2c96a76a01ccfeeb9574d87f0d987b1e3ace9d22a3ced8ec88b9 SHA512 e25f42795638a5b93f1922f1c761b0bdaf754414dfa0f7172407e0d10514c52844d0dc3146a32f93e6107a0b5bb0f8e9e5d098954e9659f28177c56f607d9851
-EBUILD xnoise-0.2.21.ebuild 1599 BLAKE2B 84d3713b2bc0d3c0a1d8eb4993800524db138290004c9a8ea6019fdc779627e395e54c3764d45f15821db5f2906df25349e6b8afb31a0c0ba6d9b6f74584e7ec SHA512 00cff72964cb19620995e0dd7816368ebe8d3e2e8f55d0d9b314d736986921d9da030b63759a013e15fe110402aff91923a5d3ed7b506160f585e765ae6a4bdd
+EBUILD xnoise-0.2.21.ebuild 1376 BLAKE2B a56406977f172b7e9c41cff403d714036060cfe74313738e451c9414215f38241d0ed54063037014d1fa7ef63bb7a8c00d326a2760ac7313188f863bb9eeee63 SHA512 40108cc0ee2d95740788081030bfdef0227852c60393181d8e109b167cd14e13cd5225b1240c06fbcc9b2927f15ed1e199d7806c4196e60016b4f66d028dbce7
 MISC metadata.xml 507 BLAKE2B 45efdf6c0fab90d05dfcc0f601d2de99bce91a80539b6a50a5bfdaf2d64f6f808843f90817144efa6c6dc5f47ebd9427d4fdcf283e1189fd814bd1e72d20c395 SHA512 06e64ff5b075eb264ebfea8d77a95cdcf901e08df501abcdf4383dca64314185abc0d539df5d306e83bc4e26488ae8182cbd5c21cb39cf8314d70f070463b446
diff --git a/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch b/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch
new file mode 100644
index 000000000000..d57cb4b6f393
--- /dev/null
+++ b/media-sound/xnoise/files/xnoise-0.2.21-QA-fix-desktop-file.patch
@@ -0,0 +1,54 @@
+--- a/data/misc/xnoise.desktop.in
++++ b/data/misc/xnoise.desktop.in
+@@ -16,24 +16,19 @@
+ [Desktop Action Play]
+ _Name=Play/Pause
+ Exec=xnoise --play-pause
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Stop]
+ _Name=Stop
+ Exec=xnoise --stop
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Next]
+ _Name=Goto next track
+ Exec=xnoise --next
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Previous]
+ _Name=Goto previous track
+ Exec=xnoise --previous
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Quit]
+ _Name=Quit application
+ Exec=xnoise --quit
+-OnlyShowIn=Unity;
+--- a/data/misc/xnoise.desktop.in.in
++++ b/data/misc/xnoise.desktop.in.in
+@@ -16,24 +16,19 @@
+ [Desktop Action Play]
+ _Name=Play/Pause
+ Exec=xnoise --play-pause
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Stop]
+ _Name=Stop
+ Exec=xnoise --stop
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Next]
+ _Name=Goto next track
+ Exec=xnoise --next
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Previous]
+ _Name=Goto previous track
+ Exec=xnoise --previous
+-OnlyShowIn=Unity;
+ 
+ [Desktop Action Quit]
+ _Name=Quit application
+ Exec=xnoise --quit
+-OnlyShowIn=Unity;
diff --git a/media-sound/xnoise/xnoise-0.2.21.ebuild b/media-sound/xnoise/xnoise-0.2.21.ebuild
index d5590f18edb4..facda46f48f5 100644
--- a/media-sound/xnoise/xnoise-0.2.21.ebuild
+++ b/media-sound/xnoise/xnoise-0.2.21.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit xdg-utils gnome2-utils
+EAPI=7
 
-DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of
-features"
+inherit xdg
+
+DESCRIPTION="A media player for Gtk+ with a slick GUI, great speed and lots of features"
 HOMEPAGE="http://www.xnoise-media-player.com/"
 SRC_URI="https://www.bitbucket.org/shuerhaaken/${PN}/downloads/${P}.tar.gz"
 
@@ -14,60 +14,48 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="ayatana +lastfm +lyrics"
 
-RDEPEND="x11-libs/gtk+:3
-	>=dev-libs/glib-2.34:2
+RDEPEND="
+	dev-db/sqlite:3=
+	dev-libs/glib:2
 	gnome-base/librsvg:2
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
+	media-libs/gstreamer:1.0=
+	media-libs/gst-plugins-base:1.0=
+	media-libs/libtaginfo:=
 	media-plugins/gst-plugins-meta:1.0
-	dev-db/sqlite:3
-	>=media-libs/libtaginfo-0.2.0
-	x11-libs/cairo
+	x11-libs/cairo:=
+	x11-libs/gtk+:3
 	x11-libs/libX11
-	ayatana? ( dev-libs/libappindicator:3 )
-	lastfm? ( net-libs/libsoup:2.4 )
-	lyrics? ( net-libs/libsoup:2.4
-		dev-libs/libxml2:2 )"
-DEPEND="${RDEPEND}
+	ayatana? ( dev-libs/libappindicator:3= )
+	lastfm? ( net-libs/libsoup:2.4= )
+	lyrics? (
+		net-libs/libsoup:2.4=
+		dev-libs/libxml2:2=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS README )
+	sys-devel/gettext
+	virtual/pkgconfig"
 
-src_prepare() {
-	sed -i -e "/OnlyShowIn/d" data/misc/xnoise.desktop.* || die
-}
+PATCHES=( "${FILESDIR}"/${PN}-0.2.21-QA-fix-desktop-file.patch )
 
 src_configure() {
 	econf \
-		$(use_enable ayatana appindicator) \
-		$(use_enable lyrics lyricwiki) \
-		$(use_enable lastfm) \
+		--enable-magnatune \
+		--enable-mediakeys \
 		--enable-mpris \
 		--enable-soundmenu2 \
-		--enable-mediakeys \
+		$(use_enable ayatana appindicator) \
+		$(use_enable lastfm) \
+		$(use_enable lyrics lyricwiki) \
 		$(use_enable lyrics chartlyrics) \
-		$(use_enable lyrics azlyrics) \
-		--enable-magnatune
+		$(use_enable lyrics azlyrics)
 }
 
 src_install() {
 	default
-	find "${ED}" -type f -name "*.la" -delete || die
 	rm -rf "${ED}"/usr/share/${PN}/license || die
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
 
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index 8cde974f380f..21a3ace3644c 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,4 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
-EBUILD xwax-1.6.ebuild 2189 BLAKE2B 571d6d7dad37324bebadb7b3ec25d526b2dd1bb18d161a5b9de08450cc07373a4b330be77659538ae7fb627945729d5706fd23069f1844d9d75600a7084c4d8b SHA512 3f67a616c8ef5e392b55e180429e520fb8ec7cdd7967f3640bbc9c8e55f981f2c6e7c7b4531510ba23998b9f328ba2f2a8396b234fca4adcd53902ab980ee614
+EBUILD xwax-1.6.ebuild 2013 BLAKE2B 35fcc442e492915c638bcafdb8aa37aa36eb8ad8ccb0e041ced1d29ca1b9b1f5c91754964bbd3cff11ae1ee94fa99eca75de4a6bbc6068df12df256fbcd7ff28 SHA512 4f66c73398a5d969d762aee2875454071383263e2d68c9cc8425e493acc495df805d3b76695432ef2bb1eedb7e7eaff09f85526ee9de73cbab92a2fbac5be06d
 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 9565610d9290..fe9164967149 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -67,12 +67,12 @@ src_install() {
 	# This is easier than setting all the environment variables
 	# needed, running the sed script required to get the man directory
 	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	newbin import xwax-import || die "failed to install xwax-import"
-	doman xwax.1 || die "failed to install man page"
+	dobin xwax
+	newbin scan xwax-scan
+	newbin import xwax-import
+	doman xwax.1
 
-	dodoc ${DOCS} || die "failed to install docs"
+	dodoc ${DOCS}
 
 	insinto "/etc/security/limits.d"
 	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-sound
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)