gentoo resync : 21.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
commit: 265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree: ab18b5617d138f6684566b619405090989d55a2c /media-sound
parent: 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
39 files changed, 86 insertions, 1008 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 78a37e69e369..0e17f6a7d27b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack-audio-connection-kit/Manifest b/media-sound/jack-audio-connection-kit/Manifest
index bd5eca0c17f7..eeca1eb69ab3 100644
--- a/media-sound/jack-audio-connection-kit/Manifest
+++ b/media-sound/jack-audio-connection-kit/Manifest
@@ -1,10 +1,4 @@
 AUX jack-audio-connection-kit-0.125.0-freebsd.patch 533 BLAKE2B 1e99c1a0f722a2aa94ea5862026b3493a89beb7cb76b444f269c56c47f98d297f15842cf468e81a28014664eb09007e4adb93a4636e955cd690ccc8ac28b140c SHA512 23ff3f34b7891d0725b32faf515a138fd1220199bba6aceebc232a9647be99658f922c6d4a42f1c3b6f98bb9619cf470e2ec213fe906a9189b43163d21f47316
-AUX jack-audio-connection-kit-freebsd.patch 496 BLAKE2B e16566049664f3357e4078bdf751af1f83c0d76b26f5717e95a578361a7d24523cf7f52610da1fd5c76faf1ed31a95ee64d993e7d529a9638ab132a3dc8c4824 SHA512 7c0cf60ddd3d07e12e036082ab10299308d1e112c6190d008a739ab0374c8ecf9e2dcb703055a58f8098e5187044e2351a1786271cecdeae23cbed72e6d68cd6
-AUX jack-audio-connection-kit-sparc-cpuinfo.patch 659 BLAKE2B 3a7856f80c0492141905aa4bb0dd089d3e350b5354dede9e9d8bbda672e31833cc6701f3638218dc1dfe7bc60861596e9e82d759ac72d3e75decb683451dd9c7 SHA512 c5964413c99fb1dd20dfe52dd40f857dab1cef123b26f74500e2f5607eda870b563595d39c4e4e0684428971e7295c847253d045b2d9ba0183f358630cfa9888
-DIST jack-audio-connection-kit-0.121.3.tar.gz 1083545 BLAKE2B 0fab3329b191e90e8961994fddb407dd635c09a389e56124734338e78803c63687595ff9ff6f4223713b7a13f79a1f17877e9e37890fafbf94bf631c2f9afe84 SHA512 57323393d5209baefe73cc0cd9a0e818b1cfd260cf9aa36cd6ad800252e22e3ddb7fc46649c54b8e840696878147c2d06c8d39fd7300b5bb92aeb69f44ed710f
-DIST jack-audio-connection-kit-0.124.1.tar.gz 1113456 BLAKE2B 2f845de92e19f164ecf5caabdfb4b1870d93050b5027c814a342b6abf826d9b70637c5c169159ae4647b0ab49fe2e2f246441214561dc828c6d049189a9f6c3f SHA512 9c885da516f2ca246edba94db26c851229d063f1557ea91ec76ca57d675a510d16cc4baad5adb316cf46aaaa8b8d7579b484a53b9a803b34fc9bb34c983a8fe2
 DIST jack-audio-connection-kit-0.125.0.tar.gz 1217977 BLAKE2B 4037b76a5a6814f30adb4145282e2295bd7b2502934ec7b3cc41ed9bc1a1319855a60d739d72641c0e18a3ee1d8bcb829a637fabf7df7a4525271bff8933f09c SHA512 acdac0588c8a6b79763177677885b6e7bfa8ee3cd9556b33bfe09512bc1191414bb4f97eed62c3c71567b13b4eb69d95ec6b438e5a9d2e22a956c073d500c46f
-EBUILD jack-audio-connection-kit-0.121.3-r1.ebuild 2301 BLAKE2B 365da2382795f4c6378159e803f67dbbc3e54fa6b5a1723ffd4aaeb2999943783fcd72048f7cf3f5dde0058c69494e43c2f1ead08e2c56dce6b535e8dcd98a34 SHA512 32ad14f0be41c45f096a5dd35c05107c1ff854df1e1e6a2803b4c3cf98f8cd156a0d3aec2d092d6786749e5820edd143463d331dca752c48479d282c2ac65672
-EBUILD jack-audio-connection-kit-0.124.1-r1.ebuild 2104 BLAKE2B 4364186d40279df43927e9ef57ac6ba16de4943444dcbf4e39fc7cb7716232a37d43e28a57765df7ed0ec80106ceebb661f2bf9be7c9dfc241656e6d4061ebd6 SHA512 1b0769d43bc619f0dc41ea307519b7118adfa265af506b3e8a6b11b0bce4fb89ef0d8fe0f69cd1de888097b17c474836b1b95f1e412bf82a99e0592b3ec7fddc
 EBUILD jack-audio-connection-kit-0.125.0.ebuild 2072 BLAKE2B 79635f9caf09e9039d6255b2ccc1d51bc5953c2c59ddda23f554faf4868fad4f5b55c09d84b5b16bd58552e69b0ca5c5ff589bbb548e12bf4a9403c123625940 SHA512 8bbfe83f51639da5838e41aa29ced5302137950d4a5ea96fbf803def178257a8bd71f0f50cd3569f6f3ae8c0e341044daaddf04a54915f256b351a1bed9cb34c
-MISC metadata.xml 514 BLAKE2B 920e43b1a4ee5e4040d05a3dd62f677943ea7166a013e82d06f255d9a0d79d99af927bc5428517232dd7d21392f74b15c40c2d2e781d720abe1c153bc85ccadf SHA512 1fc2dd1efb39c6c002c5ad647a4f5134c841138546f66300db8ce93c979522ee29c4e74cea86e6bba4fe8d5414dfd5a25cb1d98803511450cbd22933ce474c1d
+MISC metadata.xml 450 BLAKE2B 660a876764f17ce9963bbef4d0092acf7649513ea591c47eaf988ba23f0fea8a1cb2dd1bc3087a4c5175cee4e447725d3b90d22552c0a51ee5c423a88ada30d3 SHA512 13e6a976f07d7d3535ec19b5f7716d21203d08455c2b835f776ff3517749f7f3b3ec97725d6b9cc2375fcd8e51b95a46d1e8f7e17a1acbf2a71c4416c04fd7b0
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
deleted file mode 100644
index a884ac6881e1..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-freebsd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- jack-audio-connection-kit-0.121.3/configure.old	2012-05-29 11:10:22.000000000 -0400
-+++ jack-audio-connection-kit-0.121.3/configure	2012-05-29 11:10:46.000000000 -0400
-@@ -14903,7 +14903,9 @@
-   freebsd*)
-     # current FreeBSD header files conflict with the OSS driver's
-     # barrier code, this may be fixed in 5.3, stay tuned.
--    USE_BARRIER="no"
-+    # USE_BARRIER="no"
-+    TRY_POSIX_SHM=yes
-+    HOST_DEFAULT_TMP_DIR=/tmp
-     ;;
-   openbsd*)
-     # pthread_barrier* not implemented
diff --git a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch b/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
deleted file mode 100644
index 8017f90ebe93..000000000000
--- a/media-sound/jack-audio-connection-kit/files/jack-audio-connection-kit-sparc-cpuinfo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-On Linux/SPARC, /proc/cpuinfo doesn't include "Cpu0Bogo" anymore,
-use "Cpu0ClkTck" instead to determine the processor speed.
-
-linux upstream commit 8b99cfb8cc51adae7f5294c8962a026c63100959
-
---- old/config/os/gnu-linux/time.c
-+++ new/config/os/gnu-linux/time.c
-@@ -152,7 +152,8 @@
-       defined(__x86_64__)
- 		ret = sscanf(buf, "cpu MHz         : %" SCNu64, &mhz);
- #elif defined( __sparc__ )
--		ret = sscanf(buf, "Cpu0Bogo        : %" SCNu64, &mhz);
-+		ret = sscanf(buf, "Cpu0ClkTck	: %" PRIx16, &mhz);
-+		mhz = mhz / 1000 / 1000; // hz -> mhz
- #elif defined( __mc68000__ )
- 		ret = sscanf(buf, "Clocking:       %" SCNu64, &mhz);
- #elif defined( __s390__  )
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
deleted file mode 100644
index 3081514a92e8..000000000000
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils multilib multilib-minimal
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org"
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples cpu_flags_x86_mmx oss cpu_flags_x86_sse cpudetection pam"
-
-# readline: only used for jack_transport -> useless for non native ABIs
-# libsndfile: ditto for jackrec
-RDEPEND="
-	sys-libs/readline
-	>=media-libs/libsndfile-1.0.0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
-	alsa? ( sys-process/lsof )
-	pam? ( sys-auth/realtime-base )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
-	epatch "${FILESDIR}/${PN}-freebsd.patch"
-}
-
-DOCS=( AUTHORS TODO README )
-
-multilib_src_configure() {
-	local myconf=""
-
-	# CPU Detection (dynsimd) uses asm routines which requires 3dnow, mmx and sse.
-	if use cpudetection && use cpu_flags_x86_3dnow && use cpu_flags_x86_mmx && use cpu_flags_x86_sse ; then
-		einfo "Enabling cpudetection (dynsimd). Adding -mmmx, -msse, -m3dnow and -O2 to CFLAGS."
-		myconf="${myconf} --enable-dynsimd"
-		append-flags -mmmx -msse -m3dnow -O2
-	fi
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable cpu_flags_x86_mmx mmx) \
-		$(use_enable oss) \
-		--disable-portaudio \
-		--disable-firewire \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		for i in tools man ; do
-			sed -i -e "s/ ${i}//" Makefile || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/example-clients"
-		docompress -x /usr/share/doc/${PF}/example-clients
-	fi
-}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
deleted file mode 100644
index 5a1fa3d1b5ce..000000000000
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.124.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils multilib multilib-minimal
-
-DESCRIPTION="A low-latency audio server"
-HOMEPAGE="http://www.jackaudio.org"
-SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="cpu_flags_x86_3dnow altivec alsa coreaudio doc debug examples oss cpu_flags_x86_sse pam"
-
-# readline: only used for jack_transport -> useless for non native ABIs
-# libsndfile: ditto for jackrec
-RDEPEND="
-	sys-libs/db[${MULTILIB_USEDEP}]
-	sys-libs/readline
-	>=media-libs/libsndfile-1.0.0
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	>=media-libs/libsamplerate-0.1.8-r1[${MULTILIB_USEDEP}]
-	!media-sound/jack-cvs"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${RDEPEND}
-	alsa? ( sys-process/lsof )
-	pam? ( sys-auth/realtime-base )"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-sparc-cpuinfo.patch"
-	epatch "${FILESDIR}/${PN}-freebsd.patch"
-}
-
-DOCS=( AUTHORS TODO README )
-
-multilib_src_configure() {
-	local myconf=""
-
-	# Disabling CPU Detection (dynsimd) disables optimized asm routines (3dnow
-	# or sse)
-	if use cpu_flags_x86_3dnow || use cpu_flags_x86_sse ; then
-		myconf="${myconf} --enable-dynsimd"
-	fi
-
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable altivec) \
-		$(use_enable alsa) \
-		$(use_enable coreaudio) \
-		$(use_enable debug) \
-		$(use_enable oss) \
-		--disable-portaudio \
-		--disable-firewire \
-		$(use_enable cpu_flags_x86_sse sse) \
-		--with-html-dir=/usr/share/doc/${PF} \
-		--disable-dependency-tracking \
-		--libdir=/usr/$(get_libdir) \
-		${myconf}
-
-	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
-		for i in tools man ; do
-			sed -i -e "s/ ${i}//" Makefile || die
-		done
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r "${S}/example-clients"
-		docompress -x /usr/share/doc/${PF}/example-clients
-	fi
-}
diff --git a/media-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index da3dcaba033a..3eb6b77aaabf 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
-		<flag name="cpudetection">Enables runtime cpudetection</flag>
 		<flag name="pam">Add basic realtime configuration via <pkg>sys-auth/realtime-base</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 399ebf7b1219..085cfa109efd 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,9 +1,5 @@
-AUX jack2-1.9.11_rc1-gcc7.patch 889 BLAKE2B e5c31c6688dbcd2cbba44993cff03e612b364a88cac146415471564f983ba07e7d822f2baf38ee0be4eabaf6369fc1f4f3640ea1a5eab51192a782b44b6dec1f SHA512 7cae070880af90bd7ee68dbfae0ea4421a5cb2cfaaf7b1228a4668767e541b263b965bed4b572053678c7dd81f380e6759a46cd97a0a5cfc95921286739e1791
-DIST jack2-1.9.11-RC1.tar.gz 6481650 BLAKE2B b9497efdb72f2e3894a062a3ffdffc3ebf67f5ea7372d993c13581202202e0f0ba7b21563768a984201d8e5eb2854add67fb5c377e2b4ddb23806a38ddddb0f9 SHA512 4fd7d82ab6536b8c6061023858ae5b978903608b149498818971481da75c6e9e0e7e7aef5e1343730c259f4378aebfbf25916b9736e0ad8aa19584a44f894436
 DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
-EBUILD jack2-1.9.11_rc1-r1.ebuild 2298 BLAKE2B 917029b1de9c87f141e7828f7cbd7d508d2015197f88f4dd8fa1201c9b75f861cc709425eead75132f81f147b4e8e8254f4d6eef1e65fb40bc626a8ae278591b SHA512 dfe3a1abb3e5807949ba53911def098695b3e3d497ad6ce915c41b698b335826f8cdf656897e0b16152ddd42bc3502d75f23363441d3e0328759168ce89f77f4
-EBUILD jack2-1.9.11_rc1.ebuild 2231 BLAKE2B f5960181f2eb1bea4f56dc01ed8314490869d4ba549f79dcf9edc31f10b7495b6cf878a1470311e7ba0c833518c8847066a6af9aba80d9a7656a3c64d4632267 SHA512 a7a7af2ca48fe233acd04ac8933910de0e4a6d37e24d411ea0e02d5898f9333dcc9af0ef36893cfd8d2c2332ab86285bbd83e8085afa8a0719fda2dd20fefe6f
 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 2248 BLAKE2B 11df609c926f433493d6e68b799d12a19ab225e5e7152998a1cae4cd2aab88e91f7f602a27d65cdba3a9a34e3f299f77b226a31e6845c2003e3c82e61becd750 SHA512 cc0daf80bbe50f81e931b4572e219d97b7166fa7ffdd5cf12eda5f1925e4554a750a8fa4cf1c6ead747e5a52eb0c510aeca90c6234af4c5fed75e1952606c792
+EBUILD jack2-9999.ebuild 2265 BLAKE2B d33ab3cddf7396a1f5c8a9888d7337e3aa2f3df55dd4af4e55261b6d6e95bcc9bfbd882b1b8b4de6d0687e7a715bf2dacc17aaf5974ccc2ef4400a6a9f91009f SHA512 06b07335899ddabf08656c8208223c1f7af92fa2e977c061b9ce1fb9437707ae1744f5fa0570a2b7940a57bb5bdedece4e75aa2662974dcd66a1744c8fa44542
 MISC metadata.xml 679 BLAKE2B 9808048dac5d2d936aa7f6a05f66b0a98a428aa81275b5528684ba2312c49a1212ee38afac0d466e5ed87b91c253f8b973670928dd21b13470208bc84a2ff48f SHA512 8c6fc8ce9dc151cdc8adc2092a661a76ef0fd12fc8f2c922be3e7a75215e40ed5b352f8099906ae6a883fd3a3edb674d0a6784831d2cd9b881b474cf6c419152
diff --git a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch b/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
deleted file mode 100644
index dcde5fb422f8..000000000000
--- a/media-sound/jack2/files/jack2-1.9.11_rc1-gcc7.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit f7bccdca651592cc4082b28fd4a01ed6ef8ab655
-Author: Kjetil Matheussen <k.s.matheussen@notam02.no>
-Date:   Sat Jul 15 13:21:59 2017 +0200
-
-    Tests: Fix compilation with gcc7
-
-diff --git a/tests/test.cpp b/tests/test.cpp
-index 8a8a8117..d2ef9a05 100644
---- a/tests/test.cpp
-+++ b/tests/test.cpp
-@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg)
- 	jack_nframes_t delta_time = cur_time - last_time;
- 
- 	Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time);
--	if (delta_time > 0  && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) {
-+	if (delta_time > 0  && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) {
- 		printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance);
- 	}
- 
diff --git a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
deleted file mode 100644
index de3d58d89ad7..000000000000
--- a/media-sound/jack2/jack2-1.9.11_rc1-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit eutils python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-CDEPEND="media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=$(usex celt yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=no
-		--freebob=no
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-1.9.11_rc1.ebuild b/media-sound/jack2/jack2-1.9.11_rc1.ebuild
deleted file mode 100644
index fdf94f71e711..000000000000
--- a/media-sound/jack2/jack2-1.9.11_rc1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-inherit eutils python-single-r1 waf-utils multilib-minimal
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="http://jackaudio.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-	KEYWORDS=""
-else
-	MY_PV="${PV/_rc/-RC}"
-	MY_P="${PN}-${MY_PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/jackaudio/jack2/releases/download/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="2"
-IUSE="alsa celt dbus doc opus pam classic sndfile libsamplerate readline"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="media-libs/libsamplerate
-	media-libs/libsndfile
-	sys-libs/readline:0=
-	${PYTHON_DEPS}
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit:0"
-
-DOCS=( ChangeLog README README_NETJACK2 TODO )
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local mywafconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(usex dbus --dbus "")
-		$(usex classic --classic "")
-		--alsa=$(usex alsa yes no)
-		--celt=$(usex celt yes no)
-		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=no
-		--freebob=no
-		--iio=no
-		--opus=$(usex opus yes no)
-		--portaudio=no
-		--readline=$(multilib_native_usex readline yes no)
-		--samplerate=$(multilib_native_usex libsamplerate yes no)
-		--sndfile=$(multilib_native_usex sndfile yes no)
-		--winmme=no
-	)
-
-	waf-utils_src_configure ${mywafconfargs[@]}
-}
-
-multilib_src_compile() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_compile
-}
-
-multilib_src_install() {
-	WAF_BINARY="${BUILD_DIR}"/waf waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-}
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 5295a98e976e..7b9c9398cbcc 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.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=6
 
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="threads(+)"
@@ -13,7 +13,6 @@ HOMEPAGE="http://jackaudio.org/"
 if [[ "${PV}" = "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-	KEYWORDS=""
 else
 	MY_PV="${PV/_rc/-RC}"
 	MY_P="${PN}-${MY_PV}"
@@ -24,27 +23,26 @@ fi
 
 LICENSE="GPL-2"
 SLOT="2"
-IUSE="alsa celt dbus doc opus pam +classic sndfile libsamplerate readline"
+IUSE="alsa +classic dbus doc ieee1394 libsamplerate opus pam readline sndfile"
 
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	|| ( classic dbus )"
 
-CDEPEND="media-libs/libsamplerate
+COMMON_DEPEND="${PYTHON_DEPS}
+	media-libs/libsamplerate
 	media-libs/libsndfile
 	sys-libs/readline:0=
-	${PYTHON_DEPS}
 	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	celt? ( media-libs/celt:0[${MULTILIB_USEDEP}] )
 	dbus? (
 		dev-libs/expat[${MULTILIB_USEDEP}]
 		sys-apps/dbus[${MULTILIB_USEDEP}]
 	)
+	ieee1394? ( media-libs/libffado:=[${MULTILIB_USEDEP}] )
 	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
@@ -62,9 +60,9 @@ multilib_src_configure() {
 		$(usex dbus --dbus "")
 		$(usex classic --classic "")
 		--alsa=$(usex alsa yes no)
-		--celt=$(usex celt yes no)
+		--celt=no
 		--doxygen=$(multilib_native_usex doc yes no)
-		--firewire=no
+		--firewire=$(usex ieee1394 yes no)
 		--freebob=no
 		--iio=no
 		--opus=$(usex opus yes no)
diff --git a/media-sound/karlyriceditor/Manifest b/media-sound/karlyriceditor/Manifest
index 996d8795af5a..2e49be1f007a 100644
--- a/media-sound/karlyriceditor/Manifest
+++ b/media-sound/karlyriceditor/Manifest
@@ -1,3 +1,4 @@
+AUX karlyriceditor-2.2-ffmpeg-4.patch 1520 BLAKE2B 813447de8d3db0263583b0eded78f68bcae89d70917645ec92924ff08a56fdd53c6623167f1624a16292089d6293c2cb1b771a0becb7fdef8d105c37f5382dad SHA512 3a3e42a0fdb485513fe8a2c39b3ccf78d0510a6e5f77efc8e2e1e351b024505c8490e9ba43c624dc21562aa8b3841c66e13d5276c3c7342a4b306cfad9a8bf42
 DIST karlyriceditor-2.2.tar.gz 280119 BLAKE2B 1cfd3c681e7f8c52b0e67fdff96bf929ef86aa607615be832907b3d933628b8cfe2d94066acfe1739aa83c0dfc4884de7063180dc3e4acb54fb73eadfbbd2a66 SHA512 bce3aed1402c8fff3e04940527773d2855d3d67e47b159478c53e63eaadfbb70df3f4fbefb75490cc17b750455e1359963468ce14dd504f37219e1268a213103
-EBUILD karlyriceditor-2.2-r1.ebuild 805 BLAKE2B e340031752ca77551e9efc455b24694538007cba43027ff8df3f90352d5cd928ffee83de06d2da1f076d6816682d2bceb8d6d760bc83d8e9d25c44345228a623 SHA512 782dfdbaf6b698025d400cd72532e122fff71b3196fb85462a3709fa62b8a31f1ef62d9d3826debd32813e59307371ca977e99f2a218aef8d172f99db88200cf
+EBUILD karlyriceditor-2.2-r1.ebuild 854 BLAKE2B 00fe487d2f0429dceb2dbe160a6dad3a98c5da12e721be213e0f0407da3b281af839f23fc82fbc8cf9a4d9a7ce841c559040a8f1dfe02511fff721ad3d345431 SHA512 af959bb3d0cff2f7c4cdf81f070fdb9d283ad112a57b8eb7bc68a5f23a356995d1fb9c547fe18f44d3e3345c0d2c6d76029a95f6eba1af197b3150bd565eba58
 MISC metadata.xml 445 BLAKE2B 8461e838a66f087d47c9edb6953fda465f97a24828ef5e6f25efcb5dd0041f72f34563a0b21f6142e9ef99fb475af11db325c61c7bbe4b2c8d7b2b781631190d SHA512 8f31be93dceebe185179640ae877f83d1128f6193509d6979cecab95eb06db1ea9901be6e8334c2046c1e22c3a36c782807069665c15722c912833d4ed3cdff4
diff --git a/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch b/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
new file mode 100644
index 000000000000..b7ae9d6e90b4
--- /dev/null
+++ b/media-sound/karlyriceditor/files/karlyriceditor-2.2-ffmpeg-4.patch
@@ -0,0 +1,34 @@
+Description: Fix FTBFS with FFmpeg 4.0
+Author: James Cowgill <jcowgill@debian.org>
+Bug-Debian: https://bugs.debian.org/888377
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ffmpegvideoencoder.cpp
++++ b/src/ffmpegvideoencoder.cpp
+@@ -345,7 +345,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ 
+ 	// Enable interlacing if needed
+ 	if ( m_videoformat->flags & VIFO_INTERLACED )
+-		videoCodecCtx->flags |= CODEC_FLAG_INTERLACED_DCT;
++		videoCodecCtx->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
+ 
+ 	// Enable multithreaded encoding: breaks FLV!
+ 	//videoCodecCtx->thread_count = 4;
+@@ -373,7 +373,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ 
+ 	// If we have a global header for the format, no need to duplicate the codec info in each keyframe
+ 	if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
+-		videoCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++		videoCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ 	// Open the codec
+ 	if ( ( err = avcodec_open2( videoCodecCtx, videoCodec, 0 )) < 0 )
+@@ -463,7 +463,7 @@ av_log_set_level(AV_LOG_VERBOSE);
+ 			audioCodecCtx->time_base.den = m_profile->sampleRate;
+ 
+ 			if ( outputFormatCtx->oformat->flags & AVFMT_GLOBALHEADER )
+-				audioCodecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER;
++				audioCodecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+ 
+ 			// Since different audio codecs support different sample formats, look up which one is supported by this specific codec
+ 			if ( isAudioSampleFormatSupported( audioCodec->sample_fmts, AV_SAMPLE_FMT_FLTP ) )
diff --git a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
index 5c711653cc51..a0b4b5ff69a7 100644
--- a/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
+++ b/media-sound/karlyriceditor/karlyriceditor-2.2-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 DESCRIPTION="Application to edit and synchronize lyrics with karaoke songs in various formats"
-HOMEPAGE="http://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
+HOMEPAGE="https://www.ulduzsoft.com/linux/karaoke-lyrics-editor/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-ffmpeg-4.patch" )
+
 src_configure() {
 	eqmake5 "${PN}.pro"
 }
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index d016e87f4854..d29ce068780c 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,7 +1,3 @@
 DIST mpg123-1.25.10.tar.bz2 921219 BLAKE2B 04bfbe8915e3943ed42cc2d3597b0bd9c4686f77ee699f5845e7d1e905022206724cf23d6b0420a36e64b232f840dd9367f46f3c00dc2fe6256f44e8b83fa5b2 SHA512 a33666ae4aca7e7c1a93a6414d8c525ec19044c54f712d578180147d88e63033f7af2370b9ad22960cc3a0b454f15967b7a831cccc97e034c8855f70cdf1ab09
-DIST mpg123-1.25.6.tar.bz2 919169 BLAKE2B 7b330d67465f332f608fa7efbfbfe1bbe69f8912a5678f72c56080b2deb44407d66bac6af23fb8c1359373eb90966ba67901235555f1776a00dc27e66167b0a5 SHA512 0b129c38c19462f7fbe3f56ea2b856222f8a1a3ba76ef8109ca759c9a9c668432cc0ec76059f9a7a3c37228ce615e4c628c7de3b1663073302cc7c8fc93f249c
-DIST mpg123-1.25.8.tar.bz2 920677 BLAKE2B bbffa9fa36c40557abb6c70af942b63a43739462c86a22839363b36a39e1a2f16ce3f4e5462f9be9cea2addda1b46af6fdd58b24b5a0b31949efc604ef475c19 SHA512 f226317dddb07841a13753603fa13c0a867605a5a051626cb30d45cfba266d3d4296f5b8254f65b403bb5eef6addce1784ae8829b671a746854785cda1bad203
-EBUILD mpg123-1.25.10-r1.ebuild 2865 BLAKE2B ee34d7bd0083892e6a27a65ef687abaec79c178435bc32b989e7ba3008fe3206e65fb7fc26d54f0114b59d9ccd8d25ca8f4c5a9b8d34038b0c99ccec0e5e7afd SHA512 96cd43e88c9f7d93a424e1e441dba6f38c7f5a76a941d7bdf55c0ba99f7264f816b286c0f52be24aca6ff0493f4dd50a4e452ccfba2f25dde0fc16c27db12194
-EBUILD mpg123-1.25.6.ebuild 2897 BLAKE2B 2c75049f7218b4247dafd05ead9e494d7cefe8dcabac640c0bb96c249c16be6ef0661d98409d0dd4ef1c99342247fbf146bdbeae570dcf199e6cf93c800f1ad0 SHA512 f051bc85bfa74ae50005369cea98f76cd30d92e6345d02b219da0a147c9c5e8a18f88a0b52461d5d14a2ebce5b2f84bf12cbf79fc1d27bcc92aea7a67791c5d1
-EBUILD mpg123-1.25.8.ebuild 2906 BLAKE2B 6f668c24fff43f542baec764d6dcb4f26e2d03361cfc78c91c635ee48f665fc71ad0f00413827b15334b3381f4509d0159d456e36baa5b82bc1c0a6b57f7c47b SHA512 8afd4947959627b1d97285e49753bb44177d1353ee209de8e99e2afe6ed5eba88554bb70cd129a2069e509944cce17b2da4ca8f804f04a035072f1aef3a4cddd
+EBUILD mpg123-1.25.10-r1.ebuild 2864 BLAKE2B 9e8878423760d0bf5873fb18e8d5177474cda541c7e2337862882f1326b9029c1a2a6d075c5e7495a0d581ef0a74cdf9f3c8f95800805f74db237b08607f32c4 SHA512 60d871f0f66c50a56cf6c3973be347a9465e97918ad675163edbdd813b4d68592c40161dee73f63bf8544f13ba40b4368967e6eb675f01d48a121534ab883a70
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index 297083cc9dab..a2f355c63384 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
 
 # No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/mpg123/mpg123-1.25.6.ebuild b/media-sound/mpg123/mpg123-1.25.6.ebuild
deleted file mode 100644
index 39a7bcfda214..000000000000
--- a/media-sound/mpg123/mpg123-1.25.6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	elif use x86-macos ; then
-		# ASM doesn't work quite as expected with the Darwin linker
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=""
-	multilib_is_native_abi || myconf="${myconf} --disable-modules"
-
-	ECONF_SOURCE="${S}" econf \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		--enable-network \
-		$(use_enable ipv6) \
-		--enable-int-quality=$(usex int-quality) \
-		${myconf}
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/mpg123/mpg123-1.25.8.ebuild b/media-sound/mpg123/mpg123-1.25.8.ebuild
deleted file mode 100644
index 5cb30beae9dc..000000000000
--- a/media-sound/mpg123/mpg123-1.25.8.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs libtool multilib-minimal
-
-DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
-HOMEPAGE="https://www.mpg123.org/"
-SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
-
-# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
-RDEPEND="app-eselect/eselect-mpg123
-	dev-libs/libltdl:0
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-	nas? ( media-libs/nas )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
-
-pkg_setup() {
-	# Build fails without -D_GNU_SOURCE like this:
-	# error: ‘struct hostent’ has no member named ‘h_addr’
-	append-cflags -D_GNU_SOURCE
-}
-
-src_prepare() {
-	default
-	elibtoolize # for Darwin bundles
-}
-
-multilib_src_configure() {
-	local _audio=dummy
-	local _output=dummy
-	local _cpu=generic_fpu
-
-	if $(multilib_is_native_abi) ; then
-		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
-			if use ${flag}; then
-				_audio+=" ${flag/pulseaudio/pulse}"
-				_output=${flag/pulseaudio/pulse}
-			fi
-		done
-	fi
-
-	use altivec && _cpu=altivec
-
-	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
-		use cpu_flags_x86_sse && _cpu=x86-64
-	elif use x86 && gcc-specs-pie ; then
-		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
-		_cpu=generic_fpu
-	elif use x86-macos ; then
-		# ASM doesn't work quite as expected with the Darwin linker
-		_cpu=generic_fpu
-	else
-		use cpu_flags_x86_mmx && _cpu=mmx
-		use cpu_flags_x86_3dnow && _cpu=3dnow
-		use cpu_flags_x86_sse && _cpu=x86
-		use cpu_flags_x86_3dnowext && _cpu=x86
-	fi
-
-	local myconf=""
-	multilib_is_native_abi || myconf="${myconf} --disable-modules"
-
-	ECONF_SOURCE="${S}" econf \
-		--with-optimization=0 \
-		--with-audio="${_audio}" \
-		--with-default-audio=${_output} \
-		--with-cpu=${_cpu} \
-		--enable-network \
-		$(use_enable ipv6) \
-		--enable-int-quality=$(usex int-quality) \
-		${myconf}
-
-	if ! $(multilib_is_native_abi) ; then
-		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	mv "${ED}"/usr/bin/mpg123{,-mpg123}
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
-
-pkg_postinst() {
-	eselect mpg123 update ifunset
-}
-
-pkg_postrm() {
-	eselect mpg123 update ifunset
-}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index faa180a67201..0690df4abb6e 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,5 +1,3 @@
-DIST ncmpc-0.27.tar.xz 302636 BLAKE2B 95cedfdcd93d011aa21b773c3a91a20cf9c816dfa421e95802b6cc73e39d39e80bed7734764caf8e29102df6b734dcc0c64be6ef3060de8ac590dc1229b63fd4 SHA512 255b5529a5eae14d89d9419dfb06d91c50b68a9e05f2e124fc07035e2a4619c7b6801c08d52c639d934b50f939cf1dc58f3c5265805ce8eeeba211803108f663
-DIST ncmpc-0.30.tar.xz 245212 BLAKE2B 9e64188ec5d209a682f10587c033d1e958501ed84660bc8cc0a00ff3650a1509464e48431240eebe4a061dc154acbc7d6f552cb48b208107ecdc5c0e6807d9ee SHA512 bc92c51c78f7919eb6b5cebaac8bda1231701fd9011fcadd6da8bbc5cc16e5dbe30d33d6e2f7d4cc07399299bcd3de572c9516f90d0376212771fd2c3af8afc7
-EBUILD ncmpc-0.27.ebuild 1556 BLAKE2B feb8ae8cec6b8f2613453c7396b3f4986aad39aa2958365b9d87ee07aa2666704f8dc38636d370258260f4fba5a5c68145d490ba75616f81c57f3ec27672868e SHA512 eaca37338463b79c500b0d1fdeb89e10910764b457c18e1c8fc866308b0e56df81a8103a23346594c2e1a752193114ec7a48445cef86b1d2381c18cc95bb913a
-EBUILD ncmpc-0.30.ebuild 1791 BLAKE2B 0f018ecb992a4138c178f8ec1c59d2621098468e8bbe96eaea3b7760a6367e5d920ce3ef557819292f884060b4c012362645a5af0b3c3a9cf4bfab367a470e3c SHA512 95d536c33c0da807c42d5eeb488102926dc1200fd7cab6614ca3f8d71f4542a6072d6b70d102713f91d77fb6f2cc5139b6617e170be15b65d96c8b5547e8f0b2
-MISC metadata.xml 1040 BLAKE2B 465e51e6825b3d3f9c1f0538d42a98cb8f0ba90d71f2adfbfcf07474eed25514cb8e75f4b9aa3a38334fc33a8b00acfef302589b3dfcfc7d5f9828545fc0fb06 SHA512 d998c855bd6cb4b115a12bf9067836645fe60f4dab17b8612c7150f9f61958d49cfba61b7515f032b23839fda3a74d22fe21de11cc6440464b18e4aeb9ef03e7
+DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
+EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
+MISC metadata.xml 990 BLAKE2B e06b3b901b9a32b442c8400fa236230f5aa66c567bb971799521e9b1b1df3260e0c28d7769b3666b6caf495ed29c440ef3a83c2a32b4a0c3399a0f7ae5a2abc9 SHA512 ec9e7331521962746ed19da65e086d232fc32806aca80467a4d4eba8df9ac51d74f388b8a6608235263d2ed3831fb0084c9cad499d0aa33eb360872d71194629
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 204c72476004..240ddfa18ac8 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -9,7 +9,6 @@
 		<flag name="artist-screen">Enable artist screen</flag>
 		<flag name="async-connect">Enable asynchronous connect</flag>
 		<flag name="chat-screen">Enable the chat screen</flag>
-		<flag name="colors">Enable color support</flag>
 		<flag name="help-screen">Enable the help screen</flag>
 		<flag name="key-screen">Enable key editor screen</flag>
 		<flag name="lyrics-screen">Enable lyrics screen</flag>
diff --git a/media-sound/ncmpc/ncmpc-0.27.ebuild b/media-sound/ncmpc/ncmpc-0.27.ebuild
deleted file mode 100644
index 3f602e28d29a..000000000000
--- a/media-sound/ncmpc/ncmpc-0.27.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
-HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
-IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=media-libs/libmpdclient-2.9
-	sys-libs/ncurses:0=[unicode]
-	lirc? ( app-misc/lirc )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS NEWS README doc/config.sample doc/keys.sample )
-
-src_configure() {
-	# upstream lirc doesn't have pkg-config file wrt #250015
-	if use lirc; then
-		export LIBLIRCCLIENT_CFLAGS="-I/usr/include/lirc"
-		export LIBLIRCCLIENT_LIBS="-llirc_client"
-	fi
-
-	# use_with lyrics-screen is for multilib
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		--with-ncursesw \
-		$(use_enable artist-screen) \
-		$(use_enable chat-screen) \
-		$(use_enable colors) \
-		$(use_enable debug) \
-		$(use_enable help-screen) \
-		$(use_enable key-screen) \
-		$(use_enable lirc) \
-		$(use_enable lyrics-screen) \
-		$(use_enable mouse) \
-		$(use_enable nls locale) \
-		$(use_enable nls multibyte) \
-		$(use_enable nls) \
-		$(use_enable search-screen) \
-		$(use_enable song-screen) \
-		$(use_with lyrics-screen lyrics-plugin-dir /usr/$(get_libdir)/ncmpc/lyrics)
-}
diff --git a/media-sound/ncmpc/ncmpc-0.30.ebuild b/media-sound/ncmpc/ncmpc-0.31.ebuild
index 737d9ce04b02..6476c056f6db 100644
--- a/media-sound/ncmpc/ncmpc-0.30.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.31.ebuild
@@ -11,18 +11,24 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls tcp"
 
-RDEPEND="dev-libs/glib:2
-	 media-libs/libmpdclient
-	 sys-libs/ncurses:0=[unicode]
-	 lirc? ( app-misc/lirc )"
+RDEPEND="
+	dev-libs/glib:2
+	media-libs/libmpdclient
+	sys-libs/ncurses:0=[unicode]
+	lirc? ( app-misc/lirc )
+"
 
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx
-	       app-doc/doxygen )
-	virtual/pkgconfig"
+DEPEND="
+	${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/sphinx
+	)
+	virtual/pkgconfig
+"
 
 DOCS=( doc/. AUTHORS README.rst )
 
@@ -34,7 +40,7 @@ src_prepare() {
 src_configure() {
 	local emesonargs=(
 		-Dcurses=ncursesw
-		-Dcolors=ncursesw
+		-Dcolors=true
 		-Dmini=false
 		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
 		-Dartist_screen=$(usex artist-screen true false)
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 7b9e41b14599..0e908e045e4d 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -1,5 +1,3 @@
-AUX pnmixer-0.6_pre20111213-build.patch 1571 BLAKE2B a1133b3c0d916397c2d29eb9676189719bf837094b288785ee73596bdded44eb54fae399e65430ef2002057debe5737c97961c14f84c11b140162f87dbbdcd02 SHA512 c0ad5ab5e9e5b89d6f4b1af736381f4acfcaf259ed4b3291c8eeab8519825896233d074af1abda73e5bb6ecfa878bd5d36b115dd6bf3a77684ccc354d75a87ad
-AUX pnmixer-0.6_pre20111213-desktopfile.patch 328 BLAKE2B 283d3e2e791b0ef3de7a2ad4f0980c923dc48adda1839bed00ad1606dfed2adfbaa338636f4e76669761a51ad6f5418e25010eeeb94b27a2dca01aaaee2c49ff SHA512 ee9eee6503291e9bfeddbb5e5758aea496785e50722246fc9119bc69fd285e9145d63d9e61c4f01a52769f3142a12211d01c32a7c6a9edd31bc3a7e1fa044657
 DIST pnmixer-v0.7.2.tar.gz 237972 BLAKE2B 368d149d9e803b52c7b0edac9ba8996312da7122f10f536095cffcdf31d319159494fa3aab0005e6dedb4e7e0b46d58bc73dd89285c7bddca4750d29539fa489 SHA512 9f43a56d17f4c16465113d4355a546ba71ca4d208e384812cf84625a51bd9bb6fa0e93f3e40fd0a2d157c4ee2b27f64082a47bbd4135c168a95b3fcbeebf6186
 EBUILD pnmixer-0.7.2.ebuild 1010 BLAKE2B 38e73b4665b30b1401f44b5f8257b2b37dc6ba39c401e45f26558f5943718574efb90f470c26a3fdd550b3d5246bf1cc986829e0c94c4360b9c5ca33ce3259a8 SHA512 762319ccacd5e8e08921603bfa85cd147c2455cd53c8739be709bbad966f580d41ae307f353b04ac8d8b37b9f7c5ddb0bc9b4d69c976331afb539c157cc7e34d
 EBUILD pnmixer-9999.ebuild 819 BLAKE2B f11e945d77d82fd0d22b3c8f62f67bc563f7d5672528c71c1ad04d778d35cef8516a372e5586387afa1b5caca2ffe0c70a97af176b058d87a871df4da80c86c6 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
deleted file mode 100644
index 5e4fba2d0750..000000000000
--- a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-build.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Thu Nov 15 23:59:49 UTC 2012
-Subject: build system
-
-respect CFLAGS, use rdynamic
-don't use AM_CFLAGS in configure.in
-fix macros for automake-1.13
-
---- configure.in
-+++ configure.in
-@@ -1,16 +1,13 @@
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT(configure.in)
--AM_INIT_AUTOMAKE(pnmixer, 0.6-dev)
--AM_CONFIG_HEADER(config.h)
-+AC_INIT([pnmixer], [0.6-dev])
-+AM_INIT_AUTOMAKE
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
- 
--OLD_CFLAGS=$CFLAGS
- AC_ISC_POSIX
- AC_PROG_CC
--AM_PROG_CC_STDC
- AC_HEADER_STDC
--CFLAGS=$OLD_CXXFLAGS
- 
- pkg_modules="gtk+-2.0 >= 2.16.0"
- 
-@@ -37,12 +34,13 @@
- 
- if test x"$debugit" = x"yes"; then
-     AC_DEFINE([DEBUG],[],[Debug Mode])
--    AM_CFLAGS="$AM_CFLAGS -g -Wall -Werror -Wno-uninitialized -Wformat -Wformat-security -O0 -export-dynamic"
- else
-     AC_DEFINE([NDEBUG],[],[No-debug Mode])
--    AM_CFLAGS="$AM_CFLAGS -O2 -export-dynamic"
- fi
- 
-+CFLAGS="$CFLAGS -Wall -Wno-uninitialized -Wformat -Wformat-security"
-+LDFLAGS="-rdynamic $LDFLAGS"
-+
- ##########################################################################
- 
- # Make sure we have X11, and also have it added to LIBS
-@@ -74,7 +72,6 @@
-    AC_DEFINE([HAVE_LIBN],1,[Defined if you have libnotify])
- fi
- 
--AC_SUBST([AM_CFLAGS])
- 
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
---- src/Makefile.am
-+++ src/Makefile.am
-@@ -1,6 +1,5 @@
- ## Process this file with automake to produce Makefile.in
- 
--AM_CFLAGS = @AM_CFLAGS@
- 
- INCLUDES = \
- 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
diff --git a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch b/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
deleted file mode 100644
index 992e02936477..000000000000
--- a/media-sound/pnmixer/files/pnmixer-0.6_pre20111213-desktopfile.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Nov 16 00:03:56 UTC 2012
-Subject: desktop file
-
-	comply with fd.o spec
-
---- data/pnmixer.desktop
-+++ data/pnmixer.desktop
-@@ -12,4 +12,4 @@
- Icon=pnmixer
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;
-\ No newline at end of file
-+Categories=AudioVideo;
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 8dbea3412ce9..729471f4dae2 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.4.tar.gz 1019739 BLAKE2B fd10afa51aca2f277f533d3eed2b8759911a8fb35953d087025d58f27ef9f0c3e541c8dac373f5a65a0e545e5ec64d1029e0968119165bab42fa860740229cbf SHA512 33700d3dbd6d7fd31b52a951bcaf99bb9887198f2c9b8143c4e8d9369ea77c30442493f0141a960c2703b84df3fe5271b34adcf350295968002e6bb5759d99d3
+DIST pulseeffects-4.3.5.tar.gz 1021061 BLAKE2B ab93c79d803d8067a913015410b83f8748f05bd62a532a8c0b672b78c9f333c2c31992ba4be39d3e32392fd22f8da6a4b16801af60f279ca21db075a17c6af56 SHA512 7ee151b17535687af896c337d080a6daf92068d8d023b49459b5fbe21db819c638ab7deba04f89e5992147c56d08df56873dff96de2885f7ec80315173467cd9
 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.4.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
+EBUILD pulseeffects-4.3.5.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
 EBUILD pulseeffects-9999.ebuild 1687 BLAKE2B 5d583fb97fd461eda2195f727af6446377db0fe51756aca577a3f242598959ba1008978bea0297fdda495e1ee47bcb8e464c905db912b673653638062962d851 SHA512 110ce51d9552c26580ec55fad83ae762af77053e118c104e76e04d8a7de37da99bf09709386ae06bc38cec61c3430bbfc2f087a4110acb895a3d1a6f5188602e
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.3.4.ebuild b/media-sound/pulseeffects/pulseeffects-4.3.5.ebuild
index 33a78d46639a..33a78d46639a 100644
--- a/media-sound/pulseeffects/pulseeffects-4.3.4.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.3.5.ebuild
diff --git a/media-sound/quodlibet/Manifest b/media-sound/quodlibet/Manifest
index a9833f000c04..10489e991864 100644
--- a/media-sound/quodlibet/Manifest
+++ b/media-sound/quodlibet/Manifest
@@ -2,6 +2,6 @@ DIST quodlibet-3.8.1.tar.gz 3697363 BLAKE2B 67c56281a998d93b2ea457656473ab7fc45a
 DIST quodlibet-3.9.1.tar.gz 3850929 BLAKE2B c4317521259f1d46e927276ee8bd927afd72708f7b6e260a68e2cfe6e949f44e08df5884f3613804955b18b7284f0140f9d2d409833bd0a139732728903ae978 SHA512 6d6b6380de2fc2d3ab1614b304f2d7219ff1d823e03f532baa0e9b1308fd36094ad745433494253d956182ae9914eb62846df3d3e5fea92dddccdaa725178563
 DIST quodlibet-4.1.0.tar.gz 4882607 BLAKE2B 1e0c519eb3f1d377dc7fc0ee2a08faa51632eabd1f21638e38aaf5edc4faa6707274edfe314910b32895e59a5cdd27434914afb1c33aa2914788e644db2d2aaf SHA512 987001b6335e18ce18d25b71be327261c3fe5e0a142395ce061d7460e9ade2543a3372a64560b804be3e4d70889017612e9bc1a72215d45b215caf4da545e9ae
 EBUILD quodlibet-3.8.1-r1.ebuild 1717 BLAKE2B 1d5a8105c82a70394a4602244c3d7734352c02c9ff4e4b32f0802d93a5f4f1bc355397b61f48c2e5ce0b79ddaa9145d39bef54f0f6698ad5b92805affb38d7b8 SHA512 784706ebf88f4a18e869ed4bb6a89ed78c2a5c9fef8b96d4c8358e11d122afcbf831b1028c2d47450b1cf89e0c6c379164cace47f6314045eb3ac9f600be7828
-EBUILD quodlibet-3.9.1.ebuild 1761 BLAKE2B 9401568378a19461ac48fed948543c3adb820727023b9615f9ebd886499c9d2365c8fb3f4d5f140809f901cf27c0274942212c40d5603fc72ce5f315beca93b8 SHA512 ee39e47465a2fc58d608226ab9185b61e6d5e620a2c70afeb02cb5a18fbb46699d0e91deac731d3608a8ff827660203b82e7361c44e6eb142a19f9dcb3932479
+EBUILD quodlibet-3.9.1.ebuild 1760 BLAKE2B 441b5af4ce9f397b30bc58bed0416c85417b28c55123d1d93c9ecd502e4ebdb0782d5a3eb8eb62c3861d768481e8103fdf0395cf310d0e801044321a20d7746b SHA512 76648bb9945ec27282302ed8e35cb9dcfde7fa0e98860f88ef66b112f6537499296f835c11e9890de642f00de884263af15edad2396feba5d02602cbdd7ace8c
 EBUILD quodlibet-4.1.0.ebuild 1611 BLAKE2B d1a37f206b0bc5014bdf3da1e361006c03916ad9fc6763a330651a4c44eebf45ad1dd0b406b92f4638f019e6f60293dec1440f63b8afe573c48e90100cbef8f3 SHA512 1caf57d3f99aae71e015db3ed126265e08b9a5a19bc4adbf86028a7e27cfe9c64a1fd3c4db18ec1f40258e2b405cb68f3e049aeae858ea95a908bc8797697644
 MISC metadata.xml 1136 BLAKE2B 372295e43337120cabfa3a28f260fa3feff8cce235240be1c65fc0a54922b294cc94124690fdb923d82f78c5866e82bc7becfad334c8e1ca3797b6602a9d0d80 SHA512 1466590147ca42dda2b5c11fe781a39e6d25d205b69fdba20663f1d1bfc2e251123c99990810727a36fbbd7a0c868bf1ddc51e94a38985719cef1bea71f07feb
diff --git a/media-sound/quodlibet/quodlibet-3.9.1.ebuild b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
index 8539b1bc2f48..d8f5bf17d4bc 100644
--- a/media-sound/quodlibet/quodlibet-3.9.1.ebuild
+++ b/media-sound/quodlibet/quodlibet-3.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+dbus gstreamer ipod +udev"
 
 RDEPEND="dev-libs/keybinder:3[introspection]
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index f1e1c49d765e..518e47661fce 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -4,7 +4,7 @@ AUX ts3db_mariadb.ini.sample 99 BLAKE2B 8b81805ac580ea892d4b05fc55787b850202545b
 AUX ts3server-bin 323 BLAKE2B ab3fb5522ffef33d4517d76f01c91091cb1322e1433ac158c2aaaf18c56f44a74875e3ae82e7c39209207291a668104bc4d08d54dbff7042e4faebc0e54104cf SHA512 578bee3c35fc6bc5a06ceebbab1aaeab6201fdb32a13e9c2473dffd78282690f57b1bc277a973006fb573cf9f1a11c0643c0479ff1a9e1318c015437086c6c42
 AUX ts3server.ini-r1 723 BLAKE2B 3c5f77686b602ec052477c32e2b38ecc6812760b487ce4e6cd7616bd8aa57ef3aa186374805a1f5a073e755429a98bdb677ba400c7db3b833edc1e2e3db3a729 SHA512 cf1eb76d4fe7a8305b758439925be56ea4f34254ee3c66e796a3ba7cec38dd40009f455672429906c31631f4877fc70d6fde16a904239da2fa62d121b43d0481
 AUX ts3server_mariadb.ini.sample-r1 764 BLAKE2B 3d8b9e88194b54cddb945860c77d497fe8e4bd537a39a101d2658a44b72568a671e301bbb1888099907cbc36c2aba42b89a2215f19ffa8e0acfd3f417a08ba8d SHA512 861f0074e4521947fa44e2decfff172bb14f9b905c37dfc37afedcd5f42d864de7712aa0a6ff7eb17b8f885098abb720b29b16c658955c3c8aab73e451def6a8
-DIST teamspeak3-server_linux_amd64-3.3.1.tar.bz2 8415114 BLAKE2B 22908295d78677ecd09778c85b3e8dae6acd2170732759760884b76bb3614c4af8553910b9c62800bf5ab9cd32423acfe3c9bb476b7b6d7450330626f9f8ad8e SHA512 4335ed9a3ba11a8b26385f5c0b73c01da8c7374b3c0fa24bdeefc66bc297dd241e012ab30e9d0185c44a6c575a38d6c131dfdd8819147dd34f7e79d940ec49cb
-DIST teamspeak3-server_linux_x86-3.3.1.tar.bz2 8289228 BLAKE2B 3bdc1fcc29b9650ab6b1eda9d7cb9c201993fed0d194bf75071562d4f553b21098a31d1081113da7b8269056af4bcc3761acff17cf133c9fce874f63c2f4ec75 SHA512 734abdc9e0f3b6bda4fe5c71da51167745d2bdf56890a93c3b4d6d944231e9a561735224d4541f2b70584810aeca8f73f97334d26949fcd1000a708664c44eeb
-EBUILD teamspeak-server-3.3.1.ebuild 3064 BLAKE2B 2dca7f778d55d2b29086f0defebbc23384e268e00ff4533ce63251d796013caa89b7d1308d84ba161757e53e13bd0781466c6c60fef2d90c5d94a727bad40630 SHA512 14b1c9e78433aa77f61f2f67e54ba3dcdcc001d1cd9ee7cd1f8b717cf9678cd9d4b777baf16b1bc34f1bae8fde60db049200de7d130505a0563252f362c26edd
+DIST teamspeak3-server_linux_amd64-3.4.0.tar.bz2 8426025 BLAKE2B 767df96757581dd1c5139e6831c89dbb1f0a76232c5b286b88406fb2a19614c9ae29251030c00f534742c8aba0510a45f2b44e453a05a6558e82a1ac8dcd718b SHA512 568646ae4a2a3b3c8cfdc91580a073ed62985f1b6510533b0e8c8627ea4dc8cf3ff8717a1cc8323fc60dd5c399c972da505c3c84300262538a5f3e945087d832
+DIST teamspeak3-server_linux_x86-3.4.0.tar.bz2 8299226 BLAKE2B fc9149171d3463cf443f35e5fff672c4c6a3260378efb497e2fa424dcc685bd1f33907f63f0d08b755cff8151ac672b58db33fb7a0bfa74ba723615d969aeb0d SHA512 76420b495b61287e9174fa1edc8d85043ac7d79665ca457b4b377fdcb2b9231fac1f10d7cdde39df252b0e3dddba998b6191c999b402cb37192fd6307d494ed1
+EBUILD teamspeak-server-3.4.0.ebuild 3064 BLAKE2B 2dca7f778d55d2b29086f0defebbc23384e268e00ff4533ce63251d796013caa89b7d1308d84ba161757e53e13bd0781466c6c60fef2d90c5d94a727bad40630 SHA512 14b1c9e78433aa77f61f2f67e54ba3dcdcc001d1cd9ee7cd1f8b717cf9678cd9d4b777baf16b1bc34f1bae8fde60db049200de7d130505a0563252f362c26edd
 MISC metadata.xml 822 BLAKE2B ac5c32d28c089f00c7ac508d60d90fff40313dcb4758145401d4ebc76dd53f449834373475e7437c37b8892be6d121be5c2ff1b20cbbdde9c110cab4e1a1f760 SHA512 7265c0f252a1b7e1e4e2901773b81fc7e96d0b6da39475f1e7c65a37c75188f86ce3da13b39a1cf8be46b9ad80945fc3a5755135d6bb2c63829d13a0d3c1dc10
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.4.0.ebuild
index e8110a9eba1a..e8110a9eba1a 100644
--- a/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
+++ b/media-sound/teamspeak-server/teamspeak-server-3.4.0.ebuild
diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest
index 5e21d85e7087..50ef706255be 100644
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -15,6 +15,5 @@ AUX timidity.desktop.2 257 BLAKE2B 6c7f88a3ccd9fc4ea90cd228e6d04d799430a78361d6d
 AUX timidity.service 190 BLAKE2B 909311fae666b9970a8b4d56e1848f907ffeff1fc9e0cacc7a89027ec1ce6a555ea01570328d75425b006752d6332cf278642ec9a7c27b9c9adb2cb7621e241e SHA512 1022c1e37e2a97fba414673860ec89bc146da208981dd50d9486c525b47c74ae146acef2d75ceec26335c3ab98b2c928ce480a161637990ecd737507a6c21b49
 AUX timidity.xpm 1522 BLAKE2B 9aee528dbf843d992d548adc923f817373013760128ae96df7becb6bc844a95ddc056b072dbaea1528d9db5c2d4836b09f8316b740c75033fc23a0bb76186fab SHA512 1630fc235e450e5420c598357ad98eed6f04b1d1035fd6284dfeb2e633ce5d80135f89ea593d58b4eac2b9405383787e4d891b9c22ff8b5ac3ece64e9abe7d4e
 DIST TiMidity++-2.14.0.tar.xz 1356476 BLAKE2B 8d4a360d1c16b250f3bef7c010e1e263fdda13446437ff2454dc2c2a717246c4d27836a3b40586b12b33e175bc54ee211a3a1798005733461cf5833eda11811a SHA512 d8fc06fa36e4dd42de80c61943da4cd9aec5f8aaf31057a9ededa633d2d48e64c4e53391378d82a7a46ffe4f96c756b010ea9727270f80b134ae1f8bad535bd3
-EBUILD timidity++-2.14.0-r2.ebuild 5120 BLAKE2B ea61c55377c185c5b8f5ef21f65805903ab81a816932fe356d438bc91e06768ba93a2e0742079322aaef32870350999f1a8dac5898626e07b3c09cc00c4fdfd3 SHA512 331162f1be948e0ad0f8c3d05ace64d654991225cbb654957519b932ed4687a79234381bcdcf6ecd0cad9add9c3575b3d019d10f8725e76ffee8c2992a7ecf16
 EBUILD timidity++-2.14.0-r3.ebuild 5317 BLAKE2B b708c93a6b944ca3e6f248dbfb454e962b272891787d81dc375d27b3a3b0db99193bec1639c738496e47d55200c7eec97f4ac1fa618fef768906334bdeae1830 SHA512 45bcefe69f07d111af5a37c96b3a36cc3fe7ff175823a4db49973b540a18f14d2f93a71f5251bc36ec4367d810869c698fcc7d54261d293e14427bb760aa11d0
 MISC metadata.xml 331 BLAKE2B 0e52df0230422381a5982f075e39f00e982f9948a3d3309d183bbac93569d908fe3603082f11943fc35e3b8bd1c76bc131e7525c91e3aac5b7d9461093686f71 SHA512 b4559e92a59ba70b25863304bbdc59225c6ccbf3ee9ab8516db6987a19e8b5b7b6ea95f40c9ff55ed33c194ab174360d5f8fd6bfafa43290bb97a3a2093289e3
diff --git a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
deleted file mode 100644
index 355ec9f0d006..000000000000
--- a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils elisp-common user systemd toolchain-funcs
-
-MY_PV=${PV/_/-}
-MY_P=TiMidity++-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
-HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
-	emacs? ( virtual/emacs )
-	gtk? ( x11-libs/gtk+:2 )
-	tk? ( >=dev-lang/tk-8.5.13 )
-	nas? ( >=media-libs/nas-1.4 )
-	alsa? ( media-libs/alsa-lib )
-	slang? ( sys-libs/slang )
-	jack? ( virtual/jack )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )
-	speex? ( media-libs/speex )
-	ao? ( >=media-libs/libao-0.8.5 )
-	motif? ( >=x11-libs/motif-2.3:0 )
-	X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )"
-RDEPEND="${DEPEND}
-	alsa? ( media-sound/alsa-utils )
-	app-eselect/eselect-timidity
-	selinux? ( sec-policy/selinux-timidity )"
-
-PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	enewgroup audio 18 # Just make sure it exists
-	enewuser timidity -1 -1 /var/lib/timidity audio
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-params.patch \
-		"${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch \
-		"${FILESDIR}"/${P}-tcltk86.patch \
-		"${FILESDIR}"/${P}-ar.patch \
-		"${FILESDIR}"/${P}-configure-flags.patch \
-		"${FILESDIR}"/${P}-pkg-config.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export EXTRACFLAGS="${CFLAGS}" #385817
-
-	local myconf=()
-	local audios
-
-	use flac && audios+=",flac"
-	use speex && audios+=",speex"
-	use vorbis && audios+=",vorbis"
-	use oss && audios+=",oss"
-	use jack && audios+=",jack"
-	use ao && audios+=",ao"
-
-	if use nas; then
-		audios+=",nas"
-		myconf+=( --with-nas-library="/usr/$(get_libdir)/libaudio.so" --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by nas."
-	fi
-
-	if use alsa; then
-		audios+=",alsa"
-		myconf+=( --with-default-output=alsa --enable-alsaseq )
-	fi
-
-	# We disable motif by default and then only enable it if it's requested.
-	if use motif; then
-		myconf+=( --enable-motif --with-x )
-		use X || ewarn "Basic X11 support will be enabled because required by motif."
-	fi
-
-	econf \
-		--localstatedir=/var/state/timidity++ \
-		--with-module-dir="${EPREFIX}/usr/share/timidity" \
-		--with-lispdir="${SITELISP}/${PN}" \
-		--with-elf \
-		--enable-audio=${audios} \
-		--enable-server \
-		--enable-network \
-		--enable-dynamic \
-		--enable-vt100 \
-		--enable-spline=cubic \
-		$(use_enable emacs) \
-		$(use_enable slang) \
-		$(use_enable ncurses) \
-		$(use_with X x) \
-		$(use_enable X spectrogram) \
-		$(use_enable X wrd) \
-		$(use_enable X xskin) \
-		$(use_enable X xaw) \
-		$(use_enable gtk) \
-		$(use_enable tk tcltk) \
-		--disable-motif \
-		"${myconf[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog*
-	dodoc NEWS README* "${FILESDIR}"/timidity.cfg-r1
-
-	# these are only for the ALSA sequencer mode
-	if use alsa; then
-		newconfd "${FILESDIR}"/conf.d.timidity.2 timidity
-		newinitd "${FILESDIR}"/init.d.timidity.4 timidity
-
-		systemd_dounit "${FILESDIR}"/timidity.service
-	fi
-
-	insinto /etc
-	newins "${FILESDIR}"/timidity.cfg-r1 timidity.cfg
-
-	dodir /usr/share/timidity
-	dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	diropts -o timidity -g nobody -m 0700
-	keepdir /var/lib/timidity
-
-	doicon "${FILESDIR}"/timidity.xpm
-	newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop
-
-	# Order of preference: gtk, X (Xaw), ncurses, slang
-	# Do not create menu item for terminal ones
-	local interface="-id"
-	local terminal="true"
-	local nodisplay="true"
-	if use gtk || use X; then
-		interface="-ia"
-		terminal="false"
-		nodisplay="false"
-		use gtk && interface="-ig"
-	elif use ncurses || use slang; then
-		local interface="-is"
-		use ncurses && interface="-in"
-	fi
-	sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \
-		-e "s/Terminal=.*/Terminal=${terminal}/" \
-		-e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \
-		-i "${D}"/usr/share/applications/timidity.desktop || die
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	elog "A timidity config file has been installed in /etc/timidity.cfg."
-	elog "Do not edit this file as it will interfere with the eselect timidity tool."
-	elog "The tool 'eselect timidity' can be used to switch between installed patchsets."
-
-	if use alsa; then
-		elog "An init script for the alsa timidity sequencer has been installed."
-		elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity"
-		elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'"
-	fi
-
-	if use sparc; then
-		elog "Only saving to wave file and ALSA soundback has been tested working."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/media-sound/wavpack/Manifest b/media-sound/wavpack/Manifest
index f62ac9ab9f70..048df569a4c1 100644
--- a/media-sound/wavpack/Manifest
+++ b/media-sound/wavpack/Manifest
@@ -6,6 +6,5 @@ AUX wavpack-5.1.0-CVE-2018-7254.patch 3004 BLAKE2B 2c744a5675a8b8c3f6b8e956ff3b6
 AUX wavpack-5.1.0-armv7.patch 805 BLAKE2B dc69a643e3dde75cce1d5a23176cb09fecc513a98835242437659b0724de8ba2cb97a59fb1cb3dc050454ff95bc2669e6b19f10fd03fadaf06e4c859c063277c SHA512 b152f8081b712c24ae8db641f4755798ab4c7412a298054449883255fa76571ffbd0c580848a274ce1c44401f69102a0b2c66137ae36d9323e9e5330ee20856e
 AUX wavpack-5.1.0-memleaks.patch 800 BLAKE2B 601e81daad4208d109bd980cbe63ce0c638577d53fe01fa133469090faed7f641d00efd44f906732905599615513b0dddf918dc9ce13f927b3e889a1dbd0d13d SHA512 ac5f8473314939c1b07019617f8881e4675bab2d4a0f61dd95c5389ec9915a8573f3291a5c29547e8e5a300483600d36f3c53f9ee7380c5f0691860cef6a3594
 DIST wavpack-5.1.0.tar.bz2 824331 BLAKE2B 736dcb3cc0bee4ebcf76b8a7df178aa1b797ec6858358bf289a3e151f62d2ce8f430d163d46a84c0b5a7501c732ac639955c867e53fd9217ca7f213b601a8697 SHA512 4c31616ae63c3a875afa20f26ce935f7a8f9921e2892b4b8388eca3ccd83b2d686f43eed8b9ec1dead934a1148401b9dced3b05f509b7942c48d7af31cf80a54
-EBUILD wavpack-5.1.0-r1.ebuild 993 BLAKE2B 19b75f5335d4569338c0ebee2538f9114d79e7765edc47e27de205625a37f8e994646247586726c29bda5a75ee306a9bfcd26092b1cda2dc7c67d9f22e30e892 SHA512 0c2f6a66213b9e28a0525e64e52db348dede2c26a4a6a1d43c782ccec7ad4d734397971faa6ebbcadd440a9b62311acde6b7f433f07734896b40891206a2e13a
-EBUILD wavpack-5.1.0.ebuild 752 BLAKE2B a519797a235fbc6d8d0f99accc418475058fb08491cac1018efc50acf347d707bf270c7cbc11c34ebdf4ae19e7d2584bf08c857152c5b47d6600e170c2d16b9c SHA512 033c8ab3e49644faf65709af4048a5d673c33c00f5df6c1128a08358d93808fa0ad1e88ae73ea0262f838e56223b8232e3bee41759ba1837fbc0ad376da79a32
+EBUILD wavpack-5.1.0-r1.ebuild 992 BLAKE2B c6988e13c7a91624ba16275d14c4b82372e2785df3f1dc2b62e9110391169e3e66228a48104db0811398f3765ed676c579eaf2f97678b1f0bd208d787ef75c1b SHA512 cdfdc9df7b8cc54cbca444a170283afe1c15379df8de4855ea4b3bbada34df94e08dc0a0be3b366091317efb7f9b7a585f07e14b210f6d38d0f6b03d713f6300
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
index 6450108f7794..744cf57100ea 100644
--- a/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
+++ b/media-sound/wavpack/wavpack-5.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=virtual/libiconv-0-r1"
diff --git a/media-sound/wavpack/wavpack-5.1.0.ebuild b/media-sound/wavpack/wavpack-5.1.0.ebuild
deleted file mode 100644
index acc5b7de9845..000000000000
--- a/media-sound/wavpack/wavpack-5.1.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-multilib
-
-DESCRIPTION="Hybrid lossless audio compression tools"
-HOMEPAGE="http://www.wavpack.com/"
-SRC_URI="http://www.wavpack.com/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=virtual/libiconv-0-r1"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-PATCHES=( "${FILESDIR}/${P}-armv7.patch" )
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_native_enable apps)
-	)
-	autotools-utils_src_configure
-}
diff --git a/media-sound/wildmidi/Manifest b/media-sound/wildmidi/Manifest
index 4d96290fbfc1..ff5fcc5e291c 100644
--- a/media-sound/wildmidi/Manifest
+++ b/media-sound/wildmidi/Manifest
@@ -5,7 +5,7 @@ DIST wildmidi-0.3.6.tar.gz 105534 BLAKE2B 4c2a62ec61333c3d9dc7f26e981389f22c6b2b
 DIST wildmidi-0.3.7.tar.gz 121501 BLAKE2B bae856c00449564f9199f977a4881d51c19769da10bf554a8baf681454a50b67b70feeda19592be91beda65131d4f241e661524f9c65163fb95a8570fee7f779 SHA512 b4d40404891161cb55a71dd790e2dbd2c4ec21730c8aaa6f3a68eeacd36d939f859b55ab535bee2feb9ffed04337332ef1eedcffbff6ae02d7499fec97f7a42b
 DIST wildmidi-0.3.8.tar.gz 121690 BLAKE2B fd11315e930a30f89ca57af0819116f8385fa1a7ecaedf7df1decc39774fa0a98df6b12e47bc8254a6c856bf41083571effa3aa70a448c1fdbcc0bbc7e848178 SHA512 883c5b2db84bee85f14a98729496aa9e15f5c1414dbaed6108d07e649b34937cbd3e8a8823a2b6519fcc7fdd354219c0667615c7b31e8952e13f8635e5284f50
 EBUILD wildmidi-0.2.3.5.ebuild 1108 BLAKE2B f1e1c9d2b7f38959cb423ffafd5ca17c6d979fc73e5ef810112aca00dd23a547dbd7e354bb1a86207dea79a42074475e705386b5fa3badf38f2190bcbe063487 SHA512 3937c9b2f532cd09dfcd656b516d396ec0acaeed010ca09ecf8f3609f71b67591e6aae5b009b8810d2f5684040e64de2ca0000b1404666b844dff78888eebb53
-EBUILD wildmidi-0.3.13.ebuild 1854 BLAKE2B a38851de7af3f8dded960ffb79f3ad3a4c611ae4b46c5916b1125a20531f5cd268e07f8266205c15e82b80a14870e437e57d5fee88f1630d1e0cb9ffa9d44e21 SHA512 b2598534bd32924a3ac3281b78e3a4be9261919b238c9e664dcb631d62019b9414a7f55235e1df8d3c1e1a6d7a757203fe58e1ce66036b45ebc852863cb670ce
+EBUILD wildmidi-0.3.13.ebuild 1853 BLAKE2B a0d488da7321843e051c5c0512efced597420298e86a89bf8e35bf425921e834135ea13f6d7b30d67897a594eb7dfc418bb9d9881f2ff1ddbd247963c8964abc SHA512 357412f782b044b36024adf9a4b77bc1bda16317ccb18746b75c53991d57519450c929baf19a04bba546c97cdb2cc7557c2e34400cc940bba2ec4304487efcd0
 EBUILD wildmidi-0.3.6.ebuild 1870 BLAKE2B a024316067bde1b90b6397c9127238198cccda88dd958fe9063257030dd58d00ad1ae5c6a11dc4cec0d4c7134be7df3fd878efe8f043213f84a574f0fd61ae32 SHA512 a15e48e3141a238c4237b7c080234f24b27dbadbc22b26cdb957939a94dd257f0bc21c6f98030881b3d6a477050c2a77b12c57dfe1a1ff6b0be5944be82c2738
 EBUILD wildmidi-0.3.7.ebuild 1843 BLAKE2B e3637544044e1b73f9c597cdc3a759d3c6e206f8523f7703cb465707446543c728b58dae5910c0049a9216e62701a6feae5cc56044fb98d2d53354d43781479d SHA512 d16c4718fdfeaf13ab6893a8617a9cae136ed2e2639b5649f038b65a588ca0f25b6e1ef247a4572e3cc96130a2eb82c4133956adb425c7266c986136b76f8092
 EBUILD wildmidi-0.3.8.ebuild 1870 BLAKE2B 1930d55817f98a070c49732ac393829e9a6fe628bd7e458d67fba4c04be42318186c9be8b6a034a97a4b1e3b93ec66721a4db0da712f2de4b64801c6a9065adb SHA512 85d8692fc01977a7358a11d88ad05bda7ef90bb378d49d17020599eb5e542d36f5d72b68c7b13f6b1d6c6266fa166d894b2813d3328f6027becd2364f3df6a5a
diff --git a/media-sound/wildmidi/wildmidi-0.3.13.ebuild b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
index 306ba26b72c8..dfe904340d1f 100644
--- a/media-sound/wildmidi/wildmidi-0.3.13.ebuild
+++ b/media-sound/wildmidi/wildmidi-0.3.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Mindwerks/${PN}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"
 IUSE="+alsa openal oss +player"
 
 DEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
commit	265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree	ab18b5617d138f6684566b619405090989d55a2c /media-sound
parent	586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)