gentoo resync : 18.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-18 18:16:17 +0100
commit: fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree: 326613a08f25851c388715e205576a2e7d25dc4f /media-sound
parent: b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
64 files changed, 1509 insertions, 200 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7a0dbfd7698e..1ec1e0d8383b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest
index 913890772670..9d89195878f1 100644
--- a/media-sound/audex/Manifest
+++ b/media-sound/audex/Manifest
@@ -1,5 +1,3 @@
-DIST audex-0.95_pre20190112.tar.gz 177973 BLAKE2B 3d0ee2d227c073f4f60fe11745fc2e6f8a9ab63a07991d2fb94257f3c804231b6c7a305afa438a4d44e5733fb5b78be87b7ad516e3adcc8aaeb0e1f09c729e80 SHA512 445b254643802da95ca653c14947e8d304826b24cdc0a222f6b023e6603c3bb8bc940ad44ac09d8d8edd24ab0ed6287ff3def79dad07d6b6a157b2baf230c811
 DIST audex-0.95_pre20190721.tar.gz 179903 BLAKE2B 4260130eba3b1b30e94b0af5535beed6ce73b2a1a46ff91fd808f7d224b363474e02ef6592ac6136361b871cd91a7a4371faad6769f1ab74bd21d1fd2d793876 SHA512 3eec37e3396408c0ce753ed4c315830e542f3ae17fc4000b3c790be22ed74208bc2a956da4248250932e5b7fceac11802d731cf4d65709c207521bcdbaed5957
-EBUILD audex-0.95_pre20190112.ebuild 1145 BLAKE2B e752067cb141345f1c5da5695054607406d2327e99ecee7f6a6ff4048bc18d35967f25fc9c97c1a297086408993d65c8f38f2090bc95a305274e0ce4b6339a90 SHA512 76e8c67c6890e707cc15ae2f90a45fd4e47adda66d816479ce0552861610df1f8fbd46908db0e0121729ca65ab5eb7734536ae97fe21c0effd67bf502db0fc6f
-EBUILD audex-0.95_pre20190721.ebuild 1145 BLAKE2B 4851479de9aa03a36cd51466778a7d70e51a75b1b8d23e4640b4b0e64b5607d98dda2955bfef707d87d0f2d325da09c7d3cae46be2ca548b09a7fb21f1a1ce96 SHA512 d7d6b977e975f4fd155f7d9f12f33b7a034ce2ea6e3fb94022ad2d2054d85b4ac0b24a6fe2529fb14c2ce300cc454adca567ff1cfdc86da82242127d35c8f2c4
+EBUILD audex-0.95_pre20190721.ebuild 1143 BLAKE2B 9bef8e8ce523e764a954eaff6b359b4cc5e7c86d3611e534c3c0589f260e9c504a21a616094f9afa1b2f15f88a7b08cd9a1b492c4ca130ee62390f7e017376d5 SHA512 5e3bd65fabd4f7ff970d98e216dbb050d66ccf0b046caa1f41b3a65bc586971a58791d93c77a32fdebf307988878ba76ea1933dbc203a019b19f2959ea7f56f6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-sound/audex/audex-0.95_pre20190112.ebuild b/media-sound/audex/audex-0.95_pre20190112.ebuild
deleted file mode 100644
index 19b551c250d7..000000000000
--- a/media-sound/audex/audex-0.95_pre20190112.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="9bb62f34878ede3104802709c154b7b244925970"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Tool for ripping compact discs"
-HOMEPAGE="https://userbase.kde.org/Audex"
-SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-sound/cdparanoia
-"
-RDEPEND="${DEPEND}
-	!media-sound/audex:4
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
diff --git a/media-sound/audex/audex-0.95_pre20190721.ebuild b/media-sound/audex/audex-0.95_pre20190721.ebuild
index 877d451e4adc..e35263ea42f3 100644
--- a/media-sound/audex/audex-0.95_pre20190721.ebuild
+++ b/media-sound/audex/audex-0.95_pre20190721.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://userbase.kde.org/Audex"
 SRC_URI="https://github.com/KDE/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/bempc/Manifest b/media-sound/bempc/Manifest
index e517f20d99d0..a265ba471b03 100644
--- a/media-sound/bempc/Manifest
+++ b/media-sound/bempc/Manifest
@@ -1,3 +1,3 @@
 DIST bempc-0.11_p20160207.zip 237795 BLAKE2B 80ccfa052fd5c41ff948e99cfef22a767a0788de7addec482804c1d28304c48deaf64ea2d43ead590675169e9f0574793c14e072c58056108df4c5aea964e284 SHA512 8e8d85db3d9c1ec9dce5f4a5f3bfa9981a2ff9b7f80abfcf38958fe36ac843c3c6f7dafa27a018899d4d4376acb910ac779b9a9dd6e1e95cd9cc1f9db0bc4a5e
-EBUILD bempc-0.11_p20160207.ebuild 1196 BLAKE2B a6e10b6aae63f9707759c9b606ab18c854989e11b95d23a83e0c86c8bb4f841c6c39857d60b9175a5aa3f7a8d5d45eb730e65b85b7003bbc7b103f0d3f703c87 SHA512 8560dd8b1ea3c721748ea5bb3e1c97c384374f6136a0bc59a5fbc42616671ad52228b55d1c0d645fe1cdb4137c85395dfba163424f5d3cf50b934dd4e5902204
+EBUILD bempc-0.11_p20160207.ebuild 1210 BLAKE2B 00575c2a4663aa35b3c9773a9dc9f2385a9a67779cd2ecde9330b04013af87e7a01860b0fdb6894d0ff20244374ee1c60f2c84f0dbea9fdd36d7a7fad84f39b0 SHA512 aa9fcc237ea990b729460b54a06cda9f537087b72c0d2daa3582327d531b22040471e2c851cb9febbed90de9418fe0f5032b554190ff2a07e751c8964b8e649c
 MISC metadata.xml 255 BLAKE2B 9f51a02d2acccc5f1267f6e68121a58bbd29caff66ec55599ee1e2f7736a3bcc0dc899ebc9b11309282fcfdcaf6976076e18c80bbb1704de335a7bf827924768 SHA512 dbe33cd3f3bcb9830184753a5662fe66b8522ac7fce91d405601fd5a475c370d0b88b8dcefbe7d6fd921c8c7829b8d441db483cf5e7fc02aa0f91f1bb19db4cf
diff --git a/media-sound/bempc/bempc-0.11_p20160207.ebuild b/media-sound/bempc/bempc-0.11_p20160207.ebuild
index d0cee23dcc87..e00f76310b78 100644
--- a/media-sound/bempc/bempc-0.11_p20160207.ebuild
+++ b/media-sound/bempc/bempc-0.11_p20160207.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,9 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-libs/libmpdclient
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+"
 
 src_unpack() {
 	default
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
index 6f0e7c8530f3..00bd8d08018e 100644
--- a/media-sound/denemo/Manifest
+++ b/media-sound/denemo/Manifest
@@ -1,5 +1,8 @@
 AUX denemo-2.2.0-find-guile-2.2.patch 1667 BLAKE2B e8a3de848748888c2534d5515ad08945489d482365690b346568b79c1553f04eaf12990bcc32e1c6a955fe342bcd7dec6bd00b906448f1cb8d18c59c2f69bd22 SHA512 09f999ccd4b0729029ba95644c7c9070cbf94dde87b6c85d8c96e5db5f37d248936b9f0d682cf6bd0479b8b869d45ef5b2b91e83203fedc66f4896dc389cccd6
 AUX denemo-2.2.0-no-portaudio-fix.patch 842 BLAKE2B f832666fe59970efee9e8fee090ec8e4d7be20c17d83a6c5143d5e0153b2eb458d7467e4d41b29fb0681480b9261e6cfae62bbaa870c15e1988de00e5bb1c484 SHA512 5327119813e734308e874392297fdf6d9b462be13d34df01f4e97c529c0c4140c3b3ae7ee06c53c2adadf307d4c60e14417a154226176b664fc26bba12028c4c
+AUX denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch 2407 BLAKE2B d29bf9a7792a4b212124985367c8cf1c6ae5d71682e4474a3ebe1c8c9602565ba4b908156d4bdd4db2b2745c627903034a5f7f74cdecfad4b106b4685e8bddef SHA512 6fc4ece49940d0f4beaecd0c2f218516e0bac14979fbce1ad25454b5075fc5eb29873c93ff3930c7e6214643a47bbe55408ad258859f973a0b5717b67456340f
 DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
+DIST denemo-2.3.0.tar.gz 17322118 BLAKE2B b15d0d7b01b50c903c0f2064198fdf258a84a63965c7ed09e8d146f2c35581bca8f62ee4e212579fe8811099e49dde33e32045b7af6c542d98e9193a6a81bf5b SHA512 dbfbe25e0e6c7bbdb3e96d6a31dab3409937451738644ff199d075d7c647b0c88ee8cb61efb71b03aea72fe80780665871962f0ea1aa152e704040d03833604f
 EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172
+EBUILD denemo-2.3.0.ebuild 2923 BLAKE2B 2a4f7562ad164b6035a168f57371163465b77222d834bb7822ec1f9e172817793c717d9e6413d5640303f6b871c6aa9f5199095bdf721d6d863db812006cefb1 SHA512 b45cfd04366e27a88811b17665269168988c28d98fa4cae6563abfd75547f84d8a3a4bb76714e28f871958d47c3459d7cf39c944999965508f164e96b7194719
 MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd
diff --git a/media-sound/denemo/denemo-2.3.0.ebuild b/media-sound/denemo/denemo-2.3.0.ebuild
new file mode 100644
index 000000000000..6bc0a16e9940
--- /dev/null
+++ b/media-sound/denemo/denemo-2.3.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools xdg
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# configure options currently not used:
+# --enable-mem(no) memory debugging: needs Electric fence (efence), which
+#		is not available in portage. See https://github.com/boundarydevices/efence
+# --enable-gtk-doc-pdf(no) doesn't work
+IUSE="alsa +aubio debug +evince jack +fluidsynth gtk-doc +gtk3 nls +portaudio
+	+portmidi +rubberband static test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-2:12=
+	gnome-base/librsvg:2
+	media-libs/fontconfig:1.0
+	>=media-libs/libsmf-1.3
+	>=media-libs/libsndfile-1.0.28-r1
+	>=media-sound/lilypond-2.19.54[guile2]
+	alsa? ( >=media-libs/alsa-lib-1.1.2 )
+	aubio? ( >=media-libs/aubio-0.4.1-r1:= )
+	evince? ( >=app-text/evince-3.22.1-r1:= )
+	fluidsynth? ( >=media-sound/fluidsynth-1.1.6-r1:= )
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/gtksourceview:3.0=
+	)
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/gtksourceview:2.0
+	)
+	jack? ( virtual/jack )
+	portaudio? (
+		>=media-libs/portaudio-19_pre20140130
+		sci-libs/fftw:3.0=
+	)
+	portmidi? ( >=media-libs/portmidi-217-r1 )
+	rubberband? ( >=media-libs/rubberband-1.8.1-r1 )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	gtk-doc? ( >=dev-util/gtk-doc-1.25-r1 )
+	nls? ( >=sys-devel/gettext-0.19.8.1 )
+"
+
+REQUIRED_USE="
+	evince? ( gtk3 )
+"
+
+DOCS=( AUTHORS ChangeLog docs/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-configure.ac-patch-to-find-guile-2.2.patch"
+)
+
+src_prepare() {
+	sed -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' -i pixmaps/denemo.desktop || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	myeconfargs=(
+		--disable-gtk-doc-pdf
+		--disable-installed-tests
+		--disable-mem
+		--disable-rpath
+		--enable-x11
+		$(use_enable alsa)
+		$(use_enable aubio)
+		# --enable-doc does nothing for itself
+		# basic html documentation is always being installed in the
+		# /usr/share/denemo/manual directory
+		$(use_enable gtk-doc doc)
+		$(use_enable gtk-doc gtk-doc)
+		$(use_enable gtk-doc gtk-doc-html)
+		$(use_enable evince)
+		$(use_enable fluidsynth)
+		$(use_enable jack)
+		$(use_enable nls)
+		$(use_enable portaudio)
+		$(use_enable portmidi)
+		$(use_enable rubberband)
+		$(use_enable static)
+		$(usex gtk3 --enable-gtk3 --enable-gtk2)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# make check fails if used with parallel builds
+	emake -j1 check
+}
+
+src_install() {
+	default
+
+	# link html documentation installed in /usr/share/denemo/manual
+	dodir /usr/share/doc/${PF}/html
+	local f
+	for f in denemo-manual.html denemo.css images; do
+		dosym ../../../denemo/manual/"${f}" /usr/share/doc/${PF}/html/"${f}"
+	done
+}
diff --git a/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
new file mode 100644
index 000000000000..982ccfade868
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.3.0-0001-configure.ac-patch-to-find-guile-2.2.patch
@@ -0,0 +1,80 @@
+From 9a515060df9024ef64bce2055fd3f2ceada5efa8 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 14 Aug 2019 13:51:32 +0200
+Subject: [PATCH] configure.ac: patch to find guile-2.2
+
+The patch uses the GUILE_PKG command to find any installed
+version of guile instead of explicitly checking for guile-1.8
+and guile-2.0 but missing guile-2.2.
+This patch was already provided to upstream with denemo-2.2, but
+didn't yet get accepted due to not being able to compile the
+Windows version with this patch (cf. http://savannah.gnu.org/bugs/?54821)
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ configure.ac | 41 +++--------------------------------------
+ 1 file changed, 3 insertions(+), 38 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f85b74e..1fc0af0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -30,7 +30,10 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_YACC
+ AM_PROG_LEX
++GUILE_PKG
+ GUILE_FLAGS
++CFLAGS="$CFLAGS $GUILE_CFLAGS"
++LIBS="$LIBS $GUILE_LIBS"
+ 
+ AC_PROG_LIBTOOL
+ 
+@@ -63,44 +66,6 @@ AS_COMPILER_FLAG([-fdiagnostics-color=auto],
+ 
+ AM_CONDITIONAL(ENABLE_GLIB_TEST, [test "x$enable_glibtest" = "xyes"])
+ 
+-AC_ARG_ENABLE(
+-  guile_1_8,
+-  AS_HELP_STRING([--enable-guile_1_8], [use GUILE_1_8 @<:@default=no@:>@]),
+-  [
+-    if test "x$enableval" != "xno"; then
+-      useguile_1_8=yes
+-      PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
+-      LIBS="$LIBS $GUILE_1_8_LIBS"
+-      CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
+-    fi
+-  ], [ useguile_1_8=no ])
+-
+-AC_ARG_ENABLE(
+-  guile_2_0,
+-  AS_HELP_STRING([--enable-guile_2_0], [use GUILE_2_0 @<:@default=no@:>@]),
+-  [
+-    if test "x$enableval" != "xno"; then
+-      useguile_2_0=yes
+-      PKG_CHECK_MODULES(GUILE_2, guile-2.0 >= 2.0)
+-      LIBS="$LIBS $GUILE_2_LIBS"
+-      CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
+-    fi
+-  ], [ useguile_2_0=no ])
+-
+-if [test "x$useguile_1_8" = "xno"] && [test "x$useguile_2_0" = "xno"]; then
+-  PKG_CHECK_MODULES([GUILE_2], [guile-2.0], useguile_2_0=yes, useguile_2_0=no)
+-  LIBS="$LIBS $GUILE_2_LIBS"
+-  CFLAGS="$CFLAGS $GUILE_2_CFLAGS"
+-  if test "x$useguile_2_0" = "xno"; then
+-    PKG_CHECK_MODULES(GUILE_1_8, guile-1.8 >= 1.8)
+-    LIBS="$LIBS $GUILE_1_8_LIBS"
+-    CFLAGS="$CFLAGS $GUILE_1_8_CFLAGS"
+-    useguile_1_8=yes
+-  else
+-    useguile_2_0=yes
+-  fi
+-fi
+-
+ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.30])
+ CFLAGS="$CFLAGS $GLIB_CFLAGS"
+ LIBS="$LIBS $GLIB_LIBS"
+-- 
+2.22.0
+
diff --git a/media-sound/exaile/Manifest b/media-sound/exaile/Manifest
index d768a673e32c..033cfa9beaff 100644
--- a/media-sound/exaile/Manifest
+++ b/media-sound/exaile/Manifest
@@ -1,3 +1,5 @@
+DIST exaile-4.0.0.tar.gz 3635774 BLAKE2B 91a5a0a4b8f3c55ec1c8f6487f30bbc8193b1e8b861bbc4bf3cba18dcef91c8a58c937e7a581378eec9da518565826c35e55b7ab157b7ee4634d36cd71a85c4e SHA512 50ab8ec7a65dc431f2bc71a302d21e59ac3d5939b89a90ec161527e1d5c0b80b8c396f8f323b2959e0b807f577e021863fe423bf26a8f7165a6dd112afca6e45
 DIST exaile-4.0.0rc3.tar.gz 3627782 BLAKE2B 1c986309798d4cb78969a7443e4c29e02ca3a9c8e316264641ffafe97dd46b6a1745988230c13469ce2d9c37aadf7b07eee5bcd5836f33b1b2d25e3ebb69f574 SHA512 d3822a7d88934c90a2856074f177a346b19896ecca54f33e7506d37a0b25170983c057feaae162c2685780e7f0d1a6edc8ce7addbcc04cacf2d2b25e0c9f36de
+EBUILD exaile-4.0.0.ebuild 1811 BLAKE2B c62c2eed506ece4a3fad27f6261de1eb0a9b04ce9364b076342fcccc5b5b75dc3761301095bfa80aad27ba87b051d6b1893c7f604ba9ae1a922bae1111f8ac9c SHA512 aadd4278b8dbf4baa484df7959101371b92e8d48fff122142b385a77a3f8ff5f7e5ff8976864c153adb10821e9fe756ad401503734064b3b61394b94f74e593f
 EBUILD exaile-4.0.0_rc3.ebuild 1862 BLAKE2B d8ba6122dffff7ce1e40d26e14aaf23515226498f6e7c2af96764da0bcc64d2b73095a3e999219764c0423ffd3a30dcdd8077955e230887ffe75a5ae12e015f4 SHA512 2eac12361e1f281e88c1473442f5810bd22e9d32685ab177884bd3d38182cb81458a6efae41e0da3cad058b6678761bb1f44aa4c606344b02027b27fbb63839d
 MISC metadata.xml 465 BLAKE2B 1524388af85ca2f4b928ad4670fa8cc2a86a69f51d72c0dc0a755ca22a05ec95587bab11cfa9f10c9f65cd9a4b08c91ec1fb445f69f9163f54b4a86e2fb99746 SHA512 4185b5a40189086940aa0139e953f39d0af627af73ef2c34f77727e7b8ce596f6f69350531cc7b85cbea4968b7b4413f923f9eda61738a8e1c1dee3b85809942
diff --git a/media-sound/exaile/exaile-4.0.0.ebuild b/media-sound/exaile/exaile-4.0.0.ebuild
new file mode 100644
index 000000000000..304677b17949
--- /dev/null
+++ b/media-sound/exaile/exaile-4.0.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit python-single-r1 xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/exaile/exaile.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${PN}-${PV/_/}.tar.gz"
+	KEYWORDS="~amd64 ~sparc ~x86"
+	S="${WORKDIR}/${PN}-${PV/_/}"
+fi
+
+DESCRIPTION="GTK+ based media player aiming to be similar to Amarok"
+HOMEPAGE="https://www.exaile.org/"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+IUSE="cddb libnotify nls scrobbler"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/bsddb3[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	>=dev-python/pygobject-3.13.2:3[${PYTHON_USEDEP}]
+	>=media-libs/gst-plugins-base-1.6:1.0
+	>=media-libs/gst-plugins-good-1.4:1.0
+	>=media-libs/mutagen-1.10[${PYTHON_USEDEP}]
+	media-plugins/gst-plugins-meta:1.0
+	>=x11-libs/gtk+-3.10:3[introspection]
+	cddb? ( dev-python/cddb-py )
+	libnotify? ( >=x11-libs/libnotify-0.7[introspection] )
+	scrobbler? ( dev-python/pylast[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+"
+
+RESTRICT="test" #315589
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_compile() {
+	use nls && emake locale
+}
+
+src_install() {
+	emake \
+		PREFIX=/usr \
+		LIBINSTALLDIR=/usr/$(get_libdir) \
+		DESTDIR="${D}" \
+		install$(use nls || echo _no_locale)
+
+	python_optimize "${D}/usr/$(get_libdir)/${PN}"
+	python_optimize "${D}/usr/share/${PN}"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 3eeeab5f5d0b..d206b92cb2ba 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,5 @@
 DIST fluidsynth-1.1.11.tar.gz 634566 BLAKE2B ed135533c9e3e807794e0eca8117d430aa299b8772b2b6c85f6233e7e497d69f43381d9c7cf2de5ce8638f5dc616339bd28cecc3cdc23408bf5883a0b14fee79 SHA512 ad7c634426b29e5a05d67addf32d43a9ccb11a1fe3cfc09ad617416b9df3dc99a48191377f5027232521380737dde2d9b59833516d1bffb90f410bab3bbe140c
 DIST fluidsynth-2.0.4.tar.gz 1378042 BLAKE2B 0fc75ea68169c47d64bdf727b8d78e311b36cb04509832f449a52d05e085908bd1ef837dd4c5e23edc25286b8ff3fdf69a9d042520c8eb2a3234fb929bed8de5 SHA512 d58ddc5f4da9bb5954a82749617548ef32edd25f6ca5c6d5c2b06d23090784ec175d2422553a66776f543c6b253f037a6cf1e717a853344ffb899fa53752eec0
 EBUILD fluidsynth-1.1.11.ebuild 2193 BLAKE2B 4d66cef4db9220271baa5dbf8d1577e80b78fb568490cd52d2ce6bf58b3656a983be6c444a6b798b7563273c54f27a7e4dd937f1e692389fc768edc524a719cb SHA512 4f3925eb3aaf0ecf92f9ffc3435331c3f81588a46632de368d17eee9a4bd37f282772c962956882e46879526e4b79e3b7a38ee9cc0ce9302e32e96e16bf80431
-EBUILD fluidsynth-2.0.4.ebuild 1977 BLAKE2B c99f1ff4f843f464d5539c8886121ff937c95c9f600cb242495525149f466bf4a215643032fefbbe9564f60f351fd7c2d1de60acbbc757ef6005229807555327 SHA512 83ff51c2c8ea1cee7f1e3376e53d2d4007975972ce0c4a831f42ebf44928def1999d8e7e7335cefb9343a99cd566feef49e93dfa2b62bb187497f00461c075ef
+EBUILD fluidsynth-2.0.4.ebuild 1970 BLAKE2B 6f9833e43b733a366eb3e7f3b32defa96378e2a88635d43ef6b2df2f9528d9a3914ef8b232db9e17f65134e5dc79e1d6e6159a6b068e1f98fc64f170a6a43759 SHA512 6c48d02f66896260659c9d139501cb181fb468d3f4b7e4f43ffa45e3035d61194362c70db099a96b3f7713fdc415a78b92b1f2c25d8c951be18a7f790c99ecf9
 MISC metadata.xml 339 BLAKE2B 4bc7678ba8ccc3e97a79dda9294b31ffc1950212619ace448def22e50852b20e3b716368d9c5b7127aff381aab85d7fa104404fcd409144452855a4b5d41b529 SHA512 abac43fa8ab39fe41adf6c34a4f0e3aa605dbe834555b2eac4abcaadb6556cc08555197aadc43e51733cf8d4e30c7f7be3efb724536d54604069055836a36980
diff --git a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
index 6d956183e8bf..e2c18dbfea28 100644
--- a/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/FluidSynth/fluidsynth/archive/v${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash oss portaudio pulseaudio +readline +sndfile"
 
 BDEPEND="
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index a09195d7b764..5c2a18664eb1 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-music-3.30.2.tar.xz 3027580 BLAKE2B 9cd5a10fecbf7fb962455bec7ee5392a305f3bab9ebb3e2f0d24066ffd6975377c57a722e850ee340e2990f61b06456f1fe963b80d57030416af7ea3b7f92b32 SHA512 b9fa33ccb76d747e22e1144b2c77dc88432386fdfd4f52720cb1ae3230c06fb899fec654dc1e126103e393eb0358a4385099743abe26505b9b7dcffe2d04a8c8
-EBUILD gnome-music-3.30.2.ebuild 1930 BLAKE2B 13988a73d9e75e80595c41881a7a0fa339786fa0cc14d76da1bcb084db6be7f70a580712a482aee543967f2b70576f067ba6cf28e5d3f9e64acb156162de1a3c SHA512 656e1a91687791a5ff1254285733e6b5ff6538c10b8eb3b3148781db3c0f4c2919591db2896260d502f1cf9cb397708761c903111426582e7e8c64300fb6d8cb
+EBUILD gnome-music-3.30.2.ebuild 1937 BLAKE2B 318b6ad95b725e1a88d25f7ee310f69d2daa0ed3e7df19f633bea2682005f0f9bf779aa50e9c083be718ce4d0f1836cdaa0f48ed3cba433aca98cd9d4dd0387e SHA512 3dd49d5f04478be68708e628ddd6e584c3fc57c4d52dd7d76f2207685c282b85b204e8b14f62ffe642d3a3ed7dd5746b330b354ef6c9dba0bb95b8016dcf45c7
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-3.30.2.ebuild b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
index a47833a7bf95..c6dba4f8ad4d 100644
--- a/media-sound/gnome-music/gnome-music-3.30.2.ebuild
+++ b/media-sound/gnome-music/gnome-music-3.30.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # At 3.30.2 libdazzle only used from .ui file, thus introspection not needed
 COMMON_DEPEND="${PYTHON_DEPS}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index a9ce68ddc5c2..bdfbff9ce019 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
-DIST lollypop-1.1.4.7.tar.xz 455536 BLAKE2B 1c8c07fcf4f428f1ff04ff9bbea927b337ac35359e05c7675aeed6f48c0ebe68dc14f1e9bae22a3dafb3122df75f0cbae0bdf6fae0f097add6a1b8669697e624 SHA512 2b0868080ae78a5718f7169bc4c11fe603d030f505644a5aaa342ee50c5a19a567e79094b9abdf8f87e117bb551bcff522e0b0e2bf3cdb9a0cb9319c498b7b16
-EBUILD lollypop-1.0.12.ebuild 1366 BLAKE2B 76d3c0beb3b38f86ce5c68f3f1ffd5fb9bd8becca0ecd60fc45cd288f2b8945f2de0cbb630cc493fb8051ef589b6e7568279fda523448e6804eabdccf0e98023 SHA512 d6a6592473fd8ade16b8a13baa11307fd4ad9eda4889612d535a0b88b566366e8baccf380c7ca97686a46d839df5463756aa14ee5065f4ac75af616c9e5130a1
-EBUILD lollypop-1.1.4.7.ebuild 1367 BLAKE2B 7e9a894858b3fd35eeb1f4cc67b2a5211f6e46638d1ce213b091ae0ab085dbbccb1d657e907e0e96f676040918dc83f39e145ba4ac1f11c2f135cfec7eb1fc5e SHA512 830eab6931698a1763e828b1c512122607b4b563bc30f1089ae25037048439e65b9bd48e34474fdf0aed10531f72c1a8e994c9da33383c60becbaea9493ad7d0
+DIST lollypop-1.1.4.14.tar.xz 455404 BLAKE2B f7b3f781af5b5a5a070b1fabf288056209a02cfbeafd1b07fdd54a74a28c77d716907eabd90ba1dd7c3571c7eee82aaeac5a9f6d151b30e1c0ae7d5c9bb40ca5 SHA512 868a1183b030b207f3ffadd8788d4dec97ff16a758b0752b9d366e2d04138f5782d682ee7794d263a4412e276f1eaccb13e821546b8b35fc9900c66c40219662
+EBUILD lollypop-1.0.12.ebuild 1402 BLAKE2B 59520ce1f04d7248a2193f6f2b7206995ab1c2bd76c407ed23c301aa0ac4e3df011070c53291ba6b155214351fbe0cb53a0754394c7ab8c79ddb906ab994ef43 SHA512 d6270ceb393b89098522143716916b0e0c1418b87ff50dbfd22a3f7aff4699f40c14be0786c77e598727a0df50c0e0839416350c120f09a337bc331fde4dff7f
+EBUILD lollypop-1.1.4.14.ebuild 1403 BLAKE2B 723694a3d546406c3d9cefb45c4964dcfdbbb40ce4f98519b08727a5c2979ee5b5f7c27fccd3773b4f643e155b982a1616e25625e4f6a8a75afd3499ad0064cb SHA512 26fc8a7758218eb480fe9f2c6828becbecb73bfc82714b50c6f45e655e2960635d61c8b24fcac1428d307c4da2f2ee967300119bb05b895a69aacc3ee7b6b82a
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.12.ebuild b/media-sound/lollypop/lollypop-1.0.12.ebuild
index 9da3085b9d7b..4338c0ccce4b 100644
--- a/media-sound/lollypop/lollypop-1.0.12.ebuild
+++ b/media-sound/lollypop/lollypop-1.0.12.ebuild
@@ -15,6 +15,7 @@ KEYWORDS="amd64"
 
 LICENSE="GPL-3"
 SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
 	dev-libs/appstream-glib[introspection]
diff --git a/media-sound/lollypop/lollypop-1.1.4.7.ebuild b/media-sound/lollypop/lollypop-1.1.4.14.ebuild
index 498a26092c46..fe34d473e7f4 100644
--- a/media-sound/lollypop/lollypop-1.1.4.7.ebuild
+++ b/media-sound/lollypop/lollypop-1.1.4.14.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="d11925640e7c0337893933b50d144aae"
+HASH="2ce8e3ae7569bda628da8db822d08df7"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
@@ -15,6 +15,7 @@ KEYWORDS="~amd64"
 
 LICENSE="GPL-3"
 SLOT="0"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="${PYTHON_DEPS}
 	dev-libs/appstream-glib[introspection]
diff --git a/media-sound/loudness-scanner/Manifest b/media-sound/loudness-scanner/Manifest
index d82094854ba7..57bc2acea339 100644
--- a/media-sound/loudness-scanner/Manifest
+++ b/media-sound/loudness-scanner/Manifest
@@ -1,4 +1,4 @@
 DIST loudness-scanner-0.5.1_p20190709.tar.xz 65360 BLAKE2B 122a14b1700e0b971d423bb3c6395eddd49663d8980ecc57dec85cbf45b67ef72b68203b15ac21b040af824b71641635bd72c67b40b0ba757ed536e121c7e3ae SHA512 2160a1dcba92efeb308f65e2dbd32405ad6c9b72355a4161f12579d767757e709c0ffe17df988105210cbb8f05f727f6b143cbe0540edeb8c7c6585b14998fe1
-EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1844 BLAKE2B 6efd5d9f02b98700695a8ec139b88a2c32189959704ce0b88ce42bba596b4113bc43006f53f2ddd251154c6ec506484c2416cc35d6a8bc9088d778387a4d07f4 SHA512 879047d0bfafdf43fe22d50b2f71c6116c8f7a91d23c0cc26bf844d2adc5ab5c46d9d2c5b3dd1027ff39afc3e412b2a87ba7dbf9da472db9fa2573759013650d
-EBUILD loudness-scanner-9999.ebuild 1818 BLAKE2B 238da37078dedb874bf47a42ab43a97d5412bd0a0d260ec105a0520f7d8a3be742ad8981d9c31e63685f1da5c7116edbc35665c24c62e3f9df866cb836bf6d0d SHA512 49154649a0cf33f74d8d751c82c442f94f0e296221817b1fdf1e079cf76da40a0dc148d566f043f80b32710fab812b2ccec7316feb05d983aa5af2641aa564c6
+EBUILD loudness-scanner-0.5.1_p20190709.ebuild 1845 BLAKE2B 2ed162b886b8062458d601ddf00c3ba6dc3f10725e952ff3e26ad4d588ada98b364540c61f62be39632ca691e856a895a28b09acbf3caaac421d193bead05485 SHA512 2367520efe3d9b4a2a300b4b29f64b7a36cfa08ce3a7736b7d72bc47072bedd94b411d0819cc422a92d3aaa34fc7c562c6d260ecf6b8a91373927d25036e1b66
+EBUILD loudness-scanner-9999.ebuild 1819 BLAKE2B 2f35861d3a762858cd11c604d86f0c82f603c4ce862e1e72b5caaa7ea29cbf5f727df3fd35709e5e0b96469b92a5b9c8c2d174ccc19aaf6327fab7cdc8642615 SHA512 1f8feb007fedb8ac5b88bd52864c8b1062002965b8c5636d8cad476dfda4465955fa8bc7e67a6863f26eb1a680128a007250f87aacf38896f02e6541beb6b8ec
 MISC metadata.xml 977 BLAKE2B b68f84774b5494c9735661e858630eefd51bf8fc48fadee3b75237e688c96454355a0e9d728d4c0d919ed1c92871b21f7b9c4e694e9972b4f833f259bf5e8a1b SHA512 d1cfbef820d90d8b38b2baf038b06bd2bcd31c307c42f3edbf79c2d0dea98ee04b5fb30bcfc61b2336767b1a6e1afb6c2dd37cf7202f56a3673767ca471f7c74
diff --git a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
index 6570f3d70fc1..725c5aaa0a45 100644
--- a/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-0.5.1_p20190709.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~tamiko/distfiles/${P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="ffmpeg gtk mpg123 musepack qt5 sndfile"
+IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
 REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
 
 DEPEND="
diff --git a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
index c2e409a5c311..4c6bb45b8be9 100644
--- a/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
+++ b/media-sound/loudness-scanner/loudness-scanner-9999.ebuild
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/jiixyj/loudness-scanner.git"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="ffmpeg gtk mpg123 musepack qt5 sndfile"
+IUSE="+ffmpeg gtk mpg123 musepack qt5 sndfile"
 REQUIRED_USE="|| ( sndfile ffmpeg mpg123 musepack )"
 
 DEPEND="
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index c66a2d2e11ad..e9004eadc92b 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -3,6 +3,10 @@ AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba
 AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.21.10.tar.xz 670952 BLAKE2B efebbd5202b82e52800ff7e4f60fb9e7606e0b07cb157cf0bf04859887316a8466976095bc1cb83479f76f4a54074967ecfd3bbd1bf703e6ff6d5b8ad75a7816 SHA512 42272ab5f767c5a6b907f5dd922ca35abc759dfbb4769a235261fdf0433a0f70494f503255403d41dfd34902bd6aff21f48291b24fd5bc260a5fdef53800c991
 DIST mpd-0.21.11.tar.xz 671444 BLAKE2B d10e65103e9c0c6dfc44f8d4858c202ad68a5e7a44bd7dd473b7f78c697b20ab7d52d2bff0f7e7434ce06b1afb9a68e6f71ca6148efdf51e122c463506b356b2 SHA512 40e25428295f1bded618872c1450f6836c46b2e788dca06d0af134b939a25a7a9a215273bb005306df288e5dc5ccb44d4054c47e5583e54b970fa252e4b030a7
-EBUILD mpd-0.21.10.ebuild 8207 BLAKE2B 89cffe19bb5f8b78bdb83bf1594a622778cbe38004b325ee0c28f8d0947ae31794be22668b9629efd69036343199688ac49f37dc4a3a6d3e8b9ba1135b3b3163 SHA512 a9c9fc5d95f2340a084507028c3d8a861ce97271496e394d397599def16da1372748ce986f5bd163278a8be54a5251509b543f56cddfcab704d91d149d33f43c
-EBUILD mpd-0.21.11.ebuild 8210 BLAKE2B 6d8dc4bfe296f70ee0fade0a0c77059500da0a7e6fc880a329973620d823496519da8b94598757a327966f209c6c20f3f4b30bebcb99eef74849f0dc8984efa0 SHA512 18ebeaedad356600acb15badd8b5cdc3d81708ca3c62505a00fe77aa538c114accd650c439f1ea29ceb9df40cc4b8c34821abfec575bfc091a84b53bf8dc5118
+DIST mpd-0.21.12.tar.xz 672144 BLAKE2B 06eda513314fcb028784115cfc378d0d6482174565ee843a2025af7b2af1fdd7dfadc05b08981e227d11b615aa457f979e80170bc1a91886648f464772240ece SHA512 d35eb7162cfb50c10d57d1d4b035f6c4f7088fb930add97c2159c7b29ab9d7ed33a8b4d22640af78527387305b9f5d380c7c03b98cf957dc1519f772d842e7e3
+DIST mpd-0.21.13.tar.xz 672184 BLAKE2B 5aad54f0d747034f3e43f741ecaeff8317a91192c125a4631e99978f7f9c7274a921a05b92a4496fb53f70ee428321f5ae92f96386e439733c028664d80c4dc1 SHA512 626e658b4d53408be5419ce3a93a19005da5c5386119b241c1572eaaba96a628f941d5f46977de08e1de736eeab6cd6ba274d5df8f1df3e3f4b0df064a6ec43d
+EBUILD mpd-0.21.10.ebuild 8127 BLAKE2B b1b725c5704f4b7ae9eabd50ab31543f1f0893c2377a9eb62acb97109bdac197a898de0597dbc13778932d22a769f613890f1bd3e5b49e55312dd81779f1c8f9 SHA512 61c95152724bcc672d0dbc8597b83802928edefb74bbd6cfaf74735d06683cded78fac33a7bec08de1b5d23e3f8ea6e213e223d2a634e2f67e09d575391ad3cf
+EBUILD mpd-0.21.11.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
+EBUILD mpd-0.21.12.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
+EBUILD mpd-0.21.13.ebuild 8130 BLAKE2B 1ec6da3cd0207ab701ef1571cc2a3ec1711302104eb480b456f0c507c1819f2be28b8e8c6c9913afdc4181bae4b3d25970aab94ab51711aa6f9f865f72e4cd62 SHA512 6ec92a3c7f9d0676d733c3b14fe2c936aacce2dc585f3b6d078170964664add5a2f94ac53a978c6db417cf32791f5af7bf91c4291fe1597c98db3bca1c908c62
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/mpd-0.21.10.ebuild b/media-sound/mpd/mpd-0.21.10.ebuild
index 4199b689d53f..c886ec4ed037 100644
--- a/media-sound/mpd/mpd-0.21.10.ebuild
+++ b/media-sound/mpd/mpd-0.21.10.ebuild
@@ -16,7 +16,7 @@ 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
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
@@ -94,7 +94,6 @@ RDEPEND="
 	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 )
@@ -165,7 +164,6 @@ src_configure() {
 		-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)
diff --git a/media-sound/mpd/mpd-0.21.11.ebuild b/media-sound/mpd/mpd-0.21.11.ebuild
index 969b82d84813..984310bc5363 100644
--- a/media-sound/mpd/mpd-0.21.11.ebuild
+++ b/media-sound/mpd/mpd-0.21.11.ebuild
@@ -16,7 +16,7 @@ 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
+	recorder samba selinux sid signalfd sndfile soundcloud sqlite systemd
 	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
 	zeroconf zip zlib"
 
@@ -94,7 +94,6 @@ RDEPEND="
 	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 )
@@ -165,7 +164,6 @@ src_configure() {
 		-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)
diff --git a/media-sound/mpd/mpd-0.21.12.ebuild b/media-sound/mpd/mpd-0.21.12.ebuild
new file mode 100644
index 000000000000..984310bc5363
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.12.ebuild
@@ -0,0 +1,294 @@
+# 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
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/mpd/mpd-0.21.13.ebuild b/media-sound/mpd/mpd-0.21.13.ebuild
new file mode 100644
index 000000000000..984310bc5363
--- /dev/null
+++ b/media-sound/mpd/mpd-0.21.13.ebuild
@@ -0,0 +1,294 @@
+# 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
+	test tidal twolame udisks unicode vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
+DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	adplug? ( media-libs/adplug:= )
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.patch
+)
+
+pkg_setup() {
+	enewuser mpd "" "" "/var/lib/mpd" audio
+
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Ddebug=$(usex debug true false)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		-Dadplug=$(usex adplug enabled disabled)
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=false
+		-Dsndio=disabled #not yet in the tree
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.dist mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	if use unicode; then
+		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+			"${ED}"/etc/mpd.conf || die "sed failed"
+	fi
+
+	doman doc/mpd.1
+	doman doc/mpd.conf.5
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+}
+
+pkg_postinst() {
+	# also change the homedir if the user has existed before
+	usermod -d "/var/lib/mpd" mpd || die "usermod failed"
+}
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index da50c5ab091f..af1326c78ac3 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -6,5 +6,6 @@ AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
 DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4
 EBUILD murmur-1.3.0_rc2-r1.ebuild 3565 BLAKE2B 4b8282c64999cf70a51fe234d23e0737b2c710984d188c733a97a90109120af9705eb21eef2a66da118043b64b6541fe372cabe92737f0981e5a9760d6cb6833 SHA512 b6fe723f3cf2e6468a47f2ffc0102d54f6fbc7cf374e5e97eaaa7e0853162f0604cf1b0db34e0b9c009f661a09c95ff0358cfd9dbf808ce9238c94b1f7f8ded3
-EBUILD murmur-9999.ebuild 3701 BLAKE2B 28c17e4ef71a4f38835fe66270873494718662321e7138e87c3d03017baa12da60eb5758274ca41b5860be0a13f500ae5b4a3edd735f3077fdf2b3029c88a36a SHA512 29c3ea8aea5c6a3da86d487a90a9fbf0d765ae31a73723e7b585f41fa36a5535605ec0efbbf4f0a3664d5e9bdd614d93cabf1220611981cf3e22acd0d5daa9ba
+EBUILD murmur-1.3.0_rc2-r2.ebuild 3554 BLAKE2B 2df9caa9ae5efbb02bc80eb2f9d109943597a1c6fe1cf532f9f6cb3d9c4c2ef3bfd3f9140f37f92a47983037bc88ac05833a6c64cfbcda89f1d9bebb3d559ff1 SHA512 35e5ced14798cdd79fdea77dd4065d19f6c221e5ceed262a26caca1acb83e3587a162750204eb0b1503063dd13277e871c2fb296e627f81154ff8e8db938ee95
+EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild
new file mode 100644
index 000000000000..bd399783509e
--- /dev/null
+++ b/media-sound/murmur/murmur-1.3.0_rc2-r2.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils systemd readme.gentoo-r1
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_PN="mumble"
+	if [[ "${PV}" == *_pre* ]] ; then
+		MY_P="${MY_PN}-${PV}"
+		SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
+		S="${WORKDIR}/${MY_P}"
+	else
+		MY_PV="${PV/_/-}"
+		MY_P="${MY_PN}-${MY_PV}"
+		SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
+			https://dl.mumble.info/${MY_P}.tar.gz"
+		S="${WORKDIR}/${MY_PN}-${PV/_*}"
+	fi
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	>=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dbus? ( dev-qt/qtdbus:5 )
+	ice? ( dev-libs/Ice:= )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+"
+BDEPEND="
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS="
+	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
+	Please execute:\n
+	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
+	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
+	to set the build-in 'SuperUser' password before starting murmur.
+	Please restart dbus before starting murmur, or else dbus
+	registration will fail.
+"
+
+src_prepare() {
+	default
+
+	if [[ "${PV}" == *9999 ]] ; then
+		pushd scripts &>/dev/null || die
+		./mkini.sh || die
+		popd &>/dev/null || die
+	fi
+
+	sed \
+		-e 's:mumble-server:murmur:g' \
+		-e 's:/var/run:/run:g' \
+		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+
+	# Adjust systemd service file to our config location #689208
+	sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
+		-i scripts/${PN}.service || die
+}
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
+
+	local dir="$(usex debug debug release)"
+	dobin "${dir}"/murmurd
+
+	local etcdir="/etc/murmur"
+	insinto ${etcdir}
+	newins scripts/${PN}.ini.system ${PN}.ini
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	insinto /usr/share/murmur/
+	doins src/murmur/Murmur.ice
+
+	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	systemd_dounit scripts/${PN}.service
+	systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
+
+	keepdir /var/lib/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/log/murmur
+
+	# Fix permissions on config file as it might contain passwords.
+	# (bug #559362)
+	fowners root:murmur ${etcdir}/murmur.ini
+	fperms 640 ${etcdir}/murmur.ini
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index e0d9d8f503ee..6a55b9734426 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit qmake-utils systemd user readme.gentoo-r1
+inherit qmake-utils systemd readme.gentoo-r1
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -32,6 +32,8 @@ SLOT="0"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND="
+	acct-group/murmur
+	acct-user/murmur
 	>=dev-libs/openssl-1.0.0b:0=
 	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
@@ -52,7 +54,10 @@ DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
 "
 BDEPEND="
-	virtual/pkgconfig"
+	acct-group/murmur
+	acct-user/murmur
+	virtual/pkgconfig
+"
 
 if [[ "${PV}" == *9999 ]] ; then
 	# Required for the mkini.sh script which calls perl multiple times
@@ -71,11 +76,6 @@ DOC_CONTENTS="
 	registration will fail.
 "
 
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
 src_prepare() {
 	default
 
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 13ef49809113..8e67610cb1d8 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -1,6 +1,6 @@
 DIST ncmpcpp-0.7.7.tar.bz2 443801 BLAKE2B b0bf1f6264f94fc1d0dce5b7ec8d85607427e5bf8955914fddffd8dec94850e6dd20dd83a966a25353d6ec23a61e92751d83fddec8202d9a843e0ed9e3b32077 SHA512 a0bbe85f154c40513d41e85810de86ed21109b72fb0f2bdb0b78dcbddb3770aff5422b5bb7fbac2b76634c5b9aaf843bed5fc16fc672fcd71bbae911f65c0034
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
-EBUILD ncmpcpp-0.8.2-r1.ebuild 1400 BLAKE2B 3589bbbdf554ea2b8f959eb1ad1debe41f304d1a10b119a35c49a2ac7fb48cf6cfd690fcd1fa1ce51c8a6ba8d3ecd5fbd59d92a5639941a6218b1733f1574ea5 SHA512 540bd9aa529398d2e543f1410cd948e80542630d6fda7d74db1659746e898e22c34b8517be05d977032d3e4a42c749179a533562781b2fd87e731668cd97a635
-EBUILD ncmpcpp-9999.ebuild 1395 BLAKE2B f8a77e9ac893098a5a37b2540832498862125868b59f75082194151bb1f0a503d773011a61f41195a2dc95d1dd6638bab9b90a57f0dd62961131b62d7893359d SHA512 b1a99cfbb6b20a9ebd5be2ef1e088ed3db036bd64ab73d5b398e1d1a6e62a623a57376747dbcd2bf84d469a2ab6f55a5d727335e5b830e151fcb52177352f53c
+EBUILD ncmpcpp-0.8.2-r1.ebuild 1401 BLAKE2B 78592b16a7daf591099dd3a3c0e395c330e6e29ba12ae16cd51101d9b5cdc85c375d1867db68f57456dd726a1e9d043f5a820bcc7394b5d14262f9172991e084 SHA512 4f1564e261ea385669401b9d318d3de00db35f9abc8185a96049994ccba3e5cdabb017afc5474b9dcfdea41f703d6c868152647eb3d71188eb2f28a03110fcdf
+EBUILD ncmpcpp-9999.ebuild 1396 BLAKE2B ff321fc947d5dec8a6b72bfdaa886c1d9749a2d4818d04a1fd5ba8dfd03e52c6e36e001c4d69c78330f89fa38a27969d2c06a98086dd08c46d7a86157aac3bd5 SHA512 23235b975f1d1dc1e375d6c6f3bedc8625430f1ff55d88efa0cfa48acd2e2bfc1b1a386d0df68948f3f2661dbf25fe2cbc9e5191afdcafb7b21949ac40e52c31
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
index 6db57f594392..007f6387ce67 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2-r1.ebuild
@@ -54,7 +54,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${ROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
index f5c7770182d2..7b75299afc52 100644
--- a/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-9999.ebuild
@@ -57,7 +57,7 @@ src_install() {
 pkg_postinst() {
 	echo
 	elog "Example configuration files have been installed at"
-	elog "${ROOT}usr/share/doc/${PF}"
+	elog "${ROOT}/usr/share/doc/${PF}"
 	elog "${P} uses ~/.ncmpcpp/config and ~/.ncmpcpp/bindings"
 	elog "as user configuration files."
 	echo
diff --git a/media-sound/oggtst/Manifest b/media-sound/oggtst/Manifest
index 4effd3522b80..29d7e20354fe 100644
--- a/media-sound/oggtst/Manifest
+++ b/media-sound/oggtst/Manifest
@@ -1,3 +1,3 @@
-DIST oggtst.tgz 19382 BLAKE2B 6af2e7db89e27c5e13d3bc53712631fce2eef78702689b37af3a7a54e32825f95a8b054b82b808f27a2099554c232921ef1f5cefaac962a4bce5dbdf679a6018 SHA512 6ee73f4ff1a0160135583997664eeba75857d1e76ed2e1b5a9be2d30feea064fe6bdd105edd58ad358ee8d9db20f1f3a64fe4b31c6c9dc5bce5241c5ceb2ef26
-EBUILD oggtst-0.0.ebuild 708 BLAKE2B 5c048d2cadffb46f304782505f32e9277383de05b492fc73038dfc4eb8c855cea907e7ba1c2a62f9f52add797b5c8d9f45b1a0c409a63172feff7c6506683a7f SHA512 e22adfc855de13ed6b389779bdad0952b94199ae67bcb70412f82573ca429db9a86611ee218668c632adad6fa88aeb2b96c0c27278e421cc813f7cad1ca0ab76
+DIST oggtst-0.0.tgz 19382 BLAKE2B 6af2e7db89e27c5e13d3bc53712631fce2eef78702689b37af3a7a54e32825f95a8b054b82b808f27a2099554c232921ef1f5cefaac962a4bce5dbdf679a6018 SHA512 6ee73f4ff1a0160135583997664eeba75857d1e76ed2e1b5a9be2d30feea064fe6bdd105edd58ad358ee8d9db20f1f3a64fe4b31c6c9dc5bce5241c5ceb2ef26
+EBUILD oggtst-0.0.ebuild 623 BLAKE2B 240614e7f0e47e393939c3a725cddc74d6a958bc07cc9539d8118b9365e4c0383fbc05c879c3cef240641dddfd67d48cfa294e8a4cddea2b41854b7e00171a7d SHA512 0b43467656fb9f2ba6bdf6c5354ed27ebe838c6c4facbaa898fc3876c29a8cfcb5d25464fb9214e39515902617c85921f3e8c6c5eb5dfa56f104d5272556e82c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/oggtst/oggtst-0.0.ebuild b/media-sound/oggtst/oggtst-0.0.ebuild
index 0a24362b9b13..52a8223e6f76 100644
--- a/media-sound/oggtst/oggtst-0.0.ebuild
+++ b/media-sound/oggtst/oggtst-0.0.ebuild
@@ -1,34 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 inherit autotools
 
 DESCRIPTION="A tool for calculating ogg-vorbis playing time"
 HOMEPAGE="http://gnometoaster.rulez.org/"
-SRC_URI="http://gnometoaster.rulez.org/archive/${PN}.tgz"
+SRC_URI="mirror://gentoo/${PN}.tgz -> ${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
 
-RDEPEND=">=media-libs/libao-0.8.0
-	>=media-libs/libvorbis-1.0_rc2"
+RDEPEND="
+	media-libs/libao:=
+	media-libs/libvorbis:="
+DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# upstream didn't use make dist to create the tarball, there are
-	# unbound symlinks inside it.
+src_prepare() {
+	default
+	mv configure.{in,ac} || die
+	# upstream didn't use make dist to create the tarball,
+	# there are unbound symlinks inside it.
 	eautoreconf
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index be23763eb884..0b9d78045f13 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-qt-0.14.1.tar.xz 94948 BLAKE2B e0bbbaa2410220c0e34ff77cb84c783ba682587311eaf20eca286a142e122827b6294e9d0409f2ea5b18d80c06d822bbaed49d60d1402a4a97b7f7210ee2cacd SHA512 55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494
-EBUILD pavucontrol-qt-0.14.1.ebuild 710 BLAKE2B 38a2c63174e1cb5d61fc5deec8a6940ddbfdb4f605d99eaa48d83498464a69968c13539b0df2c12b9abb47160bcc9985a2e163e27a59d9262769deda2b81c46f SHA512 19ef0dc14229d8a65e6b1314ecdbf7df120075b4a3019f5cb708f20b4878b683c12dff0f2d6c7dae58e199bc525a8686303184175ccaab2152eb15032f281dfc
+EBUILD pavucontrol-qt-0.14.1.ebuild 716 BLAKE2B db27a4a19eb4694b63fdb1b81c7e0f4630c6ac8f76b791d2f39406559e6913c18bac146290cd50f0c6b00ceaba285b0e1c89866d1943de27ef058ab53d67c188 SHA512 f08c1ffaf41cfa5f9d96ec5d72a630a9fc08ac4e7416a12948cd5ea7f463322d8e616ddbf005b7e3ecf2e2b30faddf356e557c422717308abf21d413c2ccb53f
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
index cff744e1b080..7d4e8ea7116a 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.14.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 2a869ced7e47..157e8096ada1 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-3.0.tar.xz 145092 BLAKE2B 3461aaac4228150918effcff04b61f9112c8b12aa61bcce9a82d033c825d7466720a4d8f008ff19d9d8d2ad0d52c6ffd0ee0a2288ce84beb7f30c5f816eb0c11 SHA512 3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 EBUILD pavucontrol-3.0.ebuild 881 BLAKE2B ea25e8863fe6e1ce340db5c1981dea6afa587e7596ba2b4f3992fabb054566117481a5e51ff2b3c6b1171d7971d547ddef228c0035c369310b63ec392f9acb36 SHA512 520625ac6fc823eb12c31210f810b5febff29da6f35c94757c4515fe9828e01381c3be4b1e2881d071515369e780ffbabc55bc2972205ba69e99f8dc9192b782
-EBUILD pavucontrol-4.0.ebuild 890 BLAKE2B 940caf0d5a8ab91e33c3fa52341e6b31f70bbd5097561876de5b0eb8c842600beb76f0213a2cfe0b4b99cc41d8f3cc01f23c24a515f64393f1d7c708308301bb SHA512 7b70d0023af44c52ebc76c29f9acf1778c123878808397efad165e7d2ec7f24f4cfae2c7b3f76063a16e6afbaf2adeec462d2e6f2deb57fc7465ffa5e9cce3e3
+EBUILD pavucontrol-4.0.ebuild 896 BLAKE2B 145ad515e336fdecc116a28206cd64783d8fac028ccee8f0237e822a0ad1fc3a74e513bb7b8d5e2aec43341ddc59a0ed59d640b4d9e6afeea96ca27a0ef80e36 SHA512 56a023fc2cada0bc406f23eba257905b4ee1869c470b50f1bf70b3f2056f8b041faaba4dd327561edcf111fc6f37d3400afeea953d816cda84a4823b46395035
 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 c26203ba7be3..4272b6334cfe 100644
--- a/media-sound/pavucontrol/pavucontrol-4.0.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm64 ~hppa ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index ef79e6d64f25..44e77c08e735 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,4 +1,6 @@
 DIST picard-2.0.4.tar.gz 2759058 BLAKE2B e8a2a5aed7b8c99e31c1765906481432d310fd41fa01a611c7d82b182468cf4bfeb5a5aaab74c96c0971f21af3ba690537212c29c75433296cab6a1a409edf6d SHA512 cdc5f1ddeb84705fc792fb77a6d0ba06a5baf812799054ac0fd4959dfe788009f25b6f89ad0c28720f1c7c85af61534ca4f1e9e8efd6ec3cc78578d0f0b3ab32
+DIST picard-2.1.3.tar.gz 2995390 BLAKE2B dcb81cad62aba7915aeff321775452cef70819194a76530eb96a0a7b0009f7185d7652f77d07bb795b24939a3feb56b73a59d7377574b2c8f09f406ca7a88d81 SHA512 f082216a1a669ba689725c93859116e8a56991861219adb0e7c6ed4e5d621055268652820688de762f55b8672f19ff01afe5ac1ab7f79a640ea381272de9516f
 EBUILD picard-2.0.4.ebuild 1754 BLAKE2B bdccd3bc45d0f800379a38872bbd5667b20f0a32605816e3879efea7619891cb99f72f773c72d9ff1da08bfd9a9209a4fef3a95d2eaa5c7538be57fa26c7f2e1 SHA512 194a79fd4f7f467802e14f2919b647ef98bc34b5b9445a68359db86d9a8db264516411c75ddbe4389a8ea528410da588886c32b750a59016d7db0612cb17afde
+EBUILD picard-2.1.3.ebuild 1625 BLAKE2B 24bcce91d6f62becd6a88ec3f674daabcbd965b22416d89c75a439b485ef78d815a03384e5d5689715375cad7c0ce0b78aa0530e9d1cae9d35de207315ff198f SHA512 0cfe695a8986cd51e075ea0658b2a7a61f65e6c375863f725d2282fe000061359692bb6cdf5be8ec0c20a2a62d22ae08f2b3370e2082580b07a6127155233896
 EBUILD picard-9999.ebuild 1704 BLAKE2B 74df8c8bbde14f9399da4a4bf837d47982244f5f4294c2478fcd2fc2ddee9b2fd905533e74a5930833056f7cf5d3c82f17d2f99d719632b0def87211c0c5dfdc SHA512 8a743c0a66a747387d52b7eed15e5f0e90f2007f5926a87a69162cf0b60fe8a73efbbf9c6be554cb74641162f6959a8e1e3ab41deb971f53b8956707ce5da1ae
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.1.3.ebuild b/media-sound/picard/picard-2.1.3.ebuild
new file mode 100644
index 000000000000..4b01165a046f
--- /dev/null
+++ b/media-sound/picard/picard-2.1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+DISTUTILS_SINGLE_IMPL=1
+DISABLE_AUTOFORMATTING=true
+inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+	dev-qt/qtgui:5
+	>=media-libs/mutagen-1.38"
+DEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+
+RESTRICT="test" # doesn't work with ebuilds
+
+S="${WORKDIR}/${PN}-release-${PV}"
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
+calculation and lookup of AcoustID fingerprints.
+
+Install optional package dev-python/python-discid to enable
+calculation and lookup of compact disc identifiers (disc IDs).
+
+If you are upgrading Picard and it does not start, try removing
+Picard's settings:
+	rm ~/.config/MusicBrainz/Picard.conf"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	xdg_pkg_postinst
+}
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 3b0d64e2a74e..924341b9fb8b 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,5 +1,5 @@
 AUX pithos-1.3.1-dont-try-to-update-icon-cache.patch 584 BLAKE2B 9127f728cd0da41a490fdcaa3c781d9137099507192f9301e6237d7f3b833ccce81429efcf8aaa67c04945cf0af16d47829582968b7d72850446c7ced93fd3cf SHA512 cc30b733388a9dea61ea4ab23c4291c11656a117e0f9aa98e3b286b6698ec38242154da21af9dc840bc697a34a1e604f86e489a2c5d6fcb76ac6f3e1bef750e5
 DIST pithos-1.3.1.tar.gz 119658 BLAKE2B 0d6e1c4e48a4beb1082f8788d4e016371660667dbe32ee925aa4b904f60a25e6664a94cefbc62dd9323a6e69338c03fc4080517e842102fd6eeca144f568c984 SHA512 c06715516992e4aa8bb3b200035ee10ef8dcec9491d32af0fb3f4e176d0ad5313a437f228747d5d716a29d2fe5b93ddd3704aa4fe674ce3be5a17eaad13b0da4
-EBUILD pithos-1.3.1.ebuild 1980 BLAKE2B 52d1da52d54ca9575bc99820df1d82bfc5c5a1315d79cdfd0cef0686aaf0c103347a1caa279f09c2047e666d623716549bba8ed066b2b523b988ad3934392eba SHA512 324040aacc26f47f24ee4b930e8129b3370ee20f34fb691a5a72fab38965f7b44a29bf07a6bd15c8d6638ff785d2214bbf7c53c6a9e0135f32f8c027af415dc6
-EBUILD pithos-9999.ebuild 1975 BLAKE2B ce5d00c0f97d531703caf596639dc19d116f7ab540791ed356fd696e73795cae4116365a316d71be39dba9f16c1f0f87fbe5dc7bb56d4d3c1fb5fa9105fa0804 SHA512 b81a9d87251a54fe4f8cb2c8d6315ea30c596103ff66f4934f9c0b3322b0e673e432e7fc5e45fd3bef6d94f9ee00b5a8a96ae9ba857d3ca6d3b453b681b2c414
+EBUILD pithos-1.3.1.ebuild 2032 BLAKE2B 0e4fdbb9d76ebbbb0a9543607f669b88d45c983e80220031390e59d9021dbaa07fb18d197851045f2be06df6ceeb74b8157160a5db13cf100fec95f83f2f028e SHA512 75dc820f19c9c51f627b395c4f9741313fef219c5c476f9cd158d98bb4dd68ea0df14db7ec23ad79c8c2be408a425cd9c7d0be9d073719be39e8af9cd76aa40b
+EBUILD pithos-9999.ebuild 2027 BLAKE2B f39aabcb215b959a1fe8c82bee8653d4c129cbf1796c13706cada3bd21a8c5fa25fb651eecb131ea6da47c493dc496056529a4fc5d529ca53d9f6b010035c7b9 SHA512 65b119f8b42d7b87596e35ce8c280361951311bcdf243045168d1ec5f1269bc71c66a6f03688bb3c81e0463c2cc0d4fe361f8a336f47cb968e91f9a8ac347abd
 MISC metadata.xml 517 BLAKE2B 4d18a3f149c2ffc3b87206cd67a7d87978f36c9f45f6a99c3240e77458c3c2bee1ee9eb7cc64e22414eded3f44ba5da5cf8a680b16975759b0027e90fcd6e5bd SHA512 1922b0145e076b849061072c03eafe7354bf79ab32d7f2a5bab219db6a9caa92074423c5bf1196b91ff1e183bd8fab2fcbad583f20b02b9916c3e73140a97367
diff --git a/media-sound/pithos/pithos-1.3.1.ebuild b/media-sound/pithos/pithos-1.3.1.ebuild
index 5858dc11c75c..10c9b5c1741a 100644
--- a/media-sound/pithos/pithos-1.3.1.ebuild
+++ b/media-sound/pithos/pithos-1.3.1.ebuild
@@ -19,8 +19,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="libnotify appindicator +keybinder"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-python/pylast[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
index 82dd3227ef64..5aa0541cec71 100644
--- a/media-sound/pithos/pithos-9999.ebuild
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -19,8 +19,10 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS=""
 IUSE="libnotify appindicator +keybinder"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 RDEPEND="
+	${PYTHON_DEPS}
 	dev-python/pylast[${PYTHON_USEDEP}]
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
diff --git a/media-sound/pragha/Manifest b/media-sound/pragha/Manifest
index 5a300d2c2458..9367816d89d0 100644
--- a/media-sound/pragha/Manifest
+++ b/media-sound/pragha/Manifest
@@ -1,5 +1,7 @@
 DIST pragha-1.3.4.tar.bz2 691256 BLAKE2B af1455633a4f9d3c40f6b97051692fa301cfb763d0ca5f03c3ae932513556ff7a6fed5c68cdd3f7e86dbca305598cb9495221e1b2c841f7e1cb56905fa742130 SHA512 65aadf68f427f03ea7ca07d2002806eb94019c8091a80320da7d8ff4c2f0cd912e9c346956188b42d2b7a68c56c79ee5af8e8327c69ad69f4a1fa5b9e3b3ca58
+DIST pragha-1.3.99.1.tar.bz2 804701 BLAKE2B ae68c01706d593defc4ee357e1bdd1e832fb6d6720f723149c752c98f16502e1254553b404f53b40a4e126b647e6de478e7929b7715c0f9815d23b2e62e5475b SHA512 1c92bf7b2d1d1d6b3f8616b1980b60c6c688844d0bf9f80bc86185035a05971f3b8f5aa73d230b01fa5d14e54db38b356df41781e4a5da73b0adae82829c8c31
 DIST pragha-1.3.99.tar.bz2 781892 BLAKE2B 9d73dd2859db0c7ab7ac66fdafe873bd78b019408682828ddd05aa18a1591576df667e326037a7ca28eaed227fcbce943209fad16c9f55bb38c0c2c808275104 SHA512 df032fe16932ad464417306d8d01373b8e415f5f810a06b1baff647a395b10bdee5c912f36a3f6e3ea6a0e04d399257e202112c1838444d23dfc17b5fd34e12b
 EBUILD pragha-1.3.4.ebuild 2310 BLAKE2B 381391dbdcc5ced2d515ec0e9adbce25152d9b578cdeb92290dee352293ba306432c3c96ac26187b6116cc1b1186e1dbb0c32c6be93e30997fdcd9c7f966f884 SHA512 f61ec80c622a9f22a2afb6f03fb1e22e03a16ca20ee738b638b544a0541e5bf27af04772b1596e87197047c69417746982ebf3e03c0d0443e7c3a83a0ef799eb
+EBUILD pragha-1.3.99.1.ebuild 2555 BLAKE2B 660f720cfaf7242633de11a16dcb1ae750cd5e35d42c0f19d35141cfedc5ad9678e7e392ea7f20c760c845d690a218748c3b4d1bc2b96dfc2eb6ed709086350b SHA512 be4b63181f933b56bd48587796508856b57675d10885460109f7bcc432c0f50f28f2e990bcad0c95603c5cc28e1e4da0713acc2941bc311d55243d4fcc4b1b15
 EBUILD pragha-1.3.99.ebuild 2591 BLAKE2B 3ea0da51e0ffe4fee16e69d92e39143666817c9031c037be0fca13de5d457819fa348b0d7258651f67e888d265d9396f4db8ead768bfcd8c4c04f58a06ed50e2 SHA512 d83414ca8e3d34357d9b123dbb4ab19d663ea529f6898437404108d9394b061dde8d1bb0a3219f9a8e3bebe0ff8cfd7973fb80ced341d7955363f8f3d63ff06d
 MISC metadata.xml 1215 BLAKE2B d7a5bf01af7aa7047342f674cc33ee8ad9ea20dd9b0a496f1954830057bc51932530755429d54faa599da6b2817907100057153436a47a731892a8d8f91aece3 SHA512 9700873ef8ee962e9ba0057d8489b22e73ebaf55a6bda1cd58f062167f15f1b8d08e0c9061e45b4fd71040932e394a9006c00a95a944bf45ef7b65d48f922f34
diff --git a/media-sound/pragha/pragha-1.3.99.1.ebuild b/media-sound/pragha/pragha-1.3.99.1.ebuild
new file mode 100644
index 000000000000..c60f3ad27eab
--- /dev/null
+++ b/media-sound/pragha/pragha-1.3.99.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="A lightweight music player (for Xfce)"
+HOMEPAGE="https://github.com/pragha-music-player/pragha"
+SRC_URI="https://github.com/pragha-music-player/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda +glyr grilo +keybinder koel lastfm libnotify mtp +peas +playlist rygel soup +udev"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.4:3=
+	>=dev-libs/glib-2.42
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0
+	>=media-libs/taglib-1.8:=
+	>=x11-libs/gtk+-3.14:3
+	>=xfce-base/libxfce4ui-4.11:=[gtk3(+)]
+	cdda? ( >=dev-libs/libcdio-0.90:=
+		>=dev-libs/libcdio-paranoia-0.90:=
+		>=media-libs/libcddb-1.3.0:= )
+	glyr? ( >=media-libs/glyr-1.0.1:= )
+	grilo? ( media-libs/grilo:0.3[network] )
+	keybinder? ( >=dev-libs/keybinder-0.2.0:3 )
+	koel? ( dev-libs/json-glib )
+	lastfm? ( >=media-libs/libclastfm-0.5:= )
+	libnotify? ( >=x11-libs/libnotify-0.7.5 )
+	mtp? ( >=media-libs/libmtp-1.1.0:= )
+	peas? ( >=dev-libs/libpeas-1.0.0[gtk] )
+	playlist? ( >=dev-libs/totem-pl-parser-2.26:= )
+	rygel? ( >=net-misc/rygel-0.26 )
+	soup? ( >=net-libs/libsoup-2.38:= )
+	udev? ( virtual/libgudev:= )"
+RDEPEND="${COMMON_DEPEND}
+	media-plugins/gst-plugins-meta:1.0"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	>=dev-util/xfce4-dev-tools-4.10
+	sys-devel/gettext
+	virtual/pkgconfig
+	xfce-base/exo"
+REQUIRED_USE="glyr? ( peas )
+	grilo? ( peas )
+	koel? ( soup )
+	libnotify? ( peas )
+	mtp? ( udev )
+	rygel? ( peas )
+	soup? ( peas )
+	udev? ( peas )"
+
+src_configure() {
+	local myconf=(
+		$(use_enable peas libpeas-1.0)
+		$(use_enable glyr libglyr)
+		$(use_enable lastfm libclastfm)
+		$(use_enable cdda libcdio)
+		$(use_enable cdda libcdio_paranoia)
+		$(use_enable cdda libcddb)
+		$(use_enable playlist totem-plparser)
+
+		$(use_enable libnotify)
+		$(use_enable keybinder)
+		$(use_enable udev gudev-1.0)
+		$(use_enable mtp libmtp)
+		$(use_enable koel json-glib-1.0)
+		$(use_enable soup libsoup-2.4)
+		$(use_enable rygel rygel-server-2.6)
+		$(use_enable grilo grilo-0.3)
+		$(use_enable grilo grilo-net-0.3)
+		# avoid trying to use 0.2 & 0.3 simultaneously
+		# https://github.com/pragha-music-player/pragha/issues/124
+		--disable-grilo-0.2
+		--disable-grilo-net-0.2
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
new file mode 100644
index 000000000000..1be30d365307
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -0,0 +1,3 @@
+DIST pulseaudio-ctl-1.66.tar.gz 6633 BLAKE2B ec197571563f8503a0b35a4a3269984e8f53ae0df9a2bcc6a8dcf9a88df8d927634a5c8570a4bb69cc0d36289adfe73ac5b7f2d904790476be83fad3b93e2b05 SHA512 cadcb09781cf370e5280c1fa20bc9d10cc8e8162859a53f0b3cf3d94a50267638f9a454716c07cb4d300de9a3cb1bf6e6950763c2d97a48ba6cb5ac8ec72e8f7
+EBUILD pulseaudio-ctl-1.66.ebuild 683 BLAKE2B 3b29bd3f83c06a94fcee3432bd31960d45bbdfa09e8947bf71ab0e5e4836667ef0a0dea8d897176fe0dd04d537f26e2c1dc893cfa053bd23bccec2350949cdcc SHA512 63d4e67f2acac1baf8eb2f94377cc09b3715e54459cf035444552da5c52f3c171c632110c653295b103205e672c9729ac2ce05f96baaab524925342b5f3edabe
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/metadata.xml b/media-sound/pulseaudio-ctl/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild
new file mode 100644
index 000000000000..56d2816a5cb6
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.66.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI utility to control PulseAudio volume"
+HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
+SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
+# in both cases they should be already present if DE supports them
+RDEPEND="media-sound/pulseaudio"
+
+src_install() {
+	# install-man target compresses manpage
+	emake install-bin PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
+	doman doc/pulseaudio-ctl.1
+}
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index cdac0627d9a8..75d43af04945 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,6 +1,8 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.6.5.tar.gz 1881685 BLAKE2B 25f9fd27f2cb66ed32664aa5aaf6e6a7f0860a4addadd572be7e53c49434c8d57bf1799ccdd5e40546a918b5723a0ce8b34a8d8b337fe3b4c7a16fb8271d9d3f SHA512 4de2c29b723d2f42ed38021f9515be31eba51419833a449f531c9ad130636e8ce31f0207ff5c00d493ea59ed684ddfe236b7e2570fd9e54b005eae494e65a680
-EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
+DIST pulseeffects-4.6.6.tar.gz 1881680 BLAKE2B 9bb1048b3870824d19f72e29da2ee274ed387bea7fae0036a104694defd47f754fda3fa1668a95ddb8c2ea066c457bb469c3c32292dc7a378625c6f19d9339ff SHA512 ed6482169bb06490bbcbc57f293723089e5750279a74d6ec5ba2693cb1a71df88262e6fd7d91c852ba5a75b07c246992f619299017e856fca38ad5c619486963
+EBUILD pulseeffects-3.2.3-r1.ebuild 1542 BLAKE2B b98afac0e18f40b4d50578aaa766cf077b73157aefb380fc766e63cd6e1c43b2ea1026ca30b9fbcdf24aa3d150b6f835664668dded8e025e9b2b4b94c558aacc SHA512 14edbfdc37cebc7bd6bf0b9f1f1ac0217da3df742e52b1762d186274eca7cb05ea953c2289059836417430c0bc528f3327859a4f2c4f8d4e5ff99f2ee2d42d4b
 EBUILD pulseeffects-4.6.5.ebuild 1804 BLAKE2B 440b75afc189ccd5efa34f187de3dd83401ea5d756e8a8bf1fbe6878d1d47ddcf1e0cc910346dbbe34ea3390924d2906c8c91a2733d80b2aca2e0aed5f42aed2 SHA512 49381d15e31c49220443f35b4f31fd1bc46f1c74d4989dc8dbc8f1b635e7ef485d0ba106c1f99cd98c129f60914ede3a7820f692114e40ca4edeacbe8fb844e2
+EBUILD pulseeffects-4.6.6.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 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 bcf96af7cc44..cc5be9c324fd 100644
--- a/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-3.2.3-r1.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 DEPEND="
 	${PYTHON_DEPS}
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
new file mode 100644
index 000000000000..0e6624cf2428
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.6.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 8ad4be8343b3..adce643480d9 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -2,5 +2,5 @@ AUX qsynth-0.4.0-qt5-tagging.patch 372 BLAKE2B 2c0773d24939e103c2741de0498ee3696
 DIST qsynth-0.5.5.tar.gz 269061 BLAKE2B e17bb0ced40764c5bef9ae7c793f7ba1ebfe4edd761f434ad129f338d30384c639f27d697ecfdaa93d7fff52c38bed0a3b95cf51fbdad25e13c14abe795d49dd SHA512 4e90b38d428c6b49a78b648ac9604e683f32623898205abe3a98c4136c5b29ab27c101cf63207dbbfdcba105913de2dcb5cc7669a6433def71d071f39cf68429
 DIST qsynth-0.5.6.tar.gz 269583 BLAKE2B 9b06f7be1aa39addebd0b088eff885bce39c6bc245461b64fe45243306afae8879d4b516bd46c30c2a8074e580e412c38a3c264d647a35ff5c81301703731067 SHA512 752b3ac7e478594ef873b2d1c9fcb1a1dcdd1fb33f34cab5f588f628d1f11f01ecd150c9d51021a41040794b68f0538ad6979751773d5c537f53a1f227b3bf88
 EBUILD qsynth-0.5.5.ebuild 1300 BLAKE2B 82eb320196d3d8646e3a9c8b1ae5fde1ef8dacc586055bd5eb4830b21d38dc26b72de819ccc29ff98509b73e32fb2c4c0d6038f846f3e04d16f4ff9ac5ea0eeb SHA512 0c94edb732c059066ffc3e99ec9250139a6ebdb697868e387c7fdad17e00473f63326048a5f8a9d1072d1026f8e8a9912041d8a2607d5e7e355f5c30a7eb2ed8
-EBUILD qsynth-0.5.6.ebuild 1304 BLAKE2B f1e74ad0d5af54165ac556f9a5d3775d2bf9f8c675d9ef886d99b16c0ab3a73e3075a19d210ee058474ad3f3f2428b8dc7bf4d32e8e031beba5ceee784228616 SHA512 635a03e74fa5eb730bb0ecb007e936db9bd0ad908672dfb68c1964c9bafb88f53d09498db7397351f8ef9d9baeb90b16b96f46a7c6d7193edd8d3fa932153825
+EBUILD qsynth-0.5.6.ebuild 1301 BLAKE2B 433b215e3b3e3f2a8823a597611e98d78bb4f29a00982c48d78eb43ba88ea59054d3b931dec07443fe6985edb2d08db6115a71be43a1a45dfa024ce04064b94d SHA512 ba161548ecd67395bcf9ef33444c1be86eb7c0de64502875d4bff49995147b696559fd54576bccb70a6a272a5af901cfc22f69296e5479cc36bd446eeca80388
 MISC metadata.xml 755 BLAKE2B 34241e79896f3b24f562853d89374480f2c1f5c7a35bf8aaba623d6ee49a93074a1600c7290ffa7bf9147060482cf261962689c46f3f8b7eb38e17ede402c4ea SHA512 25f7c0ace8cd3b9ebe09ff93e9c39169f5345cb583646bcc146ff3b33c2cd4d689b665ae4e19f6ac588f47d5c691bfe3c16f0e67756847c7b45c090e586ab933
diff --git a/media-sound/qsynth/qsynth-0.5.6.ebuild b/media-sound/qsynth/qsynth-0.5.6.ebuild
index e4f0b6bb00dc..2a0bd80ee1c0 100644
--- a/media-sound/qsynth/qsynth-0.5.6.ebuild
+++ b/media-sound/qsynth/qsynth-0.5.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+alsa debug jack pulseaudio"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 BDEPEND="
 	dev-qt/linguist-tools:5
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 13ea0ac48ce7..f1c7689f397d 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.24.0.tar.xz 1019588 BLAKE2B 04ba81aaa2e02fa0f6d7bfc1304be3dd1eb750c324c577b4a12809fbf43fc5ff74339750af3d99e91dc66bb0f0e4e6c33144177421f34258fb13c949a3fd5b63 SHA512 7bd158a4e3a7c3072513fc508f59cd70b6d9371cde142fdb58597e72b3687790b9368fc7e1a35fd8c7b49cb28703f8b2da4a789854f96cdc0af076278818a91f
-EBUILD sound-juicer-3.24.0.ebuild 1488 BLAKE2B 3d9d2d6c4d5acea1076696b4be70e05a9af14941d5313396fd4f573b902479e0678ce653af0b71a9beac3d27ca0fbae862bddac5d414b9881f0f184763d2baff SHA512 29515fb4b45edfad7f5099d4824639aad433a6fdf8fae74e02cd4ed47603f56c0d6a3f833efe99ffb76cc6e3ec8185340e8a33e95be466efd11f018bfd169516
+EBUILD sound-juicer-3.24.0.ebuild 1495 BLAKE2B 88e05d2a4740ee85ea85d2044f2d03d48283040e794b020dc35757cc18ad386135f78a79ed2ed3f3f6a3ef1c82fb6f34cc9d4df48634609cd993d3f205813d33 SHA512 79b3a9d4d61d4213f4f2c2f856f80c34817d1bc8ce0b6854ff353d8a693f3b6cac2105babb1b604f43735388a0d6e21513f2175c8860c134ecbb1ccac7e41137
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
index 859df80ed0a7..a71ee1afec83 100644
--- a/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.24.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="debug flac test vorbis"
 
 COMMON_DEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index e3e447005666..9b5d3537db58 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,5 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.1.10.546.ge08ef575-19_amd64.deb 114975574 BLAKE2B 46da17c8ebccdc889b723ac6e9f5275dddec97d35142606ece32d1edb1ed288d1c517d41027de22da77421a76f8c00ea90ddc868b74dd46ba07cff60a581b12a SHA512 f004083eee00600a51e50d7dee03846293b5ccd6966786e91055564c7963917b9aaa917de41f299a0f5b7baecea5f466fb37722b8631743ff2ca15f43851f5f4
-EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
-EBUILD spotify-1.1.10.ebuild 3188 BLAKE2B 6a20f81c52e9f5232ec672da83d53c8b38f5115421a61fb39f11cdc9b30add11462338abacfea61b8c2ef021431ca143198339d7094edc901eda1ac04c140431 SHA512 5760f276e7907ccb4bc96436a92c8435ef33c97a68621addafe5e97204bcb1b67510d65e8de204ed07e225a4b9e528a0ba72217877ca9b0b99fda148c12f191d
+EBUILD spotify-1.0.72-r1.ebuild 3210 BLAKE2B cd775bd0a132bd9a32e64445f815e42fb271d4f30025b65d33efb6013049005749e60e309daea7031cbe1bbb1afc16fd94f5a12e283d28d3e56051541d60ba40 SHA512 d21a4c6bfa78352f3dc0679373fca05eaef3043c8d77611f9b9c6b789f42964f95492d8e6530f012df32eba364772abd9ce0d25f68ce1205003892beade2db81
+EBUILD spotify-1.1.10-r1.ebuild 3142 BLAKE2B d75a9f42f9c2870d4fc2159bb6a9009fdae9880e8be52b77738bf895805d8d14be388ed349049710dfeffd5a31b5b00511e49983564031022c0a716e6624ac02 SHA512 f2558d039f2e0261d0ff74780e5519001dfdb9612da935a2619c678047b5154f955ccdc4d2b65d229d1191cf1360d4b1db1056d29fe5407e50a818b0bc776b37
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.72-r1.ebuild b/media-sound/spotify/spotify-1.0.72-r1.ebuild
index da0339466e17..ef72a8936d6f 100644
--- a/media-sound/spotify/spotify-1.0.72-r1.ebuild
+++ b/media-sound/spotify/spotify-1.0.72-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	media-libs/alsa-lib
 	media-libs/harfbuzz
 	media-libs/fontconfig
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	net-misc/curl[ssl,curl_ssl_openssl]
 	net-print/cups[ssl]
 	x11-libs/gtk+:2
diff --git a/media-sound/spotify/spotify-1.1.10.ebuild b/media-sound/spotify/spotify-1.1.10-r1.ebuild
index 77cf183a980e..3089e3b8847a 100644
--- a/media-sound/spotify/spotify-1.1.10.ebuild
+++ b/media-sound/spotify/spotify-1.1.10-r1.ebuild
@@ -16,20 +16,18 @@ IUSE="libnotify libressl systray pax_kernel"
 RESTRICT="mirror strip"
 
 BDEPEND=">=dev-util/patchelf-0.10"
-# zenity needed for filepicker
 RDEPEND="
 	dev-libs/nss
 	dev-python/dbus-python
 	dev-python/pygobject:3
 	gnome-base/gconf
-	gnome-extra/zenity
 	libnotify? ( x11-libs/libnotify )
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/harfbuzz
-	media-libs/mesa
+	media-libs/mesa[X(+)]
 	net-misc/curl[ssl]
 	net-print/cups[ssl]
 	|| ( media-sound/pulseaudio media-sound/apulse )
@@ -92,7 +90,7 @@ src_install() {
 		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
 		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
 		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "${PN} under a PaX enabled kernel.	To do so, we must modify"
 		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
 		eqawarn "you suspect that ${PN} is being broken by this modification,"
 		eqawarn "please open a bug."
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index e5a7668cf6f8..55233b291981 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -7,5 +7,6 @@ DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f4
 EBUILD umurmur-0.2.16a-r1.ebuild 2136 BLAKE2B e8ccba8b874014b89991f731abd0c2f1b724c126aeedd6563c4b118efcc630004d3cdd46a122678499f680d4e065f410bf5656e442d8c7ca560b64e05e96f406 SHA512 d65241e668ebb560a8f4ca482374c2d4a3738ee7eb700ae7273bb2c350b5b508678c19b174848f4b59adf3f077a108cca0aaf472fe87947473aac0a7d81251f3
 EBUILD umurmur-0.2.17-r1.ebuild 2163 BLAKE2B 95d724db07bd1f6b6a405a921d21569bcda8f4baa781ef2a6e1c21e167adbc61d9f8dd975caf2f228577f30b7fff4f0a713af3a630313f7b5a5d0a27a7625d88 SHA512 265168d48225f8df2263cdaf37bc665c7f624071a63fe33b9570cc3f5e1ca9121e61923e6e0f07f45f8c2750e6090882752327e1e031b527ceee722a759c5837
 EBUILD umurmur-0.2.17-r2.ebuild 2660 BLAKE2B 60c76bfafedaa36fa4e0d1b5e1119e2601ab2bbabd871e099ed176e154d658497c5ecdb8f8195d9ef664e13240a2b692a44e6fe2d0b4b563a74b8f18e76388af SHA512 772ff1543f1cd79605475a23ce867eebcf4a227df2a3cf96e6fee6421b8290518e8a28bafaa631222704675b296cdad006be9fd8fec928e8c157c3f8c8bb0b18
-EBUILD umurmur-9999.ebuild 2660 BLAKE2B 60c76bfafedaa36fa4e0d1b5e1119e2601ab2bbabd871e099ed176e154d658497c5ecdb8f8195d9ef664e13240a2b692a44e6fe2d0b4b563a74b8f18e76388af SHA512 772ff1543f1cd79605475a23ce867eebcf4a227df2a3cf96e6fee6421b8290518e8a28bafaa631222704675b296cdad006be9fd8fec928e8c157c3f8c8bb0b18
+EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
+EBUILD umurmur-9999.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
new file mode 100644
index 000000000000..d01e6411f0f8
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls libressl mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? (
+		dev-libs/nettle:=
+		>=net-libs/gnutls-3.0.0
+	)
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls )
+		!mbedtls? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+	use libressl && ssl_provider+=( libressl )
+
+	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[@]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 54434dd96ad0..d01e6411f0f8 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd readme.gentoo-r1 user
+inherit autotools systemd readme.gentoo-r1
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
 HOMEPAGE="https://github.com/umurmur/umurmur"
@@ -35,7 +35,10 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	)
 "
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
 
 DOC_CONTENTS="
 	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
@@ -66,11 +69,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/media-sound/whipper/Manifest b/media-sound/whipper/Manifest
index 4814684c2935..7d49c28d3ec3 100644
--- a/media-sound/whipper/Manifest
+++ b/media-sound/whipper/Manifest
@@ -1,7 +1,5 @@
 AUX whipper-0.7.0-cdparanoia-name-fix.patch 2036 BLAKE2B 54d0c70f0ccf89e46607e67d3b1bd3288dc0c34da27d6111df98810d85369c51f953e415a6415c0c08649a2e7fed10cfea77e3a7695f8c4f03445948a8f83c64 SHA512 13edc4bd713409e8fa6d871ce5f9316895edb0156eeed7eef401e72c19f188a8067c45c16a3fe1c3e21209fd8ec6bdf2478e4d4376f210d535993c7ef1575453
 AUX whipper-0.7.0-src-Makefile-respect-CFLAGS.patch 1755 BLAKE2B 5b750690e20230528830a468b34d0a481dbf08af36b1b687121a57518613fabb5b298145b8f2693b21653749b3ed1e185864c6348b0adfb33810c1723fe640d3 SHA512 ccda4c1e97a841d8afec9ed68ccf87371e0883afa7b179010973925185fa58e6a21f4b488dba1891a416c22a8e0ee911318117a059c20989d673c5e5e214c25a
-DIST whipper-0.7.0.tar.gz 160649 BLAKE2B 8e14b6dda00b3c8be7ba0fabb25d1cbca536edc785373986f857bafbc2e54d358f18b27140ffda74384c4e815e68ee466c8fc5e4e5d17aa80c8237fda389ba2b SHA512 b4bf4ca64521d8600288addecec6cbd8e43d1ff9a6b9a60872eff1bd5a2b6966af036d6467ba09273ac78aa01d8cac3be29a0e2c4e6600829b9988a74ef8cd88
 DIST whipper-0.7.3.tar.gz 168393 BLAKE2B b34151ede7c867dbbca34fcec3d8ef81cb50d66abc760fa54bec880f8f1186faf3e0f5298c2890501b9bd2f586b80d2cdc45a0755b6fe12fc1a2215e9ea9ecbb SHA512 ac96393471a6b4c40f5870f6e3183b65d43229314e2a1eacbf065c51ac61cbc772f2de3bde9f20ee1f7ffec427cd03c31f27df60eb6c621a699927646080c0ab
-EBUILD whipper-0.7.0-r1.ebuild 1524 BLAKE2B 636f64d95e641a89110436ee76fd62da430bcd720e99bad6d01a3c58384c4977912c9e90c2cbbc9333d46b62ddfac2b5e88dd4f294725498df79ef03c9048220 SHA512 9e427de20c9518adf1bbab1cb60ae3b06885dca221e628251871794631a1db0dd2a970e2dda761e49798c13534d5a70bc73580fb9d78774639746a9b944bad50
-EBUILD whipper-0.7.3.ebuild 1550 BLAKE2B 0f6253476e28c9a15ba33356639fa111c6d36a384e17247daf70d11aa0c487d0057f6c9c65f13304a173db413dadd284defef7d0244e0af44a30f445f46196ba SHA512 6e460f634a82c454851695eba770b667ff324488b50d258daeb92d4d0e30224161721239ef9c0736a28485251ed412ef67cfdbb4bbe0da6f25df352a0a707515
+EBUILD whipper-0.7.3-r1.ebuild 1500 BLAKE2B ef788965cfe9699e09141e83ec02c0b552d747f0132bc65686621df578e4292fa7735a18314de1d64202cd23d7c22a16ed134028afc388277547d284262768e0 SHA512 bbf1bd8d4be78491ddf5ef2ccdec781ff96d7af25d09e1df986f091124d3c7cd1e9ca9bf6d9278c1cf8ea9406dfe5c0c92ecf6f68c75b4658b884836f30659b6
 MISC metadata.xml 530 BLAKE2B 8cf5640fc05fc9b327e3b6d5d621987cdc74b816e372817fe9d63ac83c37e1669f6b07873eba61439b5d00d26975bc5dd850c649f80454f51f800cba8d7c340c SHA512 87970186262167b583d1a90dbe5016f11368d123f6ff81782c8bffa7217c8eda42440fca4c65ccfbbf75971acf292b1067838024c2bc536cd8b6116fc2cd4172
diff --git a/media-sound/whipper/whipper-0.7.0-r1.ebuild b/media-sound/whipper/whipper-0.7.0-r1.ebuild
deleted file mode 100644
index 2aace1ef8765..000000000000
--- a/media-sound/whipper/whipper-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python CD-DA ripper preferring accuracy over speed (forked from morituri)"
-HOMEPAGE="https://github.com/whipper-team/whipper"
-SRC_URI="https://github.com/whipper-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libsndfile
-	test? ( dev-python/twisted[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	app-cdr/cdrdao
-	>=dev-libs/libcdio-paranoia-0.94_p2
-	dev-python/cddb-py[${PYTHON_USEDEP}]
-	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:2=[${PYTHON_USEDEP}]
-	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/flac
-	media-libs/libsndfile
-	media-libs/mutagen[${PYTHON_USEDEP}]
-	media-sound/sox[flac]
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cdparanoia-name-fix.patch"
-	"${FILESDIR}/${P}-src-Makefile-respect-CFLAGS.patch"
-)
-
-src_prepare() {
-	# accurip test totally depends on network access
-	rm "${PN}"/test/test_common_accurip.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C src CC="$(tc-getCC)"
-}
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_install() {
-	distutils-r1_src_install
-	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" -C src install
-}
diff --git a/media-sound/whipper/whipper-0.7.3.ebuild b/media-sound/whipper/whipper-0.7.3-r1.ebuild
index f7f2f40ca587..9491ea390da1 100644
--- a/media-sound/whipper/whipper-0.7.3.ebuild
+++ b/media-sound/whipper/whipper-0.7.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,10 +23,9 @@ DEPEND="
 "
 RDEPEND="
 	app-cdr/cdrdao
-	dev-libs/gobject-introspection[${PYTHON_USEDEP}]
 	>=dev-libs/libcdio-paranoia-0.94_p2
 	dev-python/pycdio[${PYTHON_USEDEP}]
-	dev-python/pygobject:2=[${PYTHON_USEDEP}]
+	dev-python/pygobject:3=[${PYTHON_USEDEP}]
 	dev-python/python-musicbrainz-ngs[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-18 18:16:17 +0100
commit	fc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree	326613a08f25851c388715e205576a2e7d25dc4f /media-sound
parent	b24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)