Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.
author: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:44:59 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-24 17:44:59 +0000
commit: 0706fc6986773f4e4d391deff4ad5143c464ea4e (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /media-sound
parent: aa3411e241a201d53a2689766fe419f2756819f3 (diff)
69 files changed, 338 insertions, 1974 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 49b83d73dba0..6be9f428836c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index c595e74ea395..0ce5cd2ad9ac 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 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
 EBUILD alsa-tools-1.1.6.ebuild 3545 BLAKE2B 0e90047c181bcba0a9acabcd866ac7c4c2b431d9813d2e42a30f96d3492c6ac1a90a1c347e5d8ea7b1057e0f34a7e5084749abca98e3a6a289deb71436ab5cf9 SHA512 8226210e6e41e07ae036a5f333e439e7da09b2955e45d3029263e81ea8adeb2040fad44abb3aecb3b9899ed8718cd66084f1dac426642f55f691bd7a363b0bb4
-EBUILD alsa-tools-1.1.7.ebuild 3543 BLAKE2B 8c1de7782af4deaf643c0b0d44899d368f9e7abc81ad79fcdeef47d261f4404c4109ce47e8e7af97947cab67da85ca7a72424072cbf4b4fdb8ae824c72396907 SHA512 0bc96fa13d0c4369fb9bb4a9826bd37ae33b6355a41b13ef019dcc577547ceae1182aa31278a20c77591f4be1c7a08ec181d74ee3ce28b21c8a40347d8a0470f
+EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81
 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 5748371bea47..446f976a0369 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 831b253fd142..118dd02a26e0 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -10,5 +10,5 @@ DIST alsa-utils-1.1.8.tar.bz2 1262174 BLAKE2B 643017f8f31d88356a2a55b5b1249d5b70
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
 EBUILD alsa-utils-1.1.6.ebuild 2249 BLAKE2B 9e754eb263685924e5897018242cea86a4a4b9d3fbc5aad66aa17e6df23d01d99854058e624139db257384d9cbd5c4d2722cf26dda8c0f89daffc4894e58c192 SHA512 14caac4da6c061bdf718e93465ffe09963aad438e7b83c5d82ce8b743620774d3e38aa0a8c91d9e949b35371a55d99fc6d10d0e52f209e3435b1d6d84f537dad
 EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
-EBUILD alsa-utils-1.1.8.ebuild 2326 BLAKE2B 6aeac9b7ea3038111507768e500f39a123b5ce7753a6d1022117c856697406acc85bf237b3baf3c894b49319e0b45bfc47b507eb232ba5cc0f67cb7557f1cc72 SHA512 a7962a47dec903509f024947b08723d2492c287b150afae7f5217b5570ac4d83002f6fcbe572dbc8971387ecd5c3d545dde9118c9188833fe34b2d4cdf62d9b0
+EBUILD alsa-utils-1.1.8.ebuild 2327 BLAKE2B a6dbd0cedb1f3c9be217caa581f6e3219590f0ec9928d86bb6dadaecc5994c0bb6d805f45b91f5df44c116a9058da1cf560c296114d6975220ee9b2c77962bc5 SHA512 b1b97a5e3ebbafe230187da5bb8563fd680da4e414c0fb5797904fd9e594491496a8500f95e886573fe91e93b551f20d95cf330f48d0898674dec8597f61016b
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
index 605f21a1f764..bcc1f868e6d6 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index fc4119c4db27..f0d7ed6f9ca8 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,5 +1,7 @@
+DIST amsynth-1.5.1.tar.gz 1297131 BLAKE2B 175c008cd4d7bb45234fa22a31132bcd144df98a3dba34fba3a834ffc8623f52c76b412b3b784cb83ee25d12a8762f62bea8e3488b76039ae64e6a39c4404dbe SHA512 5f1551f9d1398a97738ac6f764f169d8cdd55e94464438adb226d1284fe8845e190fe5dd7a740b33972c1bbe76aa2d60467b7a663ec6717bb9fac75e5aac62d1
 DIST amsynth-1.7.1.tar.gz 1409439 BLAKE2B 80fbd2c56b307cb7defce46e2dafe72ce1a56222314faaec9b2d16be9f4412869e377a8cea97d20803eb668b259f2110179607b4148acb8ba7d5e0ef1bb5b14b SHA512 ad5eff805f3ad30a7cc9f3933bbe82b99c670c669c0c405d5045a410afc75cdc0d692856e73ccf870d3ca66e0997a81a5c35baf57b33bb6012f19056cff725c9
 DIST amsynth-1.8.0.tar.bz2 1170068 BLAKE2B 0b570efe1db69bba04215055147792a9635bc086749ca7d70b5b3f8bc16613310591802c6cdabfd83009bda2c3b109b17ccc9d4ace7681614bed8c42c5f84f8d SHA512 a47489b103dbdd1cb2233d8629acfda2a1d26ac1f7ea5b8c4e7925676842cac21758ca94b50894e71426517bd826e9a9b6fd26800516054e24d62f7cbce4f0f9
+EBUILD amsynth-1.5.1-r1.ebuild 1057 BLAKE2B 99ac01fa27cc572705cb80bf2432870002ea5c5dc4a92d0546a019185e4a986fef9c114ff0574e405283b4cb185442ed5d9c081ad4141527a5590f31f4738233 SHA512 57cdf9495e3dbd1250bc3090b548d95a280f3443c3b3dd6ac28eccc3530c4050f64ab75954a1f3e617275910bd3f551c44ad1bc16c6a9bf1dcb3a5e4da90349c
 EBUILD amsynth-1.7.1-r1.ebuild 1003 BLAKE2B 54955a36527911ef69dbfb92731eeed27b0f0ff8266dc886697375adc0bc84864543a7610d74884ac29cc365c687b68842414932eeac0d717e611fcf52cb13b2 SHA512 7ebff70fd04c27fd458f0c40266d239c5e6a2255c012e4db4f47d8576621fac0081c22ce62f21136b69d4bd29819300e944bd0aa2b297b5044ef416489a9e8ea
 EBUILD amsynth-1.8.0.ebuild 1042 BLAKE2B b604beb035107d81f40592c33ce38dd602de904c94271fd257d37443fb3a4b71a137396839ee3e8bf150d82fec08801c7d26e681e0077d4a7cad385223391f85 SHA512 699579bf178be7a44b6b8b8cceb567fc2f2e53e972b81ebffe067a33ee65cb8550938319c85583a4d961a777fa7df6c8cb651fe17be26a23cadf736c73aba03a
 MISC metadata.xml 472 BLAKE2B 0af28a6f759474d8b879c6830e03fe043c623192b36a39acc90c431f93a82eccd392bedd172414610a58f3d74fcea6d41e081dc3cb06eec32b3352be7c2d7bfc SHA512 41a2736e7376b37ab7770ded3ee6653891ab56d4c52c5c96601d2ee3b5269de1fb2fda0de464569cae005b6b08bc5813ec9a4c20bbdf9ba7cec8d5eecae190cd
diff --git a/media-sound/amsynth/amsynth-1.5.1-r1.ebuild b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..e820000ed8f6
--- /dev/null
+++ b/media-sound/amsynth/amsynth-1.5.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools flag-o-matic
+
+DESCRIPTION="Virtual analogue synthesizer"
+HOMEPAGE="https://github.com/amsynth/amsynth"
+SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="alsa dssi jack lash oss sndfile"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	sndfile? ( >=media-libs/libsndfile-1:= )
+	alsa? (
+		media-libs/alsa-lib:=
+		media-sound/alsa-utils
+		)
+	dssi? (
+		media-libs/dssi:=
+		media-libs/liblo:=
+		>=x11-libs/gtk+-2.20:2
+		)
+	jack? ( virtual/jack )
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	oss? ( virtual/os-headers )"
+
+DOCS="AUTHORS README"
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		CFLAGS="" \
+		CXXFLAGS="${CXXFLAGS}" \
+		$(use_with oss) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with lash) \
+		$(use_with sndfile) \
+		$(use_with dssi)
+}
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index 050d6d1d9e87..1b4a7fe87e59 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,5 +1,4 @@
 AUX aqualung-1.0-ffmpeg3.patch 1148 BLAKE2B 777233c3c3aaa4921a102e480c31db9533d17316de566f7cb6439b4b9980cc4ab6c6992760a6571cede3b0eae0b1afedd38849b708a7c67f590d7bbf04b05d11 SHA512 3c932e86c8fe59951fd2c10b03a253133e79b0637e08653731f0dd12760855678aeb9e6c78dc646af7deb6a0dc61028a330020020d170262d9ab329c824f4985
 DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
 EBUILD aqualung-1.0-r2.ebuild 2474 BLAKE2B f1c14d90aa54b2312d04296666cbc1e319ed39db869af0cf580f41a440dc157fb4413328aafd016bafc6ac954e4c84e0746d34a1eb815ac7502ad8ca47a9a1fc SHA512 b70e2166296131222298abee45a2e4972fe7c8264a8111dbf2a6cfedb7706b0bcc73014c306302d3e9dc8697983b1e2a8fb09631abe576815bf82fb5a36d5aa5
-EBUILD aqualung-1.0-r3.ebuild 2479 BLAKE2B 82fc4bd1295ba6a5cdd9e0c2216994470bb1c76f1b61eef8e1f2e8ec26ab9d7d51930a07041dc0b29c63a4f310fafe4336f46a8ee0e4ae08a5ce42a65d2aad45 SHA512 710d5891e7b6be0d20ff4194ea5a6629f8f7038a32022519a4caa9b1b4c3181b24de36f6e4bef60c03eda8e5a7b8e499caeb528aeaecde23d2570a060a506ac9
 MISC metadata.xml 918 BLAKE2B 3355fd5e7d6f25ac7e8c8f51d3689f4fa7495fb5f09289bde82c1c96dddce3e8f45dc0f0f1c709d78517d7d20dc847f8e67e48cdce81bb9227332cb916a6b254 SHA512 5c0f8e22fd0b4516ffb16cd06ac9ddfeb66e5d67e904845967d06c9746503a9dddf52df84e2665593c2ec6b8b3757d7ad42bb75eaa3e908be61b976613a5e566
diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild
deleted file mode 100644
index 975f08e2a444..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop xdg
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
-	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
-	vorbis wavpack"
-
-BDEPEND="
-	virtual/pkgconfig
-	sys-devel/gettext
-"
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/libxml2
-	sys-libs/zlib
-	x11-libs/gtk+:2
-	alsa? ( media-libs/alsa-lib )
-	cdda? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac )
-	ifp? ( media-libs/libifp )
-	jack? ( media-sound/jack-audio-connection-kit )
-	ladspa? ( media-libs/liblrdf )
-	lame? ( media-sound/lame )
-	libsamplerate? ( media-libs/libsamplerate )
-	lua? ( dev-lang/lua:0= )
-	mac? ( media-sound/mac )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
-	"${FILESDIR}/${P}-ffmpeg3.patch"
-)
-
-src_configure() {
-	econf \
-		--disable-rpath \
-		--enable-loop \
-		--enable-nls \
-		--enable-transcoding \
-		$(use_enable debug) \
-		$(use_enable podcast) \
-		$(use_enable systray) \
-		$(use_enable jack jack-mgmt) \
-		$(use_with alsa) \
-		$(use_with cdda) \
-		$(use_with cddb) \
-		$(use_with ffmpeg lavc) \
-		$(use_with flac) \
-		$(use_with ifp) \
-		$(use_with jack) \
-		$(use_with ladspa) \
-		$(use_with lame) \
-		$(use_with libsamplerate src) \
-		$(use_with lua) \
-		$(use_with mac) \
-		$(use_with modplug mod) \
-		$(use_with mp3 mpeg) \
-		$(use_with musepack mpc) \
-		$(use_with oss) \
-		$(use_with pulseaudio pulse) \
-		$(use_with sndfile) \
-		$(use_with speex) \
-		$(use_with vorbis vorbis) \
-		$(use_with vorbis vorbisenc) \
-		$(use_with wavpack)
-}
-
-src_install() {
-	default
-
-	newicon src/img/icon_64.png aqualung.png
-	make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aumix/Manifest b/media-sound/aumix/Manifest
index 42a3076727dc..2181a34ef61c 100644
--- a/media-sound/aumix/Manifest
+++ b/media-sound/aumix/Manifest
@@ -1,5 +1,4 @@
-AUX aumix-2.9.1-tinfo.patch 737 BLAKE2B faae7740cbdf0af61df2febed5a7901822b73682b3e294a46b901b033c87e1900e7256b073cf0e5257ec3db32218e106cf350059a0f62ba7d29992179ea98d64 SHA512 9a2e68378d7bf7920ae2004ecefb2bcffdd829cab0c09340796de4d1617f0959e2b68432c9e29f748179abcfef87c22b8a3698615eef6485e1d7e17383d3d7eb
 AUX aumix.rc6 1037 BLAKE2B ba9842705caa5e78c7d5886afa6c8408a50169ec79a788d49ca04a8c90bcf581dcb96f4b11c8b6004370143ee6a92d9e0b660132826b2b9e167a07a6dfe73001 SHA512 8960c6c5e61e15e981bfafff7b03aded627971c11d6c21ce9e0d953737f440885fb5dda6a9f942112697c344b4f3ad9f222e2a7cfa493a504dc75a8f4c8cf1c9
 DIST aumix-2.9.1.tar.bz2 231622 BLAKE2B b96075d310b1d04bfc697a9097fd656d85705f68f1b06b1e6ee5bc0ca2b2a3614df67980d0f6e293c4d99adb9d12fae3608ac446eefd1cdf4f04de7f4a5fd1db SHA512 bd063dc9dab8455f467fbe9e4ea1baa5cef914923e66ab5a8fca1e6964cac7851e3755f054bfe41657371e221920fe9a52f9807457996244f4bcd5db4659b21d
-EBUILD aumix-2.9.1.ebuild 997 BLAKE2B f61e38c06cdb32cac7ffa212fd938c1ea383826d39fcbaeeb8589f3e22a5ec1790bcb5e191b204a9bcf6b7211683dfbbf20b7ac4dfd353dfbddb81c52941e877 SHA512 7bdcb6e6bf892acb276be89f228cb4c214e367e7372ca65b2bb3928790ef1ce61e7d2c916cc727ba78b7b687ac4ba7a047df1b69efd1bf896fe5efe851a7f934
+EBUILD aumix-2.9.1.ebuild 924 BLAKE2B a12d1ccea387fffdc81812b4e8563fb446914444dc7362fdfdec2a6867ee8afb9a2c1993723d7d6d82ee24675550228db8de4b8f3d1478716525f61e33d11daa SHA512 99bb83a33f82b18d203d07c754c0f948206545b1639fdc41c74ef04f66e84758503e5212e89fd4c4a3ae4392566b8275dcde51543a518812c518a8c1d91dd347
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/aumix/aumix-2.9.1.ebuild b/media-sound/aumix/aumix-2.9.1.ebuild
index deffad3e7208..fc6bf40487e4 100644
--- a/media-sound/aumix/aumix-2.9.1.ebuild
+++ b/media-sound/aumix/aumix-2.9.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools desktop
+inherit desktop
 
 DESCRIPTION="Aumix volume/mixer control program"
 HOMEPAGE="http://jpj.net/~trevor/aumix.html"
@@ -14,33 +14,24 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
 IUSE="gpm gtk nls"
 
-RDEPEND="sys-libs/ncurses:0=
+RDEPEND="sys-libs/ncurses:0
 	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
+DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-tinfo.patch" #578722
-)
-
-src_prepare() {
-	default
-	eautoreconf #578722
-}
+	nls? ( sys-devel/gettext )"
 
 src_configure() {
-	local myeconfargs=(
-		$(use_enable nls)
-		$(usex gtk '' --without-gtk)
-		$(usex gpm '' --without-gpm)
-	)
+	local myconf
+
+	use gtk || myconf="${myconf} --without-gtk"
+	use gpm || myconf="${myconf} --without-gpm"
 
-	econf "${myeconfargs[@]}"
+	econf \
+		$(use_enable nls) \
+		--disable-dependency-tracking \
+		${myconf}
 }
 
 src_install() {
diff --git a/media-sound/aumix/files/aumix-2.9.1-tinfo.patch b/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
deleted file mode 100644
index 969e034e0cbb..000000000000
--- a/media-sound/aumix/files/aumix-2.9.1-tinfo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/578722
-
---- aumix-2.9.1/configure.ac
-+++ aumix-2.9.1/configure.ac
-@@ -69,6 +69,8 @@
-    [  --without-ncurses       compile with no ncurses or mouse support],
-   AC_MSG_RESULT([Compiling without ncurses support]),[
-   dnl Checks for ncurses library.
-+  AC_CHECK_LIB(tinfo, main, TINFO_LIB="-ltinfo", TINFO_LIB=)
-+  AC_SUBST(TINFO_LIB)
-   AC_CHECK_LIB(ncurses, initscr, initscr=on, initscr=off)
-   if test $initscr = on; then
-     CURSLIB="ncurses"
-@@ -83,7 +85,7 @@
-     fi
-   fi
-   if test x$CURSLIB != x; then
--    LIBS="-l$CURSLIB $LIBS"
-+    LIBS="-l$CURSLIB $TINFO_LIB $LIBS"
-     AC_DEFINE(HAVE_CURSES, 1,
-       [Define this if you have (n)curses and want to use it.])
-     AC_CHECK_LIB($CURSLIB, getmouse,
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index b4703ce0f020..a5c178400183 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,6 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
-AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
-DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
-EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
-EBUILD bluez-alsa-9999.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
-MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
+EBUILD bluez-alsa-9999.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
+MISC metadata.xml 429 BLAKE2B 63f3e964e9b2aeed132b919848f9250cc5241c1a5c72b8deb6c4034313e38e92d0b54abdd08553046ef0b7b3862bb23e5eec9ce6845e991f6dd20a61e46ba74d SHA512 3d78a456405cffae4f5995197ca02dfeaf447d3ec417ddb00494cb07defc294329254c227aec5d24ed6c144a97606547b8fca184653e3882ec0c229f19621a8c
diff --git a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild b/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
deleted file mode 100644
index 6c33c4f7d936..000000000000
--- a/media-sound/bluez-alsa/bluez-alsa-1.4.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools multilib-minimal
-
-DESCRIPTION="Bluetooth Audio ALSA Backend"
-HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Arkq/${PN}"
-else
-	SRC_URI="https://github.com/Arkq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test"
-
-RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
-	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
-	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
-	sys-libs/readline:0=
-	aac? ( >=media-libs/fdk-aac-0.1.1:=[${MULTILIB_USEDEP}] )
-	hcitop? (
-		dev-libs/libbsd
-		sys-libs/ncurses:0=
-	)
-	ldac? ( >=media-libs/libldac-2.0.0 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-rfcomm
-		$(use_enable aac)
-		$(use_enable debug)
-		$(use_enable ofono)
-		$(use_enable static-libs static)
-		$(use_enable test)
-		$(multilib_native_use_enable hcitop)
-		$(multilib_native_use_enable ldac)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-	find "${ED}" -name "*.la" -delete || die
-
-	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
-	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
-}
-
-pkg_postinst() {
-	elog "Users can use this service when they are members of the \"audio\" group."
-}
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index 6c33c4f7d936..c883ca5ff3ef 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -17,10 +17,10 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="aac debug hcitop ldac ofono static-libs test"
+IUSE="aac debug hcitop static-libs"
 
 RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
-	>=media-libs/alsa-lib-1.1.2[${MULTILIB_USEDEP}]
+	>=media-libs/alsa-lib-1.0[${MULTILIB_USEDEP}]
 	>=media-libs/sbc-1.2[${MULTILIB_USEDEP}]
 	>=net-wireless/bluez-5.0[${MULTILIB_USEDEP}]
 	sys-libs/readline:0=
@@ -28,15 +28,10 @@ RDEPEND=">=dev-libs/glib-2.26[dbus,${MULTILIB_USEDEP}]
 	hcitop? (
 		dev-libs/libbsd
 		sys-libs/ncurses:0=
-	)
-	ldac? ( >=media-libs/libldac-2.0.0 )"
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0-ldac_pkgconfig_checks.patch
-)
-
 src_prepare() {
 	default
 	eautoreconf
@@ -47,11 +42,8 @@ multilib_src_configure() {
 		--enable-rfcomm
 		$(use_enable aac)
 		$(use_enable debug)
-		$(use_enable ofono)
 		$(use_enable static-libs static)
-		$(use_enable test)
 		$(multilib_native_use_enable hcitop)
-		$(multilib_native_use_enable ldac)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
diff --git a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch b/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
deleted file mode 100644
index 55530ea8b831..000000000000
--- a/media-sound/bluez-alsa/files/bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 52b08766b08ec7ef8393343553934ca148c175af Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 24 Mar 2019 13:04:24 +0100
-Subject: [PATCH] configure.ac: Fix pkg-config checks for libldac
-
-libldac actually provides the following two pkgconfig files:
-
-ldacBT-enc.pc
-ldacBT-abr.pc
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 270a74c..6f0b04b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -81,8 +81,8 @@ AC_ARG_ENABLE([ldac],
- 	[AS_HELP_STRING([--enable-ldac], [enable LDAC support])])
- AM_CONDITIONAL([ENABLE_LDAC], [test "x$enable_ldac" = "xyes"])
- AM_COND_IF([ENABLE_LDAC], [
--	PKG_CHECK_MODULES([LDAC], [libldacBT >= 2.0.0])
--	PKG_CHECK_MODULES([LDAC_ABR], [libldacBT_abr >= 2.0.0])
-+	PKG_CHECK_MODULES([LDAC], [ldacBT-enc >= 2.0.0])
-+	PKG_CHECK_MODULES([LDAC_ABR], [ldacBT-abr >= 2.0.0])
- 	AC_DEFINE([ENABLE_LDAC], [1], [Define to 1 if LDAC is enabled.])
- ])
- 
--- 
-2.21.0
-
diff --git a/media-sound/bluez-alsa/metadata.xml b/media-sound/bluez-alsa/metadata.xml
index 4fa05b5a0f0c..d35dea0f11fb 100644
--- a/media-sound/bluez-alsa/metadata.xml
+++ b/media-sound/bluez-alsa/metadata.xml
@@ -10,7 +10,5 @@
   </upstream>
   <use>
     <flag name="hcitop">Enable top-like monitoring tool for HCI</flag>
-    <flag name="ldac">Enable support for AOSP <pkg>media-libs/libldac</pkg> dispatcher</flag>
-    <flag name="ofono">Enable ofono elephony support</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index bdf182b44e61..131a8ede9295 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,9 +1,4 @@
-AUX cmus-2.8.0-elogind.patch 581 BLAKE2B 109426191591ce4df2b512d74d4e16d7e96d78e734750c1b8a6591459bbebe582fa5a6e632c17d45a6d05e0f58a18ed20432efcceb36e9c3f057e79770eb5db0 SHA512 6333c5d5700985f4a9b0996848409a4f149a70d2e32ce0b0132ac4044e46ca763c037c26e2a886f30c1a439b60619a21a398583d184f513dbca581a878bd0754
-AUX cmus-2.8.0-ffmpeg-deprecations.patch 3913 BLAKE2B 71065d6db1682955e96aa70bfd46f63175dab467743f3977a4a3b5ee90c4f595ed935ab341b6a80d0da5febf093e948dd143c36c6c4513b8f97d2abbe759daa4 SHA512 b76aa27fefe0b7c0e0d18c7aaacd19183619376c8609b777cef6b30892045aa052d9a829f7d511799998907fbabe10272a02215490025f4d1d376e18f219adc4
-AUX cmus-2.8.0-opus.patch 774 BLAKE2B 3ac353e658ec4bd87e7cf6156d76760fb84ca03b78126403ccc577c169001f468d763341da5df8a63cff2a94f3e732b4ed94384bc94da414c229793c89595497 SHA512 a1f22b620232700a30249a61ee13559bea75cf82cdac9c29ee5ccafb45c689e4c0d487523d613e37cf9c3e8764c9a4170c612721fbf1a56b04ddac63ddfe6801
-DIST cmus-2.8.0.tar.gz 317243 BLAKE2B b24c3dd74797ef26b42c2c303191dd751af7bb3b5c4c6f05bfef393eda9a35371eba4658321d473f9af210321132cfba5eab4037d257dd71c38ea3e24f78067f SHA512 cf359dfcefa833a5b10a2d16ac405672bea762b62b7177c115560127035682fba65c15b9a8710179a343d1f99212a0260b5c095542982202e2cd1bef5b0c17fc
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
-EBUILD cmus-2.8.0.ebuild 3829 BLAKE2B 4645a05212286ce2c2ba9f583ad71d978fa785b0c88d0a43560b48a0ae2ffd6bcc88afb22c95a3a2f7d696d8f7e97caf7d5ad5b6e32abe13f9760dcf6d7f41dd SHA512 c7f526006697f50bf6df78ee8dc4341acbbb5ee3d5558adfef816a9dd664b0587d6db021d3b173ab6c52218a14a6bfac2dc7a344cfd138c7a139f811ba38a5b5
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
-EBUILD cmus-9999.ebuild 3705 BLAKE2B 2452b59c056ad050a8e3015d10d157a0492ddb7ba1620883c83b36129f40dbc4d8838652f88b7122a4b9c6e281175f90be6b63c7942bebc840bd3eb2073eaa55 SHA512 03ded6c4b2fc7b4e1a201e98191d38311be5d2c56d17f9ed8b58af72c251eafe7180f0a5fda5baddbb104790d94e45716abd176ac2d4a4a999633edf7a08bde0
-MISC metadata.xml 935 BLAKE2B 6623b356fec8c0bb8ea7b30ff8b767ba108afdd0f02e4881b2afd7229b4b912f781ec89daf1078a057d6f10638e361889ecb9535b3cd81822a6a88c17972ae58 SHA512 f17d07ee3d1bb7e7a813c12d994005c6603f2c381680d4b79c07504556d7de4a84f3720916f39325eacf846000af39500259e4d2446ca6b302d61c59a1535710
+EBUILD cmus-9999.ebuild 3621 BLAKE2B 51bc89fc599042b367f0fc790aabf7202a57bcf3a688dc32b075dc82ebdbe6acd69a9953543fe02169c6e83dc4caa35360fa1d9f6f0a082fe8147c655c2a4c61 SHA512 7f94ef69e91eb456abea984db4240e833d484d9bae03bbdf4de027331e1c11e5a5524dcf7b11909954855b002b1e478b1c51b49f7c35648d56b7d44ef4824702
+MISC metadata.xml 793 BLAKE2B a7f7b70d43eca969e128e92ce3375b14fcd0d65fae8c744c4ecc3e235dbebf112ee068a98597afa4eb882c6992461ae354d7880303fe7c78950c25af0df5b715 SHA512 4074bc35433dc4c9dec0902c0a792f005fdeddc81b886be2c7ca5191423488182b6159445b5a29ad20a10740539d5e1e1dcc60253d724a1a2e8f80c65b2f5b36
diff --git a/media-sound/cmus/cmus-2.8.0.ebuild b/media-sound/cmus/cmus-2.8.0.ebuild
deleted file mode 100644
index 7ad9b48909d2..000000000000
--- a/media-sound/cmus/cmus-2.8.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/cmus/cmus/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-fi
-
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
-HOMEPAGE="https://cmus.github.io/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
-	+vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
-	aac? ( media-libs/faad2 )
-	alsa? ( >=media-libs/alsa-lib-1.0.11 )
-	ao? ( media-libs/libao )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
-	cue? ( media-libs/libcue )
-	discid? ( media-libs/libdiscid )
-	elogind? ( sys-auth/elogind )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac )
-	jack? ( virtual/jack )
-	libsamplerate? ( media-libs/libsamplerate )
-	mad? ( >=media-libs/libmad-0.14 )
-	mikmod? ( media-libs/libmikmod:0 )
-	modplug? ( >=media-libs/libmodplug-0.7 )
-	mp4? ( >=media-libs/libmp4v2-1.9:0 )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd )
-	tremor? ( media-libs/tremor )
-	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
-
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
-DOCS=( AUTHORS README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-elogind.patch"
-	"${FILESDIR}/${P}-ffmpeg-deprecations.patch"
-	"${FILESDIR}/${P}-opus.patch"
-)
-
-S="${WORKDIR}/${P/_/-}"
-
-my_config() {
-	local value
-	use ${1} && value=a || value=n
-	myconf="${myconf} ${2}=${value}"
-}
-
-src_configure() {
-	local debuglevel=1 myconf="CONFIG_ARTS=n CONFIG_SUN=n CONFIG_SNDIO=n CONFIG_WAVEOUT=n CONFIG_VTX=n CONFIG_ROAR=n"
-
-	use debug && debuglevel=2
-
-	my_config cddb CONFIG_CDDB
-	my_config cdio CONFIG_CDIO
-	my_config discid CONFIG_DISCID
-	my_config flac CONFIG_FLAC
-	my_config mad CONFIG_MAD
-	my_config modplug CONFIG_MODPLUG
-	my_config mikmod CONFIG_MIKMOD
-	my_config musepack CONFIG_MPC
-	my_config vorbis CONFIG_VORBIS
-	my_config tremor CONFIG_TREMOR
-	my_config opus CONFIG_OPUS
-	my_config wavpack CONFIG_WAVPACK
-	my_config mp4 CONFIG_MP4
-	my_config aac CONFIG_AAC
-	my_config ffmpeg CONFIG_FFMPEG
-	my_config cue CONFIG_CUE
-	my_config pulseaudio CONFIG_PULSE
-	my_config alsa CONFIG_ALSA
-	my_config jack CONFIG_JACK
-	my_config libsamplerate CONFIG_SAMPLERATE
-	my_config ao CONFIG_AO
-	my_config oss CONFIG_OSS
-
-	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
-	else
-		myconf="${myconf} CONFIG_MPRIS=n"
-	fi
-
-	./configure prefix="${EPREFIX}"/usr ${myconf} \
-		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
-		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
-}
-
-src_compile() {
-	tc-export_build_env BUILD_CC
-	emake V=2 \
-		CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_CC}" \
-		HOST_CFLAGS="${BUILD_CFLAGS}" HOST_LDFLAGS="${BUILD_LDFLAGS}"
-}
-
-src_install() {
-	default
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
-
-	insinto /usr/share/zsh/site-functions
-	doins contrib/_cmus
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use pidgin; then
-		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
-	fi
-}
diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index 0b1b04b727cc..bf501b22bd38 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-inherit bash-completion-r1
+inherit bash-completion-r1 multilib
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/cmus/cmus.git"
@@ -13,33 +12,28 @@ else
 	KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
 
-DESCRIPTION="Ncurses based music player with plugin support for many formats"
+DESCRIPTION="A ncurses based music player with plugin support for many formats"
 HOMEPAGE="https://cmus.github.io/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa ao cddb cdio cue debug discid elogind examples ffmpeg +flac jack libsamplerate
-	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio systemd tremor +unicode
+IUSE="aac alsa ao cue cdio cddb discid debug examples ffmpeg +flac jack libsamplerate
+	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio tremor +unicode
 	+vorbis wavpack"
 
-REQUIRED_USE="?? ( elogind systemd )"
+S="${WORKDIR}/${P/_/-}"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	sys-libs/ncurses:0=[unicode?]
+CDEPEND="sys-libs/ncurses:0=[unicode?]
 	aac? ( media-libs/faad2 )
 	alsa? ( >=media-libs/alsa-lib-1.0.11 )
 	ao? ( media-libs/libao )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia )
 	cue? ( media-libs/libcue )
+	cdio? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
 	discid? ( media-libs/libdiscid )
-	elogind? ( sys-auth/elogind )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac )
-	jack? ( virtual/jack )
+	jack? ( media-sound/jack-audio-connection-kit )
 	libsamplerate? ( media-libs/libsamplerate )
 	mad? ( >=media-libs/libmad-0.14 )
 	mikmod? ( media-libs/libmikmod:0 )
@@ -48,25 +42,19 @@ DEPEND="
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
 	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd )
 	tremor? ( media-libs/tremor )
 	!tremor? ( vorbis? ( >=media-libs/libvorbis-1.0 ) )
-	wavpack? ( media-sound/wavpack )
-"
-RDEPEND="${DEPEND}
-	pidgin? (
-		dev-python/dbus-python
-		net-im/pidgin
-	)
-"
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	pidgin? ( net-im/pidgin dev-python/dbus-python )"
 
 # Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
 REQUIRED_USE="tremor? ( vorbis )
 	mp4? ( aac )" # enabling mp4 adds -lfaad
 
-DOCS=( AUTHORS README.md )
-
-S="${WORKDIR}/${P/_/-}"
+DOCS="AUTHORS README.md"
 
 my_config() {
 	local value
@@ -102,12 +90,6 @@ src_configure() {
 	my_config ao CONFIG_AO
 	my_config oss CONFIG_OSS
 
-	if use elogind || use systemd; then
-		myconf="${myconf} CONFIG_MPRIS=a"
-	else
-		myconf="${myconf} CONFIG_MPRIS=n"
-	fi
-
 	./configure prefix="${EPREFIX}"/usr ${myconf} \
 		exampledir="${EPREFIX}"/usr/share/doc/${PF}/examples \
 		libdir="${EPREFIX}"/usr/$(get_libdir) DEBUG=${debuglevel} || die
@@ -124,9 +106,7 @@ src_compile() {
 src_install() {
 	default
 
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/doc/${PF}/examples || die
-	fi
+	use examples || rm -rf "${ED}"/usr/share/doc/${PF}/examples
 
 	insinto /usr/share/zsh/site-functions
 	doins contrib/_cmus
@@ -137,3 +117,8 @@ src_install() {
 		newbin contrib/cmus-updatepidgin.py cmus-updatepidgin
 	fi
 }
+
+pkg_postinst() {
+	einfo "USE flag 'wma' was replaced by 'ffmpeg'"
+	einfo "Details here - https://bugs.gentoo.org/show_bug.cgi?id=553834"
+}
diff --git a/media-sound/cmus/files/cmus-2.8.0-elogind.patch b/media-sound/cmus/files/cmus-2.8.0-elogind.patch
deleted file mode 100644
index e1309c78911d..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-elogind.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 483d1862ed023c3e00f2c8c4e71da40022af2f78 Mon Sep 17 00:00:00 2001
-From: Shiba <3816409+shibotto@users.noreply.github.com>
-Date: Tue, 12 Feb 2019 15:29:43 +0100
-Subject: [PATCH] Add support for elogind (#846)
-
----
- configure | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure b/configure
-index 1f46c30a..4627126e 100755
---- a/configure
-+++ b/configure
-@@ -289,7 +289,7 @@ check_vorbis()
- 
- check_libsystemd()
- {
--	pkg_config LIBSYSTEMD "libsystemd"
-+	pkg_config LIBSYSTEMD "libsystemd" || pkg_config LIBSYSTEMD "libelogind >= 239.3"
- 	return $?
- }
- 
diff --git a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch b/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
deleted file mode 100644
index 941f47e3d499..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-ffmpeg-deprecations.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From 9877eb02381fd4c57059f9c77be03127c28d8f88 Mon Sep 17 00:00:00 2001
-From: Niko E <nefthy@users.noreply.github.com>
-Date: Mon, 11 Feb 2019 09:09:21 +0100
-Subject: [PATCH] Fixes ffmpeg deprecations (#861)
-
-- av_register_all is no longer needed since 4.0
-- AVStream::codec is deprecated since 3.1
-- avcodec_decode_audio4 is deprecated since 3.1
----
- ip/ffmpeg.c | 42 ++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 42 insertions(+)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index eaad5c4f..418a37f8 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -128,9 +128,11 @@ static void ffmpeg_init(void)
- 
- 	av_log_set_level(AV_LOG_QUIET);
- 
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 18, 100)
- 	/* We could register decoders explicitly to save memory, but we have to
- 	 * be careful about compatibility. */
- 	av_register_all();
-+#endif
- }
- 
- static int ffmpeg_open(struct input_plugin_data *ip_data)
-@@ -143,6 +145,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 	AVCodec *codec;
- 	AVCodecContext *cc = NULL;
- 	AVFormatContext *ic = NULL;
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+	AVCodecParameters *cp = NULL;
-+#endif
- 	SwrContext *swr = NULL;
- 
- 	ffmpeg_init();
-@@ -162,11 +167,20 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 		}
- 
- 		for (i = 0; i < ic->nb_streams; i++) {
-+
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+			cp = ic->streams[i]->codecpar;
-+			if (cp->codec_type == AVMEDIA_TYPE_AUDIO) {
-+				stream_index = i;
-+				break;
-+			}
-+#else
- 			cc = ic->streams[i]->codec;
- 			if (cc->codec_type == AVMEDIA_TYPE_AUDIO) {
- 				stream_index = i;
- 				break;
- 			}
-+#endif
- 		}
- 
- 		if (stream_index == -1) {
-@@ -175,7 +189,13 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 			break;
- 		}
- 
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		codec = avcodec_find_decoder(cp->codec_id);
-+		cc = avcodec_alloc_context3(codec);
-+		avcodec_parameters_to_context(cc, cp);
-+#else
- 		codec = avcodec_find_decoder(cc->codec_id);
-+#endif
- 		if (!codec) {
- 			d_print("codec not found: %d, %s\n", cc->codec_id, avcodec_get_name(cc->codec_id));
- 			err = -IP_ERROR_UNSUPPORTED_FILE_TYPE;
-@@ -196,6 +216,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 
- 	if (err < 0) {
- 		/* Clean up.  cc is never opened at this point.  (See above assumption.) */
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		avcodec_free_context(&cc);
-+#endif
- 		avformat_close_input(&ic);
- 		return err;
- 	}
-@@ -207,6 +230,9 @@ static int ffmpeg_open(struct input_plugin_data *ip_data)
- 	priv->input = ffmpeg_input_create();
- 	if (priv->input == NULL) {
- 		avcodec_close(cc);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+		avcodec_free_context(&cc);
-+#endif
- 		avformat_close_input(&ic);
- 		free(priv);
- 		return -IP_ERROR_INTERNAL;
-@@ -252,6 +278,9 @@ static int ffmpeg_close(struct input_plugin_data *ip_data)
- 	struct ffmpeg_private *priv = ip_data->private;
- 
- 	avcodec_close(priv->codec_context);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+	avcodec_free_context(&priv->codec_context);
-+#endif
- 	avformat_close_input(&priv->input_context);
- 	swr_free(&priv->swr);
- 	ffmpeg_input_free(priv->input);
-@@ -305,7 +334,20 @@ static int ffmpeg_fill_buffer(AVFormatContext *ic, AVCodecContext *cc, struct ff
- 			AVPacket avpkt;
- 			av_new_packet(&avpkt, input->curr_pkt_size);
- 			memcpy(avpkt.data, input->curr_pkt_buf, input->curr_pkt_size);
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(57, 48, 101)
-+			if (avcodec_send_packet(cc, &avpkt) == 0) {
-+				got_frame = !avcodec_receive_frame(cc, frame);
-+				if (got_frame)
-+					len = input->curr_pkt_size;
-+				else
-+					len = 0;
-+			} else {
-+				got_frame = 0;
-+				len = 0;
-+			}
-+#else
- 			len = avcodec_decode_audio4(cc, frame, &got_frame, &avpkt);
-+#endif
- #if LIBAVCODEC_VERSION_MAJOR >= 56
- 			av_packet_unref(&avpkt);
- #else
diff --git a/media-sound/cmus/files/cmus-2.8.0-opus.patch b/media-sound/cmus/files/cmus-2.8.0-opus.patch
deleted file mode 100644
index ea95fa8536ce..000000000000
--- a/media-sound/cmus/files/cmus-2.8.0-opus.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0be981476e019e9fddb5529a73aadf004e94656b Mon Sep 17 00:00:00 2001
-From: tomty89 <tom.ty89@gmail.com>
-Date: Tue, 12 Feb 2019 18:55:09 +0800
-Subject: [PATCH] ip/ffmpeg: enable opus support (#865)
-
----
- ip/ffmpeg.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ip/ffmpeg.c b/ip/ffmpeg.c
-index 04b916cc..427257c7 100644
---- a/ip/ffmpeg.c
-+++ b/ip/ffmpeg.c
-@@ -519,7 +519,7 @@ const int ip_priority = 30;
- const char *const ip_extensions[] = {
- 	"aa", "aac", "ac3", "aif", "aifc", "aiff", "ape", "au", "fla", "flac",
- 	"m4a", "m4b", "mka", "mkv", "mp+", "mp2", "mp3", "mp4", "mpc", "mpp",
--	"ogg", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
-+	"ogg", "opus", "shn", "tak", "tta", "wav", "webm", "wma", "wv",
- #ifdef USE_FALLBACK_IP
- 	"*",
- #endif
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f19bd0670b18..f64fa63b73fc 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="cdio">Use libcdio for CD support </flag>
-		<flag name="cue">Enable CUE sheet parsing</flag>
-		<flag name="discid">Enable reading the ID of the inserted CD</flag>
-		<flag name="elogind">Enable MPRIS support via <pkg>sys-auth/elogind</pkg></flag>
-		<flag name="pidgin">Install support script for <pkg>net-im/pidgin</pkg></flag>
-		<flag name="systemd">Enable MPRIS support via <pkg>sys-apps/systemd</pkg></flag>
-		<flag name="tremor">Use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="github">cmus/cmus</remote-id>
-		<remote-id type="sourceforge">cmus</remote-id>
-	</upstream>
+  <maintainer type="project">
+    <email>sound@gentoo.org</email>
+    <name>Gentoo Sound project</name>
+  </maintainer>
+  <use>
+    <flag name="cdio">use libcdio for CD support </flag>
+    <flag name="cue">enable CUE sheet parsing</flag>
+    <flag name="discid">enable reading the ID of the inserted CD</flag>
+    <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
+    <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">cmus/cmus</remote-id>
+    <remote-id type="sourceforge">cmus</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 38db8a8c11e2..0b0f5a552fcc 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,7 +1,6 @@
 AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
 AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 BLAKE2B 6ff8c90887d262d3ee8c755ae695291d2c8c757758254c41f40bf8f07646d3810935f3c339b63525219c1358593e8e42b58a134917c83b4030ea80d5d8479e9e SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0
-AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 843 BLAKE2B e57a20fd4540a678b848ce79851d20b0ff5c01ed1c56d12f09376a4e8b5a582fbfe614a2c7bc039d23f5edbd1d23638d54e07dfeb0673661f50e7325514a1a46 SHA512 6fad2bb324f8ce2112c84185e3226ff15b1c89af69de71aae1f2dcd3743412a0b68e7bd9be93997eb73e1cc1a7032b8ce92ee4ae51a4301a2bbbe1116fde0a73
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 772 BLAKE2B 5c32881817c038fcf129940ad8cfb98a7b2c3d02498ab6ce16ccc5f4189430022ab36748eccf07b491084234d4da4fbf267f18154ceb9ae8cda143fb3d5feb7e SHA512 338f9824d94cabcfe49d344b6f583722ca78fa708b399f339fac1ae0b159d0552e3995c04806761e15fe9467950a55765ca9f242304d94bea2068eacb8d16a29
 EBUILD cvoicecontrol-0.9_alpha.ebuild 951 BLAKE2B 9b1d2ba07c664826373679ed678d0f23eb12478160d8bb0f51f4e4f4280460f067b03096879da4aaad376c233c75cdcd699f76093baf63543ada542dc50f8e96 SHA512 04d08e6961d1e2d9cd7ca55cf62a5452286574f5a49feee282a0475f19f3cdda2bd90acf34d60f13471f23cf42465dcf0209a00983aff2c54cd5aa9bab650695
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index db4a6d89d14d..5aed99496537 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools
-
-MY_P="${P/_/}"
+MY_P=${P/_/}
 
 DESCRIPTION="Console based speech recognition system"
 HOMEPAGE="http://www.kiecza.net/daniel/linux"
@@ -16,25 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
-PATCHES=(
-	"${FILESDIR}/${P}-gentoo-2.patch"
-	"${FILESDIR}/${P}-tinfo.patch" #647166
-)
+PATCHES=( "${FILESDIR}/${P}-gentoo-2.patch" )
 
 src_prepare() {
 	default
+	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in || die "sed failed"
 	# Handle documentation with dohtml instead.
-	sed \
-		-e "s:SUBDIRS = docs:#SUBDIRS = docs:" \
-		-i cvoicecontrol/Makefile.am || die
-
-	eautoreconf #647166
-
-	sed \
-		-e "s/install-data-am: install-data-local/install-data-am:/" \
-		-i Makefile.in || die
+	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in || die "sed #2 failed"
 }
 
 src_install () {
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch
deleted file mode 100644
index 2ad44a1d7f42..000000000000
--- a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-tinfo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- cvoicecontrol-0.9alpha/configure.in
-+++ cvoicecontrol-0.9alpha/configure.in
-@@ -12,6 +12,7 @@
- AC_CHECK_LIB(pthread, main, [LIBPTHREAD="-lpthread"], LIBPTHREAD= )
- AC_SUBST(LIBPTHREAD)
- AC_CHECK_LIB(ncurses, main, [LIBNCURSES="-lncurses"], LIBNCURSES= )
-+AC_CHECK_LIB(tinfo, keypad, [LIBNCURSES="$LIBNCURSES -ltinfo"])
- AC_SUBST(LIBNCURSES)
- dnl Checks for header files.
- AC_CHECK_HEADERS(fcntl.h glob.h math.h ncurses.h pthread.h signal.h stdio.h stdlib.h string.h sys/ioctl.h sys/select.h sys/soundcard.h sys/time.h sys/types.h termios.h time.h unistd.h)
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index cc57ea294a29..0acc76d1cf7e 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -2,5 +2,5 @@ AUX darkice-1.2-gcc47.patch 236 BLAKE2B df44cbc3ce60ff0fee38e4ede7d0321adc2b1fc1
 DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429ee69424910352e32d3ec4f8037ff33fcb4946aef0f84f58deb59e073be007856fd9cbe01b1570d4a0244ba98 SHA512 d8959819d70eb9b44a34d087fcf3897be5e4cb23681c049f8d88e251d83dfd86b90fdd37744fe27d861dfcbb6bb6e1521b48c5c7b4967bb061ede75596f0a823
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
-EBUILD darkice-1.3.ebuild 1259 BLAKE2B 1b2879e660dfc14fbe5cef838858bba67a0985c5660dc1689153b3c54b2ad2961dd0738a02d19288fb01f91443ac1875bf6d0fad32774162e2f20d412db40062 SHA512 1dca2cd17f870732eb790e1f11a608334d792d8b0ed81782b22a2003dce33fec319280817787ccec9aa143c5f9978313f74a24f9528676d3e63985f24f0e70e2
+EBUILD darkice-1.3.ebuild 1309 BLAKE2B 3d29d9e552859c1e9c32cd003b966fea820588d9e92d4fe62ef54c5e73edcb519cb8ce30aafe9b8df30e6b75716e62af32b223c777331dd04f908133c141e833 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e
 MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/darkice-1.3.ebuild b/media-sound/darkice/darkice-1.3.ebuild
index 2a4e5be0de1a..b3c01b466369 100644
--- a/media-sound/darkice/darkice-1.3.ebuild
+++ b/media-sound/darkice/darkice-1.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+inherit eutils
 
 DESCRIPTION="A live audio streamer"
 HOMEPAGE="http://www.darkice.org/"
@@ -9,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
@@ -27,21 +28,23 @@ DEPEND="${RDEPEND}"
 REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
+#PATCHES=(
+#	"${FILESDIR}"/${PN}-1.2-gcc47.patch
+#)
+
 src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_with aac faac)
-		$(use_with aacplus)
-		$(use_with alsa)
-		$(use_with jack)
-		$(use_with libsamplerate samplerate)
-		$(use_with mp3 lame)
-		$(use_with opus)
-		$(use_with pulseaudio)
-		$(use_with twolame)
+	econf \
+		$(use_enable debug) \
+		$(use_with aac faac) \
+		$(use_with aacplus) \
+		$(use_with alsa) \
+		$(use_with jack) \
+		$(use_with libsamplerate samplerate) \
+		$(use_with mp3 lame) \
+		$(use_with opus) \
+		$(use_with pulseaudio) \
+		$(use_with twolame) \
 		$(use_with vorbis)
-	)
-	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index cd86470272f1..ff311830d0cc 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +1,3 @@
 DIST kid3-3.7.0.tar.gz 1466849 BLAKE2B 39bdab9afb187754914ef77326d9c323e5dd4ab13a6f603deca3dfe97acb0d7a81d58a8eb569397c1a094ebaa7449997b729ce008614c8fc9f04d2b9e7995e03 SHA512 3112addba1e0697ae8874bf12336e54c744165a692dc81a99d97194df8511aa540a53085e2be84b3557cd9a2c9d3d887046c06550cef11406b28e6f6e6b507a6
-DIST kid3-3.7.1.tar.gz 1486532 BLAKE2B aec19ca9792ab5a3ae975d64b581074f6505507027bc52483a95b8570fdf7484fadd63a5cc740b59817b6b2b7227f02637aeb3e9611d206a536138c6db083198 SHA512 68b1d4978e5e984d180981d02df5efa247d50da79e5c6a41010eb3c5369b6cdc023042333865f4730e47814c4b4b69dc2f1bcbe1566396b72637fd576f5e543c
 EBUILD kid3-3.7.0.ebuild 1892 BLAKE2B a0136ed5d6f8bf649a7ef068ba5cbfc928ab480dfe258b6d70b8d0f9b94ebd7d2e7d0e574ef4f8e2414d2cd6ddb2aacd29ab5e4ee79dbee22e2e09e255f505d9 SHA512 d152bf282c735e9e302a99464c6056346dc0616bb4fbe282446da4ea87934891eabb2f1b08dca677ff628b7ab08391305434dc0019d332808710038e32657460
-EBUILD kid3-3.7.1.ebuild 1905 BLAKE2B 27b32e0c1ea2c8a800190ce634c424ba6c708632d82761801b80ac0c8aee80b2e5e91286dc666087cc43f0341b4022f32828fc319884ca7430a48937e0a092e9 SHA512 ab80cb0c825f403ffffd0281b64458d90dd26b14b82ae9c9072b3ce8b3a76681275cb1b69180e72cdcbec771123879891c90b2fb272dd2a629da09eea848d9a4
 MISC metadata.xml 661 BLAKE2B 5a16df625ed1a34a04f7cd00cae636ec4dc2867cf1bab477c4a2fd99e21777ac949391c0c940da1235ee976a00b3812a84db1fb58c8c089aed983668f9ff49fb SHA512 d27b8c077e8363864d6d4baa217bd7813a01c520cba943bf25996823b944ed07c7b78205d5c77c1610566e2aa55cf03624633e4abef86e4378f6386b7bfb89c9
diff --git a/media-sound/kid3/kid3-3.7.1.ebuild b/media-sound/kid3/kid3-3.7.1.ebuild
deleted file mode 100644
index 6ae8aae43403..000000000000
--- a/media-sound/kid3/kid3-3.7.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_KDEINSTALLDIRS="false"
-KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
-inherit kde5
-
-DESCRIPTION="Simple tag editor based on Qt"
-HOMEPAGE="https://kid3.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
-
-REQUIRED_USE="flac? ( vorbis )"
-
-COMMON_DEPEND="
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	sys-libs/readline:0=
-	acoustid? (
-		media-libs/chromaprint
-		virtual/ffmpeg
-	)
-	flac? (
-		media-libs/flac[cxx]
-		media-libs/libvorbis
-	)
-	kde? (
-		$(add_frameworks_dep kconfig)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kcoreaddons)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-	)
-	mp3? ( media-libs/id3lib )
-	mp4? ( media-libs/libmp4v2:0 )
-	taglib? ( >=media-libs/taglib-1.9.1 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!media-sound/kid3:4
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	$(add_qt_dep linguist-tools)
-"
-
-src_prepare() {
-	# overengineered upstream build system
-	# kde5 eclass src_prepare leads to compile failure
-
-	# only enable handbook when required
-	if ! use_if_iuse handbook ; then
-		cmake_comment_add_subdirectory ${KDE_DOC_DIR}
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_CHROMAPRINT=$(usex acoustid)
-		-DWITH_FLAC=$(usex flac)
-		-DWITH_ID3LIB=$(usex mp3)
-		-DWITH_MP4V2=$(usex mp4)
-		-DWITH_TAGLIB=$(usex taglib)
-		-DWITH_VORBIS=$(usex vorbis)
-	)
-
-	if use kde ; then
-		mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
-	else
-		mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
-	fi
-
-	kde5_src_configure
-}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index dc50ec2d8508..1571a4695e2a 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -6,6 +6,6 @@ AUX lilypond-9999-programming_error.patch 479 BLAKE2B f5375c71b2a82340dcda7ca24b
 DIST lilypond-2.18.2.tar.gz 16027977 BLAKE2B b19b608891e22403efe8e18dd9e86c8d0c85ba516f34242f2a8bcb53c8849a3aa0fe83726036d168f26ee1a7d868a24cc54bd86016b016d634218956e8faf0d4 SHA512 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
 DIST lilypond-2.19.80.tar.gz 17244725 BLAKE2B f0883d59b1a14634d5d32e6a6f02c0a224643d6d28a3da623d5163396b74ebd15c3307c33c4d96778254fb6486a74c3324d26e3015d51fa163e3765f2c3767aa SHA512 13a7f258bac8ff77ad6d3879f128e86dd5bf45c7780c9738e6976915574d2dfc5404e6f49ca61dcaf8bb15eb266e65fedec4131a50ded7ab305d1856bbd7a3d6
 EBUILD lilypond-2.18.2-r3.ebuild 3211 BLAKE2B 3e87556e56d9fdf00535b816a952fe5a133ad46f71668a0d02102c09c9f73b799c5d370d6ed788434901da5217524ee7675a3a10338831f5d2df44ef95525b9f SHA512 3f8ad4d240e1df1ed32c1b2fcfb2755dc4aa9f1c018693df543074cf776034bf4b4b89c7129952004ea72ef7f053dadfb9d9bf696be9e6ebd04951b6f366677b
-EBUILD lilypond-2.19.80-r1.ebuild 3299 BLAKE2B 996bfcf42327e0d6372b0867f07592be6e11afbcecdebfa79561dfae3079ee38f0a2b233357705cb00e74b18c2dbdb1e802fe6ddff120f2548d446e593bff745 SHA512 e2561b9c1adc9738ff275fb0eee2eaa2425269c009a94855d27a3f2585b75c0620ab515f447d19ce9817edd14797b3daacf6880ccd0b8979a61f68dfc6700497
+EBUILD lilypond-2.19.80-r1.ebuild 3300 BLAKE2B a679e802dfd19fdffad845e0fd42d3d43fdd19e09ae9ad52b6b49b9fb444a524fb3318851350035bd821fcaf4bb1df272a490eafcb14c021af55f85448a9ffa6 SHA512 b9da9bd8eab7806adb139a738a2bdae404d6f30d10e6dbc07e1cc0295c3c1f20508bb841a426b6cb650f270615a3a58608f6b4e08e2b1895acf049027406fdcf
 EBUILD lilypond-9999.ebuild 3466 BLAKE2B d68e1e1962510d9653b2bbee3647eb88c9bdb4a9f1824ad41ff30f07ad927f3b93f0f8ddbf7eb92f42530e4a40a778c9b2ea4c648e0c4443f82705983a41a987 SHA512 5e8a7e0fea9896c76e3187d7417dea2c38f05ebd0b5cb06aba66770608a0c2c315412c1e24f22dcbdc182371c617e911785ccfbf1ac731e67e9b8914d9f00f6a
 MISC metadata.xml 861 BLAKE2B c7214caf915ce8f32dad9cd6f08c72bb42490de9f679f073bb6e68c6f14e209f6b3013554fc786d3fb765d271bbb39d54ecdc4df2967700507ab0c9f782d4621 SHA512 d20e7dc27a7836585c7ca28cb78c073c3767a1749d16bca3989bb552d4920e949b3caf36f2227862655e61be0914602aa3af41f17a0f61246b3f305228c9b70c
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index b4574b4a73c9..11303d064643 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ IUSE="debug emacs guile2 profile vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.15
-	>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+	>=dev-scheme/guile-1.8.2:12[deprecated,regex]
 	media-fonts/tex-gyre
 	media-libs/fontconfig
 	media-libs/freetype:2
@@ -31,7 +31,7 @@ RDEPEND=">=app-text/ghostscript-gpl-8.15
 	emacs? ( virtual/emacs )
 	guile2? ( >=dev-scheme/guile-2:12 )
 	!guile2? (
-		>=dev-scheme/guile-1.8.2:12=[deprecated,regex]
+		>=dev-scheme/guile-1.8.2:12[deprecated,regex]
 		<dev-scheme/guile-2.0:12
 	)
 	${PYTHON_DEPS}"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 9eb95deadf32..bcfe63eaf1cb 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,6 +2,6 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1314 BLAKE2B 813d66f62453cfc2d5f8fa00631aba542888700307f3d0a29e4c9da806d25a22ca01566cb02c25ac25893774e73c8e272e397084e2f1fd4596a7609eb08049fc SHA512 b9e535de8d01161190fb50d8bbb5492b710cb39a5fa4c3d47d735e8a444da2cea44ec43c9af3de1bfa076caafaaf219ebd963e140a383008766f09d9fad35c75
-EBUILD mac-4.11.4.5.7.ebuild 1321 BLAKE2B c2f1b98f21ff7bc6c52868869f5b7155d8e88d7db3816c0543b3910fa2eb20de1a9bab983474e55f5ec11ce52a652289587182c740a057591e1d0ba5e805ae32 SHA512 fb1d912f512ed224a52f5899182ae40220f8e7c6cc2aa8f2c8a4d7ae3bf841e2a0e7607b685b7f07c82e348554b69f070f7a629f82b036ab04eed376dedd3404
+EBUILD mac-4.11.4.5.7-r1.ebuild 1350 BLAKE2B e70932c4abccf08d212bbc7f777fc01249f62df8311083a3de8d1dd6f2ec340bfef9de69d946cb8bb7e2183346b29df1e61b01334c6984efb058214d9c1138fb SHA512 9643694bd9a1d97a879bafa1ab2f225c298b4f1d3aa92a2096def0dfef58897ea0e0a838a4157726f3cbab117d7d4c7ad20585888a2f58e485bc7509b9edecc3
+EBUILD mac-4.11.4.5.7.ebuild 1359 BLAKE2B 3a6f2a706bc325d338541547d4d112b221735ab7e08642662c16c9444144d2ddffddd48e03e5439e896974b03e5951dcfc0f072c2d7c6bb2fd4ac87ed1cbedf4 SHA512 a4eb177a493ca9a09272793df96a3a48337b1e2658845eab63c011789206b9be443e0bae341ea47b3cd354c7a067e9694fb7b7e2701152112518ce331aa95d23
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index fcaa1e39bba7..aa65b9a5e9ee 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,12 +10,12 @@ MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
 MY_P=${MY_PN}_${MY_PV}
 
 DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
 SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mac/mac-4.11.4.5.7.ebuild b/media-sound/mac/mac-4.11.4.5.7.ebuild
index a76614813cea..1f1674b693b3 100644
--- a/media-sound/mac/mac-4.11.4.5.7.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ PATCH=s$(get_version_component_range 5)
 MY_P=${MY_PN}_${MY_PV}-${PATCH}
 
 DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
 SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
 
 LICENSE="mac"
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 43a1740e5a8e..5a116e3103c7 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -8,5 +8,5 @@ EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4
 EBUILD mixxx-2.1.5.ebuild 3003 BLAKE2B a7f2261d2a470e77b7b7d227bf68cd15e32572bca684662c66480cb8adef3878c8b25d7e85b19496ce6e977d45cd72e7e9063a405d1603bfcaef30f4637fe022 SHA512 3d59474452d549a5c2c72028067a554ec4b4b5e11e57cbed1ca445c00578026bb87b5377066335d438245597bf120e11425e0fd0a5dd0164ba1e09378e6d56a4
 EBUILD mixxx-2.1.7.ebuild 3003 BLAKE2B 5d35929d617994bd53f442deb2d6ececb490ee8867736a5232c864fe16d0e1ca44ff65c5965a7790653319d02c06bc8f528cfb8730379db54d238ebea4d8cff5 SHA512 838ec039f8acdbbce7cab3147ebf1446fc9fdc0130dedd6a13ce8f468537c1e9832b9d552a48f601acfbf069784118eabfa61d0ae24d1c8f3aa083791742abf8
 EBUILD mixxx-2.2.0.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
-EBUILD mixxx-9999.ebuild 3156 BLAKE2B 9251127fa8cab40f36aa43f999478b2bda2a4e99ab7939f1f758efd59fd58716e938b4e0128820996bd9bad616e35cf209eee4c9134fe229a296910db45dfa28 SHA512 ae54684c8970ad8068fd97674e4972326c14006c1c1e48d4563ab3b574a215d140eaa3c88f2ee6fa4ad3ebe9479c3bc1ffe5e855016605106d8ea30ab71e5af1
+EBUILD mixxx-9999.ebuild 3159 BLAKE2B 01478993c3cf731fba6ec0df3a53492cd8e932100d9b37ed398c231eb91be7179f3244715d7db0351b6a3a71dfc29c23b6f5b1e819509a90e97d4d6292b98098 SHA512 194f76c1d2aeb32a331abde710ada213879b80e0c18afe7cb2164c542ee084466496d5c7a5a21db46b07c41bc3d4a9ef439bf05e20b2f6221467d990a5d21cb6
 MISC metadata.xml 632 BLAKE2B d6c7a595841941a39b97a16a74677a1baae1a97fb4af73bb019c4fc03a96aaebf5b369b1e89a398f92c6cad4a28083620b4016cb9e5cbc99823025b776d7813c SHA512 109ee347f6a011c55858a555a93bc0d67ed6dc8a86ec7e2bcce8ad949a8742a4dedd1da3487ccaf1f928e063c6ce5750e083cddb9807d8bd732db231e2e7904f
diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild
index c3949aa84c2b..7de8d9c94349 100644
--- a/media-sound/mixxx/mixxx-9999.ebuild
+++ b/media-sound/mixxx/mixxx-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -78,12 +78,13 @@ DEPEND="
 "
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.0-docs.patch
 	"${FILESDIR}"/${PN}-2.2.0-lilv_include_fix.patch
 )
 
 src_prepare() {
 	# use multilib compatible directory for plugins
-	sed -i -e "/env.Alias('install', docs)/d;"'/unix_lib_path =/!b;n;'"s/'lib'/'$(get_libdir)'/" SConscript || die
+	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
 
 	default
 }
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index e2521eb7a6d6..a9aac90b0e5a 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -6,9 +6,7 @@ AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 DIST mpd-0.21.5.tar.xz 667624 BLAKE2B d4de4c55306a42caf4f79ee469db2037c0217563d50d7a4ed349d0c2c61cab1c6e519da96f552f38692bedf18ffbdb2032ae0a3314a05b2f2461c2da526f85e5 SHA512 b3a938f43cd554e0e761890ca7ea910e21b8f98f54f5bfceb0efcbef4df46db0d110d1bbc24a233021b463e3424d6246c1013f5a6ebdfc85a418008d49ced7a4
-DIST mpd-0.21.6.tar.xz 669272 BLAKE2B ffd50c35e431791503e5d0137abdb93beb42cf48f7638ac0f394d8c4198ce96f915220c92d078ce99cfe7c9866f8e35e58106b801a6d83cdf0a121442f12976a SHA512 20e752a8db2f8ae0b2419b35018557c37a64c6baff25666ba35fce89cfd354e4df5064c25685791f3fcca7ba9e6e6acef0e4653c0c0ffafde2847085dc51b3fa
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
 EBUILD mpd-0.21.4-r1.ebuild 8174 BLAKE2B 35bc9bb4ccf75ab510065b1eee80ad626d1359654a3faadfd0ba8e3d09eb3ab3bca37836f2d540704f1914b2a25fe90dbcc80ad1333e6b57970e0f6b2c227f09 SHA512 b347f5939053b35bc95c1600706a364a762e4e81a3a238d31e38a884970df9d1db8892c6b943d8895cd7a115e21310fab646bb0c13a2731f7037e93ac21dddd2
 EBUILD mpd-0.21.5.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
-EBUILD mpd-0.21.6.ebuild 8185 BLAKE2B bf1f75190482eb97a199b068376af40f32369ff51dc47643d3a1f65a2521611ed2373c9cd4ebb5b6a6496f781e35457e7352173e46106dae9585d781b716b960 SHA512 f3230bafb050bc68308fe99d567e4ee593907b8087bf45343ac07307d0253132a04e96a3b26e8c74f7a890914c3fac6d12a1a6155a0d46caada7fc8c2384d915
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.6.ebuild b/media-sound/mpd/mpd-0.21.6.ebuild
deleted file mode 100644
index 9f214249da52..000000000000
--- a/media-sound/mpd/mpd-0.21.6.ebuild
+++ /dev/null
@@ -1,295 +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
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
-	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
-	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
-	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
-	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd tcpd
-	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
-	zeroconf zip zlib"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	upnp? ( expat )
-	webdav? ( curl expat )
-	"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	adplug? ( media-libs/adplug:= )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile:= )
-
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-
-	chromaprint? ( media-libs/chromaprint )
-	curl? ( net-misc/curl )
-	dbus? ( sys-apps/dbus )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-
-	flac? ( media-libs/flac )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? (  dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	network? ( media-libs/libshout )
-	nfs? ( net-fs/libnfs )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	qobuz? ( dev-libs/libgcrypt:0 )
-	samba? ( net-fs/samba )
-	selinux? ( sec-policy/selinux-mpd )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	udisks? ( sys-fs/udisks:2 )
-	upnp? ( net-libs/libupnp:0 )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.58:=
-	test? ( dev-cpp/gtest )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-)
-
-pkg_setup() {
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-	sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dbzip2=$(usex bzip2 enabled disabled)
-		-Dcdio_paranoia=$(usex cdio enabled disabled)
-		-Dchromaprint=$(usex chromaprint enabled disabled)
-		-Dcue=$(usex cue true false)
-		-Dcurl=$(usex curl enabled disabled)
-		-Ddbus=$(usex dbus enabled disabled)
-		-Ddebug=$(usex debug true false)
-		-Deventfd=$(usex eventfd true false)
-		-Dexpat=$(usex expat enabled disabled)
-		-Dicu=$(usex icu enabled disabled)
-		-Did3tag=$(usex id3tag enabled disabled)
-		-Dinotify=$(usex inotify true false)
-		-Dipv6=$(usex ipv6 enabled disabled)
-		-Diso9660=$(usex cdio enabled disabled)
-		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
-		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
-		-Dlibwrap=$(usex tcpd enabled disabled)
-		-Dmms=$(usex mms enabled disabled)
-		-Dnfs=$(usex nfs enabled disabled)
-		-Dsignalfd=$(usex signalfd true false)
-		-Dsmbclient=$(usex samba enabled disabled)
-		-Dsoxr=$(usex libsoxr enabled disabled)
-		-Dsqlite=$(usex sqlite enabled disabled)
-		-Dsystemd=$(usex systemd enabled disabled)
-		-Dtest=$(usex test true false)
-		-Dudisks=$(usex udisks enabled disabled)
-		-Dupnp=$(usex upnp enabled disabled)
-		-Dwebdav=$(usex webdav enabled disabled)
-		-Dzeroconf=$(usex zeroconf avahi disabled)
-		-Dzlib=$(usex zlib enabled disabled)
-		-Dzzip=$(usex zip enabled disabled)
-		)
-
-	emesonargs+=(
-		-Dalsa=$(usex alsa enabled disabled)
-		-Dao=$(usex ao enabled disabled)
-		-Dfifo=$(usex fifo true false)
-		-Djack=$(usex jack enabled disabled)
-		-Dopenal=$(usex openal enabled disabled)
-		-Doss=$(usex oss enabled disabled)
-		-Dpipe=$(usex pipe true false)
-		-Dpulse=$(usex pulseaudio enabled disabled)
-		-Drecorder=$(usex recorder true false)
-	)
-
-	if use samba || use upnp; then
-		emesonargs+=( -Dneighbor=true )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	if use network; then
-
-	emesonargs+=(
-		-Dshine=disabled
-		-Dshout=enabled
-		-Dvorbisenc=$(usex vorbis enabled disabled)
-		-Dhttpd=true
-		-Dlame=$(usex lame enabled disabled)
-		-Dtwolame=$(usex twolame enabled disabled)
-		-Dwave_encoder=$(usex audiofile true false)
-	)
-	fi
-
-	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
-		-Daudiofile=$(usex audiofile enabled disabled)
-		-Dfaad=$(usex faad enabled disabled)
-		-Dffmpeg=$(usex ffmpeg enabled disabled)
-		-Dflac=$(usex flac enabled disabled)
-		-Dfluidsynth=$(usex fluidsynth enabled disabled)
-		-Dgme=$(usex gme enabled disabled)
-		-Dmad=$(usex mad enabled disabled)
-		-Dmikmod=$(usex mikmod enabled disabled)
-		-Dmodplug=$(usex modplug enabled disabled)
-		-Dmpcdec=$(usex musepack enabled disabled)
-		-Dmpg123=$(usex mpg123 enabled disabled)
-		-Dopus=$(usex opus enabled disabled)
-		-Dsidplay=$(usex sid enabled disabled)
-		-Dsndfile=$(usex sndfile enabled disabled)
-		-Dvorbis=$(usex vorbis enabled disabled)
-		-Dwavpack=$(usex wavpack enabled disabled)
-		-Dwildmidi=$(usex wildmidi enabled disabled)
-
-	)
-
-	emesonargs+=(
-		-Dqobuz=$(usex qobuz enabled disabled)
-		-Dsoundcloud=$(usex soundcloud enabled disabled)
-		-Dtidal=$(usex tidal enabled disabled)
-	)
-
-	emesonargs+=(
-		--libdir="/usr/$(get_libdir)"
-		-Ddocumentation=false
-		-Dsndio=disabled #not yet in the tree
-		-Dsolaris_output=disabled
-
-		-Ddatabase=true
-		-Ddsd=true
-		-Dtcp=true
-
-		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
-		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
-		)
-
-	if use icu; then
-		emesonargs+=( -Diconv=enabled )
-	else
-		emesonargs+=( -Diconv=disabled )
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
-
-	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	doman doc/mpd.1
-	doman doc/mpd.conf.5
-
-	keepdir /var/lib/mpd
-	keepdir /var/lib/mpd/music
-	keepdir /var/lib/mpd/playlists
-
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
-}
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index f9460e1e60e6..380197325c72 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,4 @@
-DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD mumble-1.3.0_pre20190313.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
-EBUILD mumble-1.3.0_rc1.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
-EBUILD mumble-9999.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
+EBUILD mumble-9999.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-1.3.0_rc1.ebuild b/media-sound/mumble/mumble-1.3.0_rc1.ebuild
deleted file mode 100644
index d15c4124e796..000000000000
--- a/media-sound/mumble/mumble-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop qmake-utils xdg
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src )
-else
-	if [[ "${PV}" == *_pre* ]] ; then
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="+alsa +dbus debug g15 jack libressl +opus oss pch portaudio pulseaudio +rnnoise speech zeroconf"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	>=dev-libs/protobuf-2.2.0:=
-	>=media-libs/libsndfile-1.0.20[-minimal]
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:5 )
-	g15? ( app-misc/g15daemon )
-	jack? ( virtual/jack )
-	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
-	libressl? ( dev-libs/libressl )
-	opus? ( >=media-libs/opus-1.0.1 )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	x11-base/xorg-proto
-"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myuse: No use option given"
-		use ${1} || echo no-${1}
-	}
-
-	local conf_add=(
-		bundled-celt
-		no-bundled-opus
-		no-bundled-speex
-		no-embed-qt-translations
-		no-server
-		no-update
-		$(myuse alsa)
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse g15)
-		$(usex jack '' no-jackaudio)
-		$(myuse opus)
-		$(myuse oss)
-		$(myuse portaudio)
-		$(myuse pulseaudio)
-		$(myuse rnnoise)
-		$(usex speech '' no-speechd)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	use pch || conf_add+=( no-pch )
-
-	eqmake5 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add[*]}" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir=release
-	if use debug; then
-		dir=debug
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	doicon -s scalable icons/mumble.svg
-
-	doman man/mumble-overlay.1
-	doman man/mumble.1
-
-	dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index d15c4124e796..1b3d0c7ac3ac 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -15,10 +15,9 @@ else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 	else
-		MY_PV="${PV/_/-}"
-		MY_P="${PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${P/_*}"
+		MY_P="${PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_P}"
 	fi
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index ad393ca93264..43d8d82d6e42 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -4,9 +4,7 @@ AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc3
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
-DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD murmur-1.3.0_pre20190313.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
-EBUILD murmur-1.3.0_rc1.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
-EBUILD murmur-9999.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15
+EBUILD murmur-9999.ebuild 3270 BLAKE2B 8356bcd481d999a52957462819ff502eab5690c049978967ca2a19c02d4fd82a697bb980d2b77002419b97fd8e577ccc7243c784317855b88b70c3e4dff911c2 SHA512 10c1708d5297ec1e94621d669990031d9e1e76ae9102dd7479c1915d84294ee35a772b1c2b00840f45a705f918f71edb625ab6b737d52317911f01315be81f00
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_rc1.ebuild b/media-sound/murmur/murmur-1.3.0_rc1.ebuild
deleted file mode 100644
index 4ee163ac142e..000000000000
--- a/media-sound/murmur/murmur-1.3.0_rc1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils systemd user readme.gentoo-r1
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' )
-else
-	MY_PN="mumble"
-	if [[ "${PV}" == *_pre* ]] ; then
-		MY_P="${MY_PN}-${PV}"
-		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
-	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
-	fi
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND="
-	>=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	|| (
-		dev-qt/qtsql:5[sqlite]
-		dev-qt/qtsql:5[mysql]
-	)
-	dev-qt/qtxml:5
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dbus? ( dev-qt/qtdbus:5 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-"
-BDEPEND="
-	virtual/pkgconfig"
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini} || die
-}
-
-src_configure() {
-	myuse() {
-		[[ -n "${1}" ]] || die "myconf: No use flag given."
-		use ${1} || echo "no-${1}"
-	}
-	local conf_add=(
-		no-client
-		$(myuse dbus)
-		$(usex debug 'symbols debug' release)
-		$(myuse ice)
-		$(myuse pch)
-		$(usex zeroconf '' no-bonjour)
-	)
-
-	eqmake5 main.pro -recursive \
-		CONFIG+="${conf_add[*]}"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc -r scripts/server
-	docompress -x /usr/share/doc/${PF}/scripts
-
-	local dir=release
-	if use debug; then
-		dir=debug
-	fi
-
-	dobin "${dir}"/murmurd
-
-	insinto /etc/murmur/
-	doins scripts/murmur.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	if use dbus; then
-		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
-		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-	else
-		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
-	fi
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur /etc/murmur/murmur.ini
-	fperms 640 /etc/murmur/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 4ee163ac142e..9795d40d3832 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -16,14 +16,12 @@ else
 	if [[ "${PV}" == *_pre* ]] ; then
 		MY_P="${MY_PN}-${PV}"
 		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
-		S="${WORKDIR}/${MY_P}"
 	else
-		MY_PV="${PV/_/-}"
-		MY_P="${MY_PN}-${MY_PV}"
-		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz"
-		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+		MY_P="${MY_PN}-${PV/_/~}"
+		SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
 	fi
 	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index d9df75f099ec..768195cb50fc 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
-EBUILD pavucontrol-4.0.ebuild 893 BLAKE2B 85b0e9e4bfc0d8894a01a7f6b46d19bb340ed53d52f3728c5007cba8dd43929220b8ffc277262830a4f86df8dd75afa687136848310b6ad0ebcc308c8fb772ad SHA512 e25a85ed23f2c3fa383190b3277a1b42889677c1ff552b09e31f2b4f520b9d4cb4f453032c69f4f4620f6f10b4a26793683af9eba0411c013012ecea8acfd6c9
+EBUILD pavucontrol-4.0.ebuild 890 BLAKE2B f40bf933b2e8112336080c2d4b284c8c80e09b686fef19d5281e9f94dcac620bd07c9a434ac74e9793880e2cf82eef497c63576dcb0c123f612afab9e7115f04 SHA512 d7a36766f88e6a34307f903aee17cadc28a6693036c78c94b3f3135684c8a19cf004b19181de49a423a8603195f2d82de7ef9cdb1cfcc828982e1514e42903b0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/pavucontrol/pavucontrol-4.0.ebuild b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
index 8b512d96dcd8..8291e6f1a184 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
-	>=dev-cpp/gtkmm-3.0:3.0[X]
+	>=dev-cpp/gtkmm-3.0:3.0
 	>=dev-libs/libsigc++-2.2:2
 	>=media-libs/libcanberra-0.16[gtk3]
 	>=media-sound/pulseaudio-5[glib]
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index c3f36e733cec..fa02b2ed2014 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,5 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
-EBUILD pulseaudio-12.2-r1.ebuild 11544 BLAKE2B 215b686f4ab5959e3c932cc1e3c873a6522161581cfff84ddc7c2a308022366c240a15246c2cf3ef637b5429f3a06eed327aa3cb59cc146be90d0cddff2d828a SHA512 1b7017e25805d304280fd8ce6c0c4f5a70da4af5341fc92a81f03c573ff5a2c07d2036ab49bc378de25d0416f06e1fbf05d31517b9ddfd4d22b50348323d8fc0
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
-MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
+MISC metadata.xml 3208 BLAKE2B c403977ebc346d7bb9c3749225bcc31324a70ed5e737eda2c7d2b6f6d3de9270425ba0aa605dd8a592f89ff249b5caecaff85a2482c0c008412c1eefc5736db1 SHA512 32ac643d5de46c26075f5539bb2feb6fdece76e88ea591e85768ecef41ec8db577577c084aa80e33ca96670eb98858474d3a4c5a8ed78801b4336fecbed89260
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 38993dac40af..a0d16e0c7810 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -17,7 +17,6 @@
       PulseAudio plugin enabled. This ensures that clients supporting
       ALSA only will use PulseAudio.
     </flag>
-    <flag name="elogind">Use <pkg>sys-auth/elogind</pkg> for giving each session a PA client</flag>
     <flag name="gconf">
       Ensure <pkg>gnome-base/gconf</pkg> is present for pulseaudio GConf
       to GSettings module automatic migration (keeping the user configuration)
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
deleted file mode 100644
index daf9be7e703f..000000000000
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ /dev/null
@@ -1,360 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
-+gdbm +glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon
-ofono-headset +orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test
-+udev +webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	?? ( elogind systemd )
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	realtime? ( dbus )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
-
-RDEPEND="${CDEPEND}
-	realtime? ( sys-auth/rtkit )
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
-	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-bluez4
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		# systemd-login isn't necessary for non-native, but the rest of systemd are; not changing it at this point close to a meson port
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use elogind && multilib_is_native_abi; then
-		myconf+=(
-			--enable-systemd-login
-			SYSTEMDLOGIN_CFLAGS=`pkg-config --cflags "libelogind" 2>/dev/null`
-			SYSTEMDLOGIN_LIBS=`pkg-config --libs "libelogind" 2>/dev/null`
-		)
-	fi
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	else
-		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
-		if use elibc_glibc ; then
-			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
-		fi
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index f9cf7bfed190..9385518bcf3c 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,11 +2,9 @@ DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.5.tar.gz 1783582 BLAKE2B 4c2154fad61705811d2e2135bdacc7f1e31d499ea65fbbb044896ba37cfde9ef4cd925fe7cc390c5611fb294d57a7297c7e54c76b3d69505c9b595d47259ad9a SHA512 fe45097bcd5aa9754c612c52cfba7d06d14185e18a75e5ae2a257733159f0288897e4f60d147e164f4bcafcd23978e23a006753b2b26e26613809863895cfab5
 DIST pulseeffects-4.5.6.tar.gz 1822218 BLAKE2B def674bb35970ceb2a440acac20ebd5c406ae1691b58e8e8cdee3f0eacc7077daf989bcd94a962a1ef1054bc81f68108fd445adebb32a96940a91306025d72a2 SHA512 c18e4b52c4eff15db40c398b0a60b7b2e7a069142552a9801d0a580f52145d8b13b4507a9d37aa49919bbdc144b85b3f02e140aca671d9dedfb521ed34dbc99e
-DIST pulseeffects-4.5.8.tar.gz 1826469 BLAKE2B fd19eb0c96b478eefd3d21c94887c8403d3b3c26b9e9e3850782565655994c25f45ccd4a4a119bc16b2299f299578a09499279b927ba9a5dc7a605b27c847dbf SHA512 4fbe59e034051b29e34eb3afba2db84a789c4f0ada8e26ee341f855c16417be7d29445bb8b5119796bc333a76714c2f450358c7d6ee1852420934b91c7ba86b2
-EBUILD pulseeffects-3.2.3-r1.ebuild 1508 BLAKE2B 8de30d74bdd807b2003c54cce7752f05fe60c10a4ad52c0d2180f926cb1f4af94844b9afb99b6cacdd776521d093acc72fe2f181a54175373fb1c2b767134634 SHA512 cef02bea9f8006de5bf33c2bd25528849f3addcc6409672f6ed8753ee621aedd0f985e45a33c2ddcba429305e71df8a2b3fa4135fd163913c36e25b0ac25b5f8
+EBUILD pulseeffects-3.2.3-r1.ebuild 1563 BLAKE2B 0228023ea1073377071fde4a8ff29f64d0cecb278443131b2b0e96c190be3cee576a7f46e8ae9c293c2c0a1ff4ba0e64cb2c3e4a26bfa36da29ffaa10eb3f6ea SHA512 542c6256cada65c39c22f7066b3f0520faaea3a0426c1baf91e21587793202df5561a4a30d07ff44ec5d77b7d83cb1dcaefc32eca350dbed3cac36780db782e8
 EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
 EBUILD pulseeffects-4.5.5.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 EBUILD pulseeffects-4.5.6.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
-EBUILD pulseeffects-4.5.8.ebuild 1774 BLAKE2B 949e7481e96674e3a62570eecdfd6542a6d92f65fe35a9c8077e1ab37fc76717e94b65c78cae2d382f5d872e250374449d83613a3e004ee4fab1a18e62302d67 SHA512 d6fe05ad2ead861c6d0a6008e346be0634687261374f23402d029fba3b45c5f40ba1df3906b3ffe37f36d710316eb339769351e44926bbcac1e825d1797038c3
 EBUILD pulseeffects-9999.ebuild 1766 BLAKE2B 713fa0e42ff237787f2a24ec1ce2cca7709fc7fb0ef5f74eb380c60d52fc48ccd20988a27db109a50c0096212f41309230f3670a86fdca534f0c6907773d363e SHA512 68ab10d1d9bebd863d768829ad949345e482bac4e87622d16113f31c7d583094a93afd5e393a740bc8b7909526636b31f24b7b8337b192d9f8c4497230c41cee
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
index 54b3db05c075..e410210bfa05 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ IUSE=""
 
 DEPEND="
 	${PYTHON_DEPS}
+	python_targets_python3_4? ( dev-python/configparser )
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
deleted file mode 100644
index c45904327f5b..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/lsp-plugins-1.1.7[lv2]
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? ( >=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-BDEPEND="
-	>=sys-devel/gcc-7.3.0
-	dev-util/itstool
-	virtual/pkgconfig
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 9f51b5a9a789..ded84293f8e8 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -1,6 +1,8 @@
 AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee36963683c7004ef1039a7a45a935844b99c59072860227111eaf19fb0a75e1a17826867d8e2fbd0d131ecdc194d6ba7294d SHA512 158eb436d801d555ca5a481375553fa456d44c16f6bf706dbf99e6837f96c001bc2654405b7b5f55ccaedddee39ae4b44526eb05fe3f165ba9ea55518bef93c1
+DIST qsynth-0.5.0.tar.gz 260537 BLAKE2B def589a1cfb76517fa34811fe75a8379043d7e0f9fc661dd456b49414042662c3a3b8f57e2d0de5fae99cbdb60062b12d9b73b93032115648b9a21921766fbeb SHA512 3c7026edfef3115fae8e2167bb961f5e32d886c8d75b3534a3f110d921264cd270953145a4737f9d6660c55fccce81d7306ec0ce4064df6e7226598b52399298
 DIST qsynth-0.5.3.tar.gz 269252 BLAKE2B c496063ba33bc78a65d63151871e841f9d3938fe03049655da3c124fd495c592f9c726c479062c3fb2d1561e4dee3284d12b04e04a51ba06e20d297b6e84ac0f SHA512 15632274e5822f5e1a49bd332c5d8b7e59a54800ad32510f425f06b4557e474d5479bd531b45fc43af20535017a656fbd9469d318940931912a56ea1856dc117
 DIST qsynth-0.5.4.tar.gz 268106 BLAKE2B e7e17c1427cbb6105fc6fbaa511325fcfbed0d06e28374e3b9fdce14a633e6554267339bb1ffe2bf1f16fbebf38095ae02eca86d74412add3a1e16d191cd1e45 SHA512 711b18efea3b4050c567f2c549ab4f44525f53de42c6cfea379260e62966215e6d59432bed946733c7e772d691edb739a882de753cf3f46b932833de7b120b7d
+EBUILD qsynth-0.5.0.ebuild 1271 BLAKE2B b8bbfd868583056ced958ac07010ac886d17e2a502230fa56a8eb832e5b355e80a59745cacbead86144b5607046e1154cf7e03e494038528dd074bcaa7b5b3dd SHA512 6d3c40d98862d8031fd97953e5fcf84dcedebb8f3dae93f344939c7028bc39448270ec3ab5f54cdfc5176de74ec855897b3a4e31e5dc931734c2e05b1b205382
 EBUILD qsynth-0.5.3.ebuild 1328 BLAKE2B 61f84dd2f5da070ed3c18c93e0b0c111673998326f25ec0816126a5bcf5458f4d78932e2fe40735bdb5ceb936b3abf0a1f209d297d5bbf6f07949798874494e9 SHA512 53bee67b1ca4be0d938be720fcb6b4d6a8fe1be52345b61349729d5ff19c85d8cc2f0e5de57f8d0cadf02d47f7852d6509ab67a13a0ade3618b85e01024438bb
 EBUILD qsynth-0.5.4.ebuild 1306 BLAKE2B 49f580815944ad797dd264781e8d58c222338cd4c162556246941e1e8d33f1d3370b3846fc78df2c2d09dff712c1e27235c6e3b9bd1aecc68bb6503a18446e63 SHA512 12595163c9f3a1ea7b7fea0a93a933cdbeca42976a8f56fcb13cd40d382de90f270ba3404d3c9c87a0d42cdd161e03ba6d61f24a8a4c60e5f449c1b530852cfb
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.0.ebuild b/media-sound/qsynth/qsynth-0.5.0.ebuild
new file mode 100644
index 000000000000..cea03459dc6d
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.5.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic qmake-utils
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug jack alsa pulseaudio"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-sound/fluidsynth[jack?,alsa?,pulseaudio?]
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+REQUIRED_USE="|| ( alsa jack pulseaudio )"
+
+PATCHES=( "${FILESDIR}/${PN}-0.4.0-qt5-tagging.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	econf \
+		$(use_enable debug) \
+		--with-qt5=$(qt5_get_bindir)/..
+
+	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/rplay/Manifest b/media-sound/rplay/Manifest
index c232178bd5f8..ef443c15dce8 100644
--- a/media-sound/rplay/Manifest
+++ b/media-sound/rplay/Manifest
@@ -5,5 +5,4 @@ DIST rplay_3.3.2-12.diff.gz 25322 BLAKE2B dc66fd94076e7ac3ffe863db98b326ce0272bd
 DIST rplay_3.3.2-16.debian.tar.xz 25456 BLAKE2B 34c69d95c964465a04681d7cb4c1a66b34d486e540486d1b47d9590fb893e574381405c15a48bfec272f3b566f5b3ab6ce88806497f8d1533f441cbf9481a3a8 SHA512 8d5db7862267fd0ec7f27896b6a76708304e54b9f2c8a52621c0a92c4688511e07a7820b2468c93032dab15f27f5dda1f8931e35d95e724501e2586a5851486b
 EBUILD rplay-3.3.2-r1.ebuild 972 BLAKE2B 894346d8cdc7ea39a3f7e69e92b3a3645df8848699be6258518b2b1a28e1605e1a9febf8cd7384003dbde0dcdfe799ec8e8cabc3781316e5e09203a7fbf13762 SHA512 d9dc52fe82472426e6d8217003fd0d46bf4dc4af7b57fb67b7356821b39604be10a5429973606b62e0949c60b030df2e5ff99e9c0249e53d27ec962a5f0d5bfd
 EBUILD rplay-3.3.2-r2.ebuild 1125 BLAKE2B 24522fbbbcbb42cda98f1692853708beef98a42fc50f998aeae58bd8234bdff1f75fa34fef2412e71044bbbbb3d4b8275416c110694a5bb1c3ec6b2427d2cc40 SHA512 8b949b1f97bf29b94cc9eac103a1cb365bee26da8f3dd91f2c6ac187cf0254366e36bf062d95fe0cef79dee0f3797faee54342430ecd3719c6e3c22fceb73785
-EBUILD rplay-3.3.2-r3.ebuild 1219 BLAKE2B eff8616537fc314a29a3df8048854c9a3bd2cf9fa025e0fb13a14e970b28f901f95e69f6b99cc121c53a9110c259fd64eca89813e07b05c9dc5b8d2e531f4007 SHA512 687299901457889f9d6dcb56099ea0dc73c73578c22c9378f36b1e48335441e521af5d7260e54c8a93698a7788e315f10ceb301e4f48071274faff0aad0290d9
 MISC metadata.xml 602 BLAKE2B 12db89459ab4cc0696d1c6ede006c6f0365854801e2a67ae060fe0a807fc8021d5d4c0b992ee1adc21951bba7aaf5734aa7c4742feff563d8b009322f58cc5d7 SHA512 2133c5096ee010c0470667238f9d600c4617b9659615b3302abd81eb7b4b84107cfe9efa2070d5536d91aa11a90be1865703cdd5f92d0ea1f8718336a65cb272
diff --git a/media-sound/rplay/rplay-3.3.2-r3.ebuild b/media-sound/rplay/rplay-3.3.2-r3.ebuild
deleted file mode 100644
index f94e25893517..000000000000
--- a/media-sound/rplay/rplay-3.3.2-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools user
-
-DESCRIPTION="Play sounds on remote Unix systems without data transfer"
-HOMEPAGE="http://rplay.doit.org/"
-SRC_URI="${HOMEPAGE}dist/${P}.tar.gz
-	mirror://debian/pool/main/r/${PN}/${PN}_${PV}-16.debian.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="media-sound/gsm"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${WORKDIR}/debian/patches"
-	"${FILESDIR}/${P}-built-in_function_exit-r1.patch"
-)
-
-pkg_setup() {
-	enewgroup rplayd ""
-	enewuser rplayd "" "" "" rplayd
-}
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	mv rx/configure.{in,ac} || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-rplayd-user=rplayd \
-		--enable-rplayd-group=rplayd
-}
-
-src_install() {
-	# This is borrowed from the old einstall helper, and is necessary
-	# (at least some of variables).
-	emake prefix="${ED}/usr" \
-		libdir="${ED}/usr/$(get_libdir)" \
-		datadir="${ED}/usr/share" \
-		infodir="${ED}/usr/share/info" \
-		localstatedir="${ED}/var/lib" \
-		mandir="${ED}/usr/share/man" \
-		sysconfdir="${ED}/etc" \
-		install
-}
diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest
index 3f49e1211d8e..093bcfbd3131 100644
--- a/media-sound/soundkonverter/Manifest
+++ b/media-sound/soundkonverter/Manifest
@@ -1,6 +1,4 @@
 AUX soundkonverter-3.0.0-deps.patch 471 BLAKE2B 083b379ce0e3ecda5723095f5aa865a9bd88251bd522fab0420710864a288468d9230466d8908ed5ca2ba76f5523021530bf0e4791dd677f3e2a4c3b38806443 SHA512 936bbe4b157b5a0a500678b364889c6e080652c03fde19243111a866e8bfa58cd5edcd2c62ea997becf9ae3391f666b8011a56c9e82fe2b5942e28f9a742d542
-AUX soundkonverter-3.0.1-fix-add-dirs.patch 936 BLAKE2B 93d19df6f74c46b5b5755c85fd548cbd5e654be6b0fbc1459db90358ce129ecf6f1afbe7b15528551e227edd61ffc4f6156c311f30a0939968b1dad86f86f7aa SHA512 2d692e3c304706b0cb135299da6d31ab1fcac352b055725e577435d44321f04ece3309ddbb3f9568dc11a85528348522cdc637ed195e7ff1c5e0710e85b1d513
-AUX soundkonverter-3.0.1-metainfodir.patch 1033 BLAKE2B d2c845bc2b5fc18ade9b7d689e291e088fa53c11d400fd1b598e74fd9da83e7082e406949722846013c413743ed672e40089ba0960086f3dcdeb2c8a2501f8b7 SHA512 d16314f12179a0caf9d09489c4dd838f814c468185f0c7bcb0eadc3078be4eedfa5ec0f76025216b3750cefe0b5a75039e645936e58a827ba10d6503442fec9f
 DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911
-EBUILD soundkonverter-3.0.1-r2.ebuild 1547 BLAKE2B dfa49893b5daa640d15c9b0a2f8cfa2fe1a13f993b97e2b9a17cbfd076c669578f58a9244b088050c6c4ff63526038685eb9735e64cc70d286691d87c63a3a8b SHA512 b40b601e4c3654254df386af3eea1bd6e1e778992058770a16214a32518af17cc5ea95a05416b9539ff56e8bddf5ab426a925995dfd9034039e68ec7182441d7
+EBUILD soundkonverter-3.0.1-r1.ebuild 1531 BLAKE2B 162a9c595ae9c111dbeca6e5a9994763f440ba8bd82c459f6a33fa0e97d83ebff313527b67729ed51b88b537fc69ccdfbe9a88bf5e7271a80abfeda9ffc986f4 SHA512 801f8ffe7148b433b4ca1d6aece1866bf73cd23f6d4e99ca144e2178f887eecb97a95677ad5ae1cdc9fdb2d7c161f1710b7cb0342c2b19cde211d6d2393a3003
 MISC metadata.xml 363 BLAKE2B 56ccd083e2b002a49f00ede22967d7c35a2ad7d765200a668876993780b243c30b8c77f162432c750e0f23b7f1310491854b7b070a426a518ccb47410a19d12b SHA512 e84860f5f638b72aa6ddd10eb3b0dcd2f9f8acc00b31fb31718454665ab808f65262b29258ae44517bd091caa5c0f328d678cd9b98652ec0aba80d0e2227f044
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
deleted file mode 100644
index cc5a584b5e0c..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 16fb09fcbd5712b7b75004229dbb74f85f213b53 Mon Sep 17 00:00:00 2001
-From: Daniel Faust <hessijames@gmail.com>
-Date: Mon, 6 Aug 2018 18:35:15 +0200
-Subject: [PATCH] Fix adding directories to the Replay Gain tool
-
-Fixes #70
----
- replaygainscanner/replaygainfilelist.cpp | 2 +-
- 1 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/replaygainscanner/replaygainfilelist.cpp b/replaygainscanner/replaygainfilelist.cpp
-index edd64d0..3df5d58 100644
---- a/replaygainscanner/replaygainfilelist.cpp
-+++ b/replaygainscanner/replaygainfilelist.cpp
-@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi
-             if( filter.contains(codecName) )
-             {
-                 QList<QUrl> urls;
--                urls.append(directory + "/" + fileName);
-+                urls.append("file://" + directory + "/" + fileName);
-                 addFiles( urls, codecName );
-             }
- 
diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
deleted file mode 100644
index cae51b5790bc..000000000000
--- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001
-From: eclipseo <30413512+eclipseo@users.noreply.github.com>
-Date: Fri, 7 Sep 2018 18:15:43 +0200
-Subject: [PATCH] Install appdata in /usr/share/metainfo
-
-appdata file should now be installed in /usr/share/metainfo.  /usr/share/appdata is deprecated.
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a0e36de..521d0da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES
- install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
- install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
- 
--install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
-+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo)
- 
- add_subdirectory(icons)
- add_subdirectory(images)
diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild
index b930b9c11d26..3dea21807b66 100644
--- a/media-sound/soundkonverter/soundkonverter-3.0.1-r2.ebuild
+++ b/media-sound/soundkonverter/soundkonverter-3.0.1-r1.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 inherit kde5
 
 DESCRIPTION="Frontend to various audio converters"
-HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter"
+HOMEPAGE="https://www.linux-apps.com/search?projectSearchText=soundKonverter
+	https://github.com/dfaust/soundkonverter"
 SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -38,15 +36,14 @@ DEPEND="
 	>=media-libs/taglib-1.10
 	media-sound/cdparanoia
 "
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
 	!media-sound/soundkonverter:4
 "
 
-PATCHES=(
-	"${FILESDIR}/${PN}-3.0.0-deps.patch"
-	"${FILESDIR}/${P}-fix-add-dirs.patch"
-	"${FILESDIR}/${P}-metainfodir.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-3.0.0-deps.patch" )
 
 S="${WORKDIR}"/${P}/src
 
diff --git a/media-sound/specimen/Manifest b/media-sound/specimen/Manifest
index 1b5884b1cb3a..f5f9845290bb 100644
--- a/media-sound/specimen/Manifest
+++ b/media-sound/specimen/Manifest
@@ -1,5 +1,6 @@
 AUX specimen-0.5.2_rc3-jackmidi.patch 1075 BLAKE2B 1160f005c78fdb575695b73ca5e81e45c6312a9f3c928ce32f097b8d96075ed012610420872aaa247bf39c28ad1cdd27dde23582ba2708269b9576f5c7127326 SHA512 14f223e0f19cf0697529048f60b84324689983e5b2799d235e0257e2fdfe1e2698e2bbe5a32a90c372300f70869f4cd1f460d3731636a3b45f9424e3add3f2e5
 AUX specimen-0.5.2_rc3-underlinking.patch 2324 BLAKE2B 41887cd863ba7c46dd64e63a70affd945450d93ae4a0f762ee2abb9577a98956ceefc776be842799e3e46f09d80fdec9fe937ae0149e974733e1c4c347ac4f31 SHA512 012c0c08c2706ce11a97fb5a8919b9d72287119658a57151648aa7adf24b22ea6d552d18b4584c68a5077e236ae7653f8c54eaafac7b698015b5e93d9f5d587d
 DIST specimen-0.5.2-rc3.tar.gz 267948 BLAKE2B f7a19c80cfe03730a9eae56ad213ed79555bf0da80bafdc55b29a9316e2cf37e6178d0c452d13f6c6a3cdf700ec8e844c21b86dff32f4eeec305534cd00f8dd8 SHA512 0fbe298ef9652b8f8535fc4382ec71457c882a7fb05412cb1621e7aa566a293b71f4a2600eaaa4336093ec73b9dd6bb53371565ef0f02d7e400d497718c384f4
+EBUILD specimen-0.5.2_rc3-r1.ebuild 1026 BLAKE2B edf02bb07b940394506cfaf1301dab17f44496f8a3ef2cc314db58ab8660d4a530147ad26d0ddd6a20b38966b84ece624ed9206ddaf62c0ecb3257cee9fc30fc SHA512 b0698454918e4e97a78e5e6cca4e59e5a76d96d26930d6ad87041059104373727db38b48057498fdc526f76ddb7dc941874536dacc7fbabbf024e6fd173d509c
 EBUILD specimen-0.5.2_rc3-r2.ebuild 985 BLAKE2B 0596dbb939e955938638d7ac4833c7fa6cd42c23079e31ad2bdac3c6f780675c5d487900d5d3c112f3294680a0b37dfd926346363fd3d499e91df14ac9d6661c SHA512 00c2065f36a1a14aefbf7c04a477a516b65d736a8f3ecd1d00f6ba931220a6b35cbed06fd8cb19e11eed1b690ca50b2a51029cbdf641043a4062296b5335777b
 MISC metadata.xml 469 BLAKE2B f079f7fa89d407784fc4c2503b933a1f2313349babbd0dc2cc373407dc92d650d6067f0203a88d5e390cd4ea21402e9b3a66cb86899978430dd7e47f4228b217 SHA512 ba825914f15f4a5451e943a8973361ed42cd2206c589fd087b1e5b4ae5b797c428fa47ef2ef6f0229b242bcd8f02a90bb5f0a01779e1bb0495cd0f8a5dd86335
diff --git a/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
new file mode 100644
index 000000000000..e96807b02ab6
--- /dev/null
+++ b/media-sound/specimen/specimen-0.5.2_rc3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="A Midi Controllable Audio Sampler"
+HOMEPAGE="http://zhevny.com/specimen"
+SRC_URI="http://zhevny.com/${PN}/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE="lash"
+
+RDEPEND=">=media-sound/jack-audio-connection-kit-0.109.2
+	>=media-libs/alsa-lib-0.9
+	media-libs/libsamplerate
+	media-libs/libsndfile
+	>=media-libs/phat-0.4
+	dev-libs/libxml2:2
+	x11-libs/gtk+:2
+	gnome-base/libgnomecanvas
+	lash? ( media-sound/lash )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-jackmidi.patch" \
+		"${FILESDIR}/${P}-underlinking.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable lash)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS BUGS ChangeLog NEWS PROFILE \
+		README ROADMAP TODO STYLE TODO WISHLIST
+	doicon pixmaps/${PN}.png
+	make_desktop_entry ${PN} Specimen ${PN}
+}
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index c392e8ecce3f..be566e56d65e 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.7.0.tar.bz2 8631710 BLAKE2B c18acc1a0755ba86aaafdd0d1b50f5f56085c5ab2ad12d3a701de2d90ff2bfb741cb81efa66843e282fb934d718f8d11d8bf8ee8fda452314a6969b93f4cf3e8 SHA512 74b6ab1685aaf5b5065a346129eb329b87aedd36495442d17c2f6bacaeef2e484e7b811b279a26a8993054026aeb81a9c1907fa8b580ad87d8ad630fe66be3de
-DIST teamspeak3-server_linux_x86-3.7.0.tar.bz2 8491441 BLAKE2B 62691579e248bbda23041887beb7395df37dafd0417f291928eb000b2b43ed755704ac8e6c340d9dab9abaa1a9b7f4cbd1b299010296b3d76d8a742890810a56 SHA512 53d420c82ed78d5d1998e278080ca6a204a5191e4f3f2001a3fc67c69a0f6ff5f2b2f32667632ba87d9ebefd3996618a3845467879f27cfd63284dd5eb940ddf
-EBUILD teamspeak-server-3.7.0.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
+DIST teamspeak3-server_linux_amd64-3.6.1.tar.bz2 8523183 BLAKE2B 1b6bd2850547ae6f86f348c988660ceab3786c16ff920e433b2e942ab2b995f8e2b9814213bddf012762cb540e2c10cc12641408e7528f9e424984f84e900104 SHA512 185559df9129b61322b7b0fda4c021e0bbfad0eecacd78c45e9467a29cd2eb5a822bed214312255f641869b4218c93931b6145fb17acacda7eab23bca5a9a8fc
+DIST teamspeak3-server_linux_x86-3.6.1.tar.bz2 8391111 BLAKE2B ad11dfe38b99db314ba73799a94fd047cf07a9f33990a0bcca99490af8cb1a4c054d3722c3bde634545f1e922d67f1d6bba57e03029f57d0999d1164f99240c4 SHA512 ca693e9bb2d6b4f994ac0934621ec9050e5b985fd34c534677754cb37a4586aa2e6ec78dea440bd919f8dce18acd238befc54d6aa73829eb94f2536ff3050ef7
+EBUILD teamspeak-server-3.6.1.ebuild 3063 BLAKE2B 13c327003913aedacad85326a3782077c8fbeb22f9fac8311b11754f01b5c05e664fb8fae1f31fada242c578df1ea88893923d5544dc2cdd3fd7ad19412c6257 SHA512 c5bb099281f5176d16209988c98b363be7f78d466bcfd285a096079c9c78c7ba4357a5162bb750a57058644f36b8e17c8662899793a98b8e76b35f5ef13fd691
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild
index d944f47933ef..d944f47933ef 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.7.0.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.6.1.ebuild
diff --git a/media-sound/volumeicon/Manifest b/media-sound/volumeicon/Manifest
index f8e85422efca..01c9242856d2 100644
--- a/media-sound/volumeicon/Manifest
+++ b/media-sound/volumeicon/Manifest
@@ -1,6 +1,8 @@
 AUX volumeicon-0.4.6-glib-2.31.patch 649 BLAKE2B 1d9605a0cd6e122a6f38e6d056233264fb1f25261fb4111e17e5f09e0c326fb55015b6804fcb6166bedb7947304615214f2ac87c44695a92e70db8addbc06a6e SHA512 6b11df00cbe09d5152a111dc3788e2f9acae83879cb81277265c5ad727e454f00014aaa9d75d0cd1ffe402a2a85801fab9d3ccce1399a8ba1bc5752997f0c65b
 DIST volumeicon-0.4.6.tar.gz 136769 BLAKE2B 3044843571052b9e543279435e090d81f2a675495c4563458141327a6a542ea65dd8323058beec1ebe80fbb42ac5a439b39c95ea5b63cb4ec0c302fddc6b7833 SHA512 f5b649a113270a417046532ec9b80e738afe1275ce919a8a7adafbac05cdf58f9454a5386d3304cce652a90e63bc5297fa8cd5b369e0f1149c898483cbfe2f71
+DIST volumeicon-0.5.0.tar.gz 160089 BLAKE2B cb91924d5058edaf21897d58f1df4dbda200e30142f57d22e3e22ce7ddb87cc7bd6538cd339d1b985d839f51f7845dc59648c17762c77c34bb387839c72432e3 SHA512 26c4973a600495886222920e6eea80a7d54ebecf9b9fa46dea6808e25bf3b5edc5b37ff0740da270e77faac687d2151d8cc53259b356e17ce99ed0e38b7fbe38
 DIST volumeicon-0.5.1.tar.gz 172401 BLAKE2B 6638ef0746fff8eab8e4ff80698793ec8cc5ac2152cbe52f61cd06041c3f5f9e690818f885e362009354a768e46d157fc6a82389e87024cc0cd072ec3b50ffe5 SHA512 a96c79f91a8a0ec96f3297af659cf738547bb33e5908edb6b499bcc5081c61339ceaccc3a854a2f953a6f177fe6d8be1578cacab522d8be63a9dda8cf7c7a452
 EBUILD volumeicon-0.4.6.ebuild 774 BLAKE2B cfddaabcfc08da4f95d45e739f1d12ea6925ebe51b7bfa8805f8631685a7ddad9454835de5ce9bd8526646fff0f814cfc5f8ac8c9ae0903e300450cedb69b148 SHA512 0d8635e822f5053b0cfd1ab15e045eaa787d179fe7311145cc839b437507ff88304e55e185a5ce78a510f0af25e677f2e6a35b0045869457334dd8b3f813b33a
-EBUILD volumeicon-0.5.1-r1.ebuild 679 BLAKE2B 3362b68ecb4f07edcdc8b95bfbaa397960bf701b43b173bb354a33c4fe38ca755161ae1c4d84242f05c4c3dd0af35b504770d5942d2a44e7cb8e8ebc1f32f5e2 SHA512 4292196484983b2e5af79b36a1863d49cdadb34608a85eab4e230e4126835dc9bf28bbf08ac8283078c01b4cbe3ffb923a651ee76b7c0f6bdb3fcd0cb687f828
+EBUILD volumeicon-0.5.0.ebuild 695 BLAKE2B 19f5be2f32aaa75caad99c6bf2ef099c45e065a4e5fa928a7a35e6e10b9f0319c0972563cc913de21b16f4ba36f84e9a8c4436fff6a99ed8029a74153d023a4e SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9
+EBUILD volumeicon-0.5.1.ebuild 695 BLAKE2B 19f5be2f32aaa75caad99c6bf2ef099c45e065a4e5fa928a7a35e6e10b9f0319c0972563cc913de21b16f4ba36f84e9a8c4436fff6a99ed8029a74153d023a4e SHA512 6430deeadbe230e172f245b2df236dce7814f5bb65e0752bf0e9cff2c68b2ada2929a3d3286223f275f286409744f9423312e1f84e5e6ea3e3acd7e7fc5720c9
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
index 5f3deee45511..cce7ca83a323 100644
--- a/media-sound/volumeicon/volumeicon-0.5.1-r1.ebuild
+++ b/media-sound/volumeicon/volumeicon-0.5.0.ebuild
@@ -1,29 +1,26 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=5
 
 DESCRIPTION="A lightweight volume control that sits in your systray"
-HOMEPAGE="http://nullwise.com/volumeicon.html"
-SRC_URI="http://nullwise.com/${PN}/${P}.tar.gz"
+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
+RDEPEND=">=dev-libs/glib-2
 	media-libs/alsa-lib
-	x11-libs/gtk+:3[X]
+	x11-libs/gtk+:3
 	x11-libs/libX11
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-"
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
 DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog"
 
 src_configure() {
 	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
diff --git a/media-sound/volumeicon/volumeicon-0.5.1.ebuild b/media-sound/volumeicon/volumeicon-0.5.1.ebuild
new file mode 100644
index 000000000000..cce7ca83a323
--- /dev/null
+++ b/media-sound/volumeicon/volumeicon-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A lightweight volume control that sits in your systray"
+HOMEPAGE="http://softwarebakery.com/maato/volumeicon.html"
+SRC_URI="http://softwarebakery.com/maato/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libnotify"
+
+RDEPEND=">=dev-libs/glib-2
+	media-libs/alsa-lib
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog"
+
+src_configure() {
+	# $(use_enable !alsa oss) fails wrt #419891, is likely only for OSS4
+	econf $(use_enable libnotify notify)
+}
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:44:59 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-24 17:44:59 +0000
commit	0706fc6986773f4e4d391deff4ad5143c464ea4e (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /media-sound
parent	aa3411e241a201d53a2689766fe419f2756819f3 (diff)