From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 30 Sep 2018 11:19:18 +0100
Subject: gentoo resync : 30.09.2018

---
 media-sound/Manifest.gz                            | Bin 61285 -> 61272 bytes
 media-sound/apulse/Manifest                        |   5 +-
 media-sound/apulse/apulse-0.1.12-r4.ebuild         |  63 +++++
 media-sound/apulse/apulse-0.1.12.ebuild            |  50 ----
 media-sound/apulse/files/sdk.patch                 | 103 ++++++++
 media-sound/apulse/metadata.xml                    |   3 +-
 media-sound/glmix/Manifest                         |   2 +-
 media-sound/glmix/glmix-0.3.ebuild                 |  26 +-
 media-sound/gnome-sound-recorder/Manifest          |   2 +
 .../gnome-sound-recorder-3.28.1.ebuild             |  44 ++++
 media-sound/mp3unicode/Manifest                    |   2 +-
 media-sound/mp3unicode/mp3unicode-1.2.1.ebuild     |   9 +-
 media-sound/mpd/Manifest                           |   3 +-
 media-sound/mpd/files/mpd-0.20.21.logrotate        |   9 +
 media-sound/mpd/mpd-0.20.21-r1.ebuild              | 270 +++++++++++++++++++++
 media-sound/mpd/mpd-0.20.21.ebuild                 | 270 ---------------------
 media-sound/music-file-organizer/Manifest          |   4 +-
 .../music-file-organizer-1.0.1.ebuild              |  27 ---
 .../music-file-organizer-1.0.2.ebuild              |  27 +++
 media-sound/opus-tools/Manifest                    |   2 +
 media-sound/opus-tools/opus-tools-0.2.ebuild       |  46 ++++
 media-sound/pianobar/Manifest                      |   2 +-
 media-sound/pianobar/pianobar-2018.06.22.ebuild    |   2 +-
 media-sound/picard/Manifest                        |   2 +-
 media-sound/picard/picard-2.0.3.ebuild             |   2 +-
 media-sound/pulseeffects/Manifest                  |   6 +-
 media-sound/pulseeffects/pulseeffects-4.3.5.ebuild |  66 -----
 media-sound/pulseeffects/pulseeffects-4.3.7.ebuild |  66 +++++
 media-sound/pulseeffects/pulseeffects-9999.ebuild  |   4 +-
 media-sound/qmmp/Manifest                          |   2 +
 media-sound/qmmp/qmmp-1.2.4.ebuild                 | 163 +++++++++++++
 media-sound/teamspeak-client/Manifest              |   6 +-
 .../teamspeak-client/teamspeak-client-3.2.1.ebuild |  91 -------
 .../teamspeak-client/teamspeak-client-3.2.2.ebuild |  91 +++++++
 media-sound/wavsplit/Manifest                      |   3 +-
 media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild      |  34 ---
 media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild      |   2 +-
 37 files changed, 931 insertions(+), 578 deletions(-)
 create mode 100644 media-sound/apulse/apulse-0.1.12-r4.ebuild
 delete mode 100644 media-sound/apulse/apulse-0.1.12.ebuild
 create mode 100644 media-sound/apulse/files/sdk.patch
 create mode 100644 media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild
 create mode 100644 media-sound/mpd/files/mpd-0.20.21.logrotate
 create mode 100644 media-sound/mpd/mpd-0.20.21-r1.ebuild
 delete mode 100644 media-sound/mpd/mpd-0.20.21.ebuild
 delete mode 100644 media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
 create mode 100644 media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
 create mode 100644 media-sound/opus-tools/opus-tools-0.2.ebuild
 delete mode 100644 media-sound/pulseeffects/pulseeffects-4.3.5.ebuild
 create mode 100644 media-sound/pulseeffects/pulseeffects-4.3.7.ebuild
 create mode 100644 media-sound/qmmp/qmmp-1.2.4.ebuild
 delete mode 100644 media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
 create mode 100644 media-sound/teamspeak-client/teamspeak-client-3.2.2.ebuild
 delete mode 100644 media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild

(limited to 'media-sound')

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0e17f6a7d27b..bb48404528a1 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/apulse/Manifest b/media-sound/apulse/Manifest
index 7f7e8d8d0f33..b22c3e6639b5 100644
--- a/media-sound/apulse/Manifest
+++ b/media-sound/apulse/Manifest
@@ -1,6 +1,7 @@
 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.ebuild 1253 BLAKE2B e04b196ab2e79156dfdf789ed1eea0524a1c9c1823e8e94ef3f73b816d41fda9854507446bb6ae9d7eed819e177601de19a406ea8bddba451a9f40f960f9952b SHA512 bc3d28644aeeceb410d4ace9ad89a8d3c5079c047c08b993764af777e3b444c31f41aa68791728f3243541e4b7240d7bec8162d088226147c90802249e215af4
-MISC metadata.xml 418 BLAKE2B 70574aa80c834d0bd9d21764cc96fcae3ca59ecb4dcd371e467606ae91d169186fb4f1fbfa0313752de01d5d6d65b6a22bb804afe5fbabc7126367720d750557 SHA512 01fa9cdf72ab998dc91603a95c95c2d6cd707a732a0756a386a640ad1cf0b84f5a2dfc931425c4a6106467950212ba32fa1fa6f879741eb78d48b4188836b06a
+EBUILD apulse-0.1.12-r4.ebuild 1596 BLAKE2B c120689c687e645fe1d3bc93924521b21dcee1c4b63e131c89fea710338838b68573b4d8d3cbc5537988d1a057a65c1f1a0d91711c601d817b30c2953569160c SHA512 770654a65ea7dca987b6e367018e256f1cb52bab940a9935b4aa45933c926062cc211277e918ff697c3efa9b786ba1a0895e59fd7381c924a2c29e774875031e
+MISC metadata.xml 539 BLAKE2B 958678641d39164ac7da9bb779329185aafe5d551dfbabaaa0872b47cbfeba6fa5d545e715ebb1fb4eb730bc192696a1517c4f474a0a51f81136b213ec4fe9ea SHA512 49cce06f24b1c9a5ec42f549fc018517650339347f97e02864ea0e2a4216c092d38c75c46a588bad3896843962b477c2ad94b34cb1f39f8255116fc4b2c92fde
diff --git a/media-sound/apulse/apulse-0.1.12-r4.ebuild b/media-sound/apulse/apulse-0.1.12-r4.ebuild
new file mode 100644
index 000000000000..46b1d98a51ad
--- /dev/null
+++ b/media-sound/apulse/apulse-0.1.12-r4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib cmake-multilib
+
+DESCRIPTION="PulseAudio emulation for ALSA"
+HOMEPAGE="https://github.com/i-rinat/apulse"
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug sdk test"
+
+DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib[${MULTILIB_USEDEP}]
+	sdk? ( !media-sound/pulseaudio ) "
+RDEPEND="${DEPEND}
+	!!media-plugins/alsa-plugins[pulseaudio]"
+
+PATCHES=( "${FILESDIR}/sdk.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use sdk; then
+		# 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
+	fi
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DINSTALL_SDK=$(usex sdk)"
+		"-DLOG_TO_STDERR=$(usex debug)"
+		"-DWITH_TRACE=$(usex debug)"
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	cmake-utils_src_install
+	# The easiest way would be setting MULTILIB_CHOST_TOOLS at global scope, depending
+	# on USE=sdk, but this is no longer permitted, so workaround is required.
+	# See bug 666884 for details.
+	if ! use sdk; then
+		unset BUILD_DIR
+		_install_wrapper() { newbin "${BUILD_DIR}/apulse" "${CHOST}-apulse"; }
+		multilib_foreach_abi _install_wrapper
+		dobin "${T}/apulse"
+	fi
+	einstalldocs
+}
diff --git a/media-sound/apulse/apulse-0.1.12.ebuild b/media-sound/apulse/apulse-0.1.12.ebuild
deleted file mode 100644
index 1f223fb6cfc4..000000000000
--- a/media-sound/apulse/apulse-0.1.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib cmake-multilib
-
-DESCRIPTION="PulseAudio emulation for ALSA"
-HOMEPAGE="https://github.com/i-rinat/apulse"
-SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+pa-headers test"
-
-DEPEND="dev-libs/glib:2[${MULTILIB_USEDEP}]
-	media-libs/alsa-lib[${MULTILIB_USEDEP}]
-	pa-headers? ( !media-sound/pulseaudio ) "
-RDEPEND="${DEPEND}
-	!!media-plugins/alsa-plugins[pulseaudio]"
-
-MULTILIB_CHOST_TOOLS=( /usr/bin/apulse )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ensure all relevant libdirs are added, to support all ABIs
-	DIRS=
-	_add_dir() { DIRS="${EPREFIX}/usr/$(get_libdir)/apulse${DIRS:+:${DIRS}}"; }
-	multilib_foreach_abi _add_dir
-	sed -e "s#@@DIRS@@#${DIRS}#g" "${FILESDIR}"/apulse > "${T}"/apulse || die
-}
-
-multilib_src_configure() {
-	local mycmakeargs=("-DAPULSEPATH=${EPREFIX}/usr/$(get_libdir)/apulse")
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	cmake-utils_src_install
-	einstalldocs
-	dobin "${T}"/apulse
-	use pa-headers && doheader -r 3rdparty/pulseaudio-headers/pulse
-}
diff --git a/media-sound/apulse/files/sdk.patch b/media-sound/apulse/files/sdk.patch
new file mode 100644
index 000000000000..bc12090b72e5
--- /dev/null
+++ b/media-sound/apulse/files/sdk.patch
@@ -0,0 +1,103 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 072f3b1..5fe6bcd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,6 @@
+ project(apulse)
+ cmake_minimum_required (VERSION 2.8)
++include(GNUInstallDirs)
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -Wall -fPIC -fvisibility=hidden")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=implicit-function-declaration")
+@@ -28,6 +29,8 @@ else()
+     include_directories(${PA_INCLUDE_DIRECTORIES})
+ endif()
+ 
++set(INSTALL_SDK 0 CACHE BOOLEAN "Install SDK files to build applications with apulse (Pulse Audio headers and pkg-config files) instead of system ones")
++
+ link_directories(${REQ_LIBRARY_DIRS})
+ 
+ add_library(trace-helper STATIC
+@@ -72,12 +75,30 @@ target_link_libraries(pulse-simple ${SYMBOLMAP} trace-helper ${REQ_LIBRARIES})
+ 
+ add_subdirectory(tests)
+ 
+-set(APULSEPATH "${CMAKE_INSTALL_PREFIX}/lib/apulse" CACHE PATH "library installation directory")
+-set(APULSE_SEARCH_PATHS "${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH")
+-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template"
+-               "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY)
++if (${INSTALL_SDK})
++    set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "library installation directory")
++
++    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse.pc.in"
++                   "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse.pc" @ONLY)
++    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-simple.pc.in"
++                   "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-simple.pc" @ONLY)
++    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pkgconfig/libpulse-mainloop-glib.pc.in"
++                   "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/libpulse-mainloop-glib.pc" @ONLY)
++else()
++    set(APULSEPATH "${CMAKE_INSTALL_LIBDIR}/apulse" CACHE PATH "library installation directory")
++    set(APULSE_SEARCH_PATHS "${CMAKE_INSTALL_PREFIX}/${APULSEPATH}" CACHE PATH "directory list for LD_LIBRARY_PATH")
++
++    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/apulse.template"
++                   "${CMAKE_CURRENT_BINARY_DIR}/apulse" @ONLY)
++endif()
+ 
+-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin
+-        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ install(TARGETS pulse-simple pulse pulse-mainloop-glib DESTINATION "${APULSEPATH}")
+-install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1)
++
++if (${INSTALL_SDK})
++    install(DIRECTORY "${CMAKE_SOURCE_DIR}/3rdparty/pulseaudio-headers/pulse" DESTINATION include)
++    install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pkgconfig" DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++else()
++    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/apulse" DESTINATION bin
++            PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++    install(FILES "${CMAKE_SOURCE_DIR}/man/apulse.1" DESTINATION share/man/man1)
++endif()
+diff --git a/pkgconfig/libpulse-mainloop-glib.pc.in b/pkgconfig/libpulse-mainloop-glib.pc.in
+new file mode 100644
+index 0000000..957e3b2
+--- /dev/null
++++ b/pkgconfig/libpulse-mainloop-glib.pc.in
+@@ -0,0 +1,9 @@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++
++Name: libpulse-mainloop-glib
++Description: PulseAudio GLib 2.0 Main Loop Wrapper (apulse)
++Version: 5.0
++Libs: -L${libdir} -lpulse-mainloop-glib -pthread
++Cflags: -I${includedir}
++Requires: glib-2.0
+diff --git a/pkgconfig/libpulse-simple.pc.in b/pkgconfig/libpulse-simple.pc.in
+new file mode 100644
+index 0000000..57d917f
+--- /dev/null
++++ b/pkgconfig/libpulse-simple.pc.in
+@@ -0,0 +1,9 @@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++
++Name: libpulse-simple
++Description: PulseAudio Simplified Synchronous Client Interface (apulse)
++Version: 5.0
++Libs: -L${libdir} -lpulse-simple -pthread
++Cflags: -I${includedir}
++Requires: glib-2.0
+diff --git a/pkgconfig/libpulse.pc.in b/pkgconfig/libpulse.pc.in
+new file mode 100644
+index 0000000..edcbbd8
+--- /dev/null
++++ b/pkgconfig/libpulse.pc.in
+@@ -0,0 +1,9 @@
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++
++Name: libpulse
++Description: PulseAudio Client Interface (apulse)
++Version: 5.0
++Libs: -L${libdir} -lpulse -pthread
++Cflags: -I${includedir}
++Requires: glib-2.0 alsa
diff --git a/media-sound/apulse/metadata.xml b/media-sound/apulse/metadata.xml
index 738e74332466..273b2be58659 100644
--- a/media-sound/apulse/metadata.xml
+++ b/media-sound/apulse/metadata.xml
@@ -6,7 +6,8 @@
     <name>Andrew Savchenko</name>
   </maintainer>
   <use>
-    <flag name="pa-headers">Install PulseAudio headers</flag>
+    <flag name="sdk">Install PulseAudio headers and pkg-config files. Be aware apulse is not
+    a full PulseAudio replacement by design and some functionality may be missing.</flag>
   </use>
   <upstream>
     <remote-id type="github">i-rinat/apulse</remote-id>
diff --git a/media-sound/glmix/Manifest b/media-sound/glmix/Manifest
index b8ee33e5e626..7be72baf3c33 100644
--- a/media-sound/glmix/Manifest
+++ b/media-sound/glmix/Manifest
@@ -1,3 +1,3 @@
 DIST glmix-0.3.tar.gz 17500 BLAKE2B 25fc1cf3a1bbdbade37a7996472b59b538a218c0f136204b6b71617ffb93f1182ebbb8be5fade6ca5859d5318c9b0f4168ad84881d23ac14ccd42b1673252d99 SHA512 158136d67f53834c34500ba88f9d4c8c7c6928878497bbf63db127c900b89d649ebed3baee129d597f46c955184efb9d8ff30676e0430968eb4e057fa2e4bb45
-EBUILD glmix-0.3.ebuild 836 BLAKE2B 90656a6ead64377801066ad1aa8fd0d874fc71139949eea303244d8dd4e7efee5f6db6f35b16901a332c5d06944cc256eb37f5001e9e628f8c1d4edd5a303aa5 SHA512 3bfcbe695d33e984d0b9bd971bb4217e7b44d9e9eae1af87029c3c4182188381769b4a14563267072debcfe5d9752fa48b9ed79bef0a5cf35001fabf3d6504ee
+EBUILD glmix-0.3.ebuild 823 BLAKE2B 3cc630a1fbdbe167e58e4149d05542b5108d46f53b26efd0fe2dc9c5650f8897c2ef71a64f424673fb0128b68bd4c76313315f069de986f0e30de2b7c86cdbed SHA512 69552e21f38bbe83a71a8f76759b89b3b77812f86771b9d8f5ac90253a5d11acd38f917127bd2e65e579fa6e80879ce9fd92fb2373f19327ca7eb5a4aa3c4bb7
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/glmix/glmix-0.3.ebuild b/media-sound/glmix/glmix-0.3.ebuild
index fa4e7709de08..e25af6abda64 100644
--- a/media-sound/glmix/glmix-0.3.ebuild
+++ b/media-sound/glmix/glmix-0.3.ebuild
@@ -1,30 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit desktop toolchain-funcs
 
-DESCRIPTION="A 3D widget for mixing up to eight JACK audio streams down to stereo"
-HOMEPAGE="http://devel.tlrmx.org/audio"
-SRC_URI="http://devel.tlrmx.org/audio/source/${P}.tar.gz"
+DESCRIPTION="3D widget for mixing up to eight JACK audio streams down to stereo"
+HOMEPAGE="https://devel.tlrmx.org/audio"
+SRC_URI="https://devel.tlrmx.org/audio/source/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
+KEYWORDS="amd64 ~ppc sparc x86"
 
-RDEPEND="media-sound/jack-audio-connection-kit
+RDEPEND="
+	media-sound/jack-audio-connection-kit
+	x11-libs/gtk+:2
 	>=x11-libs/gtkglext-1
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_compile() {
 	local libs="gtk+-2.0 gtkglext-1.0 jack pango"
 	emake CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} $(pkg-config --cflags ${libs})" \
-		LDFLAGS="-lm ${LDFLAGS} $(pkg-config --libs ${libs})" || die "emake failed."
+		LDFLAGS="-lm ${LDFLAGS} $(pkg-config --libs ${libs})"
 }
 
 src_install() {
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index f21bc49fd3d8..31f7f5f3b87d 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-sound-recorder-3.24.0.1.tar.xz 452240 BLAKE2B 37b2b81255af5aff4de08e92bf7db216b229885b1aeee87d91a1210412634b62641758c6132290b75494f780d304d78dee4c3d5d7e08de46736750c2730b20d0 SHA512 00e190e8d6a1a3961122485742705da4d85ef926453ff8098718566771600690562597f012f7cd9dc61b5910b4e75cc7518e86a092f052c3fc40a96310ab3c3f
+DIST gnome-sound-recorder-3.28.1.tar.xz 458764 BLAKE2B f6d8691758b85e6cfad0d9ddc8d894bfe8a78d34084524986bf6df694c50ca615a666a0d6fc56a82149274f40c346ed6fb317668a5d6a729b06ea4516bcb7f66 SHA512 badc5b9013a5b2e66078e4e3c93431297730b8e8ef241daa30d1fd58c5e7d6f58201c569cf8e58b24c1510fa6cce068740a0e68015b5bd59f793cf18c9f566e9
 EBUILD gnome-sound-recorder-3.24.0.1.ebuild 1083 BLAKE2B d9df40ebe569a1c0f3edfb91c57ff26b8d6345f56c9d5122c42abeda635df851f679009e21cce1dced73deb7ed7f529df036bc1aa5e2a5a4143200cface68a3e SHA512 499c05e1955bad18123c5a3f994da3034b7df4d0d6816718f39ca43df1da1cde7dc8212ca84193474a832c5d9976b996ab6394009a52420f1a0d96a88c7b2691
+EBUILD gnome-sound-recorder-3.28.1.ebuild 1082 BLAKE2B cca83913fb79be60ee6e39f9effe4d37715aecc8392bf6dea364381df216b2c61fdb30e961c12fcd7152c3efbada9b47bca85037dad901f824a1634b3d2f5014 SHA512 74ee69a6dc5224fb35d532baccb1a2cf6ea234c544bf32039de740ff4ac22e80d9847109d5db2a63c1ba9a5565768318d215eeb26ee7b1995730dec83227fac8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild
new file mode 100644
index 000000000000..abb3d9fd119a
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-3.28.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Simple sound recorder"
+HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/gjs
+	>=dev-libs/glib-2.46:2
+	>=dev-libs/gobject-introspection-1.31.6
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.12:3[introspection]
+"
+RDEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0[introspection]
+	media-libs/gst-plugins-base:1.0[introspection,ogg]
+	media-libs/gst-plugins-bad:1.0
+	media-libs/gst-plugins-good:1.0
+	media-plugins/gst-plugins-flac:1.0
+	media-plugins/gst-plugins-pulse:1.0
+
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.26
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# FIXME: upstream should provide a way to set GST_INSPECT, bug #358755 & co.
+	# gst-inspect causes sandbox violations when a plugin needs write access to
+	# /dev/dri/card* in its init phase.
+	sed -e "s|\(gst10_inspect=\).*|\1$(type -P true)|" \
+		-i configure || die
+}
diff --git a/media-sound/mp3unicode/Manifest b/media-sound/mp3unicode/Manifest
index 8308a8587d0d..8a0ce1bfb91f 100644
--- a/media-sound/mp3unicode/Manifest
+++ b/media-sound/mp3unicode/Manifest
@@ -1,3 +1,3 @@
 DIST mp3unicode-1.2.1.tar.bz2 101593 BLAKE2B d6f529a9e60e461faba410927d731a2ca640f5c0df2fcf2732d87f9598dd01e8b992adb12e0499f5d81e1cf43b399e7c3acb0840a7992a8f5cb7a9e0f09624f3 SHA512 b1ca820d1ecf6b5e0e59a8267c0cc6af5f8218191885b9a538a53b4f112f77510b3c5da81ce1e0a98d60c19b621965cea7e8e5c7b6c035054ea362fc02ed64b2
-EBUILD mp3unicode-1.2.1.ebuild 452 BLAKE2B 4ede226f5d3a8497ee0afd75bf26aeec4fb0ff6817b250cc696723ee8da8f3a9ab39d65dbcab57bcc91f7d0f5190ea439c7c190ccb6c6fa944a87399b25ec190 SHA512 f2fe3eea558bfec7fb61c2504a4cd24cee4b8b38202f1a820ec26e44c60c8011f332ad2fd0901469b8f24657692338c9baf0859cafa14b45b852fdd89d3b8a1b
+EBUILD mp3unicode-1.2.1.ebuild 453 BLAKE2B 76fd3ceae97d7bf6c56c5529b151dda341a3cad2f05faa01c1401199aac88d7179eba2dde1d269aedfe17cc05f4bea9e66cc4574dfa1e4202da15bced0a1844a SHA512 bbe11dad52a290e6df7bda236ccc7e76ea8f86848848dbd52e854d32985af94919b05e8ab2289429a4184104766aea6ef233bae7ed0761e61565b31091c0d28b
 MISC metadata.xml 390 BLAKE2B a6c01bae7d2f5b0398d0ae92b688231e161c54149d3458cc3d553e12511c2d93b4ef6c31b7e95b1657c6bb7d7fdb7f87563f7b9b001d30a84d112cd29a4e4c6b SHA512 fef55e6cfa51b0b23ba81e8df46ca4b694e0279b70d2ac07986ebf4622c61af5aa59dce9d8fbddf339f0dd66bef61e3ca34513a2061d6754cdd5d0c382e90dc1
diff --git a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
index 9ed7b7a972bb..f72c781ad0e8 100644
--- a/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
+++ b/media-sound/mp3unicode/mp3unicode-1.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Commandline utility to convert ID3 tags in mp3 files between different encodings"
 HOMEPAGE="http://mp3unicode.sourceforge.net"
@@ -10,8 +10,7 @@ SRC_URI="https://github.com/alonbl/${PN}/downloads/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=media-libs/taglib-1.4"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b028e39e1911..7acd6cd777c6 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -1,6 +1,7 @@
 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
@@ -8,5 +9,5 @@ DIST mpd-0.20.12.tar.xz 781072 BLAKE2B 0f305efa94dca844ebc9e4548d0f57ce01c0274c4
 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.ebuild 7314 BLAKE2B 20aa5ce2c93174d07d817025b3288fdee09b8d8809cefdf4caabc2c5294b5c454b792cac12952b3a4a89f291cc200bda650cd2916e50b80dd28e6f4d15690699 SHA512 49c34993453e3ff6a4776ca50c109f7dac3b506baed976675f8b07f0255d010a56e6b551300077708c02d48f009760f2e4516343042778b53a71d505cb29fb05
+EBUILD mpd-0.20.21-r1.ebuild 7314 BLAKE2B 35d022e4d5a85a88a1bfd944e3b43e9e2117630139bb8b5347fdcdb967be6c1c3a8047d39be64ccb40144a11b1d6bcd9a83bc95d184cfc6cdea30d5050b6d7bc SHA512 1de5b6fda9bc017dd01bda1f8076987416cca0220c6922ff0778125b5585b73a22ffeb04f42d562c4c2561f6fdcb42287fb0665a5aa13498a93baa809dcd7aa6
 MISC metadata.xml 2517 BLAKE2B 1723729d1962eb361c8231e9351164008b3f2e47097846afc6a06d2ae8157a6ef0643f1ddc53f0fd7ca5569eaf1f30ad28ec18079ec2a9f92cf0ad3b287f4798 SHA512 f829d7424245ff87e86d1bdd4c59cd4a102823b8796aa44d202f2b0afdf902f88fa43d478b9cf610c1ffb52595d3bc2d37bc4d67ddd440110009ff9cbcfaad46
diff --git a/media-sound/mpd/files/mpd-0.20.21.logrotate b/media-sound/mpd/files/mpd-0.20.21.logrotate
new file mode 100644
index 000000000000..55694c4531c3
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.20.21.logrotate
@@ -0,0 +1,9 @@
+/var/lib/mpd/log {
+	missingok
+	weekly
+	delaycompress
+	compress
+	postrotate
+	/etc/init.d/mpd reload
+	endscript
+}
diff --git a/media-sound/mpd/mpd-0.20.21-r1.ebuild b/media-sound/mpd/mpd-0.20.21-r1.ebuild
new file mode 100644
index 000000000000..c41cc0ebed29
--- /dev/null
+++ b/media-sound/mpd/mpd-0.20.21-r1.ebuild
@@ -0,0 +1,270 @@
+# 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 )
+"
+
+COMMON_DEPEND="
+	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:0= )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+RDEPEND="${COMMON_DEPEND}
+	!<sys-cluster/mpich2-1.4_rc2
+	selinux? ( sec-policy/selinux-mpd )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.conf.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() {
+	default
+
+	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.21.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.ebuild b/media-sound/mpd/mpd-0.20.21.ebuild
deleted file mode 100644
index 8bf40077c493..000000000000
--- a/media-sound/mpd/mpd-0.20.21.ebuild
+++ /dev/null
@@ -1,270 +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 )
-"
-
-COMMON_DEPEND="
-	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:0= )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	wildmidi? ( media-sound/wildmidi )
-	zeroconf? ( net-dns/avahi[dbus] )
-	zip? ( dev-libs/zziplib )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	!<sys-cluster/mpich2-1.4_rc2
-	selinux? ( sec-policy/selinux-mpd )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.18.conf.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() {
-	default
-
-	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/music-file-organizer/Manifest b/media-sound/music-file-organizer/Manifest
index 1685e67ce52f..22b061ef7076 100644
--- a/media-sound/music-file-organizer/Manifest
+++ b/media-sound/music-file-organizer/Manifest
@@ -1,3 +1,3 @@
-DIST music-file-organizer-1.0.1.tar.xz 6644 BLAKE2B 7307995aaf79c5eee553f1eb3dc124ca18edac5d9f65bfc71d8d738b72a78b0c4d47a31be1652b4fa2338ddc49d883066e73cc3c2c2856bad411d9ed0fb2f4a1 SHA512 4a69f90b3d859ec18746708c64c316b9f583e3ed7718848109815a9e725fe43d3ca1260dea90aae25201150569538056de7de75f05fe7ea6a1ae637f041431c2
-EBUILD music-file-organizer-1.0.1.ebuild 861 BLAKE2B 183ee99540945cf53f1400bf9ec2283698203971b702f08978c85a67fb5ca690b0d10c05845793df945ef00679548e3e422bc11f3778ad727b2a30805233d462 SHA512 3c2ddf9c2eac6f8bcd1021da17354ca5c8fefabef9f740b77ca3fb8aef3e46eebb5faf182dca74097fd63f563442c8129fd3c71677918151a18bc51578ed2897
+DIST music-file-organizer-1.0.2.tar.xz 501840 BLAKE2B 7ec80a3d49ec2cd36882f9bb5d78f1f82aba9f9b8690380f1fcda3f9fab4ba5a4879e94f4457fb079ceb27d27b599cf500da595d9f37736df3fda709cf2ee016 SHA512 61546f595b801d4377bbfb7e52517a149cae90dee6dbb29c81a15ae6c055d535b4b095928e6918b4e0784e1d52136705a4822cb294e9b665a996afc68b4951f0
+EBUILD music-file-organizer-1.0.2.ebuild 858 BLAKE2B 2cfdd5b4c0bf2bd84f701c211452813ea25c0b81f63ca0489116f1d48fc89c425a7eb0666109343cf001c997a91b210b48126c23ca046b33ac7d318ed802fad7 SHA512 62be40216b61076d8e00c4900638f53a60a4a013ee5cc716c20f3d9dc86880ccbdfe2e2f2b155123d8e3aee627b00b370e77e766bea94e09ca1a5b531b4ac0c6
 MISC metadata.xml 250 BLAKE2B 3c6a58190f2680dd7f7e4afd9e6abfedc7e36181b1a8d7fa9710e08c805ef85988e4a156221c61fc71c36f8e84113537b70a8f144e0764e7704f7dd074af8172 SHA512 d2115b154bf731eac11fd7b96a95baa2467cb660371f7a3dc7a7a77cf4a6cf992b97c5353f184010eac1d37cdfffa6c5d9ec35d82e171f0fad5086767d0173a5
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
deleted file mode 100644
index beee9faf4e8b..000000000000
--- a/media-sound/music-file-organizer/music-file-organizer-1.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Organizes audio files into directories based on metadata tags,
-along with other metadata utilities."
-HOMEPAGE="http://blog.zx2c4.com/813"
-SRC_URI="http://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="media-libs/taglib dev-libs/icu:="
-DEPEND="${RDEPEND} virtual/pkgconfig"
-
-pkg_postinst() {
-	einfo
-	einfo "The organizemusic utility recursively moves audio files and audio"
-	einfo "directories given as its arguments into the directory specified"
-	einfo "by the environment variable MUSICDIR. You may want to set this"
-	einfo "environment variable inside your .bashrc. If no MUSICDIR variable"
-	einfo "is set, it falls back to \"\$HOME/Music/\"."
-	einfo
-}
diff --git a/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
new file mode 100644
index 000000000000..90beb71cf185
--- /dev/null
+++ b/media-sound/music-file-organizer/music-file-organizer-1.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Organizes audio files into directories based on metadata tags,
+along with other metadata utilities."
+HOMEPAGE="http://blog.zx2c4.com/813"
+SRC_URI="http://git.zx2c4.com/music-file-organizer/snapshot/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/taglib dev-libs/icu:="
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+pkg_postinst() {
+	einfo
+	einfo "The organizemusic utility recursively moves audio files and audio"
+	einfo "directories given as its arguments into the directory specified"
+	einfo "by the environment variable MUSICDIR. You may want to set this"
+	einfo "environment variable inside your .bashrc. If no MUSICDIR variable"
+	einfo "is set, it falls back to \"\$HOME/Music/\"."
+	einfo
+}
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 41610eca8264..9afa1cc152fe 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..7d1df1f9f0b4
--- /dev/null
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Royalty-free, highly versatile audio codec"
+HOMEPAGE="https://opus-codec.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.xiph.org/opus-tools.git"
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="https://dev.gentoo.org/~lu_zero/${PN}/${P}.tar.xz"
+else # Official release
+	SRC_URI="https://downloads.xiph.org/releases/opus/${P}.tar.gz"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="flac"
+
+RDEPEND="
+	>=media-libs/libogg-1.3.0
+	>=media-libs/libopusenc-0.2
+	>=media-libs/opus-1.1
+	>=media-libs/opusfile-0.5
+	flac? ( >=media-libs/flac-1.1.3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf $(use_with flac)
+}
+
+src_install() {
+	default
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 50b432767df8..5da7dbc2e614 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -3,6 +3,6 @@ DIST pianobar-2017.08.30.tar.bz2 46664 BLAKE2B 2ab90efab273e2af707924072252b1de7
 DIST pianobar-2018.06.22.tar.bz2 47455 BLAKE2B f1d61709f7c95438352f29a075120c4794c666d9406fb9e6dea47930f2715a0538588d29510097487c5bc06d77ccc44f393fff1561545e21bb71f739151a712a SHA512 0fc2d90324da576266f063573549399e4354b8e83678632fadb80864e82c432a1a90a3092085f0155fc136b726ba59eabb26586a1ba11c5ce668c3a89a218133
 EBUILD pianobar-2016.06.02.ebuild 1011 BLAKE2B d8b7cfcc510558f726bd9bae9d615d51c2b3a044cf95800fe4bc0e796c772aeb92dd0113db1941a1fc29394f2d6160e74e0731c82b8071fe8df2a28f0ab18840 SHA512 bef989c331007c3e8e68673a243e8a852fa845d3e8595cb0fb32106854c6078d1f14d8d6124b535e13af323a36ab51338bd1371afc8a410b02ce055ac68d1a48
 EBUILD pianobar-2017.08.30.ebuild 1076 BLAKE2B 2b9cd4f57b910f0c48cdc297d2ec8ee02790c7686c93b8c0bc482ecbd7305742a2cfe75b5acd20a0331de9dc0d7dec481d8789ae9a9f43b711d5503e68952c7a SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e
-EBUILD pianobar-2018.06.22.ebuild 1076 BLAKE2B 87f7c157cc4356c76074b2e70c2898ede6064c4ae7007fa440aa6d82a5c995dbafa7fa332557aa97c44d5368be160cbd6ea56b43d5898467576b6f4e2b025a41 SHA512 ea4ce3f99905e01b78a5de41dc8ad850016428b12cd1e60e86090897d743687fc002f6ce1fbb16c015adddb2ab0a37a38b9be065652372a44700f840db16481e
+EBUILD pianobar-2018.06.22.ebuild 1074 BLAKE2B 1a92b84e3f89536777996c5c63b917229820e197b3170178e15b61107c92bdde532c750757c1c5ebf2bf0162f9328279a5a129c538b9b53069dead349bfb1e15 SHA512 b2e8b898cbf353bba7bca795c4bdeb773dbd1c21c780b65b948d08cd1219f08fa5766fe3d97c8214ba4a32c4dfadf14b83f8424ffc1d60fb8fc36cf0c407d542
 EBUILD pianobar-9999.ebuild 1076 BLAKE2B 2b9cd4f57b910f0c48cdc297d2ec8ee02790c7686c93b8c0bc482ecbd7305742a2cfe75b5acd20a0331de9dc0d7dec481d8789ae9a9f43b711d5503e68952c7a SHA512 83f739c2210c43095752259acff9f3ac0e9586d05a4011d5c98e70b54cb6723337cdc2c47585370ca8bb07813f75777c0959ddbee325102000a097fc8251d98e
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/pianobar/pianobar-2018.06.22.ebuild b/media-sound/pianobar/pianobar-2018.06.22.ebuild
index 21d92b644c49..19f4cb3e3a1f 100644
--- a/media-sound/pianobar/pianobar-2018.06.22.ebuild
+++ b/media-sound/pianobar/pianobar-2018.06.22.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
 else
 	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="A console-based replacement for Pandora's flash player"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index d86e56c37ba4..20fe3889c0e6 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -3,6 +3,6 @@ AUX picard-2.0.3-iteration-error.patch 904 BLAKE2B dfd8f64219a17cfa3ed5550eb5dfe
 DIST picard-2.0.0_beta3.tar.gz 2686246 BLAKE2B e11cc85282bb3dfe7298090e42b62f7e9b2d4ee7df09b040905665694074ede611884e1544abc89aa3d07e0844d6599d5fac7c0db09bad7d9e64439c0c4478c9 SHA512 c8c5bdd84af3946bc24eb495bcb83877dffedb81e6ff64742925f6d1b4f2780f86280dda839d96030ea15ee2a7bf7708c20cc4ac92e97bf9cd372ea36715d156
 DIST picard-2.0.3.tar.gz 2748358 BLAKE2B ff71f9d7836b9f797a539db772e2ffcb8cb9ba4c25997c01590292bf1b7b5d311089174313af86f1eb0e82af48bc8f350578ae6bdffba3c6b3bf98b934481f8d SHA512 759252fa3c43af1bfc09d85ef90fe451e674bfebaee31838bd2779380d1b8ad817f899896baeccf583464566eb2acfe886c8288d1757faaaff2dc17c3b8ef6ae
 EBUILD picard-2.0.0_beta3.ebuild 1774 BLAKE2B 0dd094c47179e50704a8431322051a1942cbebf34ebd171f27823734b34103dc7427b13fce2714297cb7f811a62cbf90595212dc3b0205a0c55cb02be9ebb2fa SHA512 2f6936e6544930d2d60eec787e6a0f8cc36b49f891269448b0b308c9595aa5d9441012fe2f6eafa9d30fc40f647e9c74bc0e844f9323248f5477b562157cb768
-EBUILD picard-2.0.3.ebuild 1865 BLAKE2B 96e6997ca21026d9d48bc6dd1f87fec61a8b3c6322e2d03ddfb986a7d7aac64f35672532475a156f6045ea93b1c3aff0298a93c95254376ccd20004793ca0eb8 SHA512 50267055f69dd61d6542654672e55fc50cdefc9cd0790f3028643a40c086048adf842d7a1c4c5933cf86835a40c4144abc6c977f8ae409de45fec3cd0fe2b59a
+EBUILD picard-2.0.3.ebuild 1864 BLAKE2B 54931c2fcb87851c1e050844297b2f864cc39856afef8c6181a90811b96e97d8b121aa028444b8425dd884ab415cad007cabf9c5b3569f3053cb5e57fc1747fe SHA512 407c1bead0ed119f9ec81d40040c014a4111530e9298b76c57bfe056c8a09b7bd1afe8a4ecbb817563c95aec0b749eacb2a5b663c3a2e968ac91745709e8e957
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.3.ebuild b/media-sound/picard/picard-2.0.3.ebuild
index 4db7f7a110a7..f3bbe1494326 100644
--- a/media-sound/picard/picard-2.0.3.ebuild
+++ b/media-sound/picard/picard-2.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/metabrainz/${PN}/archive/release-${PV}.tar.gz -> ${P
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 729471f4dae2..b37250170e94 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.5.tar.gz 1021061 BLAKE2B ab93c79d803d8067a913015410b83f8748f05bd62a532a8c0b672b78c9f333c2c31992ba4be39d3e32392fd22f8da6a4b16801af60f279ca21db075a17c6af56 SHA512 7ee151b17535687af896c337d080a6daf92068d8d023b49459b5fbe21db819c638ab7deba04f89e5992147c56d08df56873dff96de2885f7ec80315173467cd9
+DIST pulseeffects-4.3.7.tar.gz 1021450 BLAKE2B a3d9308056b08dca0737eafa91b18ec9d3d2f2fc3d84ac090d21bac832fc5da91ba5ed1ce595898ca07dfe1684bf4e50668956dcc0f32da5b535ec1b3e9e4f08 SHA512 5ae104bf3359aa1dc4be6fe3afa5bb8f2243b3ef2c9d5abb9a881d025b26e8e75cc80ffa1ee43fafe7fa8d238eaaf2dc933f191694093b10ed8ffe7f7e3fdc53
 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.5.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
-EBUILD pulseeffects-9999.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
+EBUILD pulseeffects-4.3.7.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.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.5.ebuild
deleted file mode 100644
index 33a78d46639a..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.3.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="${HOMEPAGE}"
-else
-	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
-	>=dev-libs/boost-1.41
-	>=dev-cpp/glibmm-2.56.0
-	>=dev-cpp/gtkmm-3.20:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=x11-libs/gtk+-3.18:3
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/gstreamer-1.12.0:1.0
-	>=media-libs/gst-plugins-good-1.12.0:1.0
-	>=media-libs/gst-plugins-bad-1.12.0:1.0
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
-	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? (	>=media-plugins/calf-0.90.0[lv2] )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	rubberband? ( media-libs/rubberband )
-	>=media-libs/zita-convolver-3.0.0
-	media-libs/libebur128
-	media-sound/pulseaudio
-	sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-	dev-libs/appstream-glib
-	sys-devel/gettext
-"
-
-pkg_postinst(){
-	gnome2_gconf_install
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm(){
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild
new file mode 100644
index 000000000000..edcf67ece621
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.3.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/pulseeffects/pulseeffects-9999.ebuild b/media-sound/pulseeffects/pulseeffects-9999.ebuild
index 33a78d46639a..edcf67ece621 100644
--- a/media-sound/pulseeffects/pulseeffects-9999.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-9999.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
@@ -37,7 +37,7 @@ RDEPEND="
 	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
 	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
 	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
-	calf? (	>=media-plugins/calf-0.90.0[lv2] )
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
 	mda-lv2? ( media-plugins/mda-lv2 )
 	rubberband? ( media-libs/rubberband )
 	>=media-libs/zita-convolver-3.0.0
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 41387ffd5b48..2ca3a9bc21b7 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,6 @@
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
+DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675626466c9842606075da8469587b850ea63a814624cb334ea66491578be134ff138594aecab9cba1c4f953b5e SHA512 086dec09700ffda8aec04c5b3c0f062cb0cde72c47902452751443fd54c8f563fc31d02f4fbf73cc0831d65aa32026c884477397d53a8e761227ab8c46be4874
 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
diff --git a/media-sound/qmmp/qmmp-1.2.4.ebuild b/media-sound/qmmp/qmmp-1.2.4.ebuild
new file mode 100644
index 000000000000..3ffb3e318976
--- /dev/null
+++ b/media-sound/qmmp/qmmp-1.2.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils xdg-utils
+[[ ${PV} = 9999 ]] && inherit subversion
+
+DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
+HOMEPAGE="http://qmmp.ylsoftware.com"
+if [[ ${PV} != 9999 ]]; then
+	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+else
+	QMMP_DEV_BRANCH="1.2"
+	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+# KEYWORDS further up
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
+gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
+pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+
+REQUIRED_USE="
+	gnome? ( dbus )
+	shout? ( soxr vorbis )
+	udisks? ( dbus )
+"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/taglib
+	x11-libs/libX11
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	archive? ( app-arch/libarchive )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+	cue? ( media-libs/libcue )
+	curl? ( net-misc/curl )
+	dbus? ( dev-qt/qtdbus:5 )
+	enca? ( app-i18n/enca )
+	ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	flac? ( media-libs/flac )
+	game? ( media-libs/game-music-emu )
+	jack? (
+		media-libs/libsamplerate
+		media-sound/jack-audio-connection-kit
+	)
+	ladspa? ( media-libs/ladspa-cmt )
+	mad? ( media-libs/libmad )
+	midi? ( media-sound/wildmidi )
+	mms? ( media-libs/libmms )
+	modplug? ( >=media-libs/libmodplug-0.8.4 )
+	mplayer? ( media-video/mplayer )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opus? ( media-libs/opusfile )
+	projectm? (
+		dev-qt/qtgui:5[-gles2]
+		dev-qt/qtopengl:5
+		media-libs/libprojectm
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	shout? ( media-libs/libshout )
+	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sndfile? ( media-libs/libsndfile )
+	soxr? ( media-libs/soxr )
+	udisks? ( sys-fs/udisks:2 )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+DOCS=( AUTHORS ChangeLog README )
+
+src_prepare() {
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_AAC="$(usex aac)"
+		-DUSE_ALSA="$(usex alsa)"
+		-DUSE_ANALYZER="$(usex analyzer)"
+		-DUSE_ARCHIVE="$(usex archive)"
+		-DUSE_BS2B="$(usex bs2b)"
+		-DUSE_CDA="$(usex cdda)"
+		-DUSE_COVER="$(usex cover)"
+		-DUSE_CROSSFADE="$(usex crossfade)"
+		-DUSE_CUE="$(usex cue)"
+		-DUSE_CURL="$(usex curl)"
+		-DUSE_KDENOTIFY="$(usex dbus)"
+		-DUSE_MPRIS="$(usex dbus)"
+		-DUSE_ENCA="$(usex enca)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_FILEWRITER="$(usex vorbis)"
+		-DUSE_FLAC="$(usex flac)"
+		-DUSE_GME="$(usex game)"
+		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HAL=OFF
+		-DUSE_JACK="$(usex jack)"
+		-DUSE_LADSPA="$(usex ladspa)"
+		-DUSE_LYRICS="$(usex lyrics)"
+		-DUSE_MAD="$(usex mad)"
+		-DUSE_MIDI="$(usex midi)"
+		-DUSE_MMS="$(usex mms)"
+		-DUSE_MODPLUG="$(usex modplug)"
+		-DUSE_MPLAYER="$(usex mplayer)"
+		-DUSE_MPC="$(usex musepack)"
+		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_OPUS="$(usex opus)"
+		-DUSE_OSS="$(usex oss)"
+		-DUSE_PROJECTM="$(usex projectm)"
+		-DUSE_PULSE="$(usex pulseaudio)"
+		-DUSE_QSUI="$(usex qsui)"
+		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
+		-DUSE_SCROBBLER="$(usex scrobbler)"
+		-DUSE_SHOUT="$(usex shout)"
+		-DUSE_SID="$(usex sid)"
+		-DUSE_SNDFILE="$(usex sndfile)"
+		-DUSE_SOXR="$(usex soxr)"
+		-DUSE_STEREO="$(usex stereo)"
+		-DUSE_STATICON="$(usex tray)"
+		-DUSE_UDISKS2="$(usex udisks)"
+		-DUSE_VORBIS="$(usex vorbis)"
+		-DUSE_WAVPACK="$(usex wavpack)"
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 853a6d86eb64..2936ddfff824 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,5 +1,5 @@
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
-DIST TeamSpeak3-Client-linux_amd64-3.2.1.run 76215644 BLAKE2B 81e3aa54f88182ff79113d994a2ef4d9e6d3ba38078879a19f21bca6637cf1d2f7bf7cf66a15edf957bc25413760f67d343db7fbbb8aa678e1aa55e8ae48d75c SHA512 b77d77daf8806bd48580abcc4721a6dbe5e30f55ed0ececc57215405d6607c3457d7ab628d4cb607d78c6f206f7093745842692176ca199bd95578f8b6fa81a8
-DIST TeamSpeak3-Client-linux_x86-3.2.1.run 75958520 BLAKE2B 2cdc92e740c3951d434f9545da670892b5f16c27fcf1c20b5fb9feb0d2bdbebabda08f2c8216b12a02a4248e685a006ef8f711ec7eb9f27e18550dc8f0e5422b SHA512 761210985b0c2f6674ae7da5bceb57783f7bba0827799fd291e951716ac7490aa3ee88d4030b985b67d5397353b459bceef42e6b41467513440ffeeaaa265d54
-EBUILD teamspeak-client-3.2.1.ebuild 2377 BLAKE2B 1231e4354854dfdba0fe4d78aa994cd5943e588487d83cc66c2b8b8137401a9eee0629b0a8738629263920fc3d181d44f306c4cc613728b3b33438c1a826950d SHA512 ef34b08bdebf7d1ce99b75a725b965f39b2fd6ef043495a23f223c0260d564032f594bb855a3b86face9592efd0df561e3113676fb660c726edea465499cb219
+DIST TeamSpeak3-Client-linux_amd64-3.2.2.run 76227220 BLAKE2B 86a50064e01a496dd68559a3fa92003bf674cb59e714a45e6d12b2e6c2b33988b6ee7b76f474b35f1c08ae17fe430e8882c271e1751381df74c4dd5f7d552c42 SHA512 3edc003d721494e914fa74ae3d2666c795c5beb7feae7cc3b379d06447acb3e0941d9c5e2495e8bec8c1c1f5e25b5b31767ea214d198b2e320fc6a7925fdc541
+DIST TeamSpeak3-Client-linux_x86-3.2.2.run 75976893 BLAKE2B 0d0396f2fdd0d61c5e1fc1daec9978e6f4ebb82511b80c97bbc86d97bcbf3237e17064666212d8ba2650dc173cef8774acc38027241247c233c14e41ed697807 SHA512 3ca1a8602a9df3ee7669d3f226a44354a92ef5b3f52b720ac7a91dbd50331c609a46a1ae83d39c82dea8f6fc0a5f32245525ab601f7fd329521478ef29909027
+EBUILD teamspeak-client-3.2.2.ebuild 2382 BLAKE2B 606440299e4aa17d4e85b629db03a06ce0e4a6d8d72977a92e41af654b267266d69b434b78e712784695092a78c67f80ac9f5521e4543d02c6a8282fb4552e07 SHA512 f08583523c4d885e547d3df4b29edc42b58ca782c497dcc78bae0c4131b44a787097b27d75ee76f5bd4a013b7d886cb8fa2967656ad512728b59777d9edfc42b
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
deleted file mode 100644
index f3e33c771106..000000000000
--- a/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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:=
-	<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:=
-	sys-libs/libcxx[libcxxabi]
-	sys-libs/zlib:=
-	virtual/udev
-	alsa? ( media-libs/alsa-lib )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-RESTRICT="mirror strip"
-
-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/teamspeak-client/teamspeak-client-3.2.2.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.2.ebuild
new file mode 100644
index 000000000000..6c018afb5dd9
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 strip"
+
+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/wavsplit/Manifest b/media-sound/wavsplit/Manifest
index c76756f76cea..5e05677e1cf8 100644
--- a/media-sound/wavsplit/Manifest
+++ b/media-sound/wavsplit/Manifest
@@ -2,6 +2,5 @@ AUX wavsplit-1.2.1-64bit.patch 1929 BLAKE2B 66e6e92a9f5c090bb383cd582cd9ff2310f0
 AUX wavsplit-1.2.1-Makefile.patch 495 BLAKE2B 8aa9ac0991630cca8d8720af33d1649b788f00cb1c171acfc77f4b04de1dc157e581eeefc3025a3b498000f8e331a910680096877462b0545632d2a3130224a2 SHA512 53bb5a83d30429f616f4d2274516741b5454fec82befe3bb5399d7d3d5a7f00160474dbb1104375de7cef090dc96719cb0f8c39cc72eeaada7974a53c22d4ec7
 AUX wavsplit-1.2.1-large-files.patch 6277 BLAKE2B 01e763a872a321aa6e477c7324ead458d358dfca3c2c26bc491615c66fdf10d8d1ee386baada563c7be8107e7c144d7931113547bc17d5ba4f2c8c97c23cbe16 SHA512 06d1250034e09c4a1937742ec992a4d42fe296034c59c5ea40131f093a574d9894b66b9a0217bf424f8171e779cf7a08fd45955bd36e183b6b698e0c33e6586e
 DIST wavsplit-1.2.1.tar.gz 32246 BLAKE2B 38e9e4f27c0adef12ece224224765a60442f34fa4a7ef5af1416071374a5c1f8f4908836fe568c6e046472da26abd51c6ba91a03f0ca10acea5b73a04f961859 SHA512 df0e4bf867fb19e50a8be10f13ed6f4c40e848106c6053661f7226e9893715f0318af4b19bf289b840dbf72768b8508af38351c24725cf3eb81a9f3dbcd27a19
-EBUILD wavsplit-1.2.1-r1.ebuild 812 BLAKE2B aaa5b7deb1621a68561374b0bbe1a5c88fa4994b58d862faf722d13da3182b22f0c46c17fdbfecbd51b7f689642fff61ab04985f79e27030f6099d1cc75c813e SHA512 a5dc805776a23e54bcdde8057503ffc00bf4c78fb34a4870eb2d2338b6c55861d113b06b066ce8036527d0bbfc8f0f57fabcd138f9c29f092084654e14e9f2e8
-EBUILD wavsplit-1.2.1-r2.ebuild 766 BLAKE2B c8dfc4b388ecc6059f28c81ace1ef016c4c5213bdc8236cde0d9cc3e3b2365833f30a709f63d7ea81f51cf38477bfd3ecb96ada18893b745062e732c72e5e7b2 SHA512 9998be51fef2424dd4e2fecad87089ac582935cd152469c4ee782a26ac5ee3db6c58632616571c20d14da6f44a7cff8b71775f125cbb0e238accc11dbde973b0
+EBUILD wavsplit-1.2.1-r2.ebuild 764 BLAKE2B aeafffd30d884c5909467bfa0e3faf4726c9ea9687f006c62ee0e40a9468ee2840f1157cd665ecaf18792e954e385f1e0fe899733651e10349e3242b2ae8e07e SHA512 8f0ec619fc2258674066fb11f5ae9afb5aa1be920dbc9bcfc446197453aaedec140812dc533b63a6fdae00d662eece2c02b89eb62f0d7669e55611ac233b6bdf
 MISC metadata.xml 331 BLAKE2B 53308e6ee29eac8d7573ff409099d4825985af37eb40f30b78523891f0fd7fce3628c30e559935e5506c6a8139a5dba45bf0303305222055891c1932bc2e46f3 SHA512 c9839a79cbe27caf7ce682e8b6db6e6b0abda1b1ee643820272f78026f6f7695e641980cbed35d8a89a050ff778d715bc7e7960bdef04fd4e1a29b355fba08f2
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
deleted file mode 100644
index 18b9dbcd2bb3..000000000000
--- a/media-sound/wavsplit/wavsplit-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="WavSplit is a simple command line tool to split WAV files"
-HOMEPAGE="https://sourceforge.net/projects/wavsplit/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-#-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
-KEYWORDS="~amd64 -sparc x86"
-IUSE=""
-
-src_prepare() {
-	emake clean || die
-	epatch "${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-large-files.patch \
-		"${FILESDIR}"/${P}-64bit.patch
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" || die
-}
-
-src_test() { :; } #294302
-
-src_install() {
-	dobin wav{ren,split} || die
-	doman wav{ren,split}.1 || die
-	dodoc BUGS CHANGES CREDITS README{,.wavren}
-}
diff --git a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
index 7e422e4d3fa0..4f4669af7bd7 100644
--- a/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
+++ b/media-sound/wavsplit/wavsplit-1.2.1-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 #-sparc, -amd64: 1.0: "Only supports PCM wave format" error message.
-KEYWORDS="~amd64 -sparc ~x86"
+KEYWORDS="amd64 -sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-Makefile.patch
-- 
cgit v1.2.3