gentoo resync : 04.08.2018

35 files changed, 162 insertions, 1085 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1a1ae9e452de..407c957281ab 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 2d956fc5c7fd..7f7e8d8d0f33 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,4 +1,6 @@
 AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228
 DIST apulse-0.1.10.tar.gz 110272 BLAKE2B 3e05c93de225125ed0de75f5576282da89acd88398d3a5159d09a6f50a7747a3a341e192f35520d3fa79a6739bf287bbcf39fb350116aa5b5a86ca5034a13034 SHA512 e922448095b7e3c8ae5766fadd5912ad39c1d0d68c73954305d17909b6bafe3a95c7e1ad4d63a4824293e0ba1495c253204343f31330c0ddb4fb419fe1f9eb12
+DIST apulse-0.1.12.tar.gz 117220 BLAKE2B 04d88a298ff5e21e19fda1979ebbc96a6441f83212d6903a004a54ee360276985e66b637571a76e3fe6821d42762ac515b02a8a2cb0149a66f3150e34bd0d9b7 SHA512 9fe39ab93e90d7ec589c7632bf439bfc7fe8bbd0792ce1197ec8547fbe1901fec50facdf33c55cfbadbc1af4414fdf48f1f241406903a8f15f445b97dca7076a
 EBUILD apulse-0.1.10.ebuild 1081 BLAKE2B 372e93e508f668fff85c7d9117ee305bfa47d4685122503e3c6789b4b7423fcdd403c3305f0a719105060703a8640980ede90ba9c4939bc7691352d1810ec85f SHA512 3ba6f8eddad6065760b3d31ad52d306e63992be35595903f57edb4c93bf7b5712ad0d61b21cbb7dc7009b8a80c626b33302d3462661f28ed2944b13a5b573ece
-MISC metadata.xml 339 BLAKE2B 82c2aa295f95ca8a2f1704a863fc5af3c44abb0080e702aba14debdc66a78ae2fc5ee463545f8fb4eb440adf74f74c6a7d3a85b6ee2fc30ad0b4fc55c80f282a SHA512 d33b0678d50e2a48420629dfbd05ad9a5562886c7c051d2004dbf266c4280ec52db4c52a2f0774664ab17602cbb40ce333e02799e4c3bad858bf5cc66ea0562f
+EBUILD apulse-0.1.12.ebuild 1253 BLAKE2B e04b196ab2e79156dfdf789ed1eea0524a1c9c1823e8e94ef3f73b816d41fda9854507446bb6ae9d7eed819e177601de19a406ea8bddba451a9f40f960f9952b SHA512 bc3d28644aeeceb410d4ace9ad89a8d3c5079c047c08b993764af777e3b444c31f41aa68791728f3243541e4b7240d7bec8162d088226147c90802249e215af4
+MISC metadata.xml 418 BLAKE2B 70574aa80c834d0bd9d21764cc96fcae3ca59ecb4dcd371e467606ae91d169186fb4f1fbfa0313752de01d5d6d65b6a22bb804afe5fbabc7126367720d750557 SHA512 01fa9cdf72ab998dc91603a95c95c2d6cd707a732a0756a386a640ad1cf0b84f5a2dfc931425c4a6106467950212ba32fa1fa6f879741eb78d48b4188836b06a
diff --git a/media-sound/apulse/apulse-0.1.12.ebuild b/media-sound/apulse/apulse-0.1.12.ebuild
new file mode 100644
index 000000000000..1f223fb6cfc4
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.12.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib cmake-multilib
+
+DESCRIPTION="PulseAudio emulation for ALSA"
+HOMEPAGE="https://github.com/i-rinat/apulse"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+pa-headers test"
+
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	pa-headers? ( !media-sound/pulseaudio ) "
+RDEPEND="${DEPEND}
+	!!media-plugins/alsa-plugins[pulseaudio]"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Ensure all relevant libdirs are added, to support all ABIs
+	DIRS=
+	_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
+	multilib_foreach_abi _add_dir
+	sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
+}
+
+multilib_src_configure() {
+	local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse")
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	cmake-utils_src_install
+	einstalldocs
+	dobin "${T}"/apulse
+	use pa-headers && doheader -r 3rdparty/pulseaudio-headers/pulse
+}
diff --git a/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml
index 7b8c0f8e4b74..738e74332466 100644
--- a/media-sound/apulse/metadata.xml
+++ b/media-sound/apulse/metadata.xml
@@ -5,6 +5,9 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
+  <use>
+    <flag name="pa-headers">Install PulseAudio headers</flag>
+  </use>
   <upstream>
     <remote-id type="github">i-rinat/apulse</remote-id>
   </upstream>
diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 6bdc87e7b6a6..1eabc7726116 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,3 @@
-DIST flacon-4.0.0.tar.gz 1294289 BLAKE2B 3afadc3545493558a5eadb7720509410fb448fed1e1fc5511f0ce477ea0e6e876d19e3038d5eb77191b449f730f50e6f1e3e4eacf546b064868863ed918acdee SHA512 64efc3369f11a7345d106a253873bcaf64ff0bbfb045e3554fecdc48a86ee5d150bef06643a5bf481d6e139a45a2bfdee91e730f9aa1354a4772f0d994297b78
 DIST flacon-4.1.0.tar.gz 1579869 BLAKE2B 6e0bf31f0eb47bf594d74e0f058f333daa9ee84f9313e75e059f1568386c20f79482926f6f786d332ecfbb72c3991e346a7b98ab8f27a2a4b4ce5c195c23d6bb SHA512 4e786571ba3e157aad2dc27523f8b9de259b44b84c7b054124a610199ef19855832000e4499d18bd6f725f2133bbbbf8d0d75f1cafbdce918605c3b407f6b0ef
-EBUILD flacon-4.0.0.ebuild 2472 BLAKE2B 7f289cf3b0cd94d757bc47122d117af72be6d8e9bb8ab273af64bbffd955f01e59b63effb27e821bb1ab6f119cc504700acb4efaed33e202ad5c02a362352c77 SHA512 a6300f02429e8eca6a81dbae41cd6904f76c3114f182765f60dd8e2851cf83132f3e0d497dc3c8ee5f0079df54b028811fbc71e028064c980c5bc0c72f96c4a8
 EBUILD flacon-4.1.0.ebuild 2487 BLAKE2B 6d785d27fd85a20e1fce1c825af29c94c10f38b47fb2e005c5d56f6bf0d3514b894d1668e120281b45ef432112f1d02a70a885b2400696cf2ee98379e12298ea SHA512 8625a895f8cadce399892eb931ae3b851d4496a26f2faec61f6e480eb8f1415035140854d0de9adab753a685eb601453c82b95493d7b7f256e3e52daff7bb9bc
 MISC metadata.xml 505 BLAKE2B 95e22c79d22d438696eaca5a304e1ac5660b049511a59bf6ed79aeedf9039b24fcd4de3ee3babc4c34b9e471a615ffcc1a36a9156350e430dc6fa6ca6bbd9923 SHA512 6979e575ee4e5230e7674fa77ece86fc27b983af03c1dfd938c3b3ca9e8f0e89f7ab2c99eaecdd1f512e70fd9d1004963669bfefa68176d40c6460272ac334dc
diff --git a/media-sound/flacon/flacon-4.0.0.ebuild b/media-sound/flacon/flacon-4.0.0.ebuild
deleted file mode 100644
index a9ff778b390a..000000000000
--- a/media-sound/flacon/flacon-4.0.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
-PLOCALES="cs cs_CZ de es es_MX fr gl hu it ja_JP lt nb nl pl pl_PL pt_BR pt_PT ro_RO ru sr sr@latin tr uk zh_CN"
-# Tests require lots of disk space
-CHECKREQS_DISK_BUILD=10G
-
-inherit check-reqs cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
-
-DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
-HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="
-	app-i18n/uchardet
-	dev-qt/qtcore:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-qt/linguist-tools:5
-	dev-qt/qtconcurrent:5
-	test? (
-		dev-qt/qttest:5
-		media-libs/flac
-		media-sound/mac
-		media-sound/shntool
-		media-sound/ttaenc
-		media-sound/wavpack
-	)
-"
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
-	rm "translations/${PN}_uz@Latn.desktop" || die
-	rm "translations/${PN}"_{et,zh_TW}.ts || die
-
-	remove_locale() {
-		rm "translations/${PN}_${1}".{ts,desktop} || die
-	}
-
-	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx "${BUILD_DIR}/tests/${PN}_test"
-}
-
-pkg_postinst() {
-	elog "${PN} optionally supports formats listed below."
-	elog "(List will be empty if all extra packages are installed.)"
-	elog "Please install the required packages and restart ${PN}."
-	optfeature 'FLAC input and output support' media-libs/flac
-	optfeature 'WavPack input and output support' media-sound/wavpack
-	optfeature 'APE input support' media-sound/mac
-	optfeature 'TTA input support' media-sound/ttaenc
-	optfeature 'AAC output support' media-libs/faac
-	optfeature 'MP3 output support' media-sound/lame
-	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
-	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/gnac/Manifest b/media-sound/gnac/Manifest
deleted file mode 100644
index 5b844a43176d..000000000000
--- a/media-sound/gnac/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX gnac-0.2.4.1-cflags.patch 363 BLAKE2B 2b9e277668dad9988cc39478d2ba381c5ffa4be3d2a57acd71bae657582c36d2fd44f81e67f2a12c4a3e2867a572531a8a129f8352e11db947b67e30c4fca1ed SHA512 ec43a8925136432ae2d05cace27d98c6193babee3d5d6b6c4c86ce9494875c4d6289624cb7436af1e0467583a70afe87087d7251a81053fa83cdf5cb1959d3a5
-AUX gnac-0.2.4.1-nls.patch 316 BLAKE2B 65aa687187269eb3c5c245ea6a4d2005683f2c8861c25ec94e91a25182d5780fad314894dce16737e542908e0d6d5d02d2dceac3875773a9ff0d65d4be85c7cc SHA512 2d553fa9ca941ba8f24c83a5e18de528ea6284e5a5ddb66b472227f02425555a783f49bada25b277817cd358e7c3895b9cf76166e9c357edb732e5d1480f288a
-DIST gnac-0.2.4.1.tar.bz2 929747 BLAKE2B 5375efe2ccdbbd4d6be936532521005228cf84d68626e993f5ea914fb1b3f717d4df6febc490a94614d8d69b54a6f5a031874f49b5c5b1ece834526b6db9366f SHA512 c474854222cc938d6ec081cdf5e8e8762e5618eca1c17dacaf8412970310ee50af2fad92501ba3b129f8756782fabd770e52656d6eead77d1a8ec0dd5f972f9b
-EBUILD gnac-0.2.4.1.ebuild 1174 BLAKE2B 587a2539106683c574df8ac07bb6350eeb05431bbd85df79824360371312d4b646c037ba3657460dd5c3a9c8e5a0ba529ee29dda4573ffd183c4e7e07e18c67b SHA512 846ac03dc38b63eb4d9c2f4d1b834176560e372bbde03a5b3b3dd094a12d09a8be74fa360692dd2c8fd8b51cfa39648f7b45c8dc27bf005a5b0744779c0df3c7
-MISC metadata.xml 327 BLAKE2B 2195e935e844f7e29b327f31e3eb9bd5c5dc2806093acaadc8b4664248d9d18b00f26613bcde952e9a5641f6f76c51660f68bab00a18c177e2492206bffafaa8 SHA512 625a24b4c289ba16de91190300b2eb295b728642e030cf25a5c6c439f6b0cfeaff1a03f172bf83bb23f7dbea50cb839df7b041bb4d7069dc8ee8da7e3caa7601
diff --git a/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch b/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch
deleted file mode 100644
index 816eadb70ef7..000000000000
--- a/media-sound/gnac/files/gnac-0.2.4.1-cflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- gnac-0.2.4.1/configure.ac
-+++ gnac-0.2.4.1/configure.ac
-@@ -122,16 +122,6 @@
-   AC_SUBST(DISABLE_DEPRECATED)
- fi
- 
--# debug support
--AC_ARG_ENABLE([debug], [],
--[ if test "$enableval" = "yes"; then
--    CFLAGS="-g -ggdb -O0"
--  else
--    CFLAGS="-O2"
--  fi
--  AC_SUBST([CFLAGS])
--  ])
--
- AC_SUBST([AM_CPPFLAGS])
- AC_SUBST([AM_CFLAGS])
- AC_SUBST([AM_LDFLAGS])
diff --git a/media-sound/gnac/files/gnac-0.2.4.1-nls.patch b/media-sound/gnac/files/gnac-0.2.4.1-nls.patch
deleted file mode 100644
index 76d822f08bf9..000000000000
--- a/media-sound/gnac/files/gnac-0.2.4.1-nls.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnac-0.2.4.1/po/POTFILES.in
-+++ gnac-0.2.4.1/po/POTFILES.in
-@@ -32,6 +32,7 @@
- [type: gettext/xml]data/profiles/vorbis.xml.in
- [type: gettext/xml]data/profiles/wav.xml.in
- [type: gettext/xml]data/profiles/wavpack.xml.in
-+intl/plural.c
- libgnac/libgnac-converter.c
- libgnac/libgnac-error.c
- libgnac/libgnac-gst.c
diff --git a/media-sound/gnac/gnac-0.2.4.1.ebuild b/media-sound/gnac/gnac-0.2.4.1.ebuild
deleted file mode 100644
index 641dcf40ff3c..000000000000
--- a/media-sound/gnac/gnac-0.2.4.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils flag-o-matic gnome2
-
-DESCRIPTION="Audio converter for GNOME"
-HOMEPAGE="http://gnac.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gnac/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="aac flac libnotify mp3 nls wavpack"
-
-RDEPEND="
-	x11-libs/gtk+:3
-	dev-libs/libunique:3
-	dev-libs/libxml2:2
-	libnotify? ( x11-libs/libnotify )
-	>=media-libs/gstreamer-0.10.31:0.10
-	>=media-libs/gst-plugins-base-0.10.31:0.10
-	media-plugins/gst-plugins-gio:0.10
-	media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?]
-	aac? ( media-plugins/gst-plugins-faac:0.10 )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	>=app-text/gnome-doc-utils-0.17.2
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-PATCHES=(
-	"${FILESDIR}/${P}-cflags.patch"
-	"${FILESDIR}/${P}-nls.patch"
-)
-
-src_prepare() {
-	default
-	epatch -p1 "${PATCHES[@]}"
-
-	# fix bug 574568 by restoring pre-GCC5 inline semantics
-	append-cflags -std=gnu89
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable nls)
-}
diff --git a/media-sound/gnac/metadata.xml b/media-sound/gnac/metadata.xml
deleted file mode 100644
index 291998630e92..000000000000
--- a/media-sound/gnac/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gnac</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/horgand/Manifest b/media-sound/horgand/Manifest
index ee96dd8a7c41..0a85790715ae 100644
--- a/media-sound/horgand/Manifest
+++ b/media-sound/horgand/Manifest
@@ -1,4 +1,4 @@
 AUX horgand-1.14-overflow.patch 235 BLAKE2B 95be6c62891707f79026b7066adbf8ef52cf79f2f19ff8de771f3e7cb6515c6703aa524e82e515bc38fd41c836eb5a4efad4d54f8c8a99a2fb49bf4d3ecf0458 SHA512 d7506c99e01a3f82d3424f368764208e3bd9638c1ffe493cdc9c69a7037164ff9c3a8787fb151fa6395001bdbfd0fabcd9c46118e10b14fe4e2d542894de6807
 DIST horgand-1.14.tar.gz 2531734 BLAKE2B 3b461a070e2716e1fb359b83edf2fa9db41bf24c1feff70fd80245964eaacb41861f7c43257dafadf25be096e02c78125a6987b0954b658cbefd44c798319c19 SHA512 d67a51972d2ddf3044cadfd40e298da6282c05de23faed98589602110a142728c45dd9d0f8cbc9c9a3b488a4e32d08a69ae36e7d94ea287e0880682eee066360
-EBUILD horgand-1.14.ebuild 1017 BLAKE2B e35b74ea55028ce0063e074e4cb8f53d15416aa790a5742d7b3ac4081a149065a2d6f5397178da3a07afaf63f92c950b4f08466f75ba42d2d003a674cc3bada7 SHA512 18865483352d28eb58ca38219aa4eafc586f25967aad0b5cd4632a465c832408cef4eeeb1c35fd388fd69cbbfa5081ada5a087097224f0982731836a42253267
+EBUILD horgand-1.14-r1.ebuild 916 BLAKE2B 8cf694d2e0356820b81c270737d1b4c49d77fef53ebfc881c2ea605c63b92a6be72bb399470a6145b3d39adf44fe06d8cf67449b81e42b26ec8b99d3809242d6 SHA512 ded53590fda6c44c560573461ba37b2b13217f7de3e3c7518760ca7e73b9693b73ebcfc6aca617fcf55ab6d61e715a10010ea1d084c71774686cc946622368b5
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/horgand/horgand-1.14.ebuild b/media-sound/horgand/horgand-1.14-r1.ebuild
index 11769b0c9231..a02538b9c3e9 100644
--- a/media-sound/horgand/horgand-1.14.ebuild
+++ b/media-sound/horgand/horgand-1.14-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Opensource software organ"
 HOMEPAGE="http://horgand.berlios.de"
@@ -24,17 +25,17 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-overflow.patch
+	default
+	eapply "${FILESDIR}"/${P}-overflow.patch
 }
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} $(fltk-config --cxxflags) \
-		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)" || die "emake failed."
+		$(pkg-config --cflags jack) $(pkg-config --cflags sndfile)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README
+	default
 	doman man/${PN}.1
 	newicon src/${PN}128.xpm ${PN}.xpm
 	make_desktop_entry ${PN} Horgand ${PN}
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index f4f029627fe9..46fe105105e5 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -4,6 +4,6 @@ AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75c
 AUX mpd-0.20.4.logrotate 79 BLAKE2B fcff807fb7557d480378ae6712f598147c9dbc3381ca89b21529277bfc636448e474b610096eae5c02963bc5aa5cf1055f0a9bbde36f2cc8d178e373a755fa84 SHA512 b4616307eb4b06e42a53120bb37276ea19cb1b3096094214062835f71093a1d196bc515b6b6f1e23dbd83a49151565807071959408c4f1078d95925660d3b324
 DIST mpd-0.20.10.tar.xz 778828 BLAKE2B c16b955ace770cf3d5da2ccad81fd3089cf2e60bf47774745d75babcff38fa344646b26dd32617fa2fe86ee0c785b9c8272ea6c90f77266b1a0cba2d48145236 SHA512 bac6a71e5b85600c590eae6b785474574cf0d7b03d9add537161b968a2997a975a597639a9fece119a01a7e27b5207523e4ae30b2f4f35791eff8c3ff26d107c
 DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c49f40fe3fc8510b8f2748f2cf623125c16da382a8495aa6eeb1a8b9707a3bb46a5fa8a0657c9ffa11fbcb5dc SHA512 3e221edc71cc65f9da46aa4f1d0bc2f8ca701cc4a103ea8efb08191918312b2f3b0023288e3dcabe0779e81ee6f628773d779462e09a55f2c090cca0e3d099af
-EBUILD mpd-0.20.10.ebuild 7246 BLAKE2B beb040eb0eca988c33fa5aef07022c3eeeda6afbc50d86ba8ee0f4d96137935ebf5abb3e094130de5cd83dec109527e06c3b95d2178f856a214896615debba48 SHA512 53d08548f75b6be0530c0ff6f0e4210e99020ff79f36515b1abbf4bf7c3db5e64bdf0c3a5396c5c89d07e37f23c28dc81d7e4a75bfeb17970e53d0892e84fe44
+EBUILD mpd-0.20.10.ebuild 7248 BLAKE2B b32e3c19c811e344d70a0b0a260bc8553e7a495e2efc9596ed580cad91ac12d84314856a0e1cc5a27064a7446983c000c89e1f7ce068029ca137a67b7346a662 SHA512 244256b2a88028895e6765dc6d4bb504342009ab53193215ce6a97369216d04097d424d5b12ba97772bbd0af866a7e65a684b5dc0d2b6f9566e0c4b4bb9e4f80
 EBUILD mpd-0.20.12-r2.ebuild 7315 BLAKE2B f70d4a926544b8f424226bc3dc1e49af3473682a790a0cb5ea0ed12d1e052d69b31f984b1cf241851c8eea935f06984fa7cfa1dd48c21895849317d2c8c97c15 SHA512 a19375a8cf82b488fe3b1caf48212a33cd8096572b74c14793c63883df944dd39e3ee7ca0dfc67f31c916d892f0359372b88a46bcc95ce3d60c7acf63bd7b5b3
 MISC metadata.xml 2403 BLAKE2B d061cff6d63c179f9dd58b22a6fe6e5eb14c6163440ad9aa3bc9a30adf1ec3bb612030c3d3e739d9c2f92983441683b69cec61285a38254aa5c038df14cdc500 SHA512 97ce4e8fe377823325847e1ab013338d4394863a92d4728dbbf016ca8b4a0b0416e5803380bdcc7f834245565596bcdd2169c5d3e0db1cef8b4a1b9943a2d3a1
diff --git a/media-sound/mpd/mpd-0.20.10.ebuild b/media-sound/mpd/mpd-0.20.10.ebuild
index 169aa5acc382..f6cea8f7ebd7 100644
--- a/media-sound/mpd/mpd-0.20.10.ebuild
+++ b/media-sound/mpd/mpd-0.20.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="alpha amd64 ~arm hppa ~ppc ~ppc64 ~sh x86 ~x86-fbsd ~x64-macos"
 IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
 	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
 	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index acf892169206..0f0f42ecbfef 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -7,11 +7,8 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda2338ad8db639ad333598b1589d259acf71ef34e904a240710f5343864fa868789eaa7f7cae1b07902ebd989fe83e12 SHA512 8863d8d7aede0d9a4d158e84e7bece91747c335f9ac98c7b21fafe76b762f8817e1125307aa46e561e540d2c40525e91f51a55ec34ac55d58fd5980199856a7a
-DIST pulseaudio-11.99.1.tar.xz 1655948 BLAKE2B 33d774bbcb2cf4a1d457e2cecfae007a75acc5c8ba188c5f2fbce773cf3fb67c9c345538584014898f42b3ff7c6e680c9660ff07f7d74630f711f85d9c514d2c SHA512 f9340f836bd12756ddb30e27bb04f8470a97ec372f5d9a2703da3ac348436b7b3efe074635c5a994cc6cd77c7f18aa2d74811c7e12bc52c0578fd15f8dffaab8
-DIST pulseaudio-12.0.tar.xz 1657212 BLAKE2B b38bdeec21c336d7435b1ae895eb50b164d513f4b15d5c6b559df457722da02484072d3beb8874c3690efd1ddff1e13966ab5501d1e9418683461ca977b2c6fb SHA512 e9b02522f1e9cc2cf2e9db3364153fff5bc70561df34bc8e254e373a24c45585c1c722de8b6ebd7cd1814f523cf29b67c6940390a6fcc1ccbdde5aeff48f8d8c
-EBUILD pulseaudio-11.1-r1.ebuild 10990 BLAKE2B 7c5d064fa0b728ef39a0c9e6aa538427bceb66e19cef41e19167185793c6021c9365584fc22f9b4417a510c90253216a1515339954cc3ae26c352e2e987b29ac SHA512 4c076242f0a7f3bee1bece13a1ef5563b848a5be3856180fa69bc3b62892a9a9cf33df368d875c9382ee51e761689588b6f0fdc864a6b746d591103f12839323
+DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
+EBUILD pulseaudio-11.1-r1.ebuild 10988 BLAKE2B 891673695478f3296371fad34b7e77dadf9fe21f228961ce30a08e50f4f5d2acd0888e7a78ed4194253d6eb3bf3ddf86ceff485cf215fcbd4b88672610dea5a7 SHA512 bb1e952c43c219b26cbe19fdec6df394bc407cfc829d9b78e4ad2c08535296dd890173f3afb6bb7c0dabd4be1ca384837ea8faa72efd37b082705afc328371be
 EBUILD pulseaudio-11.1.ebuild 10850 BLAKE2B 7c4423b125ba27e84d4af9b0ae99d31c5672490aed122a71887746ac9ca4554a96cddaf7eec8ae9b7ed91b3fa72a1caab541c95fe53a7117b4a93e8d9c982274 SHA512 88584bc0f38e6bb559d913d92fa5b06370590f43eaa11ac59af4ea07739d6f6870165e0801655982a11ff4f42e44de1b58962e5123f3d657cfcdf4727f04b0d0
-EBUILD pulseaudio-11.99.1-r1.ebuild 10990 BLAKE2B fbf57d791769744ef97fd49390bcb9d30a5a02450650f8b81a3b27575fc1188e7da5797939b01a6c308ba61a4b448377c5a5602ec0e7e585de98ece239b9da6e SHA512 a290149a12739dd09707d18f192f45532e36ab9473a211de4c3da0d37abe142ba710813ceb9019116953e96a451d8f4b7a9636710ea84000b584543073c8846f
-EBUILD pulseaudio-12.0-r1.ebuild 10661 BLAKE2B d411bcf361f9affe99c93f954b122bafc843b327e7e2668b3a01a18b0def83615aeced03d21aadae9fd993535ee44802ae3aed4b8b6a689627c2eaeaf3b575c1 SHA512 fbe96ce05c0b7aff771481d93d7d5567c08c7edfcfbc920e056dbd18cff7c488f86cfe9d5966e8eb71f0919e7af32194bc92f0c0a8997104e23c0385752a794b
-EBUILD pulseaudio-12.0-r2.ebuild 10725 BLAKE2B 1f3c236fd549f603530bafc9bdc6371e20790491636bb80c4d1994ed18d7a52ee3032ea372c9e65edaa49b9ed60159616b9b2f2df540971b8d5f70c28949c21a SHA512 8f53f1f9818040641656efcb0c2a56b0abd7fc8483816b8b2baae9a2bace7ebe71e91e4a6ff7950d0135a90eab1fca19179d7c07a2d3740d5eeec65105559e44
-MISC metadata.xml 3536 BLAKE2B c0b86b7db7099c5bdbec7f3fade2c058e35684aac8b090d66f579883f37c3f35377de1b2351b49d81119a5a8186874725321e3b0562922edfc306da3286ee118 SHA512 cfe2c11ed40617e80d3d83b8d96a76dcc64921d0facf4d3b6b97f81aaf41fa731862e385140d8167e05d1f6a8a032b48f59d240c8836742cefd69541c9c583de
+EBUILD pulseaudio-12.2.ebuild 11122 BLAKE2B 9e08ab99e4eff95a16e905e4cef66d55a3cc91fa651e2fb965e3a239605fbc5612d679def64401e6ee07ea97b3dea77349214fe620af341c9d676fe3ffad6420 SHA512 782d235efbc4ca48deab1b987918efc41db4f704bb145d8bfb5f55ddc2e77fabb0f1a348a2d77fbbebdfb296391eb880dd982aefed0c2a3886563f065f5db837
+MISC metadata.xml 3739 BLAKE2B da9e8c870669921600e4c2e3377dbabde19bd8e177741478b72da7f58a985c001268686e941b2dbcf557ac301056c0c9ff3dddc952ea3f12acd43cee955962b1 SHA512 673b98d8140d2b0ba0253d09e9066c7dddcc5a6d3ab4342579c4aba09cc1b0c3345c26dfa7e14868a0a3c1b1783e96971ccd56ebfe8105122bd9dc25d72d64c0
diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 3ae38b43ad4f..25a2d372c613 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -26,20 +26,22 @@
       enable this flag if you want to use a system wide instance. If
       unsure, enable this flag.
     </flag>
-    <flag name="gsettings">
-      Use GSettings instead of GConf to store user preferences.
-    </flag>
     <flag name="oss">
       Enable OSS sink/source (output/input). Deprecated, upstream does
       not support this on systems where other sink/source systems are
       available (i.e.: Linux). The padsp wrapper is now always build
       if the system supports OSS at all.
     </flag>
-    <flag name="glib">
+    <flag name="glib" restrict="&lt;media-sound/pulseaudio-12.0">
       Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
       libpulse client library, to allow using libpulse on glib-based
       programs.
     </flag>
+    <flag name="glib" restrict="&gt;=media-sound/pulseaudio-12.0">
+      Add support to <pkg>dev-libs/glib</pkg>-based mainloop for the
+      libpulse client library, to allow using libpulse on glib-based
+      programs. Build the GSettings PA module.
+    </flag>
     <flag name="system-wide" restrict="&gt;=media-sound/pulseaudio-0.9.21.1">
       Allow preparation and installation of the system-wide init
       script for PulseAudio. Since this support is only supported for
diff --git a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
index ee526c96d715..760c88ca1214 100644
--- a/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-11.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
diff --git a/media-sound/pulseaudio/pulseaudio-11.99.1-r1.ebuild b/media-sound/pulseaudio/pulseaudio-11.99.1-r1.ebuild
deleted file mode 100644
index dc14bd2694fc..000000000000
--- a/media-sound/pulseaudio/pulseaudio-11.99.1-r1.ebuild
+++ /dev/null
@@ -1,364 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 eutils flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib
-gnome gsettings gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-	gsettings? ( !gnome )
-"
-
-# libpcre needed in some cases, bug #472228
-RDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.4.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	gnome? ( >=gnome-base/gconf-2.4.0 )
-	gsettings? ( >=dev-libs/glib-2.26.0 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	>=media-libs/speex-1.2.0
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=()
-
-	if use gdbm; then
-		myconf+=( --with-database=gdbm )
-	else
-		myconf+=( --with-database=simple )
-	fi
-
-	if use bluetooth; then
-		if multilib_is_native_abi; then
-			myconf+=( --enable-bluez5 --disable-bluez4
-				$(use_enable native-headset bluez5-native-headset)
-				$(use_enable ofono-headset bluez5-ofono-headset) )
-		fi
-	else
-		myconf+=( --disable-bluez5 --disable-bluez4 )
-	fi
-
-	myconf+=(
-		--enable-largefile
-		$(use_enable glib glib2)
-		--disable-solaris
-		$(use_enable asyncns)
-		$(use_enable oss oss-output)
-		$(use_enable alsa)
-		$(use_enable lirc)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable jack)
-		$(use_enable zeroconf avahi)
-		$(use_enable dbus)
-		$(use_enable gnome gconf)
-		$(use_enable gsettings)
-		$(use_enable gtk gtk3)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable orc)
-		$(use_enable X x11)
-		$(use_enable test default-build-tests)
-		$(use_enable udev)
-		$(use_with sox soxr)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_enable ssl openssl)
-		$(use_enable webrtc-aec)
-		$(use_with caps)
-		$(use_with equalizer fftw)
-		--disable-adrian-aec
-		--disable-esound
-		--localstatedir="${EPREFIX}"/var
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	if ! multilib_is_native_abi; then
-		# disable all the modules and stuff
-		myconf+=(
-			--disable-oss-output
-			--disable-alsa
-			--disable-lirc
-			--disable-jack
-			--disable-avahi
-			--disable-gconf
-			--disable-gsettings
-			--disable-gtk3
-			--disable-samplerate
-			--disable-bluez4
-			--disable-bluez5
-			--disable-udev
-			--disable-openssl
-			--disable-orc
-			--disable-webrtc-aec
-			--without-fftw
-			--without-soxr
-
-			# tests involve random modules, so just do them for the native
-			--disable-default-build-tests
-
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			--with-database=simple
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		use doc && dohtml -r doxygen/html/
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	# Drop the script entirely if X is disabled
-	use X || rm "${ED}"/usr/bin/start-pulseaudio-x11
-
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-	fi
-
-	use zeroconf && sed -i -e '/module-zeroconf-publish/s:^#::' "${ED}/etc/pulse/default.pa"
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	# We need /var/run/pulse, bug #442852
-	use system-wide && systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-
-	# Prevent warnings when system-wide is not used, bug #447694
-	use system-wide || rm "${ED}"/etc/dbus-1/system.d/pulseaudio-system.conf
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-		if use gnome ; then
-			elog
-			elog "By enabling gnome USE flag, you enabled gconf support. Please note"
-			elog "that you might need to remove the gnome USE flag or disable the"
-			elog "gconf module on /etc/pulse/system.pa to be able to use PulseAudio"
-			elog "with a system-wide instance."
-		fi
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
deleted file mode 100644
index c5606ea2177d..000000000000
--- a/media-sound/pulseaudio/pulseaudio-12.0-r1.ebuild
+++ /dev/null
@@ -1,339 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
-
-DESCRIPTION="A networked sound server with an advanced plugin system"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
-SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
-
-# libpulse-simple and libpulse link to libpulse-core; this is daemon's
-# library and can link to gdbm and other GPL-only libraries. In this
-# cases, we have a fully GPL-2 package. Leaving the rest of the
-# GPL-forcing USE flags for those who use them.
-LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-
-# +alsa-plugin as discussed in bug #519530
-IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer gconf +gdbm
-+glib gtk ipv6 jack libsamplerate libressl lirc native-headset neon ofono-headset
-+orc oss qt5 realtime selinux sox ssl systemd system-wide tcpd test +udev
-+webrtc-aec +X zeroconf"
-
-# See "*** BLUEZ support not found (requires D-Bus)" in configure.ac
-REQUIRED_USE="
-	bluetooth? ( dbus )
-	equalizer? ( dbus )
-	ofono-headset? ( bluetooth )
-	native-headset? ( bluetooth )
-	udev? ( || ( alsa oss ) )
-"
-
-# libpcre needed in some cases, bug #472228
-CDEPEND="
-	|| (
-		elibc_glibc? ( virtual/libc )
-		elibc_uclibc? ( virtual/libc )
-		dev-libs/libpcre
-	)
-	>=media-libs/libsndfile-1.0.20[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.4.0[${MULTILIB_USEDEP}]
-		>=x11-libs/libxcb-1.6[${MULTILIB_USEDEP}]
-		x11-libs/libSM[${MULTILIB_USEDEP}]
-		x11-libs/libICE[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-	)
-	caps? ( >=sys-libs/libcap-2.22-r2[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 )
-	alsa? ( >=media-libs/alsa-lib-1.0.19 )
-	glib? ( >=dev-libs/glib-2.26.0:2[${MULTILIB_USEDEP}] )
-	zeroconf? ( >=net-dns/avahi-0.6.12[dbus] )
-	jack? ( virtual/jack )
-	tcpd? ( sys-apps/tcp-wrappers[${MULTILIB_USEDEP}] )
-	lirc? ( app-misc/lirc )
-	dbus? ( >=sys-apps/dbus-1.0.0[${MULTILIB_USEDEP}] )
-	gtk? ( x11-libs/gtk+:3 )
-	bluetooth? (
-		>=net-wireless/bluez-5
-		>=sys-apps/dbus-1.0.0
-		media-libs/sbc
-	)
-	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
-	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
-	equalizer? ( sci-libs/fftw:3.0 )
-	ofono-headset? ( >=net-misc/ofono-1.13 )
-	orc? ( >=dev-lang/orc-0.4.15 )
-	sox? ( >=media-libs/soxr-0.1.1 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-	media-libs/speexdsp
-	gdbm? ( sys-libs/gdbm:= )
-	webrtc-aec? ( >=media-libs/webrtc-audio-processing-0.2 )
-	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
-	dev-libs/libltdl:0
-	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
-RDEPEND="${CDEPEND}
-	gconf? ( >=gnome-base/gconf-3.2.6 )
-"
-
-DEPEND="${RDEPEND}
-	sys-devel/m4
-	doc? ( app-doc/doxygen )
-	test? ( >=dev-libs/check-0.9.10 )
-	X? (
-		x11-base/xorg-proto
-		>=x11-libs/libXtst-1.0.99.2[${MULTILIB_USEDEP}]
-	)
-	dev-libs/libatomic_ops
-	virtual/pkgconfig
-	system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) )
-	dev-util/intltool
-	>=sys-devel/gettext-0.18.1
-"
-# This is a PDEPEND to avoid a circular dep
-PDEPEND="
-	alsa? ( alsa-plugin? ( >=media-plugins/alsa-plugins-1.0.27-r1[pulseaudio,${MULTILIB_USEDEP}] ) )
-"
-
-# alsa-utils dep is for the alsasound init.d script (see bug #155707)
-# bluez dep is for the bluetooth init.d script
-# PyQt5 dep is for the qpaeq script
-RDEPEND="${RDEPEND}
-	equalizer? ( qt5? ( dev-python/PyQt5[dbus,widgets] ) )
-	system-wide? (
-		alsa? ( media-sound/alsa-utils )
-		bluetooth? ( >=net-wireless/bluez-5 )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/pulseaudio-11.1-disable-flat-volumes.patch # bug 627894
-)
-
-pkg_pretend() {
-	CONFIG_CHECK="~HIGH_RES_TIMERS"
-	WARNING_HIGH_RES_TIMERS="CONFIG_HIGH_RES_TIMERS:\tis not set (required for enabling timer-based scheduling in pulseaudio)\n"
-	check_extra_config
-
-	if linux_config_exists; then
-		local snd_hda_prealloc_size=$(linux_chkconfig_string SND_HDA_PREALLOC_SIZE)
-		if [ -n "${snd_hda_prealloc_size}" ] && [ "${snd_hda_prealloc_size}" -lt 2048 ]; then
-			ewarn "A preallocated buffer-size of 2048 (kB) or higher is recommended for the HD-audio driver!"
-			ewarn "CONFIG_SND_HDA_PREALLOC_SIZE=${snd_hda_prealloc_size}"
-		fi
-	fi
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	gnome2_environment_reset #543364
-
-	enewgroup audio 18 # Just make sure it exists
-
-	if use system-wide; then
-		enewgroup pulse-access
-		enewgroup pulse
-		enewuser pulse -1 -1 /var/run/pulse pulse,audio
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--disable-adrian-aec
-		--disable-bluez4
-		--disable-esound
-		--disable-gconf
-		--disable-solaris
-		--enable-largefile
-		--localstatedir="${EPREFIX}"/var
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
-		$(multilib_native_use_enable alsa)
-		$(multilib_native_use_enable bluetooth bluez5)
-		$(multilib_native_use_enable glib gsettings)
-		$(multilib_native_use_enable gtk gtk3)
-		$(multilib_native_use_enable jack)
-		$(multilib_native_use_enable libsamplerate samplerate)
-		$(multilib_native_use_enable lirc)
-		$(multilib_native_use_enable orc)
-		$(multilib_native_use_enable oss oss-output)
-		$(multilib_native_use_enable ssl openssl)
-		# tests involve random modules, so just do them for the native
-		$(multilib_native_use_enable test default-build-tests)
-		$(multilib_native_use_enable udev)
-		$(multilib_native_use_enable webrtc-aec)
-		$(multilib_native_use_enable zeroconf avahi)
-		$(multilib_native_use_with equalizer fftw)
-		$(multilib_native_use_with sox soxr)
-		$(multilib_native_usex gdbm '--with-database=gdbm' '--with-database=simple')
-		$(use_enable glib glib2)
-		$(use_enable asyncns)
-		$(use_enable neon neon-opt)
-		$(use_enable tcpd tcpwrap)
-		$(use_enable dbus)
-		$(use_enable X x11)
-		$(use_enable systemd systemd-daemon)
-		$(use_enable systemd systemd-login)
-		$(use_enable systemd systemd-journal)
-		$(use_enable ipv6)
-		$(use_with caps)
-	)
-
-	if use bluetooth; then
-		myconf+=(
-			$(multilib_native_use_enable native-headset bluez5-native-headset)
-			$(multilib_native_use_enable ofono-headset bluez5-ofono-headset)
-		)
-	fi
-
-	if ! multilib_is_native_abi; then
-		myconf+=(
-			# hack around unnecessary checks
-			# (results don't matter, we're not building anything using it)
-			ac_cv_lib_ltdl_lt_dladvise_init=yes
-			LIBSPEEX_CFLAGS=' '
-			LIBSPEEX_LIBS=' '
-		)
-	fi
-
-	ECONF_SOURCE=${S} \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-		use doc && emake doxygen
-	else
-		local targets=( libpulse.la libpulsedsp.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake -C src ${targets[*]}
-	fi
-}
-
-multilib_src_test() {
-	# We avoid running the toplevel check target because that will run
-	# po/'s tests too, and they are broken. Officially, it should work
-	# with intltool 0.41, but that doesn't look like a stable release.
-	if multilib_is_native_abi; then
-		emake -C src check
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake -j1 DESTDIR="${D}" bashcompletiondir="$(get_bashcompdir)" install
-		if use doc ; then
-			docinto html
-			dodoc -r doxygen/html/
-		fi
-	else
-		local targets=( libpulse.la libpulse-simple.la )
-		use glib && targets+=( libpulse-mainloop-glib.la )
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C src \
-			install-libLTLIBRARIES \
-			install-padsplibLTLIBRARIES \
-			lib_LTLIBRARIES="${targets[*]}" \
-			install-pulseincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	if use system-wide; then
-		newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
-
-		use_define() {
-			local define=${2:-$(echo $1 | tr '[:lower:]' '[:upper:]')}
-
-			use "$1" && echo "-D$define" || echo "-U$define"
-		}
-
-		unifdef $(use_define zeroconf AVAHI) \
-			$(use_define alsa) \
-			$(use_define bluetooth) \
-			$(use_define udev) \
-			"${FILESDIR}/pulseaudio.init.d-5" \
-			> "${T}/pulseaudio"
-
-		doinitd "${T}/pulseaudio"
-
-		systemd_dounit "${FILESDIR}/${PN}.service"
-
-		# We need /var/run/pulse, bug #442852
-		systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles" "${PN}.conf"
-	else
-		# Prevent warnings when system-wide is not used, bug #447694
-		if use dbus ; then
-			rm "${ED%/}"/etc/dbus-1/system.d/pulseaudio-system.conf || die
-		fi
-	fi
-
-	if use zeroconf ; then
-		sed -e '/module-zeroconf-publish/s:^#::' \
-			-i "${ED%/}/etc/pulse/default.pa" || die
-	fi
-
-	dodoc NEWS README todo
-
-	# Create the state directory
-	use prefix || diropts -o pulse -g pulse -m0755
-
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use system-wide; then
-		elog "You have enabled the 'system-wide' USE flag for pulseaudio."
-		elog "This mode should only be used on headless servers, embedded systems,"
-		elog "or thin clients. It will usually require manual configuration, and is"
-		elog "incompatible with many expected pulseaudio features."
-		elog "On normal desktop systems, system-wide mode is STRONGLY DISCOURAGED."
-		elog "For more information, see"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/WhatIsWrongWithSystemWide/"
-		elog "    https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/SystemWide/"
-		elog "    https://wiki.gentoo.org/wiki/PulseAudio#Headless_server"
-	fi
-
-	if use equalizer && ! use qt5; then
-		elog "You've enabled the 'equalizer' USE-flag but not the 'qt5' USE-flag."
-		elog "This will build the equalizer module, but the 'qpaeq' tool"
-		elog "which is required to set equalizer levels will not work."
-	fi
-
-	if use equalizer && use qt5; then
-		elog "You will need to load some extra modules to make qpaeq work."
-		elog "You can do that by adding the following two lines in"
-		elog "/etc/pulse/default.pa and restarting pulseaudio:"
-		elog "load-module module-equalizer-sink"
-		elog "load-module module-dbus-protocol"
-	fi
-
-	if use native-headset && use ofono-headset; then
-		elog "You have enabled both native and ofono headset profiles. The runtime decision"
-		elog "which to use is done via the 'headset' argument of module-bluetooth-discover."
-	fi
-
-	if use libsamplerate; then
-		elog "The libsamplerate based resamplers are now deprecated, because they offer no"
-		elog "particular advantage over speex. Upstream suggests disabling them."
-	fi
-}
diff --git a/media-sound/pulseaudio/pulseaudio-12.0-r2.ebuild b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
index 9279212c9ae8..df7688118c99 100644
--- a/media-sound/pulseaudio/pulseaudio-12.0-r2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
+inherit bash-completion-r1 flag-o-matic gnome2-utils linux-info systemd user udev multilib-minimal
 
 DESCRIPTION="A networked sound server with an advanced plugin system"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/PulseAudio/"
@@ -29,6 +29,7 @@ REQUIRED_USE="
 	equalizer? ( dbus )
 	ofono-headset? ( bluetooth )
 	native-headset? ( bluetooth )
+	realtime? ( dbus )
 	udev? ( || ( alsa oss ) )
 "
 
@@ -64,7 +65,6 @@ CDEPEND="
 	)
 	asyncns? ( net-libs/libasyncns[${MULTILIB_USEDEP}] )
 	udev? ( >=virtual/udev-143[hwdb(+)] )
-	realtime? ( sys-auth/rtkit )
 	equalizer? ( sci-libs/fftw:3.0 )
 	ofono-headset? ( >=net-misc/ofono-1.13 )
 	orc? ( >=dev-lang/orc-0.4.15 )
@@ -79,9 +79,10 @@ CDEPEND="
 	systemd? ( sys-apps/systemd:0=[${MULTILIB_USEDEP}] )
 	dev-libs/libltdl:0
 	selinux? ( sec-policy/selinux-pulseaudio )
-"
-# it's a valid RDEPEND, libltdl.so is used for native abi
+" # libltdl is a valid RDEPEND, libltdl.so is used for native abi in pulsecore and daemon
+
 RDEPEND="${CDEPEND}
+	realtime? ( sys-auth/rtkit )
 	gconf? ( >=gnome-base/gconf-3.2.6 )
 "
 
@@ -150,9 +151,8 @@ src_prepare() {
 	default
 
 	# Skip test that cannot work with sandbox, bug #501846
-	sed -i -e '/lock-autospawn-test/d' src/Makefile.am || die
-
-	eautoreconf
+	sed -i -e '/lock-autospawn-test /d' src/Makefile.am || die
+	sed -i -e 's/lock-autospawn-test$(EXEEXT) //' src/Makefile.in || die
 }
 
 multilib_src_configure() {
@@ -212,6 +212,11 @@ multilib_src_configure() {
 			LIBSPEEX_CFLAGS=' '
 			LIBSPEEX_LIBS=' '
 		)
+	else
+		# Make padsp work for non-native ABI, supposedly only possible with glibc; this is used by /usr/bin/padsp that comes from native build, thus we need this argument for native build
+		if use elibc_glibc ; then
+			myconf+=( --with-pulsedsp-location="${EPREFIX}"'/usr/\\$$LIB/pulseaudio' )
+		fi
 	fi
 
 	ECONF_SOURCE=${S} \
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index ed7932095e57..acc75b5a599d 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,10 +1,8 @@
 DIST pulseeffects-3.1.6.tar.gz 614441 BLAKE2B bb7461532785cd0ab79d0f506b5b9bcfc006779776e25870ce92b4af4e7cb0f7b3bcfe9c58180e52bdb9b9be20a14644ed8622fd3cc578dd3bdf9ff173c091b6 SHA512 efd9871c57f4b7152e4528927c7371e225980a09acacf4fcf939c468c7cb01b94b1bbb3c94cbd8879a6b41c7c4794ed5f45035a2b185b0a09b31515c964d4722
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.1.3.tar.gz 721527 BLAKE2B 616e341375aa71a209e8d5e3043b3013da037609ddbec595eec1f655c9a725e17f1c9359535aa4c6bf441af2e7943bef435340ecccbbd92c5022230697609a40 SHA512 416111e77a09adad9af501d4ef24482969277ac52da5d1df730995ab650e6eca46b96ec6277bada8ee8ed5bb14a09592e566d419ea19f6a87840cecdf1a79bdd
-DIST pulseeffects-4.1.9.tar.gz 852833 BLAKE2B f315c56e42ea8e4fad04bd4872f09841d86b874d973aae31d5b34feaa8d036f49f91ffbfe1292f47c7037a4e55c86ea13034998fc14a724d1f9fc440c2fc7724 SHA512 48539f3ec1f827e67a552663f54ce2ec364de9e898b6b485dd195e13719f17124a88ac1e7aef79af0f09f14485bc7b3133739abbcd4cf3a403d4b5d435f219f7
+DIST pulseeffects-4.2.3.tar.gz 982490 BLAKE2B 6c38d42147515ac918659eead60002f8863cd2c498be53fae125c4c7593fd7515e717f5997bef0ca9bbd343119c96462fae1c22dd0dd945fdecd1f6b9b610d1b SHA512 86fc1d64c0ff0c05d432f413de4bc6158341a5a49c9ce027123f0029e94b7c1bf2ee1da253742e19761e2654fd1a6149c6ca3a67e8c31efd878cca0102367f9a
 EBUILD pulseeffects-3.1.6.ebuild 1474 BLAKE2B c37c8cc5b72e9ea384d7e34fe107a9d8a22fbf45309328dd49f99cca01cf85629497399fa388eb94b1a31dceb1dcd5ab5544abf73eddba81edecb1ba749e5a87 SHA512 34755ef7a7b27df191a9044e34f68bef3807a50b5e691adcaba156014244c8f89bed6583fb1684f586e45058eb6ffca0aa1f0af26266884ee32920131b8379de
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.1.3.ebuild 1417 BLAKE2B 889d988ed05c491f366e78aaa88a8455d431ed47490edba05575ae705fb7dce2d796baea85f1a48d3eef9b2b80fd1476a6a45754a895ab1f6a29af490969bd71 SHA512 73375cff820247f19cda0ab51eba32fab8629721ceb34f73fe1050c5b6a2346eb54f9a05244550e8742958fb5590e5af1b5e1fbdd45be1644de42ce83f4b2343
-EBUILD pulseeffects-4.1.9.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
-EBUILD pulseeffects-9999.ebuild 1515 BLAKE2B a01b7e30bb2dc724e62c8360a8eff01c71ac1ab0d378d481da8bb8499375e690921bebe57c3c8b8d184b7d965ddd73a11990d5ba91c688c23cca12fe66119655 SHA512 2242d7cc3f57c135d6c0f5babdc3a65051009d7dcdb66715d84381d36523adaecc192bdd6b93f2e5edc204611d1d27c336e6bdd4d2fc1c9518374fe7f872ec62
+EBUILD pulseeffects-4.2.3.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
+EBUILD pulseeffects-9999.ebuild 1556 BLAKE2B 4916a47b76b4206d9f8b285916dbdfe13684c8feb6bb707a212a2a4844972f18370aba90719d982a8c2f8af452519ee25b225515d038dfef89167d514a9ba6b6 SHA512 7b22ee540afbcb64ac52bab63c430c69744513279153a6c5f7d277b9e3cb3a94576b037bd8e8d2b8b52837b10cd958d1af62e731e7904dbcc0d13f087f6f33ef
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild b/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
deleted file mode 100644
index edfa01b18d19..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.1.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="~x86 ~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-DEPEND="
-	>=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/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 )
-"
-RDEPEND="${DEPEND}
-	media-sound/pulseaudio
-"
-
-pkg_preinst(){
-	gnome2_schemas_savelist
-}
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.1.9.ebuild b/media-sound/pulseeffects/pulseeffects-4.2.3.ebuild
index fde99f8f82b8..90b1ffc99215 100644
--- a/media-sound/pulseeffects/pulseeffects-4.1.9.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.2.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -41,6 +41,8 @@ DEPEND="
 	mda-lv2? ( media-plugins/mda-lv2 )
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
+	dev-util/itstool
+	media-libs/libebur128
 "
 RDEPEND="${DEPEND}
 	media-sound/pulseaudio
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index fde99f8f82b8..90b1ffc99215 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
 	EGIT_REPO_URI="${HOMEPAGE}"
 else
 	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~x86 ~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-3"
@@ -41,6 +41,8 @@ DEPEND="
 	mda-lv2? ( media-plugins/mda-lv2 )
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
+	dev-util/itstool
+	media-libs/libebur128
 "
 RDEPEND="${DEPEND}
 	media-sound/pulseaudio
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 6b463bb45816..b0e98a952a0b 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,10 +1,10 @@
 DIST qmmp-1.1.12.tar.bz2 1147871 BLAKE2B e511b02c38cbc5fcb478585df14a50c9f67985da9ef5e1e11557f2acbbd454d1b1beb430c8e2e2725a7d9ceea63243746fd41ecf2970fd3c52bcf21857bc1228 SHA512 a45680dcee478a7f03a04dbc87525368ac227a9de7e803252470f517027639d3426bf27a3235996d94ad68212596c03e7a67b5ad00a642532f02a820bf4097ee
 DIST qmmp-1.1.7.tar.bz2 1135005 BLAKE2B fc6574b5baa1aaf89cb13f194e59daafa0fe502c1e5ebe5322ae5564eeeb590b6f531307470dc93ef586d992ac827c114b89559ba83b6daab57d16e364388c53 SHA512 058187d34b848c0917077a167bcb52c63e39b5150409295ea658484d99fcd5582f7871979d3d3eea40aa97f0d9bf2a2d72ae721b827bcc0366b1bbc652aa3a72
-DIST qmmp-1.2.1.tar.bz2 1187267 BLAKE2B 11577481801c9a89acd327c23c94bbfee8e1d3869da6f271f6fa392623977dea256e3a521493f1de5255ac57bc7b881cd0a47b2bfeb5f516d1a5238dd6ac6912 SHA512 a21483e075934b4f696384737cc852c5054f2b088430db84cd461f6c16d6018ea02c992ae50467093f30c82d671113a4c308040d91328ce941e14fabaeb93e17
 DIST qmmp-1.2.2.tar.bz2 1187439 BLAKE2B 984a1a38cc20500c07a928cc2a1cd5d0210307c0acaedc73b36d3d7d90fc9ddd1b7d84e8791ec7f2dfbfe1288c24b1e62dbadc191e6ef596863a3ec5ca777075 SHA512 deec5ad6e53222d390e5f147ac1dbf3f471c0266eb32315b9b334348ae10f54b88842ae016d95282a41d27592c46f3479c6f594dc8eccb330750025469b468b6
+DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
 EBUILD qmmp-1.1.12.ebuild 3860 BLAKE2B 3ff315969c52877dfd02651bee97b01ba72ab00383a20f6183ad823e0242b3d4676bcc3d28c6a4c33c1c4a64810757f09d1add8b14d656354ddc81ae88ed19a3 SHA512 cb3b6e484f7f63f6659937362ad090a0534c759f4bcdffe9b8aa1161d1a3733bf3dc2b781bbe8650fdeba88d1b52a1f3db7fe0da0206c9137f161dc7bd99ff1f
 EBUILD qmmp-1.1.7-r1.ebuild 3858 BLAKE2B 544e062718ea06fb28e0920ef7d4c1ee1fa8ad850248a956df78054f1f63b06538af04cd8b09fb5f059af5748ce2530f8fb72dc33f902b1c6b5cfab9c8d62c28 SHA512 88a97842bd3b8f43409c420d391421845a45ce597e9334a6218b13bd36ce18dcc510f82dbe67f175e88ed8da5c8bb28eb3a526c0499f828041fadc9b6c3ba22a
-EBUILD qmmp-1.2.1.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-1.2.2.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
+EBUILD qmmp-1.2.3.ebuild 4174 BLAKE2B f89ba88df7ddcca820028778416ece543951481e82bd6136a45e95349f934e2a3683e2c5dc5248c606c51e44d2eae4c1ef5686e8eec8a93ba1b2fd2ea958a538 SHA512 b33fbca7a5e380f08adcb182caf3772b30e3bdb092e88684e16b8298646b89fae14cb9ebbaf3f1292c2e44689863515d4f87bc944ff5e1f37ff1abd314a8bb49
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
 MISC metadata.xml 1776 BLAKE2B acbe67572cda04be31f68a07539acc2f1124b789bd1986fcd0e17f7688c37d2248236467b9f04c6de04030c4ce59962e78741fad57d9bd993b1a893fcc58ecbc SHA512 92f5f391cadb3f602d950a52ba0c6e3e8b5ec844ed7d6ffd5bc1ac112fcb46f113ac8524676a1d8c482366703966edbd551a4906aba54af54ca0856e20215425
diff --git a/media-sound/qmmp/qmmp-1.2.1.ebuild b/media-sound/qmmp/qmmp-1.2.3.ebuild
index b0b24f039928..b0b24f039928 100644
--- a/media-sound/qmmp/qmmp-1.2.1.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.3.ebuild
diff --git a/media-sound/qtractor/Manifest b/media-sound/qtractor/Manifest
index 5d7c25e32de6..51a196469ba8 100644
--- a/media-sound/qtractor/Manifest
+++ b/media-sound/qtractor/Manifest
@@ -1,5 +1,6 @@
-DIST qtractor-0.8.4.tar.gz 1752418 BLAKE2B a66edab959df43c6210e8fb26338d1299b26eb9a767158e371741bffc847420eac3a5a487da9cb83b6da0fe2705a34c9a3290a2a5400e66cf8e6ff3060e1b541 SHA512 406c19eb37273ac932b0f797db6e064e48119a245fe25762f743a261c9f80ec3ce762c76ddbc633ad17bb5924affb7db7ded95d1403b9b1edaa360e6ff060f92
+AUX qtractor-0.9.1-qt-5.11.patch 961 BLAKE2B 392220acdf078d0011a91c77a3e2f15ea395f41d8f206a28cd8d4632752943ad1d7b6ae6f14f2c8457e4548045ba3de5ecb3706ab7fdd0534ecec19e2113e0ed SHA512 b7dd5a429693d5a4944a9b4a7ba252e7bcb5879e95ffab3caa828d3934cb3ecac30f29fb627241073fe2b40f2de523de638c2d9aa7c686dd30b53ef870c6af07
 DIST qtractor-0.8.5.tar.gz 1766017 BLAKE2B eaa75f6efd7ebcfdb1e21c717960d22eb9790c4a3f15ae8bcc364c9b6a5eed6137e4f9d47bd914abdb3679de2cbc30e9c72e32f07fc1ca06959140c5c96dc29b SHA512 9f916e46460403fcb4b1e2dadd048dd52c0d74425a2220cc4d40456141ff7bf5a9cb2fda0f394dac38079af67c322720468d9b7825181442875945899b699329
-EBUILD qtractor-0.8.4.ebuild 1500 BLAKE2B 08ae14793c7c906a98aa8b107198c1cda598c6f1c31d804fa11151bcf5eac10546e1927c16b8b14d04d22f671813e691a0b40339bf5602c483dd69e9a0039cc4 SHA512 fa3ab5724e7b23d90e2e476e2dc0238e82d69af5b863361ef7bd1b72de9e7bc902aa3130225eadf5c04ca7be2bc8a43ca28123d3eb07065b914c7470c84f8842
+DIST qtractor-0.9.1.tar.gz 1763699 BLAKE2B a1d03361266a91abc6c0425d71ee2fa53fd5ec6299a23f15ba1599e480d43c30180334defaa50fcc73a02b7ddafd694bfaf6a00fa14fbdd767276c05b7ec56b8 SHA512 c40a7535740bc8315ffc640f791b640a12a4ba135070502682681c3022923f1edb62738127cae0c523a6410cb163b4cac2828544ae629b42fc93946f3d4d8a59
 EBUILD qtractor-0.8.5.ebuild 1500 BLAKE2B 08ae14793c7c906a98aa8b107198c1cda598c6f1c31d804fa11151bcf5eac10546e1927c16b8b14d04d22f671813e691a0b40339bf5602c483dd69e9a0039cc4 SHA512 fa3ab5724e7b23d90e2e476e2dc0238e82d69af5b863361ef7bd1b72de9e7bc902aa3130225eadf5c04ca7be2bc8a43ca28123d3eb07065b914c7470c84f8842
+EBUILD qtractor-0.9.1.ebuild 1504 BLAKE2B 2f6c75da0d150666fe377dd46244df3bf98a6d40caeb61868e5ae20fa8e2503fd4b4d729186e8d211c070a16ed15c73ac5464734b49375acce2f587156703404 SHA512 cad2ef21a1577b9df0ba76d93a0f3d60a3da16702ce8919eea29c25f6204eecd8b3dd5149914dfc21cd81a9ab07166afcd6f39d4c5da1b662143446dbc899f02
 MISC metadata.xml 542 BLAKE2B bc7330f8b5f775ebbab52dcf034130ee6016eada843baca1529e58d3c72ac19ce7fcd13b3483e4bf15b3620e8ee4c379520730146a39ec72d6ea1aaba094d93b SHA512 002d353914af0071fae342598619aef3b0dfe099d500da0bc98f40c209689f123dbbd93ca80a89a53c6257a54ee808798a858987d80a0443e2cc723dbfdedb7b
diff --git a/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch b/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
new file mode 100644
index 000000000000..c30166ea368f
--- /dev/null
+++ b/media-sound/qtractor/files/qtractor-0.9.1-qt-5.11.patch
@@ -0,0 +1,38 @@
+From b49da1c4c44e668f3ae9ceba3002d77d10694c85 Mon Sep 17 00:00:00 2001
+From: daviddavid <geiger.david68210@gmail.com>
+Date: Wed, 30 May 2018 06:49:13 +0200
+Subject: [PATCH] Fix build with Qt5 >= 5.11.0
+
+---
+ src/qtractorMeter.cpp       | 1 +
+ src/qtractorTrackButton.cpp | 2 ++
+ 2 files changed, 3 insertions(+)
+
+diff --git a/src/qtractorMeter.cpp b/src/qtractorMeter.cpp
+index d1b826c5..14c38366 100644
+--- a/src/qtractorMeter.cpp
++++ b/src/qtractorMeter.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include "qtractorObserverWidget.h"
+ 
++#include <QAction>
+ #include <QHBoxLayout>
+ #include <QVBoxLayout>
+ #include <QPainter>
+diff --git a/src/qtractorTrackButton.cpp b/src/qtractorTrackButton.cpp
+index 488eb831..5a314dd8 100644
+--- a/src/qtractorTrackButton.cpp
++++ b/src/qtractorTrackButton.cpp
+@@ -26,6 +26,8 @@
+ 
+ #include "qtractorMidiControlObserver.h"
+ 
++#include <QAction>
++
+ 
+ 
+ //----------------------------------------------------------------------------
+-- 
+2.18.0
+
diff --git a/media-sound/qtractor/qtractor-0.8.4.ebuild b/media-sound/qtractor/qtractor-0.9.1.ebuild
index 4796180c1501..1595ca670dfa 100644
--- a/media-sound/qtractor/qtractor-0.8.4.ebuild
+++ b/media-sound/qtractor/qtractor-0.9.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic qmake-utils
 
@@ -41,24 +41,24 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-DOCS=( README ChangeLog TODO AUTHORS )
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
 
 src_configure() {
-	append-cxxflags '-std=c++11'
+	append-cxxflags -std=c++11
 	econf \
-		$(use_enable mad libmad) \
-		$(use_enable libsamplerate) \
-		$(use_enable vorbis libvorbis) \
-		$(use_enable osc liblo) \
 		--enable-ladspa \
-		$(use_enable dssi) \
 		--enable-lilv \
 		--disable-qt4 \
 		--with-qt5=$(qt5_get_libdir)/qt5 \
+		$(use_enable debug) \
+		$(use_enable dssi) \
+		$(use_enable libsamplerate) \
+		$(use_enable mad libmad) \
+		$(use_enable osc liblo) \
 		$(use_enable rubberband librubberband) \
 		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable zlib libz) \
-		$(use_enable debug)
+		$(use_enable vorbis libvorbis) \
+		$(use_enable zlib libz)
 
 	eqmake5 ${PN}.pro -o ${PN}.mak
 }
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 7351a681b003..7b8e9dc82fe4 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-3.0.0-beta1.tar.xz 196916 BLAKE2B 82832a151e030cbd2be129fe7f4dcd92430aadc71b163c3800cc2108f502020561e2c74291cbb25050ed42bd9d71fdfe310f107af84f612711554cf3e32fd07b SHA512 a27a2c7b4156a6d6c682424c5fa64a4dd82537b1dbfa8176fa39fbfc4d139a21b7dd042de80d088333c0aef0042a76940ab8da5d9708b6aac3399b32b7408f09
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
-EBUILD soundconverter-3.0.0.ebuild 1800 BLAKE2B ef9ab547b5c2a8f9cd930e217240394d26e10bc6adc09ded60fe2fc81102186938f264f952d922272043eab7df394fb110afa85823f028a26dd6367eb5af96ef SHA512 38f4c6321cd78a9db113a0a60198e6a98561095f82b9f5d20d11451058fa11af9c4a0131914c07ef0ffa66823428df7e8be192c6a2daf24969e75a96b80ec0da
-EBUILD soundconverter-3.0.0_beta1.ebuild 1723 BLAKE2B f23e65f31ea2707e8bced4de1a19813c5d0b140aa5e38c8d6b0dfa46a2a92a771b3d590e0479e88d2239eb6b95f126068e959fd8f1821a258682db02bb9d3e9c SHA512 703175800399bb19fed41bee82a0e839a10f0c1d36f9da5c7854d8d030788f246ffb449765e20651e42fa050e966e1e45c1ca01cbdd0f4002e6434f8777dbc16
+EBUILD soundconverter-3.0.0.ebuild 1799 BLAKE2B 7b962993406c4a58e530afff0aa966308ac3154c64a43b8a4fdb8fe20a2a15e1a21e2bfa4de52b91860fdc0a6fb08db536a9bd1c02c491946ff92cf0f0a9bdaf SHA512 d263c6e6268d769c424b387a58163f5d178b8f52bd2b6c2cf1ee03cd8622584a87218833b1bb1a03205179d991373b683fdbfc86643875f9ac7b56eac69e4075
 MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
diff --git a/media-sound/soundconverter/soundconverter-3.0.0.ebuild b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
index d9e46c23e72f..da78a4cd53e2 100644
--- a/media-sound/soundconverter/soundconverter-3.0.0.ebuild
+++ b/media-sound/soundconverter/soundconverter-3.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="aac flac libnotify mp3 ogg opus vorbis"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild b/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
deleted file mode 100644
index 3a778827fb89..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.0_beta1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="http://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gconf:2[introspection]
-	x11-libs/pango[introspection]
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/taginfo/Manifest b/media-sound/taginfo/Manifest
index 196d383f4f0a..279cc68953d0 100644
--- a/media-sound/taginfo/Manifest
+++ b/media-sound/taginfo/Manifest
@@ -1,3 +1,3 @@
 DIST taginfo-1.2.tar.bz2 8272 BLAKE2B 07ea6bbdbd7db614be4cb989d4ae1968dab2c5f7dcb44288875dc8874015609b02c8d17dc0e946bb7fff013e2fd20f95aab02ec73441e40dfac2bb5a0ea09f16 SHA512 5e12d63ff3f7db2ed5bb877a3ab6e1a1a63793df30d0433ddb30e2630cab82bff4644331915e3cf80054a55435672b6b534c2550765ee4f88e1e0bf1859fd6e3
-EBUILD taginfo-1.2-r1.ebuild 577 BLAKE2B 6129d9a49f362c9873b9d3a8c8a15179e10f219038d1ddf1d26542839799e44abcb49d1134414f6d55a0c769507f226d2184529a3442b8d22c55cb823f382733 SHA512 a98fe5b92206e17024439b9f0b26bef2864edca3c9541c98eac63212585d7fd8f03b40dc3059416a31254e0a8aef87192d97cefa9e303ee3232633f483a7ef1b
+EBUILD taginfo-1.2-r2.ebuild 564 BLAKE2B f61243e15491cb65a6f931e2aaa8cf0c9b5dbdf7605fafbd4a05bf213b06572dd9013e74405889177db44f71bf62f5f4426190985e9f1f31436b85c06b247662 SHA512 6f46700da4399266585e28fc6c6aea17d5271542e9eeddabfb0496868ae17ecc52c52038baac7f8de1091f55cb1b7b05195982ac869ee5dffe933bafd9f1b3a0
 MISC metadata.xml 328 BLAKE2B 1e3bb8774ee9b7f6f741d6cc92029643599c999516b818562ffb12b2897a0dab5fca01d179650effb8c7a36db00f00b116b5b4bbe2bef6dee35440ff8c27adef SHA512 4fbf91c2ea652085728af556f6cf66924dc9ba3efb50a28c5dd52240306e25f18c7c634988c57fe0a0f65647a9501a504e5bec290b75298b95b58d497ecbc79d
diff --git a/media-sound/taginfo/taginfo-1.2-r1.ebuild b/media-sound/taginfo/taginfo-1.2-r2.ebuild
index 47c6440ec433..8c20895d3dec 100644
--- a/media-sound/taginfo/taginfo-1.2-r1.ebuild
+++ b/media-sound/taginfo/taginfo-1.2-r2.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
+
 inherit toolchain-funcs
 
-DESCRIPTION="a simple ID3 tag reader for use in shell scripts"
+DESCRIPTION="A simple ID3 tag reader for use in shell scripts"
 HOMEPAGE="http://freshmeat.net/projects/taginfo"
 SRC_URI="http://grecni.com/software/taginfo/${P}.tar.bz2"
 
@@ -17,10 +18,10 @@ RDEPEND="media-libs/taglib"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	emake CC="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS}" || die
+	emake CC="$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS}"
 }
 
 src_install() {
-	dobin taginfo || die
+	dobin taginfo
 	dodoc ChangeLog contrib/mp3-resample.sh README
 }