gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-sound
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
98 files changed, 1092 insertions, 891 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bdd2ab5bf2ea..612be3d5ca7f 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index be3e625fc421..56a420f211b9 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -3,4 +3,4 @@ DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
 EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
 EBUILD abcde-2.8.1.ebuild 1756 BLAKE2B 84baa7f929ae4144ab55b2b470eba21982306ee02afed134de69aec855b3abb23637b0ed1b485047ea00fda2ec2e408bd8c3b52fa5a3d7183a81a5dba870433b SHA512 4010e4bdad8d4b489c6be85a9c8eb96b17a05f51662e6a88d6a888ff05b99f4c0e7060063e7f7a3e7bf8a9fc7830d9ba29e4207d5276b734679a88b0c1cb66c1
-MISC metadata.xml 651 BLAKE2B ca84bde665367b9f55bdd57c3c7783c293b037715cbbec3540142ca1e3b4cf98865cb57a378973c1383bd6d83c263ca4e1520bc49c88ce299b3a92fbbbe04d2f SHA512 9174fb9c065d85ff2cb5312bca39bf33d5798f06caafe2a6d8e5fc239b253df8956a30b920fb0392e6a979328c975718f8393655a7cdaf975a72747de1c67ef5
+MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 41b01c0f1635..658ab9a36efa 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
 		<flag name="mac">Enable support for Monkey's Audio files</flag>
 		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
-		<flag name="opus">Support opus encoding using opusenc</flag>
 		<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/alsa-tools/Manifest b/media-sound/alsa-tools/Manifest
index 102d134e56c3..15c315f41968 100644
--- a/media-sound/alsa-tools/Manifest
+++ b/media-sound/alsa-tools/Manifest
@@ -1,10 +1,8 @@
 AUX envy24control-config-dir.patch 593 BLAKE2B 481ffd2bf81ce1e8fb0cd8ee1d40c398c54aec73ca705c26ea234915c47f2da7f48a71075612540ac42d4aaf91dfc43d23b08ec72c6598b25126b1771841e15e SHA512 267be12fb2d9d561cc2746317beaf5168362005cb98a55d3efe5741dcd974b088bfa049f2ed185919083fe2e24596eec67de2f2984da5369b9aa0eac983b5cef
 DIST alsa-tools-1.1.0.tar.bz2 1715113 BLAKE2B 9b64f3a78e0cff212663c716c189591cd249e58992e5b403e8948b0fa81c4b3b86cc4872f4dcb7a0fadf9cb313043201549b10f3a36d546911bba18fe9fc3602 SHA512 caabbc9a8b494de6bba0dea6440b335b35e5c7dab4942ac36f127a75c2212ff98e7e38566444666edcf40c6c95e6d9797c421014fb5c5c292bb398780e6c9f87
-DIST alsa-tools-1.1.3.tar.bz2 1715759 BLAKE2B c267c746b1b6e986d65e4f69874eb8432e141e823112037ac21f6c794275c818d66dc8adb680c62eb72621d6d6b0974efaffadcf5b7dd7aea53c4c1528631c14 SHA512 b7c6c7639ea30fd8385c817fcd9dee4e5ed7c5766801d11a61d94f3211db4f99ecc0f00173573b69724ad9a06138605c353f4a40c8631eb4325b9718788bea50
-DIST alsa-tools-1.1.5.tar.bz2 1715977 BLAKE2B a8608d19794f7072959121a5f6ab8a7f676d600706bcf52d7e0ec770947fa85948927c1967d4ed35befd31f3bf1b66633ae107274b11490b4bb4558d434c4f80 SHA512 42463540def2260bda0fdb0b08a665ef336deb817920605ce8f77b4904595eadc7d4774d799385bb2271026e26976cc733a776b228814d2c7d7651c46a45098d
 DIST alsa-tools-1.1.6.tar.bz2 1778330 BLAKE2B 256ffaef47f78c07f1d8cd86df57b2f75cb6838c407586b52144963350d51271fb500e627e152d05d1c586c337c70fc839072094e0492a0a1b160d6876ccedeb SHA512 33617ec6726ca11f66849c893a8dd9bf9faa8832374788819d9280159ac358c83443331faac24881df593cfd0b24b22769a41cbcb0af3c1fd781baab0c802d17
+DIST alsa-tools-1.1.7.tar.bz2 1782642 BLAKE2B 1b2235c3471595c17836b376e5c87194b798f39d2ab52398c634b430c55a4d10482af2aef9568c6694ac4f5a58c4b2f4601cc6a7a80b4e1a3e87dd8d86d8e67a SHA512 d715fa5b909fb33ffce252b4ae9f027dc7c1a509253d52bda6ecbc5e0a38e7d30ab8486b14114b226424217812a0edf66e7ec11f7674e44c77a14e4dfb16889c
 EBUILD alsa-tools-1.1.0.ebuild 3491 BLAKE2B 6c4c591a1025f18d1b8e7e2058fbb227f200ec5c50334ae400a9cff94d5630d05f5298faf91c2c76451b09ef9b90d1e3b1b04aad70871eb79d55a6f66b683f53 SHA512 704b16d093923c138ea05bfbeebd96be74987ea0ea076f40e2260e32765074bbde1bfe08f3b231fc6fb6b7b32a5eb2241c980f9d62294475df8e848e46393284
-EBUILD alsa-tools-1.1.3.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
-EBUILD alsa-tools-1.1.5.ebuild 3497 BLAKE2B 247f1a79678b2a6f647da73c5e523a95d62565d66eebce000e5987adaa92995d5066e859c688ed7b7197939bf3e9ecb0b031e33d2c30dece41219d6eacf01459 SHA512 0c9bafd1470f61f189a19de82a7bbcafaeb9c195edb13632f63c846f5a248d755f668592025afd427719ea1d79223baafe994fac24b5b1a3fe6daffa5d81a60e
-EBUILD alsa-tools-1.1.6.ebuild 3547 BLAKE2B 6c8107c40bfc3927e2e5a4d6eedb4791882dcebb5d3033eec1f4d8d338e9bd01ff422eadca8b32dc569405e5624779d7529a848ab124f2e8103da4440d2b6e57 SHA512 26a4f2338d1714e1a9a0cebf8a731a3b19ee4513fc1738411bd7865e84630c7d83a7f1fefea09c10c1c9b831d9b2e5ac4f10f86a9f0441388eb06aafb54d0a6e
+EBUILD alsa-tools-1.1.6.ebuild 3548 BLAKE2B b6a7fd71fdf79123aed542424f475b42d4d279daa2f33d586c499518aaf20aea4311b9e0d960f0e8d2e67bd77ddb1f0d1039a6c7a5af5be91d51eb5c097c7b84 SHA512 2535753579ebff3dd7fe0f4cca577a4873e2b71c902eae675d7d9cef97aab708cb46a0d02342e9dcebb1ccf8f09ac4f6c80c3965183c1e4a4c637b00d0bba882
+EBUILD alsa-tools-1.1.7.ebuild 3544 BLAKE2B b833cc72f9bd1d45a75f992cd9d0667ba23e94bcda8a22b2d39c2d72fa475bc78fc5e746061dd961fa7a7b83d74af3e7f910ba46ffd5fa8c67f21c5b8d5900ad SHA512 f2f7ed51b00cdd3ae72eae5d22f0185001bb0c96bbba656882c8f562ef962aa8b484b87db45aa2730ad2659c740e9c62621d8c2e4c069610cdda4c5f44055c81
 MISC metadata.xml 225 BLAKE2B 6f0446c3c537887bfd8d5c8a99af6eb89e48a3124d4b1a89552e178d79f1e8cffeb730fac6f39626ee6ac8091e9473af034b71b4165ac620f59cff34d3670fe5 SHA512 7806a6a0628364586838c96fec8875c8654490d461b58acd63871c4f2f580f589e16c968dcf58218afdac1815df5bd88bb50226c067fbddef27acad509ef9b5f
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
deleted file mode 100644
index 972e14d4b033..000000000000
--- a/media-sound/alsa-tools/alsa-tools-1.1.5.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Advanced Linux Sound Architecture tools"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
-alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
-alsa_cards_emu10k1 alsa_cards_emu10k1x alsa_cards_ice1712
-alsa_cards_rme32 alsa_cards_rme96 alsa_cards_sscape alsa_cards_pcxhr"
-
-COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
-	>=dev-python/pyalsa-1.0.26
-	fltk? ( >=x11-libs/fltk-1.3.0:1 )
-	gtk? (
-		>=dev-python/pygtk-2
-		x11-libs/gtk+:2
-		x11-libs/gtk+:3
-		)" #468294
-RDEPEND="${COMMON_DEPEND}
-	gtk? ( media-fonts/font-misc-misc )" #456114
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/envy24control-config-dir.patch
-)
-
-pkg_setup() {
-	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
-
-	if use gtk; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
-	fi
-
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
-	fi
-
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
-
-	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
-	fi
-
-	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
-}
-
-src_prepare() {
-	default
-
-	# This block only deals with the tools that still use GTK and the
-	# AM_PATH_GTK macro.
-	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	# This block deals with the tools that are being patched
-	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
-		pushd "${dir}" &> /dev/null
-		eautoreconf
-		popd &> /dev/null
-	done
-
-	elibtoolize
-}
-
-src_configure() {
-	if use fltk; then
-		# hdspmixer requires fltk
-		append-ldflags "-L$(dirname $(fltk-config --libs))"
-		append-flags "-I$(fltk-config --includedir)"
-	fi
-
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		case "${f}" in
-			echomixer,envy24control,rmedigicontrol )
-				econf --with-gtk2
-				;;
-			* )
-				econf
-				;;
-		esac
-	done
-}
-
-src_compile() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
-		emake
-	done
-}
-
-src_install() {
-	local f
-	for f in ${ALSA_TOOLS}
-	do
-		# Install the main stuff
-		cd "${S}/${f}"
-		# hotplugdir is for usx2yloader/Makefile.am
-		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
-
-		# Install the text documentation
-		local doc
-		for doc in README TODO ChangeLog AUTHORS; do
-			if [[ -f "${doc}" ]]; then
-				mv "${doc}" "${doc}.$(basename ${f})" || die
-				dodoc "${doc}.$(basename ${f})"
-			fi
-		done
-	done
-
-	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	prune_libtool_files
-}
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
index 5f4c7573d32d..b0f1e28d9fa4 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 IUSE="fltk gtk alsa_cards_hdsp alsa_cards_hdspm alsa_cards_mixart
 alsa_cards_vx222 alsa_cards_usb-usx2y alsa_cards_sb16 alsa_cards_sbawe
diff --git a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
index 972e14d4b033..446f976a0369 100644
--- a/media-sound/alsa-tools/alsa-tools-1.1.3.ebuild
+++ b/media-sound/alsa-tools/alsa-tools-1.1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic gnome2-utils xdg-utils
 
 DESCRIPTION="Advanced Linux Sound Architecture tools"
 HOMEPAGE="https://alsa-project.org/"
@@ -24,7 +24,7 @@ COMMON_DEPEND=">=media-libs/alsa-lib-${PV}
 		>=dev-python/pygtk-2
 		x11-libs/gtk+:2
 		x11-libs/gtk+:3
-		)" #468294
+	)" #468294
 RDEPEND="${COMMON_DEPEND}
 	gtk? ( media-fonts/font-misc-misc )" #456114
 DEPEND="${COMMON_DEPEND}
@@ -35,35 +35,44 @@ PATCHES=(
 )
 
 pkg_setup() {
-	ALSA_TOOLS="seq/sbiload us428control hwmixvolume hda-verb"
+	ALSA_TOOLS=(
+		seq/sbiload
+		us428control
+		hwmixvolume
+		hda-verb
+		$(usex alsa_cards_mixart mixartloader '')
+		$(usex alsa_cards_vx222 vxloader '')
+		$(usex alsa_cards_usb-usx2y usx2yloader '')
+		$(usex alsa_cards_pcxhr pcxhr '')
+		$(usex alsa_cards_sscape sscape_ctl '')
+	)
 
 	if use gtk; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdajackretask"
-		use alsa_cards_ice1712 && \
-			ALSA_TOOLS="${ALSA_TOOLS} envy24control"
-		use alsa_cards_rme32 && use alsa_cards_rme96 && \
-			ALSA_TOOLS="${ALSA_TOOLS} rmedigicontrol"
+		ALSA_TOOLS+=(
+			echomixer
+			hdajackretask
+			$(usex alsa_cards_ice1712 envy24control '')
+		)
+		# Perhaps a typo the following && logic?
+		if use alsa_cards_rme32 && use alsa_cards_rme96 ; then
+			ALSA_TOOLS+=( rmedigicontrol )
+		fi
 	fi
 
-	if use alsa_cards_hdsp || use alsa_cards_hdspm; then
-		ALSA_TOOLS="${ALSA_TOOLS} hdsploader"
-		use fltk && ALSA_TOOLS="${ALSA_TOOLS} hdspconf hdspmixer"
+	if use alsa_cards_hdsp || use alsa_cards_hdspm ; then
+		ALSA_TOOLS+=(
+			hdsploader
+			$(usex fltk 'hdspconf hdspmixer' '')
+		)
 	fi
 
-	use alsa_cards_mixart && ALSA_TOOLS="${ALSA_TOOLS} mixartloader"
-	use alsa_cards_vx222 && ALSA_TOOLS="${ALSA_TOOLS} vxloader"
-	use alsa_cards_usb-usx2y && ALSA_TOOLS="${ALSA_TOOLS} usx2yloader"
-	use alsa_cards_pcxhr && ALSA_TOOLS="${ALSA_TOOLS} pcxhr"
-	use alsa_cards_sscape && ALSA_TOOLS="${ALSA_TOOLS} sscape_ctl"
-
-	{ use alsa_cards_sb16 || use alsa_cards_sbawe; } && \
-		ALSA_TOOLS="${ALSA_TOOLS} sb16_csp"
+	if use alsa_cards_sb16 || use alsa_cards_sbawe ; then
+		ALSA_TOOLS+=( sb16_csp )
+	fi
 
 	if use alsa_cards_emu10k1 || use alsa_cards_emu10k1x; then
-		ALSA_TOOLS="${ALSA_TOOLS} as10k1 ld10k1"
+		ALSA_TOOLS+=( as10k1 ld10k1 )
 	fi
-
-	use gtk && ALSA_TOOLS="${ALSA_TOOLS} echomixer"
 }
 
 src_prepare() {
@@ -72,7 +81,7 @@ src_prepare() {
 	# This block only deals with the tools that still use GTK and the
 	# AM_PATH_GTK macro.
 	for dir in echomixer envy24control rmedigicontrol; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
 		pushd "${dir}" &> /dev/null
 		eautoreconf
 		popd &> /dev/null
@@ -80,7 +89,7 @@ src_prepare() {
 
 	# This block deals with the tools that are being patched
 	for dir in hdspconf; do
-		has "${dir}" "${ALSA_TOOLS}" || continue
+		has "${dir}" "${ALSA_TOOLS[*]}" || continue
 		pushd "${dir}" &> /dev/null
 		eautoreconf
 		popd &> /dev/null
@@ -97,35 +106,32 @@ src_configure() {
 	fi
 
 	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
 		case "${f}" in
 			echomixer,envy24control,rmedigicontrol )
 				econf --with-gtk2
-				;;
+			;;
 			* )
 				econf
-				;;
+			;;
 		esac
 	done
 }
 
 src_compile() {
 	local f
-	for f in ${ALSA_TOOLS}
-	do
-		cd "${S}/${f}"
+	for f in ${ALSA_TOOLS[@]} ; do
+		cd "${S}/${f}" || die
 		emake
 	done
 }
 
 src_install() {
 	local f
-	for f in ${ALSA_TOOLS}
-	do
+	for f in ${ALSA_TOOLS[@]} ; do
 		# Install the main stuff
-		cd "${S}/${f}"
+		cd "${S}/${f}" || die
 		# hotplugdir is for usx2yloader/Makefile.am
 		emake DESTDIR="${D}" hotplugdir=/lib/firmware install
 
@@ -140,5 +146,15 @@ src_install() {
 	done
 
 	# Punt at least /usr/lib/liblo10k1.la (last checked, 1.0.27)
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index cb8d58de0a85..8cac599a2fe8 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -3,11 +3,9 @@ AUX alsasound.confd-r4 340 BLAKE2B bcd03d51441528871316f1de640c4e7d382756bfea893
 AUX alsasound.initd-r6 2189 BLAKE2B f0c4b5b51aae15f5d841b4e2ea8ce6a0631f92868a12b481798c484f6eff54bf8de0352c8c8b01c58d6164ab8de25bbfebb619f87bebb9c50c00610b67eed2e8 SHA512 960e6eff97174004abeb8d36d68c01a9f67e589174743928bb63dc37390f9868551e5b7e11c8386db67889c3d518f5ff4564b258dfee5e3317c164bc52aac04e
 AUX alsasound.initd-r7 2190 BLAKE2B af02158bfa5d74c174cb5efbb8dff4c0b51ff856d7b4afdc5c5f601e5e7055710474db63ac9c6dd4145a680e94f08f8beff138d43a1ad50e3f24d52ae6bd40b7 SHA512 725153b0843bae7a4fee5ed5b1d80e0839420f18314e6a759a00ba6895176823b1842fdbacfbcdce7aa755c44892090ba9e649580e7acd7df1677d8b387df115
 DIST alsa-utils-1.1.2.tar.bz2 1193140 BLAKE2B 8c9d3baae1530a399299379963e68c50d2d4fca63045b7c59b14240d5ad6316c37f1c7d6f4a7fa2cfeb8e5ae561440b9ad689475e006ab1fcaea2065b7c33015 SHA512 38dc3331e8410123085738e74ca34c860666027ee2f6aaa21f48e726c84d8e6264043c8c7111ce2b1e158a0f38142a04d72a128ee54e00173dc4e4ba514d2f14
-DIST alsa-utils-1.1.4.tar.bz2 1202047 BLAKE2B 5da3c543ef6056b99ed56975211a0a788e0672160f21b7579e4f9d6d192b655d81a1350f096ff35547f89c7353532523c592d44cf3d5a740cd2189cb9626144d SHA512 96852b3f5b57d7d9078a20881f28311543d446b69c80450179823a225089df7306456991890a7ef37672c1f55e9c386a7731c94e125504dcda2c88a674c8b4c7
-DIST alsa-utils-1.1.5.tar.bz2 1202691 BLAKE2B 2a30079775d7d0abb8e2036f2e2569b392920bd5f60ec5361b9b69d3f1cc1d277225318c7e0c477c6d9608a3c45430cd1e2030069e4cdf1f960a7631985f9eab SHA512 102e9ed34b89219dbad243ad5f61ca65fb8101502566c02f40d4e69abb45baa7a60f24440de1417e0f0e7f55b28db53d365d53a59af11f1ca816e2aa5907153d
 DIST alsa-utils-1.1.6.tar.bz2 1203722 BLAKE2B e098ecbc5835c8ecd311a4df1ab51a709200b0d3666437f7f059d3842f07e1200a934b951e8e2c8ecedbe0aef4e2c766d875df577662eb21ce989807941ab6b7 SHA512 24d0ffaeeccecb3276d7d35ef51e6de6026a63fa5a1a1e4605b024f54d8097717e97ec9d33cfe50830ad17e4a89268ca24b065039b0df7f9fbe02b570617aa58
+DIST alsa-utils-1.1.7.tar.bz2 1205754 BLAKE2B 419fa61fe85750ed26ab2b1dfe87adc7898f8c95dfe082993c0d5ee7755c4cb6563000555f44267608a2138d033e7011e7c67d98b714fdf1884cc03a8fd50ed3 SHA512 5da9b03e219d67634307bd5bb06b76734db5286221bec11658ce9c4dfca8ed639a4155ed90450f1d6c8db322960bb023ced0873e276500ce24f14fab17ceeb65
 EBUILD alsa-utils-1.1.2.ebuild 2199 BLAKE2B 110899e375e20f25067db6dcc21b3302ac119dc9656c88946f0fa304084571f61ab6335536336d874dedad465dfcb0b4b1c39e3a7b0b502082dbb90ca5a32abf SHA512 e0253fbba1c48e7318d5b9ab5bceebccd303ac09e6e2687a3947788e90491a7c88952209128ece17ffeb6255330118d3a43e245513e4c1dca9254bbeed72394f
-EBUILD alsa-utils-1.1.4-r1.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
-EBUILD alsa-utils-1.1.5.ebuild 2273 BLAKE2B 567cf0b992c725bc555df0c9b437b4985c70679c0ff0768ecbd9086873ab5d3aba25bdd5ba1ed6e1520423659512da68618b6d1e441b80fe8d33379d0550c647 SHA512 170a3d59d02f65d33647eaf70f28f354c725fe11087c640e6917fc9c51a02540ecb2461da224e2c70282010869edadc6399252f04fcc8c70d6faab5be07dfc08
-EBUILD alsa-utils-1.1.6.ebuild 2260 BLAKE2B 9fb6d1078cfa7b85f4c9edc8fec80778fa61a79c4acae3e401018357a0da7d5d60415ad830de6551f27f0973edd08178dd04c9a211953b8634eaa5f38a2a66de SHA512 bd18ccc3281c5eec232de0a5128e56f4c0508e342af3b226d389421bc2aedf9ea58ba0c6ebdd1fe790c1523b909662715041b63df9e40aded966cef2407e0d3d
+EBUILD alsa-utils-1.1.6.ebuild 2254 BLAKE2B 2977985938945fbf24e34735f5bb07cb44e644c9feeb7c6efab3a02cdb6864ee2a38ca49bf759f9642af7decc763d8b73dedf7cbe8da7799a061c3eb6b6b3bb2 SHA512 6f300503628a3fe5ea5dc570ac04d7c5bdbf52169570c9333f32f5f696527ca685e9b709c4e94dae3e9ee465e58d0edd8eeea705f5d42f8d4229bd27f5bb476a
+EBUILD alsa-utils-1.1.7.ebuild 2266 BLAKE2B 55f1b932f6812fb453d7f5fd2cf432b046297bd90a998c85fa338e0ece9b45f06ce7083988f48876ab481851a5e5e5de94a7291cd602f935b3c89ff3122f0c87 SHA512 6ff5c859af866ce59d46952fc25d1f4f5402ed1aa458ec2798a51647c9cc1a5424f0f3c3a1b0b4327f501f239f8bd25eae9880f7d414a2774581b720a1a207f2
 MISC metadata.xml 479 BLAKE2B 1245c4734565b6ad06c137019aeb4ea92a5fe71e1ea66bb5860566cc00b7fc8a3b03ba343262ac10c7d8b93c1efc91e3a1fd56999a5cb9ee0ff11a0d9d9c03e1 SHA512 e03521bce9f75fc5ef16413153542993d6038bd07eb928a76b7f99b729d53dd160986128fa1754d16820fca89a58a3b23628e32c04d01d52f769f48ecc5ee367
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
deleted file mode 100644
index acbfd5824ecf..000000000000
--- a/media-sound/alsa-utils/alsa-utils-1.1.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils systemd udev
-
-DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="bat doc +libsamplerate +ncurses nls selinux"
-
-CDEPEND=">=media-libs/alsa-lib-${PV}
-	libsamplerate? ( media-libs/libsamplerate )
-	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
-	bat? ( sci-libs/fftw:= )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-alsa )"
-
-src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
-		${myconf}
-}
-
-src_install() {
-	default
-	dodoc seq/*/README.*
-
-	newinitd "${FILESDIR}"/alsasound.initd-r7 alsasound
-	newconfd "${FILESDIR}"/alsasound.confd-r4 alsasound
-
-	insinto /etc/modprobe.d
-	newins "${FILESDIR}"/alsa-modules.conf-rc alsa.conf
-
-	keepdir /var/lib/alsa
-
-	# ALSA lib parser.c:1266:(uc_mgr_scan_master_configs) error: could not
-	# scan directory /usr/share/alsa/ucm: No such file or directory
-	# alsaucm: unable to obtain card list: No such file or directory
-	keepdir /usr/share/alsa/ucm
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "To take advantage of the init script, and automate the process of"
-		elog "saving and restoring sound-card mixer levels you should"
-		elog "add alsasound to the boot runlevel. You can do this as"
-		elog "root like so:"
-		elog "# rc-update add alsasound boot"
-		ewarn
-		ewarn "The ALSA core should be built into the kernel or loaded through other"
-		ewarn "means. There is no longer any modular auto(un)loading in alsa-utils."
-	fi
-}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
index d27b42e0d67e..a4bef363fabb 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://alsaproject/utils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0.9"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE="bat doc +libsamplerate +ncurses nls selinux"
 
 CDEPEND=">=media-libs/alsa-lib-${PV}
diff --git a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild b/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild
index acbfd5824ecf..80b674c26780 100644
--- a/media-sound/alsa-utils/alsa-utils-1.1.4-r1.ebuild
+++ b/media-sound/alsa-utils/alsa-utils-1.1.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils systemd udev
+EAPI=7
+inherit systemd udev
 
 DESCRIPTION="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 HOMEPAGE="https://alsa-project.org/"
@@ -18,27 +18,26 @@ CDEPEND=">=media-libs/alsa-lib-${PV}
 	ncurses? ( >=sys-libs/ncurses-5.7-r7:0= )
 	bat? ( sci-libs/fftw:= )"
 DEPEND="${CDEPEND}
-	virtual/pkgconfig
 	doc? ( app-text/xmlto )"
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-alsa )"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	local myconf
-	use doc || myconf='--disable-xmlto'
-
-	# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
-	econf \
-		--disable-maintainer-mode \
-		$(use_enable bat) \
-		$(use_enable libsamplerate alsaloop) \
-		$(use_enable nls) \
-		$(use_enable ncurses alsamixer) \
-		--disable-alsaconf \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d \
-		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa \
-		${myconf}
+	local myeconfargs=(
+		# --disable-alsaconf because it doesn't work with sys-apps/kmod wrt #456214
+		--disable-alsaconf
+		--disable-maintainer-mode
+		--with-asound-state-dir="${EPREFIX}"/var/lib/alsa
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX}/$(get_udevdir)"/rules.d
+		$(use_enable bat)
+		$(use_enable libsamplerate alsaloop)
+		$(use_enable ncurses alsamixer)
+		$(use_enable nls)
+		$(usex doc '' --disable-xmlto)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index e9b470b22ae1..162a2214f9a2 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,7 +1,5 @@
 AUX apulse 488 BLAKE2B 20231c1041e1658e993ecc5f0dbd37f1d7e718aa5095b0bcb18b6c78639da5da29d5aa72fe77c774598d199e8284cceaab9fdb9aa07cf734957fb1c2d8d617c0 SHA512 2b1ebb3d574af2469f50a42e324b3367b5e08d3de00076620ce2133226d544ab2507e6d752ff3ed427319978ab5e1a0e73189368666a5c7f5ed61f1294417228
 AUX sdk.patch 4357 BLAKE2B ad43209ebf78f1f8937bfde54c88034a9c0f426caf62da5aa70b6171e29546af97c374765bed081cdf13827add3d02e5cdb6b30adccaae03318c102dba4cff65 SHA512 f1f743d049c120f3c8d6d1387577b53e9637881d9d5e007c55b4e42feca21b170ee24146c5fb0cc050c3eb1c26659dc6363e673710ae08c76f2844306a1ca01d
-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
-EBUILD apulse-0.1.12-r4.ebuild 1427 BLAKE2B ec17b7b6e2851c83bc37c5717116b2bdfc29793ef8cd99c8f2e0666424282170e19e7f56d599266ca6dcbb95ce4c54ed15a0b6f353bac753e318f60764fa8be3 SHA512 5394018fc9c5bea858512980a959067b934e662ac8393cd88b60ed77762d77d0eeeba0dd65ded3d4a528713b2cab95b8d2fb5da1199337536a05c1c22630e680
+EBUILD apulse-0.1.12-r4.ebuild 1422 BLAKE2B 2d6285fee007177284ad3e2d0ff06c006ffd31362b8f428db5689c4897044bf9f06855c9c79cb6d48ad93e951d7ba3a6e0def3325e4d767693c5e9f627064e59 SHA512 ed85600610668531916dace2a10abc0d3e39cf7ca353e8c530b930ef8742d99f3b0a5e0928f8a39230b9fd1041630e34e0dd5c62e41382e7a47521386396427c
 MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.10.ebuild b/media-sound/apulse/apulse-0.1.10.ebuild
deleted file mode 100644
index 82fe77ba30c8..000000000000
--- a/media-sound/apulse/apulse-0.1.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 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"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]"
-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_install_all() {
-	cmake-utils_src_install
-	einstalldocs
-	dobin "${T}"/apulse
-}
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
index b4e49def9d58..5d0b6c1550a7 100644
--- a/media-sound/apulse/apulse-0.1.12-r4.ebuild
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 IUSE="debug sdk test"
 
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 6d48096bacb2..81d2085090da 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -2,4 +2,4 @@ DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
 EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
 EBUILD asunder-2.9.3-r1.ebuild 1045 BLAKE2B ca487c6e9b44f7ffe47d6245e555a0d66875da1abd3b999d79c315f60d304ecc9e4c56da2603eac25c704e3a9bfa0bf48ad5e730dd4a8a4f69ac6a2fc051651f SHA512 c9b4828e8e907fe02467fc2b10f1d4ec074e10d8b238a73987278f4001177905a1db8127c1dc3f23e01f5260507e9f05fb7085f9463a21b1c9c0896bd4ece2f3
-MISC metadata.xml 407 BLAKE2B 3977485349c4dbb217e3ddcafaf22c7d394b764e6196a21fc63781ccf16a989ffd00faa0d4fbd9ff1c7bd35879d3cfdf586d0b5723b3e09d78fc034bf9736a5b SHA512 504625a32837ff424070b0fa4e691e71b0be4270958289c10d768790750842c581c919332747b26d7c43ada99d007e6517ff181474d668fcedc1ded21ae32f21
+MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 06e70988f837..243034768d61 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -7,6 +7,5 @@
 	</maintainer>
 	<use>
 		<flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
-		<flag name="opus">Support for creation of Opus files</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/cmus/Manifest b/media-sound/cmus/Manifest
index 135ab009529b..8096384dc767 100644
--- a/media-sound/cmus/Manifest
+++ b/media-sound/cmus/Manifest
@@ -1,3 +1,3 @@
 DIST cmus-2.8.0_rc0.tar.gz 315613 BLAKE2B b5f44b724176ecca61376866da20614ba34e741b8295b8d21ba0eb13226024812dd6dfafe98f08ed367fd9454e787da5ba623b238b5944f5ae69fe58b02a224c SHA512 0379f18497d6510fad35a2d905c932d12f2726a5694d3ab272ce139e9ea4520cb4dd1cf3fafe890f6ada8a64285f8c04ef7571647a66c2d44df17e2dca80f869
 EBUILD cmus-2.8.0_rc0.ebuild 3300 BLAKE2B f4af7df639feff9d976cda04f6bcb9b3cdb2592046ca3ce8600845b0200f34b0541042edb0785010698296775864fc9221876e887f4acd1d675c05dbae4002f3 SHA512 306d304bc131a67960188573ad46da113539c86eb40e7bf78762214065fb69c8653f2af8e19ac140499ad199139c0c12a82249e6f6d13d632704fd99cf49d2a8
-MISC metadata.xml 872 BLAKE2B 3d99b417d7f9d1b7b7fcbc79a0fb7124f425fa8d5307ce623d59c0a941e99a0ad62e18b2770ecb320eee4c2c0b98702a5a44c3ee06d533b583d7f4d8e2fad68d SHA512 3d4ef1bf44ff73be65e203c2ba979a782cb64ee821316edf5885b037a4ca89f868bbaa54e65eab8eb315811c976f867678fd3ac22fa021ea494d0e6c08e7760a
+MISC metadata.xml 793 BLAKE2B a7f7b70d43eca969e128e92ce3375b14fcd0d65fae8c744c4ecc3e235dbebf112ee068a98597afa4eb882c6992461ae354d7880303fe7c78950c25af0df5b715 SHA512 4074bc35433dc4c9dec0902c0a792f005fdeddc81b886be2c7ca5191423488182b6159445b5a29ad20a10740539d5e1e1dcc60253d724a1a2e8f80c65b2f5b36
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index b6311fbd0308..f64fa63b73fc 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -10,7 +10,6 @@
     <flag name="cue">enable CUE sheet parsing</flag>
     <flag name="discid">enable reading the ID of the inserted CD</flag>
     <flag name="pidgin">install support script for <pkg>net-im/pidgin</pkg></flag>
-    <flag name="opus">enable support for <pkg>media-libs/opusfile</pkg></flag>
     <flag name="tremor">use libivorbis from <pkg>media-libs/tremor</pkg> instead of <pkg>media-libs/libvorbis</pkg></flag>
   </use>
   <upstream>
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index f09a2a775675..0acc76d1cf7e 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -3,4 +3,4 @@ DIST darkice-1.2.tar.gz 357026 BLAKE2B 3553711a05631feca198de83387234dc1ca85429e
 DIST darkice-1.3.tar.gz 371411 BLAKE2B 45684ba4a14dc7cc6271400af11f4aa610fe3d079d1f497f277af866fef92f58080efb6fa6d230288444e78ea93e5cd1257d441d75cbbb7a9ce1696091ed0fe0 SHA512 710dde580005e999e9b11981affdefab6c01868710e9de29d93fb0f40db3321dfe3ab6ed2dc1887bb22ac9a0789fe1648d948f4453c92feb312f7af97c253674
 EBUILD darkice-1.2.ebuild 1432 BLAKE2B 4b891be0777bdcb207018dc8bae3e4627b8ef6c70b49c7563d27b9c0983ea625ac1f9feeab66bafb0382d51c425a473b8727c746363d58116caa9f8155731968 SHA512 0a5a6eeebbb1bd28dc117939a504981872ccf9ca010123d7b8dee40c3f3343776804bfcc736a231791b83f63c3b149b52de87190ddd2d9b3cddc424f08a7d754
 EBUILD darkice-1.3.ebuild 1309 BLAKE2B 3d29d9e552859c1e9c32cd003b966fea820588d9e92d4fe62ef54c5e73edcb519cb8ce30aafe9b8df30e6b75716e62af32b223c777331dd04f908133c141e833 SHA512 923c2bca3c9d7e166b46c945a771745a874feb3ad8244863fb3857882dd64005dee846164a0628f62f25db15201611c188864a320fc838c0a9fba496ad7f3e4e
-MISC metadata.xml 583 BLAKE2B 748e92c324b0685539a85ae1d2816ad9c7241fc8a6c3b30799a499f74612c4593fcc513b95b1236a188925e63eb2caca859671b7a43247d2737c5c90767a27de SHA512 673e3a01b1a5bd92119ad87e56b85dae309fa3f7a9de66d21908557819887ed3804477566ce0a00c2a919ae760ea7896cf67b2d25e894fa52463110fa0e23ba8
+MISC metadata.xml 524 BLAKE2B 05c3bdca6fd593bae9aa6dd13f05e5953ad8143737121a3f021b4862d3d20c90448efec42a3d37bb17e3e3651247a0c7d3f3f486bfd42ceb2508f8bc33cd9bef SHA512 4acf731ab9d985087d227f1090c5ffdd1130c6d9e20add6f2bd69aaf381c0e18e4a85852346f7a91f27e785065e14a6ad6aa6bedf47cc23a18f172c969d164e3
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 456878486386..ca82233e961f 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
-		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/denemo/Manifest b/media-sound/denemo/Manifest
new file mode 100644
index 000000000000..6f0e7c8530f3
--- /dev/null
+++ b/media-sound/denemo/Manifest
@@ -0,0 +1,5 @@
+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
+DIST denemo-2.2.0.tar.gz 17032009 BLAKE2B 66732fcdaa5d5119ca2a45e5a8c6829e05092a4f0e18e3c8a991bddaaf863ea05889654af47150650d2c67397afa957de0fc3ce0ada86a22be00ae91d4add993 SHA512 74bef7b888abd86db42cee7ecb404e1b9211f9965207366c99980137194acd2afa6ec8b1c18da8a12fe4c6951d8a1bb873b313f5749ea629bb7eaeedf12368ef
+EBUILD denemo-2.2.0.ebuild 2930 BLAKE2B 65c16eb446dbeb906ce8fa5f3190bf3f62c0e4b8647a76937720fb5251028d66d34399cb6b759742895f6979e46ec97703eaedc5d6ee027469886b4487b7b39a SHA512 73ac587a3c715b27bbe04ad2ee6e66c538ec08f6a64c860adb9a102d6fc3627a22184fae20453530b2ea8e5c9a191a97bcdc6a403ad8ca6f5b82280d6b6bc172
+MISC metadata.xml 1587 BLAKE2B b20d6c43ea998e867ac1fbb84faab58cf3901b40700b36485d9de57336b8616117bae28e712b061dc49a80c9b27637b43a6b08d01535597ad7cf4d5a935dc72d SHA512 f14e3e591bc4824b8a9a872e3574a2e5e73a70451a02d85c021ff77eddc9034c6eac1238c968ee637fa5bb9fc4f98d71486be379faede67b462818534b392ecd
diff --git a/media-sound/denemo/denemo-2.2.0.ebuild b/media-sound/denemo/denemo-2.2.0.ebuild
new file mode 100644
index 000000000000..be5092be45e3
--- /dev/null
+++ b/media-sound/denemo/denemo-2.2.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools xdg-utils
+
+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 doc jack +fluidsynth +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}
+	>=dev-util/intltool-0.51.0-r1
+	>=sys-devel/flex-2.6.1
+	virtual/pkgconfig
+	virtual/yacc
+	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}-no-portaudio-fix.patch"
+	"${FILESDIR}/${P}-find-guile-2.2.patch"
+)
+
+src_prepare() {
+	sed -i -e '/^Categories=/s/GNOME\;/GNOME\;GTK\;/' 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
+		$(use_enable doc)
+		$(use_enable doc gtk-doc)
+		$(use_enable 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() {
+	DESTDIR="${D}" emake install
+	einstalldocs
+
+	# link html documentation installed in /usr/share/denemo
+	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
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
new file mode 100644
index 000000000000..d69edb0173d5
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.2.0-find-guile-2.2.patch
@@ -0,0 +1,60 @@
+diff --git a/configure.ac b/configure.ac
+index 4bb3afa..9c146ad 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
+ 
+@@ -40,44 +43,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])
+-      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"
diff --git a/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
new file mode 100644
index 000000000000..a4aa60909de2
--- /dev/null
+++ b/media-sound/denemo/files/denemo-2.2.0-no-portaudio-fix.patch
@@ -0,0 +1,29 @@
+From 2e3c3b974e3e27873841c0ad9a05537a682e85f5 Mon Sep 17 00:00:00 2001 
+From: Richard Shann <richard@rshann.plus.com> 
+Date: Sat, 30 Dec 2017 15:32:35 +0000 
+Subject: [PATCH 1/2] Fix bug #52741: Can't build with --disable-portaudio 
+
+--- 
+src/audio/midi.c | 7 +++++++ 
+1 file changed, 7 insertions(+) 
+
+diff --git a/src/audio/midi.c b/src/audio/midi.c 
+index 55683cfe3..71c5df2cd 100644 
+--- a/src/audio/midi.c 
++++ b/src/audio/midi.c 
+@@ -29,6 +29,13 @@ 
+ 
+ #define SHAVING (0.01) //seconds to shave off a note start time to ensure stopping before noteon is sent, and starting with noteon first note may depend of speed of machine??? FIXME 
+ 
++#ifndef _HAVE_PORTAUDIO_ 
++gdouble get_playback_speed (void) 
++{ 
++ return 1.0; 
++} 
++void set_playback_speed (double speed) {} 
++#endif 
+ 
+ static volatile gboolean playing = FALSE; 
+ 
+-- 
+2.11.0
diff --git a/media-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
new file mode 100644
index 000000000000..ef9a91fa02d7
--- /dev/null
+++ b/media-sound/denemo/metadata.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
+	Denemo is a music notation editor which uses
+	<pkg>media-sound/lilypond</pkg> to typeset music notation with LaTeX.
+</longdescription>
+<use>
+	<flag name="alsa">
+		Enable alsa support through <pkg>media-libs/alsa-lib</pkg>
+	</flag>
+	<flag name="aubio">
+		Enable <pkg>media-libs/aubio</pkg> support
+	</flag>
+	<flag name="doc">
+		Use <pkg>dev-util/gtk-doc</pkg> to build documentation in html format
+	</flag>
+	<flag name="evince">
+		Use <pkg>app-text/evince</pkg> document viewer
+	</flag>
+	<flag name="fluidsynth">
+		Enable Fluidsynth MIDI software synthesis using
+		<pkg>media-sound/fluidsynth</pkg>
+	</flag>
+	<flag name="gtk3">
+		Enable support for the GTK+. If enabled uses slot 3 of
+		<pkg>x11-libs/gtk+</pkg>, if disabled it uses slot 2
+	</flag>
+	<flag name="jack">
+		Enable jack support through <pkg>virtual/jack</pkg>
+	</flag>
+	<flag name="portaudio">
+		Enable support for <pkg>media-libs/portaudio</pkg>
+	</flag>
+	<flag name="portmidi">
+		Enable support for the <pkg>media-libs/portmidi</pkg> backend
+	</flag>
+	<flag name="rubberband">
+		Enable support for <pkg>media-libs/rubberband</pkg>
+	</flag>
+</use>
+<upstream>
+	<bugs-to>https://savannah.gnu.org/bugs/?group=denemo&amp;func=additem</bugs-to>
+</upstream>
+</pkgmetadata>
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 71e7635fae9c..fba574a9e7f0 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -6,4 +6,4 @@ DIST easytag-2.1.8.tar.xz 2459496 BLAKE2B 4ba27728071a3a87af72a37cd0337d361ae690
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
 EBUILD easytag-2.1.8.ebuild 1443 BLAKE2B 4e6892fd7c7df21400e032c1863af21ed09106a3aa24498a6da1418a26cccf1ff77de76de2712ea10a2e7724727b7472adbb6336cde5e8417e9a7d96547d8459 SHA512 c55dc94db97b55b0f3f50c1fe0d40749e87ad8620e460a4422dce3cdeabd0ca2c850fb315a40168e0802146ce0f1b6db18152db88183972efd950845c58d5568
 EBUILD easytag-2.4.3.ebuild 1645 BLAKE2B 8ba8ed176a87b9189d6ce6c5ea0cd09cc0b01a3d1e4b5747e5c763f1af5e4bcd241d901470924f3a20518df36f8bfa1b7d6a6a942f7b3fc52970b843d5c2ab80 SHA512 c722d39fd6f08e9999b71914af9e6efe8f263bde9063707a330cfb26c1e200f54e50a2a344f2056d62ad316df8576b00cd5c389078ff7fb26e5771c4cfa12404
-MISC metadata.xml 565 BLAKE2B 74adbab18a112ed8cd165f2947ba5bc6b5bf2cfa231ae3139510db65ecd22dd39fb1f69890c789c51257aa8dabaf96b82edb696a5e9e5e91ccd65d5d26117e6f SHA512 20baf00e8f0315ff490b5379d9c6dc14f66c46837d9d3eea073ff85596370e48356a80534e795f3023b7251a79e749f04a575a1d4e7deaba1e909f6038f7718a
+MISC metadata.xml 423 BLAKE2B 8265687f0456937b9ba2700d2d7078e237b5d0dbc04905eec92ee94364c20f9dd4655321b4a5a5788b128b1771e161f5319d056ffaca350f93a988995eae608d SHA512 6cd8c3b87e91a7b0b6b8f6aa4d8e38ab7400fb53fc3653a6f898eec609cd5ce6cb07bab1e3b67ee0c4e1fb91fcaa6e6fb835ce26dcd38cc7090bea5942e71da0
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 086aae70a896..7636046d6e23 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -5,8 +5,5 @@
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
 	</maintainer>
-	<use>
-		<flag name="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
-	</use>
 	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
 </pkgmetadata>
diff --git a/media-sound/gogglesmm/Manifest b/media-sound/gogglesmm/Manifest
index 2ce667c1d5e4..b56fe322d527 100644
--- a/media-sound/gogglesmm/Manifest
+++ b/media-sound/gogglesmm/Manifest
@@ -1,3 +1,3 @@
 DIST gogglesmm-1.1.9.tar.gz 1419421 BLAKE2B c170da80c46b25e86060376e19cecdfe10ce91ce48d92c370cf9f2b6ccce0afba6f917185286f3226d082dc0d791863595be4ebc0d118dd4f1af7f0699582cde SHA512 54de949b37e272a2235cf2f910890590f18b12c2b3199cb87bbe393ae659a3a9b7bd47f5a5f43ce035e94b87098c07d534efee2a6c17ebabb9bbed3453126e2e
 EBUILD gogglesmm-1.1.9.ebuild 1039 BLAKE2B e423cb8152f2db398ae97c55ebf7bf0c68c538d1a7d6e62f8289eebd95ee14b3b2e866732ddb6dea0ab184848cd93ff60cc9e6fe8bcfa31c0e1c0f64e297c747 SHA512 88c46448dc1fcb2f7afa9180e981f14104088e54cbc946692c293c322d6962d4161d81826eae1b63907561b40325226d9264a09b389abb1de3210ade4b04dcb8
-MISC metadata.xml 520 BLAKE2B 486c672dd41704681329195d583e4a835d7d22152d4eed069ef2e3c42f45095ae2546e620e73bee125b148149f94f7459122e560acbad2393a9786e01354df51 SHA512 6c0291e8eb2cd7844c468793ce152c4e76992e94d13300f9afe776f708e738bc139d8a4922e12a9815b793ae53bdc2553b191ac5b7c50b1ee346c2a75f184a7c
+MISC metadata.xml 448 BLAKE2B 4a31050a18310ba35f5357159e9ada1671feda06dc71635617acf8825073a3a822aa95a3d3110545ff9ccdd809d317ab45000f5aaab5d8f52a8dad0c6133a03a SHA512 349f8b931b5a24ea7b588f63f67b38ac00e752491031cf434802719bd4d4d62aa5c7d277cf5e6a3dee72c570c121606b6a108e080262b1070de538c384552858
diff --git a/media-sound/gogglesmm/metadata.xml b/media-sound/gogglesmm/metadata.xml
index 43eb2ed76959..ed725894ca70 100644
--- a/media-sound/gogglesmm/metadata.xml
+++ b/media-sound/gogglesmm/metadata.xml
@@ -12,7 +12,4 @@
 	<upstream>
 		<remote-id type="github">gogglesmm/gogglesmm</remote-id>
 	</upstream>
-	<use>
-		<flag name="opus">Enable support for opus codec</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 00dd7678b801..5c9a89919c77 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -5,5 +5,5 @@ DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c
 EBUILD grip-3.4.3.ebuild 1207 BLAKE2B 014b3ae549e72ae4960820532e746337a3d821684f98e19619ab9314441c2be743df3e7049885c921bd5d09f837d275a661116a9c258cfce1008f7978a5fcb00 SHA512 e6fff5d8728217b346a200ee84bec062212be2a2b37e5e942f730d897e53983df66e032a72e7540be6aa83732cd9bd0bdf20566b66ebf6a37a21f1e909a6f44c
 EBUILD grip-3.7.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
 EBUILD grip-3.8.1.ebuild 1214 BLAKE2B 9f83fc44a41fea6a509a0c1f85f8f46d7a7bba8f0e161152dbd31f180ed1336a498d506057a6d7e40a2200b61fdf5d0f5185d4f7d0f9b7aef8dfbea9c9ed39b5 SHA512 ad6bfc7cee3c25c7c6ab4c274b8c98744f8cf6c5d28b0b7d8c88b1699c45a50cc93dcc73559bbb758d39bb339cc2f0a839d7a2e9c263739bcecb8f0e4120424a
-EBUILD grip-3.9.0.ebuild 1223 BLAKE2B 07454e777fa6f14c229603090040b89349da02f0a5aeb38cb76cc2a59ccacf9467120ba4a7fbba2bad48ca6bbb44a59457e55e6f53014be961c01c9175a8855e SHA512 dfc5240ede6b26b2ef026923e7444672cdf3f1bffa98d8920e8f0d84caea2561f9deaf8ed0c5517504b15514fe4bfa7ed7ab6b8692d6eddddbf70ec97f39f230
+EBUILD grip-3.9.0.ebuild 1218 BLAKE2B c6c424d05651474333d322dd1bac779418f3b446c5f28397820fa07ea4c0edca60bfe478d56825fbc5a2a669dd98e4712b191c864a10582bb0d00d2c2f1122a8 SHA512 68f067ef88b5572a6338397e7c8be9a7f200da93b7d3a49d4e2a533082ee7b65c85a8999b8110de8a8e6e69e6d2c925dc132197d9a59459fde9cfc732d323f30
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0.ebuild
index 8d544186c922..cd20960d0c8a 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="vorbis"
 
 # lame and vorbis-tools are no real RDEPENDs. But without them
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 085cfa109efd..4021d690c0b0 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -2,4 +2,4 @@ DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9
 EBUILD jack2-1.9.12-r1.ebuild 2322 BLAKE2B 586c6938eeccdd8304a9f6d93d69eedaa73664a4b8ce6c01d4bca46400f8529083e7cacb1c988e95cebb1d071c06a1b1bfa7178e66bf94535732514c842a6586 SHA512 ed3a07bc3cdad2bed8dd70ac13eca389cd795dfd9421c56146af01f2c00d8408164f7e9e16bc7a5f9eb3bd9fbd824c64d0d0ddc151bdabf5a0a5ff4a34a40e5e
 EBUILD jack2-1.9.12.ebuild 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
 EBUILD jack2-9999.ebuild 2265 BLAKE2B d33ab3cddf7396a1f5c8a9888d7337e3aa2f3df55dd4af4e55261b6d6e95bcc9bfbd882b1b8b4de6d0687e7a715bf2dacc17aaf5974ccc2ef4400a6a9f91009f SHA512 06b07335899ddabf08656c8208223c1f7af92fa2e977c061b9ce1fb9437707ae1744f5fa0570a2b7940a57bb5bdedece4e75aa2662974dcd66a1744c8fa44542
-MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
+MISC metadata.xml 586 BLAKE2B 2caab3f98d8d74d03b85391c12b3432430544379e3379144e3a39cd36ab2335f81779cb3029726dafbff2dfbedec203dde78bc6bbe5678fed44cc6c0fe296ec1 SHA512 92ba1eb5d693bfab1f53b6e4bb2a11fa523681db94dbe92b39847e24144c4fa0181f4c3d7f49bb0738fce348fb87a79bf3f8b927f25aab10e240a021ae50a920
diff --git a/media-sound/jack2/metadata.xml b/media-sound/jack2/metadata.xml
index 5156eca67d7a..73e09bb1a19e 100644
--- a/media-sound/jack2/metadata.xml
+++ b/media-sound/jack2/metadata.xml
@@ -7,8 +7,7 @@
   </maintainer>
   <use>
     <flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
-    <flag name="celt">Support CELT low delay audio codec (<pkg>media-libs/celt</pkg>)</flag>
-    <flag name="opus">Support <pkg>media-libs/opus</pkg></flag>
+    <flag name="celt">Support CELT low delay audio codec</flag>
     <flag name="classic">Enable building of jackd</flag>
   </use>
   <upstream>
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 193d0b90b5eb..1f5dcc21d0ca 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,3 +1,3 @@
-DIST lollypop-0.9.601.tar.xz 376712 BLAKE2B d3747a1e994cd8de816eed49d87a8f279394981f14e2de82785203ba5ec0e71604a569f5f3e8e57da55f9bf62066da15232d46a0d117d094c6638b6608491620 SHA512 d13bd50f6b591a0f6491010817833d345a7fe1e63ef0eaab2ebad7c877990cf5e2dfba62911a690d223d912750a150fda40be81ca9a094968ed4796c1ed66f65
-EBUILD lollypop-0.9.601.ebuild 1269 BLAKE2B 98923c79b2abdde170987deec5a8811d4fdd6286f27477df42c0981292cef185c4032e0d535c75a12e2ffaf00f3ba6e3d31606a04dab85495530a966fc2736af SHA512 f674df9851ad36ed5e8d83a586e037825759d4fe66ff3711bb1f886fa53e0a905bd49081b6e643e70f36b86919b99685feb15925a3e1545993bdbb66f36f7324
+DIST lollypop-0.9.605.tar.xz 451556 BLAKE2B 520cb54398839c24bebf3cd53b69de07174d5c674f1e6c72a100949bbd1cb04045b8f87799fd6f118af9191b1a552b9db098c6a72d6af5fdea604ec4970c29ea SHA512 0f377e7f1db1becf2edc7d15a1bae01665e11f87adc693118e778bf85659968de210912db7618f022cf123a458b156fd7fafbfdadbb2cb905dc1049a436d4d96
+EBUILD lollypop-0.9.605-r1.ebuild 1332 BLAKE2B 567e9f9097c2c18f0150ef0f2abbb2248ee6e407a52f13fa6bbaefa7be5ab137d5fc5cbdf2d822980ec80443b8fa9d573c66116d41c34a373dcd52ae50d8dd20 SHA512 1d5d96fe1fa372ea732fe671ee7f6501a19d1711f2ef4fceee7e38f8680795eed7ff7ab8777d3dc6be9f38f1c56d3e409b7dbe46246c5dcbb47445a79ce0d682
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-0.9.601.ebuild b/media-sound/lollypop/lollypop-0.9.605-r1.ebuild
index 2e53e4c81d53..16b08b545fe8 100644
--- a/media-sound/lollypop/lollypop-0.9.601.ebuild
+++ b/media-sound/lollypop/lollypop-0.9.605-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="sqlite"
-HASH="93d895a6c74c64aaa9d4cdc4d58bd6e6"
+HASH="7e56defb7152c6cd7140e9ea98df4ce7"
 inherit python-r1 gnome2-utils meson xdg-utils
 
 DESCRIPTION="Modern music player for GNOME"
@@ -32,11 +32,12 @@ DEPEND="${CDEPEND}
 	dev-util/intltool
 "
 RDEPEND="${CDEPEND}
-	app-crypt/libsecret
+	app-crypt/libsecret[introspection]
 	dev-libs/totem-pl-parser
 	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
 	dev-python/dbus-python
 	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
+	media-libs/gst-plugins-base:1.0[introspection]
 "
 
 RESTRICT="test"
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 76d18e32485d..bcfe63eaf1cb 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,5 +1,7 @@
 AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb29553427372fa74375c1cf5721f28bd6bbcc6e091cb3703705d773bda93e3cede89725cbe28b8b678307fa3d5eeca1c3a5d SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63
+AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
+EBUILD mac-4.11.4.5.7-r1.ebuild 1350 BLAKE2B e70932c4abccf08d212bbc7f777fc01249f62df8311083a3de8d1dd6f2ec340bfef9de69d946cb8bb7e2183346b29df1e61b01334c6984efb058214d9c1138fb SHA512 9643694bd9a1d97a879bafa1ab2f225c298b4f1d3aa92a2096def0dfef58897ea0e0a838a4157726f3cbab117d7d4c7ad20585888a2f58e485bc7509b9edecc3
 EBUILD mac-4.11.4.5.7.ebuild 1359 BLAKE2B 3a6f2a706bc325d338541547d4d112b221735ab7e08642662c16c9444144d2ddffddd48e03e5439e896974b03e5951dcfc0f072c2d7c6bb2fd4ac87ed1cbedf4 SHA512 a4eb177a493ca9a09272793df96a3a48337b1e2658845eab63c011789206b9be443e0bae341ea47b3cd354c7a067e9694fb7b7e2701152112518ce331aa95d23
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/files/mac-4.11.4.5.7-null.patch b/media-sound/mac/files/mac-4.11.4.5.7-null.patch
new file mode 100644
index 000000000000..fa1f3598ea82
--- /dev/null
+++ b/media-sound/mac/files/mac-4.11.4.5.7-null.patch
@@ -0,0 +1,12 @@
+diff -Naur monkeys-audio-4.11-u4-b5-s7_old/src/Console/Console.cpp monkeys-audio-4.11-u4-b5-s7/src/Console/Console.cpp
+--- monkeys-audio-4.11-u4-b5-s7_old/src/Console/Console.cpp	2017-03-04 17:52:24.154352673 +0100
++++ monkeys-audio-4.11-u4-b5-s7/src/Console/Console.cpp	2017-03-04 17:52:31.400352385 +0100
+@@ -51,7 +51,7 @@
+ 
+ _ErrorDesc ErrorList[][2] = {
+   ERROR_EXPLANATION
+-  NULL
++  0
+ };
+ #endif
+ 
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
new file mode 100644
index 000000000000..aa65b9a5e9ee
--- /dev/null
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_PN=monkeys-audio
+MY_PV=$(ver_cut 1-2)-u$(ver_cut 3)-b$(ver_cut 4)-s$(ver_cut 5)
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="http://etree.org/shnutils/shntool/ http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
+SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
+
+LICENSE="mac"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="cpu_flags_x86_mmx static-libs"
+
+RDEPEND=""
+DEPEND="
+	sys-apps/sed
+	cpu_flags_x86_mmx? ( dev-lang/yasm )
+"
+
+S=${WORKDIR}/${MY_P/_/-}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-output.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+	"${FILESDIR}"/${P}-null.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS TODO README src/History.txt src/Credits.txt ChangeLog.shntool )
+
+RESTRICT="mirror"
+
+src_prepare() {
+	default
+
+	sed -i -e 's:-O3::' configure || die
+}
+
+src_configure() {
+	append-cppflags -DSHNTOOL
+	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable cpu_flags_x86_mmx assembly)
+}
+
+src_install() {
+	default
+
+	insinto /usr/include/${PN}
+	doins src/MACLib/{BitArray,UnBitArrayBase,Prepare}.h #409435
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-sound/mangler/Manifest b/media-sound/mangler/Manifest
index 84a8b5e1f502..a2c631abf840 100644
--- a/media-sound/mangler/Manifest
+++ b/media-sound/mangler/Manifest
@@ -1,3 +1,3 @@
 DIST mangler-1.2.5.tar.bz2 5390985 BLAKE2B b2b61d49683b356be5bcaf111d0e75cc0ff30cbb131b0de360128e2973a415eb87736b55a965fb30651e5d3580a2274754ddb8a44b345c55fc6ba0caa26de0a5 SHA512 e72eb2f408ba925d10563c6821e08406007bd0b7586f9ee054a1de421a6195351140a2df9656a45389f5f568ebf44f53fb719fbf6fb113695f230dd4bad21e38
 EBUILD mangler-1.2.5-r1.ebuild 1295 BLAKE2B 82b4992a98d9a651af33fe66ca105bb6b9933d47aa112a6de4da154df2d0c5cb39e7004c39936f8f446b0f5c7588578aac8a06fc5cb1e646ed30686d1902ec85 SHA512 5e6f290adefc914529f4fcff40f1ddde7a21f511632bf04185dfb28504b5f7b4d352ac2e9bc9db6dfe90ce9b61ef9f2741a4ebb92a5140c938b0417e37f779bb
-MISC metadata.xml 546 BLAKE2B 64c5d482b08f0e362c11b58e47432cd7afa26060d8cfd6c5216227b0526bdc1b9d5e942eebb82f62740509794d65dd811dc5950f92c34c44aac88c202a912343 SHA512 4d2adde453fd4b652d36d293e6b52341a9accd60c853394ddb83db975a644e0df775880d3ebfe8fd25a00238d9c679276f0fcffd288dd9e42de9ae3811f18b54
+MISC metadata.xml 470 BLAKE2B dba7ffdefd9ed484e5397a60c4b13f051879ffd760fc32cf423f51343242cca71578ab6d3d87471250f9b223d0247bd92ba3ee2ff1b5b2d05f92dd4ee89b72f1 SHA512 dec3e027307afb3b5589f56e595371026232d5f328fe9520b6d21282eba626b736dbefa7768cb06c4821e75b45340a04a7252e0a1b1380b618ef1f9d54b1692c
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index ffc44310f0dc..1ca96e6372cb 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -4,7 +4,6 @@
   <use>
     <flag name="espeak">Text to speech engine</flag>
     <flag name="g15">Logitech g15 lcd support</flag>
-    <flag name="opus">Codec specialized for speech over the internet</flag>
   </use>
   <maintainer type="person">
     <email>prometheanfire@gentoo.org</email>
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 0c886aa115e0..8158a48ab6ab 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -6,4 +6,4 @@ EBUILD mixxx-2.1.1-r1.ebuild 3004 BLAKE2B a1718363b127fe5515d616bf8daf6a354c9ee4
 EBUILD mixxx-2.1.3.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-2.1.4.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
 EBUILD mixxx-9999.ebuild 3006 BLAKE2B 0c393607bc1db7e23d986a55c4b72c966ea00d317884a24cea3550414e5fb04963a0a5085a717a0f9a3e3ed7564909162e7fa699f43d38256afe6862ceb34b3a SHA512 1df37aec5a1d8c5bce3b2bb352328b9da488235baaf2121704ed17fa1cfb82b9ff5d813e5c44c94b9618438c4cdfba52f933ecbf4827d2165d27ee19358fdc36
-MISC metadata.xml 642 BLAKE2B 125facf06db489fe7e3f4663b1664a4e0c4288cad028b9d0e73db345c8e6a8004383b4efb70e7b5315028fba769fb790cb2b39949980b5adc6f3de2178c0f7c9 SHA512 e336e472a4ee405e18a2521cbd296917a1c555c444eb3794eea602a36ec30f5eab99e9dcad36a08c9852c228253721311d957ef632ae0d14c96391a95ad4dd5e
+MISC metadata.xml 549 BLAKE2B 20dba66bc128eceb037f39f0bd04ee4f4dafda37968f90f09de12d6485b37f1391963d1bcf343755da69a74c3d3f72218e97b9cf13e9e699bae4ea098fbcf9af SHA512 c89877382e9baf90038ca7c6175ef8edc3296950dc7386b00f861a90fcc3296ec4d21df665c8aa62042c1b952cd270af77b85a5959518600f43f963ffce51296
diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 3c563007a7bc..4627d1b0b257 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="hid">Enable HID controller support</flag>
-		<flag name="opus">Enable support for opus codec via <pkg>media-libs/opusfile</pkg>.</flag>
 		<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 7acd6cd777c6..d57def02c9a2 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,13 +1,10 @@
 AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20d60eecf3a62ce6c3eb0e6a8c29252ef6e3045a96af6e8cd12d7c27dfbdf8a79fa3ed025258b8c9cb7b05d SHA512 4b646bc5d8fe4c76421f4cb0dbc7894cf9118492662ea1127f90c48f84760a1167988692c2b63f49182afcd46c578de7203356bbf9dd47787f9129f7c3dbf4a5
 AUX mpd-0.20.10-libcdio-2.patch 843 BLAKE2B d0c7eeeedb6065b1e08b1a8b1e6f5237408cd1b747aba72651441f0c203a4d32a39bf4e3c2371ae16fbde2f991c2f60870b15e8340b81bbc793355131ea57f62 SHA512 c9b62e6e0e7408ff3ab1e73c08001e498150c6bda8a9796ef23c35ba4dd0313e243129f7fb1760997f4a226f1ea3de56657eeead41f07bcaafa9affde40cc851
-AUX mpd-0.20.12.logrotate 88 BLAKE2B 2ff692c0c37da35ba3d53c2050653131a0de364094a779eba7ed7b2db3334f1eef7fa261b6a94416cd6a29290fb563a4a15ef70768c2860d2d9c3b7f9fdfbc4d SHA512 6c0ad8341f24633271972a2414e945a8eb14db31b114e1c260bcc0c50e1288bdbc5e3344ff9ef53c3c28d7368985e55a944d53705302b8a3d14eccc9fe2d6b48
 AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.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
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 EBUILD mpd-0.20.10.ebuild 7285 BLAKE2B 08b8d0afe72f0ad186438441aa1229e71c1c2564250c9e624eac2f7c6ec7596bd9f0ad4b353b4ca37af9acac2bda7b2a59f134265cb9a41be0bdfef64cf384b8 SHA512 82c6c20fbe05137a61ed07daa9bdcd0e7639267d8301e14257978d13e67a6ec9e0581f873c22df14a90a1dffb71dfd47fc456aee49889dc5d67a566ea6326ba4
-EBUILD mpd-0.20.12-r2.ebuild 7361 BLAKE2B 6c257159de263c22984a28331cf6ad9bf17ab34bc6e255901f2871588133f2ddcc99cabe142f14a75e831faaad9cf2588889286cb6183716d9a14bd4e4f74624 SHA512 c5d52149a1ac383c35fdf5f22c756459545f1f0ca630d0ba3a433e6f856c9ad49482e3a39e94abc025c2e094abe2e260e8716fbda78e1ff8280a92957e720a36
-EBUILD mpd-0.20.21-r1.ebuild 7314 BLAKE2B 35d022e4d5a85a88a1bfd944e3b43e9e2117630139bb8b5347fdcdb967be6c1c3a8047d39be64ccb40144a11b1d6bcd9a83bc95d184cfc6cdea30d5050b6d7bc SHA512 1de5b6fda9bc017dd01bda1f8076987416cca0220c6922ff0778125b5585b73a22ffeb04f42d562c4c2561f6fdcb42287fb0665a5aa13498a93baa809dcd7aa6
-MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
+EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
+MISC metadata.xml 2412 BLAKE2B b208c2d3481421794b7fd5328814e9dd340eb820df4972c0bd70626d9d63707dfceb8f7446239a3ca581f46004a1aa5e6438cbb6449700f472c1aa411d848649 SHA512 4cbaa880020239d2fcf6e2f057004569eb86288d3f25dce8e89eddc8d65cbbccf01dd0cfbfc376790297a1147d18aec3148515659fae5aec3bbe215bb94c2f8d
diff --git a/media-sound/mpd/files/mpd-0.20.12.logrotate b/media-sound/mpd/files/mpd-0.20.12.logrotate
deleted file mode 100644
index 738313e9e310..000000000000
--- a/media-sound/mpd/files/mpd-0.20.12.logrotate
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/lib/mpd/log {
-	missingok
-	postrotate
-		/etc/init.d/mpd --quiet reload
-	endscript
-}
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index 422ce7b850ea..d6162fb2c8ad 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -26,7 +26,6 @@
     <flag name="mpg123">Enable support for mp3 decoding over media-sound/mpg123</flag>
     <flag name="network">Enables network streaming support</flag>
     <flag name="nfs">Enable support for the Network File System</flag>
-    <flag name="opus">Enable Opus codec support</flag>
     <flag name="pipe">Support writing audio to a pipe</flag>
     <flag name="recorder">Enables output plugin for recording radio streams</flag>
     <flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
@@ -36,7 +35,6 @@
     <flag name="twolame">Support twolame MPEG-2 encoding</flag>
     <flag name="webdav">Enable using music from a WebDAV share</flag>
     <flag name="wildmidi">Enable MIDI support via wildmidi</flag>
-    <flag name="zip">Support for ZIP files</flag>
   </use>
   <upstream>
     <remote-id type="github">MusicPlayerDaemon/MPD</remote-id>
diff --git a/media-sound/mpd/mpd-0.20.12-r2.ebuild b/media-sound/mpd/mpd-0.20.12-r2.ebuild
deleted file mode 100644
index 78b954370d78..000000000000
--- a/media-sound/mpd/mpd-0.20.12-r2.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info systemd user
-
-DESCRIPTION="The Music Player Daemon (mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio +curl debug +eventfd expat faad
-	+fifo +ffmpeg flac fluidsynth gme +icu +id3tag +inotify +ipv6 jack
-	lame mms libav libmpdclient libsamplerate libsoxr +mad mikmod modplug
-	mpg123 musepack +network nfs ogg openal opus oss pipe pulseaudio recorder
-	samba selinux sid +signalfd sndfile soundcloud sqlite systemd tcpd twolame
-	unicode upnp vorbis wavpack wildmidi zeroconf zip zlib webdav"
-
-OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
-	modplug mpg123 musepack ogg flac sid vorbis wavpack wildmidi"
-ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
-
-REQUIRED_USE="
-	|| ( ${OUTPUT_PLUGINS} )
-	|| ( ${DECODER_PLUGINS} )
-	network? ( || ( ${ENCODER_PLUGINS} ) )
-	recorder? ( || ( ${ENCODER_PLUGINS} ) )
-	opus? ( ogg )
-	upnp? ( expat )
-	webdav? ( curl expat )
-"
-
-CDEPEND="
-	adplug? ( media-libs/adplug )
-	alsa? (
-		media-libs/alsa-lib
-		media-sound/alsa-utils
-	)
-	ao? ( media-libs/libao[alsa?,pulseaudio?] )
-	audiofile? ( media-libs/audiofile )
-	bzip2? ( app-arch/bzip2 )
-	cdio? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	curl? ( net-misc/curl )
-	expat? ( dev-libs/expat )
-	faad? ( media-libs/faad2 )
-	ffmpeg? (
-		libav? ( media-video/libav:0= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( media-libs/flac[ogg?] )
-	fluidsynth? ( media-sound/fluidsynth )
-	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
-	icu? ( dev-libs/icu:= )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( network? ( media-sound/lame ) )
-	libmpdclient? ( media-libs/libmpdclient )
-	libsamplerate? ( media-libs/libsamplerate )
-	libsoxr? ( media-libs/soxr )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	mms? ( media-libs/libmms )
-	modplug? ( media-libs/libmodplug )
-	mpg123? ( >=media-sound/mpg123-1.12.2 )
-	musepack? ( media-sound/musepack-tools )
-	network? (
-		>=media-libs/libshout-2
-		!lame? ( !vorbis? ( media-libs/libvorbis ) )
-	)
-	nfs? ( net-fs/libnfs )
-	ogg? ( media-libs/libogg )
-	openal? ( media-libs/openal )
-	opus? ( media-libs/opus )
-	pulseaudio? ( media-sound/pulseaudio )
-	samba? ( >=net-fs/samba-4.0.25 )
-	sid? ( || (
-		media-libs/libsidplay:2
-		media-libs/libsidplayfp
-	) )
-	sndfile? ( media-libs/libsndfile )
-	soundcloud? ( >=dev-libs/yajl-2:= )
-	sqlite? ( dev-db/sqlite:3 )
-	systemd? ( sys-apps/systemd )
-	tcpd? ( sys-apps/tcp-wrappers )
-	twolame? ( media-sound/twolame )
-	upnp? ( net-libs/libupnp:= )
-	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="${CDEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.patch
-	"${FILESDIR}"/${PN}-0.20.10-libcdio-2.patch
-)
-
-pkg_setup() {
-	use network || ewarn "Icecast and Shoutcast streaming needs networking."
-	use fluidsynth && ewarn "Using fluidsynth is discouraged by upstream."
-
-	enewuser mpd "" "" "/var/lib/mpd" audio
-
-	if use eventfd; then
-		CONFIG_CHECK+=" ~EVENTFD"
-		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
-	fi
-	if use signalfd; then
-		CONFIG_CHECK+=" ~SIGNALFD"
-		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
-	fi
-	if use inotify; then
-		CONFIG_CHECK+=" ~INOTIFY_USER"
-		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
-	fi
-	if use eventfd || use signalfd || use inotify; then
-		linux-info_pkg_setup
-	fi
-
-	elog "If you will be starting mpd via /etc/init.d/mpd, please make
-		sure that MPD's pid_file is _set_."
-}
-
-src_prepare() {
-	cp -f doc/mpdconf.example doc/mpdconf.dist || die "cp failed"
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-database --disable-roar --disable-documentation
-		--enable-dsd --enable-largefile --disable-osx --disable-shine-encoder
-		--disable-solaris-output --enable-tcp --enable-un --disable-werror
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-
-	if use network; then
-		myeconfargs+=(
-			--enable-shout
-			$(use_enable vorbis vorbis-encoder)
-			--enable-httpd-output
-			$(use_enable lame lame-encoder)
-			$(use_enable twolame twolame-encoder)
-			$(use_enable audiofile wave-encoder)
-		)
-	else
-		myeconfargs+=(
-			--disable-shout
-			--disable-vorbis-encoder
-			--disable-httpd-output
-			--disable-lame-encoder
-			--disable-twolame-encoder
-			--disable-wave-encoder
-		)
-	fi
-
-	if use samba || use upnp; then
-		myeconfargs+=( --enable-neighbor-plugins )
-	fi
-
-	append-lfs-flags
-	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
-
-	myeconfargs+=(
-		$(use_enable eventfd)
-		$(use_enable signalfd)
-		$(use_enable libmpdclient)
-		$(use_enable expat)
-		$(use_enable upnp)
-		$(use_enable adplug)
-		$(use_enable alsa)
-		$(use_enable ao)
-		$(use_enable audiofile)
-		$(use_enable zlib)
-		$(use_enable bzip2)
-		$(use_enable cdio cdio-paranoia)
-		$(use_enable curl)
-		$(use_enable samba smbclient)
-		$(use_enable nfs)
-		$(use_enable debug)
-		$(use_enable ffmpeg)
-		$(use_enable fifo)
-		$(use_enable flac)
-		$(use_enable fluidsynth)
-		$(use_enable gme)
-		$(use_enable id3tag id3)
-		$(use_enable inotify)
-		$(use_enable ipv6)
-		$(use_enable cdio iso9660)
-		$(use_enable jack)
-		$(use_enable soundcloud)
-		$(use_enable tcpd libwrap)
-		$(use_enable libsamplerate lsr)
-		$(use_enable libsoxr soxr)
-		$(use_enable mad)
-		$(use_enable mikmod)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable musepack mpc)
-		$(use_enable mpg123)
-		$(use_enable openal)
-		$(use_enable opus)
-		$(use_enable oss)
-		$(use_enable pipe pipe-output)
-		$(use_enable pulseaudio pulse)
-		$(use_enable recorder recorder-output)
-		$(use_enable sid sidplay)
-		$(use_enable sndfile sndfile)
-		$(use_enable sqlite)
-		$(use_enable systemd systemd_daemon)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_enable wildmidi)
-		$(use_enable zip zzip)
-		$(use_enable icu)
-		$(use_enable webdav)
-		$(use_enable faad aac)
-		$(use_with zeroconf zeroconf avahi)
-		--with-boost="${EPREFIX}"/usr
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-		--with-systemduserunitdir=$(systemd_get_userunitdir)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc
-	newins doc/mpdconf.dist mpd.conf
-
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
-
-	if use unicode; then
-		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
-			"${ED}"/etc/mpd.conf || die "sed failed"
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-0.20.12.logrotate ${PN}
-
-	use prefix || diropts -m0755 -o mpd -g audio
-	dodir /var/lib/mpd
-	keepdir /var/lib/mpd
-	dodir /var/lib/mpd/music
-	keepdir /var/lib/mpd/music
-	dodir /var/lib/mpd/playlists
-	keepdir /var/lib/mpd/playlists
-}
-
-pkg_postinst() {
-	# also change the homedir if the user has existed before
-	usermod -d "/var/lib/mpd" mpd
-}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
index c41cc0ebed29..a4f1962c0a1b 100644
--- a/media-sound/mpd/mpd-0.20.21-r1.ebuild
+++ b/media-sound/mpd/mpd-0.20.21-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/mumble/Manifest b/media-sound/mumble/Manifest
index 9c4b8dc8395b..eed4e7c2473f 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,2 +1,2 @@
 EBUILD mumble-9999.ebuild 3023 BLAKE2B 16048b08d26ee51dcccacd19c9e6adfc0038e6d50d83a79b4f87f47ca8fa642fbf78cbb46f96c5553d1a6fbd44dc6af3de43a96cb149009cb58a6f8d4693d6fe SHA512 97b35ab609a8b7e7757633a8f80dd4d36697d52d58d5e1aa4ac3e55396ec4aef4df8fbe0a43bad3173ae1975eabb0825778dac127639bdabb06ccee641a1725b
-MISC metadata.xml 843 BLAKE2B 5048f202061b73223ef1d8c7beb20e5fbeb3726c0f1d8039bf4385e111e221dcc52ed309356311f3ba885f306c4d7c074caf9c785c86d8fda924c4ebf69475ae SHA512 0037f9510526f803d2abfe97c2b8712ff626b93d12457d5111f23b20787505168789cd86f9a3b4dad845634f584faa9e30e02777f4d0a7a8bd34f9fc9e1ca40f
+MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 146871bb68ac..760004df57f7 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -10,7 +10,6 @@ Mumble is an open source, low-latency, high quality voice chat software primaril
 	</longdescription>
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
-		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg>.</flag>
 		<flag name="rnnoise">Enable alternative noise suppression option based on RNNoise.</flag>
 		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
 	</use>
diff --git a/media-sound/ncmpcpp/Manifest b/media-sound/ncmpcpp/Manifest
index 3ca4851135ec..1077bf76a536 100644
--- a/media-sound/ncmpcpp/Manifest
+++ b/media-sound/ncmpcpp/Manifest
@@ -3,6 +3,6 @@ DIST ncmpcpp-0.8.1.tar.bz2 464123 BLAKE2B 0edb57fc3a0527dea085a10736ff2cdca3ea25
 DIST ncmpcpp-0.8.2.tar.bz2 465713 BLAKE2B 0d07477b3473e1ac7362175cef4bfb085ebdb4c8b1e77f7bb68d8bf4c645fdcccd067d12e2080a740ade18c57dd055f270d2e50096f0ad3afaa40175e19259cf SHA512 9384edd162f40af23e4f26f437356520f117e4e2ab513ed3de132d2f11e597082d1cb7f0dd3696660d0c9bb85ad03e31fb921c97a11c7b28b32c5907fdbb8e8f
 EBUILD ncmpcpp-0.7.7.ebuild 1501 BLAKE2B b4fac49d9ebca61da51109aa52b06a14f5005064d4427bb94403d534ad03ff65574ff7cbf0d0708dadc7942c51ddc93bc0260e1741ba5b75a026a2e5c726e674 SHA512 dc3691ec4e4d92f063fcccf219e3566ebc85d8b2b0bdf8134720701172108bce462ba9278b9405c556c8631df846747e5f5a2ccdfaab1b6efad58ec92e9474e1
 EBUILD ncmpcpp-0.8.1.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
-EBUILD ncmpcpp-0.8.2.ebuild 1404 BLAKE2B 47db7c4ced708da6b78afa0a410e5938d0a3fc5cf7916adee506ea997b35e3de7d2b004e9d3295b6e36e75af2d042f60603d6d243c2b4a3982279e21202a09dc SHA512 6af5a76e471a154458777d1dc0ebfc298ff927444d01d2b70ebca01a617dc11f5ab6e1baed83cd03a323f835cea76aa1396a307092ecf789d49e0ac29630febb
+EBUILD ncmpcpp-0.8.2.ebuild 1398 BLAKE2B 884dd2b899f971087dd8c8152be1df83928e897e6e34b0d65394bd3771a95e024510ae2efcd02fdf2cce8406ab3b31cd38822a640086c6d757ac9dda5a4bed2b SHA512 478763e7f57d66b1005efa5a81e919bb38a78340f67edf7bcb4212edaf46ea2a2a88b5f6df9a8f287d0553cd588085cf779da6f0b081d38ea0e870d4ef6db622
 EBUILD ncmpcpp-9999.ebuild 1393 BLAKE2B df97f04580a0043cd6bb4dd1dfd9b756f11a98dd14f05058e64f30a50c0a557a5fdab6bef229ff512c07b4b314e99bfbc043a69e16ddf540bea72b7b1b6ba724 SHA512 bb3920892524c4f6969490f0219786bae21f20f9660ed6a78f7b307f46396966679c5aa7368e558336f203d25c344b7509282fd7e77890e1bcea9d96f138d5e0
 MISC metadata.xml 1175 BLAKE2B 2a7f404c5db97a726429add8dc33d3ec1d0032e1a57291bebe3c79d76d9cfaca2eeb1e6e3b83b6ce8ffcdf94442cd32fe5079f2f19d70a05cc12da66caf96316 SHA512 9584bdbc4c3def081acc02f78bb64d28fb795db2b7766bb842709613124f5548c0c4b0ed02865d459e1ce45158d59137220a341e29f51db31c6cdf1c91bc776d
diff --git a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild b/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
index bd2f837dbb38..58f8e679616a 100644
--- a/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
+++ b/media-sound/ncmpcpp/ncmpcpp-0.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="${HOMEPAGE}stable/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="clock icu outputs taglib visualizer"
 
 RDEPEND="
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 9afa1cc152fe..9bf57c870b3a 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,5 +1,5 @@
 DIST opus-tools-0.1.10.tar.gz 312093 BLAKE2B d96377f3c56990bafef58f0eacdf8795302400eb986e6408b2eb1af67eae59194709b9e1ef86b420b4adab767be329278cc60c1fcc7da4b3f461b532ebf8bdb1 SHA512 4ead97b9fe4658968a4b5cbe4bde5e2d8cbfaaea18dd0d817597cc6b6b11f26937b9eee7358ade63568f0213131aa80ecbed169d1b3885980a556871a4a7fe98
 DIST opus-tools-0.2.tar.gz 457680 BLAKE2B c5896a6303aa1e1626097622e671bc96fd292a0f0c40a56410ef1f7699f8d18540d71e70f1cace6a91bb430886f1ddb07ba08503bdf82aa81758793bcea5b530 SHA512 6fdde8d938e8fadc9391b5d188883dab0aecf8b27d40d00b5d67d8fac9cfd9d5107b1934bfe6310587400f277c99d1db5cabf3d26f340ce2141873dec238e5ce
 EBUILD opus-tools-0.1.10.ebuild 944 BLAKE2B 128013973365bd4de9d4f11cbc536b3868935482cb24a7998b5ec6f73195497d28d5622d6ad9186849ba2850882ee4a0179bb04098f9d8471a1c2ae2fe884d52 SHA512 844133cf0a6077d13cc85eec31dc47af94c25bd3dac6eea41eb396b9a36a27d6b0d67e86be0fc53dea8bd3ea03595ef47aba87d06482f3ddf144bc70466b7c38
-EBUILD opus-tools-0.2.ebuild 995 BLAKE2B 95ccf37fa0a9185de8ed54c0ab6656dafa0c9b15b7b77c32927ad1b6572e28ffe893b5fb426fed2a351621b27eac44ea73119c718f209a0f52ad9603208a28ba SHA512 a14069037a9a2d87b04eafe7ec3f9558ef393cd92e73ec51e6a2bb9e9ff7713a23a3206589665e61bea9d2ae91f3936f941117724542e53570e9845ecbbaecda
+EBUILD opus-tools-0.2.ebuild 1007 BLAKE2B cd9627edd8696f5becfeced83169fe1b724f085cb4ed29a52a6d3718afa248b1b4b166e8b0170a0956b12627712a260645bc689b4550ef117c9d35b5b674522c SHA512 7efa5b8ffba5e62c066438e7582852f357700d1d37bf7f3ade9d29a6e5ec8d2adfd8c898ac30b53fb33e759f2ac5f6d8d5b12151a3f1b3be0b91066ac9db9818
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index 7d1df1f9f0b4..789bbd1a16dd 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="flac"
 
 RDEPEND="
diff --git a/media-sound/pavucontrol-qt/Manifest b/media-sound/pavucontrol-qt/Manifest
index adc179065821..bdd57b3c2c99 100644
--- a/media-sound/pavucontrol-qt/Manifest
+++ b/media-sound/pavucontrol-qt/Manifest
@@ -1,3 +1,3 @@
 DIST pavucontrol-qt-0.4.0.tar.xz 34916 BLAKE2B f42f560b125e292ae3a8ab76e2020d1a899019e8ed40d6f4d3e90fe1baa0cc044093310fe9ac11c6529f9cc1abc41d475aa2d445de8f19e6f89ed456525aa7d9 SHA512 62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb
-EBUILD pavucontrol-qt-0.4.0.ebuild 780 BLAKE2B 0169b1a5e0366724d75a036cb83d16e822740d591930dd84221a453e1af6f8980c217f52e0da3b1a5cd2377b89aff2c700680d1372a0ca5751b4144d3872e6c6 SHA512 be6c67498e5398327a943c76e1476b499920b3a14b43b8cc66306b907f9e0ea3509e54d17f7b73f363ddaad966ea134e50a0ae5011112f33547a8b7d490902c2
+EBUILD pavucontrol-qt-0.4.0.ebuild 775 BLAKE2B 6e5b47111723959f49917ff2251d3a617025f0565147648c31d7d4bb35f366a1e8b3670760c22d97cb13c0770971ac30d045286e51b0f7b4d38b571c51340235 SHA512 a777547bb37805a559a89e4aaa488949643f770a6f5ea843d183df50ba2d250dbd5fa4a6449916e9c021099c7287d093a99335f43fcf670dc9f2fb3b7b2b2faf
 MISC metadata.xml 320 BLAKE2B 089cafc47e9654c549e2d1cdbf40287b9cbdb9bfe0f8a2c82ee4b679ddbb61506f4b2049a62ff0a1e2f1dddae526209878ba05a009e18e95100b9c6e2c33e7ca SHA512 684f3ca2854648c433f9dd4e936609b82bedc97c7096d12719af0764243270055d4daeb3bb2b2c5adbf8f710d13b9b6d719eb6a228da3703e656e25298f3ef1f
diff --git a/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild b/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
index 656d182603ab..f5fb52e6913d 100644
--- a/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
+++ b/media-sound/pavucontrol-qt/pavucontrol-qt-0.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/media-sound/potamus/Manifest b/media-sound/potamus/Manifest
index d762b770f272..3f5293fc89fa 100644
--- a/media-sound/potamus/Manifest
+++ b/media-sound/potamus/Manifest
@@ -1,4 +1,4 @@
 AUX ffmpeg29.patch 684 BLAKE2B 06808e146419469de9f3d4a98db52e45c284779677b9f7525d108afbf485fb804a8bdf45909fbc53c19546dc6b56ae308348a1616f94af269c9cd1407bb134bd SHA512 3de805c7e4808863ca4fa9fa7c450ce1db6222a69ef6e43016e2d7d687a5461beda75869b3bd5ad6266f00948ce94ff63b15c9fa97104303a56300e0aa2cb475
 DIST potamus-16.tar.gz 144874 BLAKE2B ca18b2a6e948a913f652383a81a9e637265c7cf78126846c6824fe12f8a34ab2902ade69366e036b00da61604780e340671a68588b52576c0e5827f07b1b7ba8 SHA512 e4c87d4166d958d200edc13835c57c894b0803b243fd79fb211480a217a33ca34fbd451622842efc47c0ed1b79bcd0fa4f0258f129f70678f14c373234b1b32d
 EBUILD potamus-16.ebuild 1272 BLAKE2B 4070417acd64772b087e88db609a97762176404f263c60dd919c2348cde4fda3e0cfefd18714061aff376bdd2c1b546555a46bf4c9e95be141940b72c9b86061 SHA512 48b6b50e09ba733c0f12e25d716dc4f34ac97f8882ce62a0dca924fb257fcf293d3338b5d20b4a5b5e7309f269e75a017b3c34b66ecb46c33cfa2466985f6d4c
-MISC metadata.xml 321 BLAKE2B 83b225dbeefaacfa834eb2e2add72bed38dbf5320682d2a50cda1ff0de4c36845501071f416242ec83cbff0144e285ef4bbf4f85e11d4cd42cab1b5b2f21f5d5 SHA512 10c84204031ebaad014bcd3acae8faceaad8f9e589ab6f6429485074e242111a94b41995af7c35f1cbf7b85b2cf76a304b1b6b49d018cffff330f861efd01a3f
+MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
index 72f0cd7e04cf..c870d0eef0ab 100644
--- a/media-sound/potamus/metadata.xml
+++ b/media-sound/potamus/metadata.xml
@@ -5,7 +5,4 @@
 	<email>sound@gentoo.org</email>
 	<name>Gentoo Sound project</name>
 </maintainer>
-<use>
-	<flag name="opus">Adds support for the Opus codec.</flag>
-</use>
 </pkgmetadata>
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index b37250170e94..adb233e454a0 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,7 +1,7 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
-DIST pulseeffects-4.3.7.tar.gz 1021450 BLAKE2B a3d9308056b08dca0737eafa91b18ec9d3d2f2fc3d84ac090d21bac832fc5da91ba5ed1ce595898ca07dfe1684bf4e50668956dcc0f32da5b535ec1b3e9e4f08 SHA512 5ae104bf3359aa1dc4be6fe3afa5bb8f2243b3ef2c9d5abb9a881d025b26e8e75cc80ffa1ee43fafe7fa8d238eaaf2dc933f191694093b10ed8ffe7f7e3fdc53
+DIST pulseeffects-4.3.8.tar.gz 1020024 BLAKE2B 07cc1341a9c829c6e9e4f820337ee993b16e4d014636ad89793952059af5814754682035841b4307a700d2681e49aec5cd4138cdf13fafc79e60557d8087a362 SHA512 3c6537daf2fd3205ecb42ee91cc01ce2a4b28ec2ecfe32c978f70e8334fef667369c684b1ea2dfdd0537fe70d10084a1c758da7757f5473d1dafba6110dc03c7
 EBUILD pulseeffects-3.2.3-r1.ebuild 1568 BLAKE2B b50ff96cee7ea244dc499c46bfd9dc382e3fa22d03b1d74c25614a5fcd9b540521bc4b7c50a42cd11e19286f5f86c82b7ab5cb93c44da0e29a9d87c2bb4157ba SHA512 704a2e5d1bc7abc1ab31d48092cd825a140a571e5ee0034bf4a9041615183c91383fb5b4051275a4b598be35e638b375e63de3d117d0fdbc63fdfb341c57e05e
 EBUILD pulseeffects-3.2.3.ebuild 1492 BLAKE2B 959ccbff4ddd3376895dd833d7a36ba81b8b2d46381a7cc14aa73ab2701d01910fcc340fffe0058099f31e80332670182671c3c737d0b41746af5a386b2e6182 SHA512 281ff12ecc62b6c75db6ffaa290517ab24c8110db4333c54221d87f2283feab60a5ff2e0e02ead2193bafcb7d4a8c6b990e67cd1925e9afa5ee16aa5b49decd2
-EBUILD pulseeffects-4.3.7.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
+EBUILD pulseeffects-4.3.8.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 EBUILD pulseeffects-9999.ebuild 1684 BLAKE2B 968769997ea15381297a4845118fe0408b82097245b83bda760933b024a9792df73e3dc1c15c60e02195b5a4d457c7c9b7c4a13a342a5585e2b27bad4762122e SHA512 b526e120bb7b6caf08d16e503d117728695ea19adba16e8ccc85a11900dc808b20911de9c34b1c7122f1abca5deec10fb0f656cf9ae510daec4b0ca6875d9796
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild
index edcf67ece621..edcf67ece621 100644
--- a/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.8.ebuild
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 2ca3a9bc21b7..2bb5cbfb29a1 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -3,4 +3,4 @@ DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
 EBUILD qmmp-1.2.4.ebuild 4171 BLAKE2B 83e5f7bf60a315e55491b571bdd7440edd0023b3e3bf61aa2484c6ddb06873606ecbefea24499eaef252ce4fda770b368b2c0804d88801cc43853f36fc8794fb SHA512 fb1c6f1c21b84a6ef507a8dd218ff469172861cff6b6970652bf78538859e1ebf217c21f9e60167296c8bd87dbe40bba36ffbd423708f9cafa0fd6c2d13855b5
 EBUILD qmmp-9999.ebuild 4174 BLAKE2B f89b2d24351b45622cd4f09b8883d549eb90f1b3d963c3dad4f9230e45fcbf720caa11a97acae7e881414dae61a2939da30a37dac3e24e9a09782fe303b9072f SHA512 7db78b91c76d766f8c5d0251ba3c1d5ee94a47427865b75bcf386f0d0d01969bb4ad169196b7acb8932dfd4d93b40eeb39c8b2e4e8cf4699ed5e92be1bd38b16
-MISC metadata.xml 1776 BLAKE2B acbe67572cda04be31f68a07539acc2f1124b789bd1986fcd0e17f7688c37d2248236467b9f04c6de04030c4ce59962e78741fad57d9bd993b1a893fcc58ecbc SHA512 92f5f391cadb3f602d950a52ba0c6e3e8b5ec844ed7d6ffd5bc1ac112fcb46f113ac8524676a1d8c482366703966edbd551a4906aba54af54ca0856e20215425
+MISC metadata.xml 1726 BLAKE2B cb094a332efab67fd0171b3f2f2c15928e35f2dc3dbb348eaaee54716e61390549e8506caaa42430df2f03f436b8a28502a7870de2335caf792c3af6ecc2cdc9 SHA512 4c63d06e5c2e08725a1bd3a9172c41ddbba831b88b1ff23749c9702560355b963413540b7261609f1c063d8f4b311b5402dee63e9918628d4c3a90585cece510
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index d6e2ae6cf128..fa31e6172dd3 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -19,7 +19,6 @@
 		<flag name="lyrics">Fetch track lyrics from the web</flag>
 		<flag name="midi">Enable midi support using wildmidi library</flag>
 		<flag name="notifier">Enable qmmps' notifier system</flag>
-		<flag name="opus">Enable the opus plugin</flag>
 		<flag name="projectm">Enable projectm music visualization plugin</flag>
 		<flag name="qsui">Enable QMMP simple UI</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
diff --git a/media-sound/qtscrobbler/Manifest b/media-sound/qtscrobbler/Manifest
index c64297366034..73ae9c7b27c3 100644
--- a/media-sound/qtscrobbler/Manifest
+++ b/media-sound/qtscrobbler/Manifest
@@ -1,5 +1,5 @@
 AUX qtscrobbler-0.11_pre20130123-qt5.11.patch 697 BLAKE2B d60d5da77ab0a30d9ad89d24a10882ce91c85bf9959e5be6019c69b0db95c60d2e6d1c2cbf5a1fdd5494236ce5d78d9b5a5a05b9bea264db750c0f570cda85d0 SHA512 2edf71e6397dfdbb1aaeb38bca5b6a3b2a097b1a25038f62d1052cb5258cf94b12c26181fea76c64506ed60bfdeaa4968429836eb47e874aec273cdb480689ce
 AUX qtscrobbler-0.11_pre20130123-qt5.patch 5444 BLAKE2B 5e8ef860627e3f8a1b5c6d7a845d4b71c2ae473a42c1fd9619d9a6a270b50e7214bec232c51faf918d4d220490ea1273e016280e56c3d4b06075fcb9feb528bd SHA512 716dc1d84d1eddcec15ec4b87c0c7454acda58ebb94ed5e7a1f5a79ec0a04d473c6dc9e7eb6649986346743cf8a673bdc25e714c221fefd0f05e0925a0f5b0c3
 DIST qtscrobbler-0.11_pre20130123.zip 298519 BLAKE2B 36d3c3fdf59aa7fd9127c0200b03a6427f6fa27cb40e144f10041a25ba977e40fc5f63547596cf93f797d94e741a4a159c5e1aa48f8742d7738d1c113b22aae8 SHA512 24de4a45d4b31fb3c544b963b97b8716b8472a0dfde1bd2fd6bf101785f22ef07ff34fcd9ce7028fe231b215538bb8e4c3248c234feb870a3adeb4c0b259d646
-EBUILD qtscrobbler-0.11_pre20130123.ebuild 1285 BLAKE2B d6ea8043f5932cc68231731d0ead450f99faed2a5d0e9871c103eedf648004b445320f0c5744c85e26b9ecf6489e84b1dac51dd71f49de58e812693ecde14958 SHA512 e16d66960de5faa44f4426bc38000a1f50bc86ec0807b2f4e088a6d3513b57388d274206b33e06eaa33218fa269e68ffe5e44b74b4ffc150fe005bb0960f6bf7
+EBUILD qtscrobbler-0.11_pre20130123.ebuild 1307 BLAKE2B 699ade962f0728763aaa97f18621d0e0bb365ef5243610391639b3da7a2dbbd4036c6383985ba21b92d325ffe2ffa4df1f485f0ce9472df502aa1e721b946acd SHA512 93d6c9e2bb94f26f0310da87acbb6bb134353274387ed35972b6d3ef08ace9340813639f6cd33a5c2bed311da74f3c85a06ea533ba3dc342dba1ed7b9459df46
 MISC metadata.xml 340 BLAKE2B 350f5459a036f9c55c558bc8f7d9ab02a3b9045eeed136d8ef2963a19c9e3ca281dbff32ac8259333b625ca86ff66a8a747f6e5893baf643f5a1d7318303511d SHA512 67534a9d49ba6af88e23b14129c377309124be860237efbe926ba870f554aac980522cf7c791fe2075da689670994487631760c986a7b11834a2f2f9b48fc317
diff --git a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
index 3dc54d6064d0..18da2c44154b 100644
--- a/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
+++ b/media-sound/qtscrobbler/qtscrobbler-0.11_pre20130123.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ RDEPEND="
 	media-libs/libmtp:=
 	net-misc/curl"
 DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
 S="${WORKDIR}/${MY_PN}-code-${COMMIT}"
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
index 13989be0b2ee..8f8a3e4d5624 100644
--- a/media-sound/sc2mpd/Manifest
+++ b/media-sound/sc2mpd/Manifest
@@ -7,8 +7,6 @@ DIST ohnet.1dd641.tar.gz 20831753 BLAKE2B 82724b7f2cd5cd0dcaa54786394a2560b965f5
 DIST ohnetgenerated.e3edb9.tar.gz 1887473 BLAKE2B 1b878dd743f0b45f69c3eb018ddbd64db60285ee8743bb039f9a794a9e0ecdb516e1138ac622fc7cde3462fe5c3cfc006d71d0b22048496c1bc190cc4f34a906 SHA512 9b48d0ff496acfa4313c1efc90e73f1050fee011b1ab301b9268ba4009fca9a47978cbe2f1f0a1d05d7c939f95b4a38560b9f63464305032c20d36af3ade8811
 DIST ohsongcast.3299ea.tar.gz 831313 BLAKE2B aaa5590af288bbf2b358bad613b983418f6648219bba046113a8c712f3a369fee2894c8aa42f96ead16582b96b982d1696b478950e0e3d0ef6c8e3325e5a3214 SHA512 ac1e81166e5b73a943f78c930ef89fc5b71447c7eb8c4cc509c50c686a360a25f75f1651061a653bf995c15377bee4cb98a97665bf27f04f947940a249e12661
 DIST ohtopology.cc09c0.tar.gz 118703 BLAKE2B ef5b560cb2a272586e8755117b5021d67562bda962b0c6240072ad42876ae71f21c81611521d31b01212d2175637244b8513332858aec3d7e713546587111ed0 SHA512 46f1e4ba6b7553b81c939c2ae691ab89e0bf9b565820e8c65b14b6534f3a9240580cb9fd69f46568c5f0c8d105da825b6f9abbf61a64289a4f553a47902b38d4
-DIST sc2mpd-1.1.4.tar.gz 218128 BLAKE2B 71ff5e95d868c40d5c9fc72d65161d97ccc1ed366e7465c038efb646bb4ab581d24dbab7280fb739029bbaec7ff8f5804006a4cdc8a61ad0395acb9da74db95c SHA512 eebd21198ec2a9b0e1122a9b3316eaefd38daa2e6b6aa4c480e8c1fef0a8600a68c386d1957b4cf9203a61bcc63b7842e145073092f30ec2e81cdf1010e9f1ad
 DIST sc2mpd-1.1.5.tar.gz 219031 BLAKE2B ac8a3b4da6caff58db4948c32d643bf9244efa4ad77e29c18aa7e10036715a9a84c9f69478f5a2eabf6769112fb61ea15e1d7e8e613fbae05794cef609f21247 SHA512 8ea47b8bda62b8e97b95b0ddf0ab7979a54ae8bc599c67ef7bdd16ea876254446c8be440fade7355be93742c94c6f20b56e40a5756cc3c0dbe0409612dc3788e
-EBUILD sc2mpd-1.1.4.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
-EBUILD sc2mpd-1.1.5.ebuild 4566 BLAKE2B 7bf45b49fbeb40a971898568a8a704605bce5c500997ce7d24d0fb22a5a299af9fedf271565e2ee20bd01fc8104f6404ee906ccf977cbec1704ce15f19757bad SHA512 a38646d513b604ea0237be131adf7992603090e1cdfa12e4f715b2239a73d7d06440a0ecbfe7622e8a6475eb0df3921dc7f227a977a265398d514bc401be5a6d
+EBUILD sc2mpd-1.1.5.ebuild 4562 BLAKE2B fbecb9f945afb3d1ba06e15cdcabefc762cd4a68919208001843fbf6dac4b5b52bd773934b8db7f685f31e9f2508a4d06e4c05223c69fb3658a2a681ceaf3a2a SHA512 c2f91e7fb6b48cda77c204c631d44f6765433d7d9f01872a17a99f588f3fe09dc2827cbc48104b8752defb27b607612dc7bbd20fc478748a9f52fba435c221c8
 MISC metadata.xml 313 BLAKE2B 81be81a3249c77371bf3c159e69a7151fd4763449f1b32cb02de42e774e4e050b45197e0a22dd294b3f9f116c680d18e18c03437bc571952b6739a01f5b04180 SHA512 993a3648e52c72afc8cceb7cf87a3bbf28658f106ca0b12c2e90f098e8d02b6d73f6e1ff728aef86715daae17533a17e6495d8110c59f91e116e84587ef5eddc
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
deleted file mode 100644
index 90ecdf9ac79c..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-sha_net="1dd6411ffbe59fe09517162fb88e2405adb4990f"
-sha_netgenerated="e3edb912410d4c5a4d5323bb1e9c27660a42d78f"
-sha_topology="cc09c09da4be8d3d04adae5b8f0daaf8450906a3"
-sha_songcast="3299eaedfea34993b79e6d30444792d4fb12a110"
-sha_devtools="d3586187dfa5f0a8b0f3e35e3d1dc50d1c34943d"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://codeload.github.com/openhome/ohNet/tar.gz/${sha_net}
-		-> ohnet.${sha_net:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohNetGenerated/tar.gz/${sha_netgenerated}
-		-> ohnetgenerated.${sha_netgenerated:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohTopology/tar.gz/${sha_topology}
-		-> ohtopology.${sha_topology:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohSongcast/tar.gz/${sha_songcast}
-		-> ohsongcast.${sha_songcast:0:6}.tar.gz
-	https://codeload.github.com/openhome/ohdevtools/tar.gz/${sha_devtools}
-		-> ohdevtools.${sha_devtools:0:6}.tar.gz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	net-libs/libmicrohttpd
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	mkdir openhome || die "Couldn't mkdir openhome"
-	mv ohNet-${sha_net} openhome/ohNet || die "Couldn't mv ohNet"
-	mv ohNetGenerated-${sha_netgenerated} openhome/ohNetGenerated || die "Couldn't mv ohNetGenerated"
-	mv ohdevtools-${sha_devtools} openhome/ohdevtools || die "Couldn't mv ohdevtools"
-	mv ohTopology-${sha_topology} openhome/ohTopology || die "Couldn't mv ohTopology"
-	mv ohSongcast-${sha_songcast} openhome/ohSongcast || die "Couldn't mv ohSongcast"
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	epatch "${FILESDIR}/ohnet.makefile.patch"
-	epatch "${FILESDIR}/ohnet.optionparser.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak || die "Couldn't patch UserTargets.mak"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	epatch "${FILESDIR}/ohnetgenerated.makefile.patch"
-	epatch "${FILESDIR}/ohnetgenerated.commonmk.patch"
-	sed -i -e 's/ bundle-after-build//' UserTargets.mak \
-		|| die "Couldn't patch generated UserTargets.mak"
-
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-	# Begin ohbuild.sh reverse engineer
-
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 Receiver WavSender || die "Failed to build ohSongcast"
-
-	# End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
index 90ecdf9ac79c..88eb814868c4 100644
--- a/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
+++ b/media-sound/sc2mpd/sc2mpd-1.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ SRC_URI="
 "
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/snapcast/Manifest b/media-sound/snapcast/Manifest
new file mode 100644
index 000000000000..b9a9bfe5e25b
--- /dev/null
+++ b/media-sound/snapcast/Manifest
@@ -0,0 +1,9 @@
+AUX snapcast-options-for-use-flags.patch 2583 BLAKE2B 4ad94f7c2d796017047645dcc74bd04209817dcf6c96c05cf92a130af2c5239761325f25a0bf8ebd65c6d1221f3ba248b93eb98c22ad278c06bca46c8e27d056 SHA512 84be456467309c2c040526dfa1847e65fdec2c59d7ba917416d10ece0d7173d53ce11c2fed2a566fb3157e58757ea21500464c46abff18e57dfb092c18450932
+AUX snapclient.confd 643 BLAKE2B f15281f607b230b165e61dae2d71e58a9b899329da435caca46aa866a14528246bbfd9abfa1002815270d98fb926e322025095b9955fe84e0381c17149ca0b9c SHA512 34961a219a608aa5447fc4b47d08785923a4a8a5d70f87f03c62dab2f590180d72992f40594772ac9d2c8cfc89281789418eee46c860b1b7c1b826e6660cfc72
+AUX snapclient.initd 378 BLAKE2B a1f2dda0843c541edfefce80e0ad9587af8ef50844fe742d932a1a1d3ea06e8587574ec4c08d403858bb42b4bf3ebcfa67fce59182b2f779e09e2ad53790d0ca SHA512 5d58c9746ba793c59ae1690a97aa5f0c74ffd3fe86a1f9ed5851e3f181e050188f70a96fbc7b8cfe0afe5de784bc332e25b4a4e68873503106b2231c59e8af69
+AUX snapserver.confd 1013 BLAKE2B 205c58e3d42dc12d759c7dd5acbb1a1229ae052a48392731a7cc10cf9ab36250938995a75c4968c33521cf1480396856b5cd8653e90b5b8a3188e1660b1c1257 SHA512 5adcf37ed69ccb09541f7bf7563ddf5a8aaf1bfcabc02f430976ae5b8e418ea68cf0b22216f3f7387a04f7516a8f30cc5b2923f811c1833c7a4208e951fd266e
+AUX snapserver.initd 383 BLAKE2B bd920738ecb98eda76f0045b50b3b0763cd123ab5eb08bbbe2964d7a0556b6df2ecb879dd0b0ff9614b10520008e9934cb278a0f3705539076eb812404f0ba58 SHA512 565084bea18bfefe60c0e33e0fd33929a0b170df9d0cbbfbf794a9ee9055a9bf605a716ff18bf72d2813e890b64815eebc2bc24963f300b4061cf017440a62d6
+DIST snapcast-0.15.0.tar.gz 667452 BLAKE2B 0bf7e28ba52356c8fff8066ded3d741243c2ba88cdc6cefda113c0d6866fe14b2fea6198d7809e564cd61d32a336a2c30ee22f6f5d6ae77368a6f3e254cc5065 SHA512 3751eeaa9be4ffd5c7633b8770f36e87360ab83004f090a8350e377f60a79d9502b92b92c5c9c35f513705e6484d113de9942f0a896824d7c5f806ba0010e84e
+EBUILD snapcast-0.15.0.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+EBUILD snapcast-9999.ebuild 2027 BLAKE2B 3b59f8b92af313d4be43e94cf6f96b80b0bef11bd13ad7d131b1af700929665c39c2916b5f48b996a4a39df6c4f194b5b3accf434f378ad11e4a23e81bb887be SHA512 1fbc1e71107ba90abbd03a61d67ffdcc684e5fbd59e611c0f79c4f2197d3cf83634bbfee6391ef83dfbc2837b54eceb1f5a4496d3c3bf495952b8d7ff0836cc6
+MISC metadata.xml 1335 BLAKE2B 6b0e6cfeb32d2fd6c9dfd5404df5795a1c82f1fffb2e12c31ee5c6656e0b7470d41416775c816211847bb37288f620b7f5ffe85641b88d3b5493f21436a43ae6 SHA512 78bc34f1071f7efaf923dded86d6af3761f34612832b29e6ddacf63c7bcbb5c9662e3857a818dfd0328423a7ba3aaa6d383cf425551227b6228d6d58cad4943b
diff --git a/media-sound/snapcast/files/snapcast-options-for-use-flags.patch b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
new file mode 100644
index 000000000000..956d6299d457
--- /dev/null
+++ b/media-sound/snapcast/files/snapcast-options-for-use-flags.patch
@@ -0,0 +1,90 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 52fec6e..d068db1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,11 @@ option(BUILD_TESTS "Build tests (run tests with make test)" ON)
+ option(BUILD_SERVER "Build Snapserver" ON)
+ option(BUILD_CLIENT "Build Snapclient" ON)
+ 
++option(BUILD_WITH_FLAC "Build with FLAC support" ON)
++option(BUILD_WITH_VORBIS "Build with VORBIS support" ON)
++option(BUILD_WITH_TREMOR "Build with vorbis using TREMOR" ON)
++option(BUILD_WITH_AVAHI "Build with AVAHI support" ON)
++
+ 
+ if (NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+     message(FATAL_ERROR "One or both of BUILD_SHARED_LIBS or BUILD_STATIC_LIBS must be set to ON to build")
+@@ -109,10 +114,12 @@ else()
+         endif (ALSA_FOUND)
+     endif()
+ 
+-    pkg_search_module(AVAHI avahi-client)
+-    if (AVAHI_FOUND)
+-        add_definitions(-DHAS_AVAHI)
+-    endif (AVAHI_FOUND)
++    if(BUILD_WITH_AVAHI)
++        pkg_search_module(AVAHI avahi-client)
++        if (AVAHI_FOUND)
++            add_definitions(-DHAS_AVAHI)
++        endif (AVAHI_FOUND)
++    endif(BUILD_WITH_AVAHI)
+ 
+     add_definitions(-DHAS_DAEMON)
+ 
+@@ -154,29 +161,39 @@ if(NOT HAS_CXX11_STRING_SUPPORT)
+     add_definitions("-DNO_CPP11_STRING")
+ endif()
+ 
+-pkg_search_module(FLAC flac)
+-if (FLAC_FOUND)
+-    add_definitions("-DHAS_FLAC")
+-endif (FLAC_FOUND)
++if(BUILD_WITH_FLAC)
++    pkg_search_module(FLAC flac)
++    if (FLAC_FOUND)
++        add_definitions("-DHAS_FLAC")
++    endif (FLAC_FOUND)
++endif()
+ 
+-pkg_search_module(OGG ogg)
+-if (OGG_FOUND)
+-    add_definitions("-DHAS_OGG")
+-endif (OGG_FOUND)
++if(BUILD_WITH_VORBIS OR BUILD_WITH_TREMOR)
++    pkg_search_module(OGG ogg)
++    if (OGG_FOUND)
++        add_definitions("-DHAS_OGG")
++    endif (OGG_FOUND)
++endif()
+ 
+-pkg_search_module(VORBIS vorbis)
+-if (VORBIS_FOUND)
+-    add_definitions("-DHAS_VORBIS")
+-endif (VORBIS_FOUND)
++if(BUILD_WITH_VORBIS)
++    pkg_search_module(VORBIS vorbis)
++    if (VORBIS_FOUND)
++        add_definitions("-DHAS_VORBIS")
++    endif (VORBIS_FOUND)
++endif()
+ 
+-pkg_search_module(TREMOR vorbisidec)
+-if (TREMOR_FOUND)
+-    add_definitions("-DHAS_TREMOR")
+-endif (TREMOR_FOUND)
++if(BUILD_WITH_TREMOR)
++    pkg_search_module(TREMOR vorbisidec)
++    if (TREMOR_FOUND)
++        add_definitions("-DHAS_TREMOR")
++    endif (TREMOR_FOUND)
++endif()
+ 
+-pkg_search_module(VORBISENC vorbisenc)
+-if (VORBISENC_FOUND)
+-    add_definitions("-DHAS_VORBISENC")
++if(BUILD_WITH_VORBIS)
++    pkg_search_module(VORBISENC vorbisenc)
++    if (VORBISENC_FOUND)
++        add_definitions("-DHAS_VORBISENC")
++    endif(VORBISENC_FOUND)
+ endif()
diff --git a/media-sound/snapcast/files/snapclient.confd b/media-sound/snapcast/files/snapclient.confd
new file mode 100644
index 000000000000..311cce1c4fa6
--- /dev/null
+++ b/media-sound/snapcast/files/snapclient.confd
@@ -0,0 +1,33 @@
+# conf.d file for snapclient
+
+# Options for running Snapclient as daemon
+#
+#	-s, --soundcard arg (=default)
+#  		Index or name of the soundcard
+#
+#	-h, --host arg
+#		Server hostname or ip address
+#
+#	-p, --port arg (=1704)
+#		Server port
+#
+#	-d, --daemon [=arg(=-3)]
+#		Daemonize, optional process priority [-20..19]
+#
+#	--user arg
+#		The user[:group] to run snapclient as when daemonized
+#
+#	--latency arg (=0)
+#		Latency of the soundcard
+#
+#	-i, --instance arg (=1)
+#		Instance id
+#
+#	--hostID arg
+#		Unique host id
+#
+# For all command line options, please see man snapclient
+
+SNAPCLIENT_USER="--user snapclient:audio"
+
+SNAPCLIENT_OPTS="-d"
diff --git a/media-sound/snapcast/files/snapclient.initd b/media-sound/snapcast/files/snapclient.initd
new file mode 100644
index 000000000000..df69eb2621a0
--- /dev/null
+++ b/media-sound/snapcast/files/snapclient.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name=snapclient
+command="/usr/bin/snapclient"
+command_args="$SNAPCLIENT_USER $SNAPCLIENT_OPTS"
+pidfile="/run/snapclient/pid"
+
+depend() {
+	use avahi-daemon
+}
+
+start_pre() {
+	checkpath --directory --owner snapclient:audio --mode 0775 \
+		/run/snapclient
+}
diff --git a/media-sound/snapcast/files/snapserver.confd b/media-sound/snapcast/files/snapserver.confd
new file mode 100644
index 000000000000..9b12f81ff2ab
--- /dev/null
+++ b/media-sound/snapcast/files/snapserver.confd
@@ -0,0 +1,45 @@
+# conf.d file for snapserver
+
+# Options for running Snapserver as daemon
+#
+#	-p, --port arg (=1704)
+#		Server port
+#
+#	--controlPort arg (=1705)
+#		Remote control port
+#
+#	-s, --stream arg (=pipe:///tmp/snapfifo?name=default)
+#		URI of the PCM input stream.
+#		Format: TYPE://host/path?name=NAME
+#		[&codec=CODEC]
+#		[&sampleformat=SAMPLEFORMAT]
+#
+#	--sampleformat arg (=48000:16:2)
+#		Default sample format
+#
+#	-c, --codec arg (=flac)
+#		Default transport codec
+#		(flac|ogg|pcm)[:options]
+#		Type codec:? to get codec specific options
+#
+#	--streamBuffer arg (=20)
+#		Default stream read buffer [ms]
+#
+#	-b, --buffer arg (=1000)
+#		Buffer [ms]
+#
+#	--sendToMuted
+#		Send audio to muted clients
+#
+#	-d, --daemon [=arg(=0)]
+#		Daemonize
+#		Optional process priority [-20..19]
+#
+#	--user arg
+#		The user[:group] to run snapserver as when daemonized
+#
+# For all command line options, please see man snapserver
+
+SNAPSERVER_USER="--user snapserver:snapserver"
+
+SNAPSERVER_OPTS="-d -s pipe:///tmp/snapfifo?name=default"
diff --git a/media-sound/snapcast/files/snapserver.initd b/media-sound/snapcast/files/snapserver.initd
new file mode 100644
index 000000000000..02762c861b03
--- /dev/null
+++ b/media-sound/snapcast/files/snapserver.initd
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name=snapserver
+command="/usr/bin/snapserver"
+command_args="$SNAPSERVER_USER $SNAPSERVER_OPTS"
+pidfile="/run/snapserver/pid"
+
+depend() {
+	use avahi-daemon
+}
+
+start_pre() {
+	checkpath --directory --owner snapserver:snapserver --mode 0775 \
+		/run/snapserver
+}
diff --git a/media-sound/snapcast/metadata.xml b/media-sound/snapcast/metadata.xml
new file mode 100644
index 000000000000..3a92671f3335
--- /dev/null
+++ b/media-sound/snapcast/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="avahi">Build with avahi support</flag>
+		<flag name="client">Build and install Snapcast client component</flag>
+		<flag name="flac">Build with FLAC compression support</flag>
+		<flag name="server">Build and install Snapcast server component</flag>
+		<flag name="tremor">Build with TREMOR version of vorbis</flag>
+		<flag name="vorbis">Build with libvorbis support</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<name>Johannes Pohl</name>
+			<email>github@badaix.de</email>
+		</maintainer>
+		<bugs-to>https://github.com/badaix/snapcast/issues</bugs-to>
+		<remote-id type="github">badaix/snapcast</remote-id>
+	</upstream>
+	<longdescription lang="en">
+		Snapcast plays audio streams time sychronized on multiple devices over 
+		network using a server and a client component. The server picks up an 
+		audio stream from a fifo pipe, thus it can be combined with any audio 
+		source that is able to write to a pipe.
+	</longdescription>
+</pkgmetadata>
diff --git a/media-sound/snapcast/snapcast-0.15.0.ebuild b/media-sound/snapcast/snapcast-0.15.0.ebuild
new file mode 100644
index 000000000000..a664ea01e296
--- /dev/null
+++ b/media-sound/snapcast/snapcast-0.15.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Synchronous multi-room audio player"
+HOMEPAGE="https://github.com/badaix/snapcast"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit user cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
+	EGIT_BRANCH="develop"
+else
+	inherit user cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+
+REQUIRED_USE="|| ( server client )"
+
+RDEPEND="avahi? ( net-dns/avahi[dbus] )
+	client? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	tremor? ( media-libs/tremor )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/aixlog-1.2.1
+	>=dev-cpp/asio-1.12.1
+	>=dev-cpp/popl-1.2.0"
+
+PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
+
+pkg_setup() {
+	if use server ; then
+		enewgroup "snapserver"
+		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
+	fi
+
+	if use client ; then
+		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_AVAHI=$(usex avahi)
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=no
+		-DBUILD_WITH_TREMOR=$(usex tremor)
+		-DBUILD_WITH_VORBIS=$(usex vorbis)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for bin in server client ; do
+		if use ${bin} ; then
+			doman "${bin}/snap${bin}.1"
+
+			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
+			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
+		fi
+	done
+
+	if use client ; then
+		keepdir /var/lib/snapclient
+		fowners snapclient:audio /var/lib/snapclient
+		fperms 0770 /var/lib/snapclient
+	fi
+
+	if use server ; then
+		keepdir /var/lib/snapserver
+		fowners snapserver:snapserver /var/lib/snapserver
+		fperms 0770 /var/lib/snapserver
+	fi
+}
diff --git a/media-sound/snapcast/snapcast-9999.ebuild b/media-sound/snapcast/snapcast-9999.ebuild
new file mode 100644
index 000000000000..a664ea01e296
--- /dev/null
+++ b/media-sound/snapcast/snapcast-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Synchronous multi-room audio player"
+HOMEPAGE="https://github.com/badaix/snapcast"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit user cmake-utils git-r3
+
+	EGIT_REPO_URI="https://github.com/badaix/snapcast.git"
+	EGIT_BRANCH="develop"
+else
+	inherit user cmake-utils
+
+	SRC_URI="https://github.com/badaix/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="+avahi +client +flac +server static-libs tremor +vorbis"
+
+REQUIRED_USE="|| ( server client )"
+
+RDEPEND="avahi? ( net-dns/avahi[dbus] )
+	client? ( media-libs/alsa-lib )
+	flac? ( media-libs/flac )
+	tremor? ( media-libs/tremor )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	>=dev-cpp/aixlog-1.2.1
+	>=dev-cpp/asio-1.12.1
+	>=dev-cpp/popl-1.2.0"
+
+PATCHES=( "${FILESDIR}/${PN}-options-for-use-flags.patch" )
+
+pkg_setup() {
+	if use server ; then
+		enewgroup "snapserver"
+		enewuser "snapserver" -1 -1 /var/lib/snapserver snapserver
+	fi
+
+	if use client ; then
+		enewuser "snapclient" -1 -1 /var/lib/snapclient audio
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_WITH_AVAHI=$(usex avahi)
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_WITH_FLAC=$(usex flac)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_STATIC_LIBS=$(usex static-libs)
+		-DBUILD_TESTS=no
+		-DBUILD_WITH_TREMOR=$(usex tremor)
+		-DBUILD_WITH_VORBIS=$(usex vorbis)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	for bin in server client ; do
+		if use ${bin} ; then
+			doman "${bin}/snap${bin}.1"
+
+			newconfd "${FILESDIR}/snap${bin}.confd" "snap${bin}"
+			newinitd "${FILESDIR}/snap${bin}.initd" "snap${bin}"
+		fi
+	done
+
+	if use client ; then
+		keepdir /var/lib/snapclient
+		fowners snapclient:audio /var/lib/snapclient
+		fperms 0770 /var/lib/snapclient
+	fi
+
+	if use server ; then
+		keepdir /var/lib/snapserver
+		fowners snapserver:snapserver /var/lib/snapserver
+		fperms 0770 /var/lib/snapserver
+	fi
+}
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 083ca06f46ab..88b9fe6c23c5 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,6 @@
 AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
+AUX sonic-visualiser-3.1.1-qt-5.11.patch 262 BLAKE2B 627bedb71bab01fefa7edaee88f1245f19f312eea257904b2d03202b52c975a546fae73985b5cb9be4b42e97da2f41f28a26c13246f34a8c303b30ada0b276d0 SHA512 60ac4c02507c23fd7ebec556770175ddef3132ae54b0ef3136767c476f86e0c01e518ef2939b2ed6ddc044127f4a7393a800cfe70bfa21c2c103e378c8ea5983
 DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
-EBUILD sonic-visualiser-3.1.1.ebuild 2678 BLAKE2B 973202ef9f34738c2ede4ffebd589b5c9a75bf8af6609471e60a0d74b163562493fc469273a30575e4c0ee1fcfda0697d3539af7b7f330cd2c8c2915b7afc120 SHA512 2ae7a8242714a67ee0bb6ff2c2438e1ecb584439ce423b974bbe1c7baa85737a8a6e7d27395dbb57e073671e41fe1404bda4a65affb9b522d5f92b05dccb6d61
+EBUILD sonic-visualiser-3.1.1.ebuild 2710 BLAKE2B 66b1f3e8674cba67e4da8da29f5b48d5e18c064baa942f2cedfc640c6871aa2a1b0d1bdb6c5b5a8ca5b943de37ef53614a8b9dc4375a16b39fe96b3494adfb08 SHA512 882b2d59ddbe590fa7e0040d5c7e823b4aab082fcfffdabf9e2246005f77b13f3f0c56005361112f041c5f741e4abc5388dee2048715b5ac3f398db7cdbb179b
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
new file mode 100644
index 000000000000..5d62677128b4
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/664628
+
+--- a/svapp/audio/AudioCallbackRecordTarget.cpp
++++ b/svapp/audio/AudioCallbackRecordTarget.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "data/model/WritableWaveFileModel.h"
+ 
++#include <QDateTime>
+ #include <QDir>
+ #include <QTimer>
+ 
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
index feed92ce32e0..264d383f4b8b 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 
-PATCHES=( "${FILESDIR}/notest.patch" )
+PATCHES=(
+	"${FILESDIR}/notest.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 sv_disable_opt() {
 	einfo "Disabling $1"
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 7b8e9dc82fe4..3b340ec1ff14 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,3 +1,3 @@
 DIST soundconverter-3.0.0.tar.xz 201548 BLAKE2B bdca42d22d2e497b807149dcd5c8f911519b71dc7e836ad359831d0b7cd2241f58f8f9f60fa4580e2f038528e9c249dfa8a811d1681d0c8dead2c53e0f58f7ce SHA512 6f5518711c76e7748447805dbf16ac8622c5041c3f3cac2de6f31968aab4eff43a2fde2da48c47d12093ce1732208923d83d57b6a97ea99fbf882dfef239a62d
 EBUILD soundconverter-3.0.0.ebuild 1799 BLAKE2B 7b962993406c4a58e530afff0aa966308ac3154c64a43b8a4fdb8fe20a2a15e1a21e2bfa4de52b91860fdc0a6fb08db536a9bd1c02c491946ff92cf0f0a9bdaf SHA512 d263c6e6268d769c424b387a58163f5d178b8f52bd2b6c2cf1ee03cd8622584a87218833b1bb1a03205179d991373b683fdbfc86643875f9ac7b56eac69e4075
-MISC metadata.xml 422 BLAKE2B c38fb6712043983aeaccb925b572fe26156e10776ff00ff454fd215ddedb0751d3c5f5a973725da4e765907f3c9d0ffe6f4062650a7afa2e092cd9b6930219b2 SHA512 5dc640470aea1b45a59fbc757c1fc57a287a733c7e924cecec2dfda988caf313aa9863e86bc4a538565d9e574207654e62ec2071d03f647d21ef6dff38d15732
+MISC metadata.xml 348 BLAKE2B ca79913ada8d48522d7f0f593caff90549704f518c13f1ca79f34a1f885ffa1500d498be6fe4f70b301a3ff168235ca9e6a2642ff4c4d5a0565ad3bc8de99050 SHA512 a9daf27ee0eeb8342f28e7089b3ff3fdfafb1e19f517efc0d56f5eaae09f05b5b7309368af53fba1f46b8810349ca1f6f82aa3c14369144b22970f488c6ae1b5
diff --git a/media-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 06978decb7f6..15f4ec06414c 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gstreamer@gentoo.org</email>
 		<name>GStreamer package maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="opus">Enable Opus audio codec support</flag>
-	</use>
 	<upstream>
 		<remote-id type="launchpad">soundconverter</remote-id>
 	</upstream>
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 9628468dcb33..c1a280bad9c8 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -10,4 +10,4 @@ AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0
 AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
 EBUILD sox-14.4.2-r1.ebuild 2621 BLAKE2B 15db996f6aea42581d1c2d8744c7a06769e08366d4c017ea1683ad50a0b94ddabed7b3d9f47e69dafaf7df662533e3fa1492724dcace92c054f058286f711884 SHA512 b82bd81d5c58f1d56416ea4a0de453831b8a199d99a59fdbbc79934898f2a33b77ed86870ea26091df91df5ae8211c62b410e14ea7f0d30d8a3fdb9dd1f4f87f
-MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
+MISC metadata.xml 579 BLAKE2B 9a129ee262f9147b903659d806b5cb7db559a3cd70adbe6cbf0faca60ae3f2d3c5898ea713813b124bdb43fac7b7e4fa9a6702892bc99dfa9fe3271403160077 SHA512 3b09529397d2d31693f701c05e4db73db553177ec6471a28612254fe3117d1b3574bdf3381a024c23c2e8c7efa02925d0c464548ed4105c573266c612595de2f
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index 75d285d5cb6a..9f80c9612eac 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/metadata.xml
@@ -8,7 +8,6 @@
   <use>
     <flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
-    <flag name="opus">Enables reading Ogg Opus files.</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
   </use>
   <upstream>
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 2936ddfff824..ca3d3017b1bc 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,5 +1,8 @@
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
 DIST TeamSpeak3-Client-linux_amd64-3.2.2.run 76227220 BLAKE2B 86a50064e01a496dd68559a3fa92003bf674cb59e714a45e6d12b2e6c2b33988b6ee7b76f474b35f1c08ae17fe430e8882c271e1751381df74c4dd5f7d552c42 SHA512 3edc003d721494e914fa74ae3d2666c795c5beb7feae7cc3b379d06447acb3e0941d9c5e2495e8bec8c1c1f5e25b5b31767ea214d198b2e320fc6a7925fdc541
+DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab
 DIST TeamSpeak3-Client-linux_x86-3.2.2.run 75976893 BLAKE2B 0d0396f2fdd0d61c5e1fc1daec9978e6f4ebb82511b80c97bbc86d97bcbf3237e17064666212d8ba2650dc173cef8774acc38027241247c233c14e41ed697807 SHA512 3ca1a8602a9df3ee7669d3f226a44354a92ef5b3f52b720ac7a91dbd50331c609a46a1ae83d39c82dea8f6fc0a5f32245525ab601f7fd329521478ef29909027
+DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808
 EBUILD teamspeak-client-3.2.2.ebuild 2382 BLAKE2B 606440299e4aa17d4e85b629db03a06ce0e4a6d8d72977a92e41af654b267266d69b434b78e712784695092a78c67f80ac9f5521e4543d02c6a8282fb4552e07 SHA512 f08583523c4d885e547d3df4b29edc42b58ca782c497dcc78bae0c4131b44a787097b27d75ee76f5bd4a013b7d886cb8fa2967656ad512728b59777d9edfc42b
+EBUILD teamspeak-client-3.2.3.ebuild 2379 BLAKE2B 057d9457649540a24310cbf2e41e00f13a03dbeef8ddf2eacbe0dc5252f83edc70acfa639d85b275c713fb262f382ca111cc8b0f503b092e2274e35e72c2a625 SHA512 6cb276274f2949f09df682d9479e127fb7191da51ed61e42e0fee1f97800b359f8e70390bf6543b4840e4cbcb4523d48e9eed0eaf43b4303d37f9964271f8de9
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
new file mode 100644
index 000000000000..816b907b9fee
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit desktop unpacker xdg-utils
+
+MY_PV="${PV/_/-}"
+
+DESCRIPTION="A client software for quality voice communication via the internet"
+HOMEPAGE="https://www.teamspeak.com/"
+SRC_URI="amd64? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_amd64-${MY_PV}.run )
+	x86? ( http://ftp.4players.de/pub/hosted/ts3/releases/${PV}/TeamSpeak3-Client-linux_x86-${MY_PV}.run )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="teamspeak3"
+SLOT="0"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	app-arch/snappy:0/1
+	<dev-libs/openssl-1.1:0
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility,dbus,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwidgets:5
+	net-libs/libsrtp:0
+	sys-libs/libcxx[libcxxabi]
+	sys-libs/zlib:0/1
+	virtual/udev
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/teamspeak3-client/error_report
+	opt/teamspeak3-client/package_inst
+	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
+	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
+	opt/teamspeak3-client/ts3client
+	opt/teamspeak3-client/update
+"
+
+src_prepare() {
+	default
+
+	if ! use alsa; then
+		rm -f soundbackends/libalsa_linux_*.so || die
+	fi
+	if ! use pulseaudio ; then
+		rm -f soundbackends/libpulseaudio_linux_*.so || die
+	fi
+
+	mv ts3client_linux_* ts3client || die
+}
+
+src_install() {
+	exeinto /opt/teamspeak3-client
+	doexe error_report package_inst ts3client "${FILESDIR}"/ts3client-bin update
+
+	exeinto /opt/teamspeak3-client/soundbackends
+	doexe soundbackends/*.so
+
+	insinto /opt/teamspeak3-client
+	doins -r gfx html resources sound styles translations
+
+	dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
+
+	dodir /opt/bin
+	dosym ../teamspeak3-client/ts3client-bin /opt/bin/ts3client
+
+	make_desktop_entry /opt/bin/ts3client "Teamspeak 3 Client" /opt/teamspeak3-client/styles/default/logo-128x128.png "Audio;AudioVideo;Network"
+
+	einstalldocs
+}
+
+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/tempest_for_eliza/Manifest b/media-sound/tempest_for_eliza/Manifest
index 4cb301276d82..1aaf8aad8cfa 100644
--- a/media-sound/tempest_for_eliza/Manifest
+++ b/media-sound/tempest_for_eliza/Manifest
@@ -1,4 +1,3 @@
 DIST tempest_for_eliza-1.0.5.tar.gz 45046 BLAKE2B 4e5be0142ee7ab7cbee5e5c4bbe6e8c035928c342cc78ba733853a826736fa125bcd20e6230a61574fa6a146500518e644c5c9a7cd4cbc5544e7be0b34e0b56d SHA512 f14aec8427f1f9a7cfe59e2165e2d7b1a5d963c807755ec2299a0fa2f36492b3fb4240b0b4fce54cc9957cf4d3709839bc40035594fcb2568247bcb62b4614f9
-EBUILD tempest_for_eliza-1.0.5-r1.ebuild 795 BLAKE2B 30e58d25b0c02413bf8134ff4064dce867858d7f30ab0d224791f212c02189d79457f258128de70b4baa06d27b7b005c95089dc78ed2f9243f058edd204d232e SHA512 539ed37510b41e3e9105e7db06bd62788f1f2a95c6d669fe3f071b1244334b30e3fd9346dc179cfad8e147c4a00c86d6b63a18a946bdf948dd7d76b9c5866d4d
-EBUILD tempest_for_eliza-1.0.5-r2.ebuild 669 BLAKE2B 777c4a1572c2b76279e337baaede292c37878177d460f335affeaa01aca96ff79d9f1015fbc4e73b7fcf5600704d5f31c477516aa7e4a7195c837e0621c54381 SHA512 1621bd34dd8e2b94114219f719c9256ab43b17f1690ea20194005e6c1e1ff7a3e25864dd4fd7694022a145c6adde78190f236e2b1149bc6b2540acd25387ba60
+EBUILD tempest_for_eliza-1.0.5-r2.ebuild 664 BLAKE2B 39bd8209059503ca3be9ffe18470687e371a68f4228b06e8120581484493ce69f20ac4cc82e05fa6c45792ee16a027dd1e55cbdd38b44ceef79b3032fb5d11b0 SHA512 3e2f7ed6eea7f077fc9ae49c7209f388fe5196d6298b24d65587c2dce4b7d7d8eee131e5e881262661ad3cf443f273e6841f6931db399b0b9b93cdaa811c8765
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
deleted file mode 100644
index 2ab5ed9d6b60..000000000000
--- a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit toolchain-funcs
-
-DESCRIPTION="listen to music on the radio generated by images on your screen"
-HOMEPAGE="http://www.erikyyy.de/tempest/"
-SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	tc-export CXX
-	econf \
-		--enable-debug \
-		--enable-nowarnerror
-}
-
-src_compile() {
-	emake CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog README
-
-	rm songs/Makefile*
-	insinto /usr/share/${PN}
-	doins songs/* || die "doins failed"
-}
diff --git a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
index c1f630a8951e..a08ce37b2515 100644
--- a/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
+++ b/media-sound/tempest_for_eliza/tempest_for_eliza-1.0.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.erikyyy.de/tempest/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/libsdl"
 DEPEND="${RDEPEND}"
diff --git a/media-sound/tk707/Manifest b/media-sound/tk707/Manifest
index 9d996aa9d029..0ab04254396f 100644
--- a/media-sound/tk707/Manifest
+++ b/media-sound/tk707/Manifest
@@ -1,6 +1,7 @@
 AUX tk707-0.8-asneeded.patch 644 BLAKE2B 240bb074707a26ea68e3a18b6cfedc5209fcc6b9176f649a4507b6a61cc05f0d5b80f42122362f833499e5463b726fcd94fd9490fa17492a2ab5c007ce80ca1d SHA512 eeb595cec305420eebeb01c10d7ecab8ae5b429e96470004c27da802f28fcd221064efe1d72fd67073f73b7d19238beb5b2619e18d568858d78f5858de0c3431
+AUX tk707-0.8-glibc-2.27.patch 466 BLAKE2B 1fd4c37d9ef1992da969d69a225cac875494ef96080d8cb6e89cb2a4a27e077ad86a5bf5e34f4ac7741d977ac2e7695aba0a14cc5a55b8c2dea55f2437054748 SHA512 b1324d02930325c7a9d22e720a74c28c9e53d29073ffc2a71fc59c1708868ce36158b6a4e8d57f550fda591d458fc4913b77f4348e3a90a664ae0319e5d5cf1e
 AUX tk707-0.8-nostrip.patch 501 BLAKE2B d70bf604b68185c7397429058a77c9b8b2f9a24e0e6446ad40f05b59ca9f072f624b9a31777b476bde94dc16fdf27611379968ffbb85e88e06886e4d243c605c SHA512 bb652d71029a74c3b487e40aeb1dcac66333033235ad4cf60a4ce1e0c515728792528364c35fae0ae6b071e028173c0f42bf794fa36855be1e1531deb02e5915
 DIST tk707-0.8-updated_tcl2c.patch.gz 7368 BLAKE2B 733fc4d30462d347d1583378d9f32786f6f8aa974d4741cdf3b7f903eecbe43b9eb07815dd3bd6a1fdb4a3cfab893dbec10e386b3fee32f5ec9f22eebea62e94 SHA512 b64a0303ad338863591993696bec1e8ad89473d20be5c08b8935ff8f577684af03f9bed46f0873c4a6d7839cfab583b918d0113ab12341e3b662560385720736
 DIST tk707-0.8.tar.gz 404862 BLAKE2B e99879bf504c3be6c450e7352b8977c572333dae378cc1c4ef96854e263e454350986399c8be72aa03cf8f19cdb0a3c204394a60d1ee10dfcacc62322ebe82f2 SHA512 af5a6958d3ae3fe5e53be5251ba2b3038447b898a3ec40e866a7a0c4d025e450effee7adfc528f01a581b3f7186a269480a4cc6104378f5fdff46ebe277c44c6
-EBUILD tk707-0.8-r1.ebuild 748 BLAKE2B 417668caa61e3cbe0000bc7909d385af4bf012b10378202c7184711683a8ba28893c531f7fcd2f57d100cba3ed23f13780dd7b8bbeee9e5decebc2539e44f230 SHA512 9905a6e10cdba3d652a23131113f184d15a7581b88b8901dce72ec07305eb66fddf676ddc2c634b79aa22b991f3471dd817ecd5a7be85b769d8cd70855d65fc3
+EBUILD tk707-0.8-r2.ebuild 861 BLAKE2B f17cb4bf5e185a597c57db2bd01ca3e21937fcba71147c2ec4001ba8e472797635235526837e4bb1d6f97fe2423ffb78a27b81d449b268ca1309c769de3deea8 SHA512 dd8deb44c237b30392e5696e8b74d12cf6db93f99f67e882b79ce661e9a7b08475092e3a94a00810fa23bae05e6db03b335259437b8da7833029b6d568081b9c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
new file mode 100644
index 000000000000..5a2c09bb704e
--- /dev/null
+++ b/media-sound/tk707/files/tk707-0.8-glibc-2.27.patch
@@ -0,0 +1,18 @@
+Bug: https://bugs.gentoo.org/648308
+
+--- a/tk707AppInit.c
++++ b/tk707AppInit.c
+@@ -31,13 +31,6 @@
+ extern int Init_tk707(Tcl_Interp *interp);
+ extern int Init_tk707_Scripts(Tcl_Interp *interp);
+ 
+-/*
+- * The following variable is a special hack that is needed in order for
+- * Sun shared libraries to be used for Tcl.
+- */
+-
+-int *tclDummyMathPtr = (int *) matherr;
+-
+ #ifdef TK_TEST
+ extern int		Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
+ #endif /* TK_TEST */
diff --git a/media-sound/tk707/tk707-0.8-r1.ebuild b/media-sound/tk707/tk707-0.8-r1.ebuild
deleted file mode 100644
index 10c5456ac6c5..000000000000
--- a/media-sound/tk707/tk707-0.8-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils autotools
-
-DESCRIPTION=" An \"7x7\" type midi drum sequencer for Linux"
-HOMEPAGE="http://www-lmc.imag.fr/lmc-edp/Pierre.Saramito/tk707"
-SRC_URI="mirror://gentoo/${P}.tar.gz
-	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE=""
-
-RDEPEND=">=media-libs/alsa-lib-0.9.0
-		>=dev-lang/tcl-8.4
-		>=dev-lang/tk-8.4"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	EPATCH_SOURCE=${S} epatch ${P}-*.patch
-
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-	epatch "${FILESDIR}/${P}-nostrip.patch"
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/tk707/tk707-0.8-r2.ebuild b/media-sound/tk707/tk707-0.8-r2.ebuild
new file mode 100644
index 000000000000..03b31573728b
--- /dev/null
+++ b/media-sound/tk707/tk707-0.8-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools desktop
+
+DESCRIPTION=" An 7x7 type midi drum sequencer for Linux"
+HOMEPAGE="http://www-ljk.imag.fr/membres/Pierre.Saramito/tk707/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	mirror://gentoo/${P}-updated_tcl2c.patch.gz"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="
+	>=media-libs/alsa-lib-0.9.0
+	>=dev-lang/tcl-8.4:0=
+	>=dev-lang/tk-8.4:0=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-updated_tcl2c.patch"
+	"${FILESDIR}/${P}-asneeded.patch"
+	"${FILESDIR}/${P}-nostrip.patch"
+	"${FILESDIR}/${P}-glibc-2.27.patch"
+)
+
+src_prepare() {
+	default
+	mv configure.in configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	HTML_DOCS="tk707.html" default
+	rm -rf "${ED}"/usr/share/html/
+	make_desktop_entry "${PN}"
+}
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest
index d25785b146f5..a2ce05e9cb71 100644
--- a/media-sound/tomahawk/Manifest
+++ b/media-sound/tomahawk/Manifest
@@ -1,3 +1,3 @@
 DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7
 EBUILD tomahawk-0.9.0_pre20180501.ebuild 1585 BLAKE2B 35d70ed1b3c8fbe9e96aaa1d3c901a8c41993145142d870577e858970894fce7f9b9cbae5837eff97be334b72975365b02b0c5214e188a7bd96f226e9bfdb086 SHA512 ddbc08c214ab3f17c8dbeea1da2d026f9825257c0020b29089aa0814e2a95f105dac8c29c4aa7d6a8feda5f681f708f4a7f4c93e80534b9f327a9c0469aabed3
-MISC metadata.xml 469 BLAKE2B f1ce874c2e31f6b88d9c91492d08128d7df704724f7db998f1748e2f92c4a02150cbc46eaf9b01c0ebaefc113e30babb34d0759f15d31d5690bf0c65476a54d1 SHA512 1a6df7c09acd55070789d645b4926da6b93095ea9ceea4c593a48140bf86fd0492df908a81350eeaf323478468c7e6814665e0cf6c76dbeb8ba4fddf7efe0986
+MISC metadata.xml 363 BLAKE2B e035e86fb321fa55cf2a0a915e4434f34d021b454c2f035116d0777b88f144f29278a530808490960aa179d08f5aba5264d656c5073bca3b265161ddabaa4c00 SHA512 2434683e90124bb737b6871f2cb4aa84c556c198b629f325f29996338842905632d919c26b0af3e669b93003802e3b04644336bbf4aae315e9de9dbc9f9f8b15
diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 3bc448c2a0a9..602a023a5bef 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 12365f5a0bfe..10fdfe772c35 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,7 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 394 BLAKE2B e2b31b58d2f1edb6a490a7244524572cb89062005a47f463c2df857a9a380a541547c65a0de28bc33945f9bb2762390a186adebb5bc36b633af713b54bff3155 SHA512 49dc040957a0af4b6d2b50eb1ee9e41f6b593358a7acd66ee809b06cc775e330757f9952843499f6d1cac6cedcd73b1907a51f31f6721ca9d3fb7719bc496709
-DIST upmpdcli-1.2.15.tar.gz 401551 BLAKE2B 0ec3fd67d67fd039f5b0ac385ad12a78e3c48b0d2530690eb9aaff66bbdbf7ae7229d64cfe753d9e70e75070ee5bc4d0849d11909813f06377981974733134ee SHA512 4a62aced9fa2395752164332c84bf3dedd7b793e7e37638cfe063e887d52b9ce956c866de2aa1cddb7a4dcad97562050f9588aedd59e49e7d427671179f9258a
 DIST upmpdcli-1.2.16.tar.gz 429958 BLAKE2B d484e98ca7774e6d55e42937152efda9bc2127afd6a222575055c48cd7cf5d61f6b578d80a3eca75d7299570cc9d3acc78b1e0c461f4a064528fdb9cb62eee22 SHA512 1fd5b1939f7140f2e54401967308dd155e0f72406188b82e8ccc9178f5feeb0d37cfcd28dd220dd5437d06f49955cc83d70f0bb7c3659452ccb2e73f8846a226
-EBUILD upmpdcli-1.2.15.ebuild 990 BLAKE2B 671d826f638b7013ac40c94208f6349b1e07267677e77da0c4daa5fa8127d91dccda07fd22a0a6a85e174d1b7d53e51af82c6a410b8f2b68f580cecad7caa703 SHA512 451990bcd180fe710d7016d95636d8532ee781ab28f1517fb119f8639d652a01c4386452bc81e037962d77f934c1fe287fe59ef011c69af6aa693dbb7f8b065b
-EBUILD upmpdcli-1.2.16.ebuild 996 BLAKE2B fd1e2c1cc6cf620119b2b727286c566cadb88bd523c9086e73bda8dfc3ed8c12f3306b68f6cd91cd09c4f188721a0b81309554d1ded99e7b2ec3a6d3532e75ab SHA512 e9425f227ff43313f0d16a46ad66d7b42872dc6c886a50888f103169c545295134f73f8493dd2b9c165a8e0c5f4ea5389692723712dddbe290782c5aca175e2e
+DIST upmpdcli-1.3.6.tar.gz 515712 BLAKE2B 6de6a3af2e474a3f8d12865e3cdd420f31955e88a0eb1c8ffd019809666c4c613631d642b34bb5fa473fceb7207613d90584fdf856b6a49899f9c2aa31b2b471 SHA512 280b02116786c86fd5f1e472fa9070b3a6d846acd670e36d476b150d4a3e91e5a6d1546b7053b1f35a2e0de553c8517640934af010d371d3cbed248592be502d
+EBUILD upmpdcli-1.2.16.ebuild 992 BLAKE2B 55ad9cf6e1ad47cd2e2853db83ff192491689771aeba636f5199dad6fcc5d0d157a7fbaa5528eaa36b962219b34859ac631f3144d9632da94d6e07d1b720d76e SHA512 05a5ee2f3670dcd0ea351d1555a8712b59b712a4074da0211383ca46dd8d39b9e9a45f31b59ae230b02289d14581b220f4c5cbebca79d0fa308630c9925e6fb7
+EBUILD upmpdcli-1.3.6.ebuild 1042 BLAKE2B ac46e84fce1f8ffc7326ff257de334e288c17ef07d2f6778a3629b50c95137fc019d2cee829fdf25d0c09202bee3ecb837ff9c69f1478713ecaab344075e0071 SHA512 ba56672d1a1ef71d34bcd4a92df0a69ab11438a784a31faea1447ce766cd08ddb083e76f695bc502ef0338671243e9907f347b45c98dbf3107e87cced0ef033f
 MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild b/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
index e7340ec9f9c4..54eaba576366 100644
--- a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="thirdparty"
 
 DEPEND="
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
index d62b00ce8541..72972052488f 100644
--- a/media-sound/upmpdcli/upmpdcli-1.2.15.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit user
+inherit systemd user
 
 DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
@@ -23,7 +23,7 @@ DEPEND="
 RDEPEND="
 	${DEPEND}
 	thirdparty? ( dev-python/requests )
-	media-sound/mpd
+	media-sound/mpd[curl]
 "
 
 pkg_setup() {
@@ -35,6 +35,7 @@ src_install() {
 	default
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
 }
 
 pkg_postinst() {
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index dc7356170b3b..f4accf8f1969 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -9,4 +9,4 @@ DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb70
 EBUILD xmms2-0.8_p20161122-r3.ebuild 7519 BLAKE2B ad7093c0b9af101e3f29ad81b6eda1fac3842cbeaf7dd2322704ed8ff2394038c141d72a9bcc6b4ab14ee12d36d2af3e12b8fc9851fdb2ec17bd5bdb5c107c93 SHA512 3fe26a7e0f1542ef9ec787d87d4ff7ee5c6ad19543c66d1a6c31ceae5d921ad5bd48c20b5d7a546aea69a87b1877e0144d1cdee7ac8c06eba96826185f982185
 EBUILD xmms2-0.8_p20161122-r4.ebuild 7577 BLAKE2B 449e5421e5bd4c1febb2403b1fabf53af35ed8c22a06488805fff23fef27b8691cda0cfd2d7b6fe230160929d3549c081581fb736d9fb34b6ebad4c28325959a SHA512 189a0fe53beb27adac0326c3370d147706c3072f933fb0d09d0bc3503555108b2d8acd8f2046902b59e20a3078c19262632241722bd2e9f1028b42b188941eb6
 EBUILD xmms2-0.8_p20161122.ebuild 7389 BLAKE2B bb82ad9ed821fefab30cb8a3f9a4b77e50ec6cc219b297506e8e2fbe8aba2b347c1da0a1b675d072b8bd97263dd03c47bcb8589daddeea8e3d0e7a85020c44c2 SHA512 2c09816bf4c22b89e885b4c6c64f0bbf42729eba0f77834451d9fc943057aba9a15f0362b81458192d21c48e61918f689d7f9b0fd7dea22e416b96598caa293d
-MISC metadata.xml 2619 BLAKE2B db882bae1912243670ae3f8a075704ac0398f50a66f0ce990b4283b26b0c99846ea4d491375d9d920b320bb49da9ced1209bcfc86dd341f1e4cbc0a3649bd38d SHA512 f4477bdfc7575b104a7852dfcc789178631c0f0b470a968af7b763c8b7d70ab6cea8a4ff739b3b9adea280838cc5d8cb773337d899b20ecc0797a9d16ef38e97
+MISC metadata.xml 2560 BLAKE2B 267abaaa9bf07aa218ef3d2613c4ff94c183f84f5caf2525a1d902dbdecebc724e94bdf84f09bd820cec2579bb293478777459b2a0d801e560f853270746d576 SHA512 f92c04cad82b65f335aa44d0890f133df1f1bbdba97592f1c69bb90e9fa2a8d8827029ff10998cb4fb8ab936dc1f2c9a7402b6259e5000e2644467e89b23b26e
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 551b4bd98e80..a19d3fb9caf9 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -38,7 +38,6 @@
 		<flag name="ices">Icecast source output plugin</flag>
 		<flag name="mac">Support for Monkey's Audio (APE) format with help of <pkg>media-sound/mac</pkg></flag>
 		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
-		<flag name="opus">Enable Opus audio codec support</flag>
 		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
 		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
 		<flag name="sid">Support for C64 SID</flag>
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /media-sound
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)