gentoo resync : 04.05.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-05-04 12:02:00 +0100
commit: eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree: ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /media-sound
parent: b7ebc951da8800f711142f69d9d958bde67a112d (diff)
82 files changed, 644 insertions, 1380 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 9a225e3107fe..e8b496b833f4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index 3106e59a70bc..c13b567b73f3 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,6 +1,3 @@
-AUX abcde-2.5.4-eyeD3-0.7-api.patch 622 BLAKE2B 2ea52354945fa8d503b06785b0a6a1c9b8f982cf4fe962c7f155b43e87d9ef1ccc129a1bab0ea628f3616972790194519e8929cc9ac9280d2669b30f6df707a2 SHA512 6d9ac83d900f7c3b020903ed90568c5d0c5758664d899b8f778ca69a8ef0eb21d4d60795aa682fd031a0a27b95c2f0b1a7e635ef40e59f9c5f1f05d21f4bacdc
-DIST abcde-2.5.4.tar.gz 104229 BLAKE2B 38244005df80868e24a21d39f3d4cabd6d8b8d6e4d8384a37c01a40cc550b584a3fc4ee1dcd88ae05980cf4a9368a51d2035e49717faa8086b922f2815f735a6 SHA512 be3c8f697873b65888a37ea6209e161a6fc7bbe26c6e139b211b1fbcb233d3e250b21f6fad2114962ca4dcce79240e2cec51f69ce47549c737071a6122694791
 DIST abcde-2.8.1.tar.gz 149238 BLAKE2B 0adb1ea164e72292ee1e5b7e99c6bd9a92342f9eb5036280b91ad43ab62e5b0ef79652d094a81f38f4052c749d874e12da76eaf74134d07517fc8fac1f0d7e64 SHA512 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
-EBUILD abcde-2.5.4-r1.ebuild 1556 BLAKE2B 1b05caec47b0dd5b10d530641d5fd7963b1746524b6a660bba397e8bbc94cb0468f2a04a7f72f75870c08561626091a32cae871e3832bc16d00e32715a3a084d SHA512 cfae3e23754c1b6a8170d8f4046a4c436ae7247f19e9af3c4397229bc5677f55d935bed731ece8f316edf91f7887e6bf39194d4f094f3810ad9306c7a189e030
-EBUILD abcde-2.8.1.ebuild 1750 BLAKE2B 4a38d572e6c9bcc40b505c77e23914a1e84379871df34efa7151d25692d82eae2331e6001c30d9d2987595bb216d5e894dc9ad740214e44053c514556307d3ac SHA512 70a2f5379c8f1ea3aee668dc8b1e2981745868230972391928428051b5f60e1d8baeebd81bf8a244f543e47dd257b811077abed15330bb31854af9790bec4d69
+EBUILD abcde-2.8.1.ebuild 1749 BLAKE2B 667eab5834dfb542bba2d825152de1bd4b4a30a6464cf868cef5ad20c5bbbbe97a4fc5678d7029ca6e435bb3d5716c7e8e31860f9002bf753c29e14485a37f60 SHA512 74bd3b26110ffb38a45aee0a4f2ff720ae841bba1bc59deb35e39676acb279de5554895dc4a32b05abcb50d9387b43a90ed771f514caff01770a0d6055c04c60
 MISC metadata.xml 588 BLAKE2B d6639ce0154b4d8b2ad0c7df4d203c7da5650687e24c79ec92977a8e7534539ac62f597b31a3488f976d8f1f11a07f4a77c9b936c56b09ad8e965076e89aa1e8 SHA512 375d7d28e8fb20a86cc92df73927b27e065a975c850aa23575f0f1ea7cc88b46e8eb92013a8b1ff44d5cc150c0082da8142fa41bec49d642c14844ef1a5b1cb1
diff --git a/media-sound/abcde/abcde-2.5.4-r1.ebuild b/media-sound/abcde/abcde-2.5.4-r1.ebuild
deleted file mode 100644
index 1a0fc6bf0134..000000000000
--- a/media-sound/abcde/abcde-2.5.4-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A command line CD encoder"
-HOMEPAGE="https://code.google.com/p/abcde/"
-SRC_URI="https://abcde.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-# Enable MP3 related flags by default
-IUSE="aac cdparanoia cdr flac +id3tag +lame musicbrainz normalize replaygain speex vorbis"
-
-# See `grep :: abcde-musicbrainz-tool` output for USE musicbrainz dependencies
-RDEPEND="media-sound/cd-discid
-	net-misc/wget
-	virtual/eject
-	aac? (
-		media-libs/faac
-		|| ( media-video/atomicparsley media-video/atomicparsley-wez )
-		)
-	cdparanoia? (
-		|| ( dev-libs/libcdio-paranoia media-sound/cdparanoia )
-		)
-	cdr? ( virtual/cdrtools )
-	flac? ( media-libs/flac )
-	id3tag? (
-		dev-python/eyeD3:0.7
-		>=media-sound/id3-0.12
-		media-sound/id3v2
-		)
-	lame? ( media-sound/lame )
-	musicbrainz? (
-		dev-perl/MusicBrainz-DiscID
-		dev-perl/WebService-MusicBrainz
-		virtual/perl-Digest-SHA
-		virtual/perl-Getopt-Long
-		)
-	normalize? ( >=media-sound/normalize-0.7.4 )
-	replaygain? (
-		vorbis? ( media-sound/vorbisgain )
-		lame? ( media-sound/mp3gain )
-		)
-	speex? ( media-libs/speex )
-	vorbis? ( media-sound/vorbis-tools )"
-
-src_prepare() {
-	sed -i -e 's:etc/abcde.co:etc/abcde/abcde.co:g' abcde || die
-
-	epatch "${FILESDIR}"/${P}-eyeD3-0.7-api.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" etcdir="${D}"etc/abcde install
-
-	dodoc changelog FAQ README TODO USEPIPES
-
-	docinto examples
-	dodoc examples/*
-}
diff --git a/media-sound/abcde/abcde-2.8.1.ebuild b/media-sound/abcde/abcde-2.8.1.ebuild
index 1dedefd70a54..2a06fdfdf54f 100644
--- a/media-sound/abcde/abcde-2.8.1.ebuild
+++ b/media-sound/abcde/abcde-2.8.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://abcde.einval.com/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 # Enable MP3 related flags by default
 IUSE="aac cdparanoia cdr flac +id3tag +lame mac musepack musicbrainz normalize opus replaygain speex vorbis wavpack"
 
diff --git a/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch b/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
deleted file mode 100644
index 15f234877996..000000000000
--- a/media-sound/abcde/files/abcde-2.5.4-eyeD3-0.7-api.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Update to eyeD3 >= 0.7.0 API
-
---- abcde
-+++ abcde
-@@ -829,7 +829,7 @@
-						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
-						-G "$GENREID" -n "${TRACKNUM:-$1}" \
-						${TRACKNUM:+-N "$TRACKS"} \
--						${ENCODING:+--set-encoding="$ENCODING"} \
-+						${ENCODING:+--encoding "$ENCODING"} \
-						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
-						"$ABCDETEMPDIR/track$1.$OUTPUT"
-					;;
-@@ -3879,7 +3879,7 @@
-	TAGGER="$EYED3"
-	TAGGEROPTS="$ID3V2OPTS"
-	ID3SYNTAX=eyed3
--	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+	TAGGEROPTS="--encoding utf16 $ID3V2OPTS"
- fi
-
- # NOGAP is specific to lame. Other encoders fail ...
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index c305df906e4e..9a4d1c734ac5 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,4 +1,3 @@
 DIST alsaplayer-0.99.81.tar.bz2 806906 BLAKE2B 6b37aaa65f6426a43483c3fa7e077ca89ce553655587e0f44ac61ade5d4f5467a304e18ef0142336b0cc94311498ccaa16d9ed2d6eb8109474626c6d1a4ca97d SHA512 6723b36837d01f14645bb1d43ec7c54c85e8afed9b020f56dc81b4de64b74e4da2504507fe83954c7b26817e90510c585d09e759fc11e731d4d27e86f3932650
-EBUILD alsaplayer-0.99.81-r1.ebuild 1919 BLAKE2B c1f73cd22c958ef65582a3ded287337bac220596bc61ffe95edb45246089a7976ee6e153f5dee25c19f28588a5072c196e2b9aa1d67290e14261a1821fbdb231 SHA512 6bf9ebcee6912190c4e832bd9bf30995d46a5feb0054b71d1894e9ed7a3aa9d63fca1132ababd2ec93e9000a9bf77efade7079473d109751e19deaebccae7abe
-EBUILD alsaplayer-0.99.81.ebuild 1953 BLAKE2B 9b474fb6a2b00fa7510d105f3c7d42d807e34ce5f547795607dedd2b0a35d345c11ef9431a280bf5713d475b0b3950cd50327d4283a78ceb6e4a7580707772c0 SHA512 2916eb5516a8caa4bc173a0c579b76824f3b3625303f56ef3ce507f46a4e19ed5a1abf74b1851b57b1d8c1cc729ce0c4f00488aee03410fa12e9367cbbf98994
+EBUILD alsaplayer-0.99.81-r1.ebuild 1918 BLAKE2B df8b7b54c08e91d1973a57f01e06818e16317854b321618ba7f5bb8ca7bfe50be17a90a719613b56e6663b5bf528bafddd4b0c0efb2507218e31bf31fa8e7271 SHA512 3b8871d3dfade6ad15fda2ff927b960a6ab5893e8c90b94354c1266ae93164c50bc7797933763c32fd8f9b4a6ae06acac86fba92ef21f450b52877ecbaebdc89
 MISC metadata.xml 337 BLAKE2B 1f60abc42f95db4e9876c4894ddc16175f17d35b53c7d9fcd425e0124d3fdf08978b349cf2364cfc32555408d1e5ec011fc6367ac9d3e4b7260cf0d2d665522e SHA512 eb9f49ef0aaa5f6ec8c8a29f0459cde3fbbcce419217ae9c22ed6f50dea1893e02037b556daa4276de62aa18fd3193d8c213c6b819d701689fea845d64f97f61
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
index bfbd3f058085..54627dd53847 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.81-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
 IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
 
 RDEPEND="
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
deleted file mode 100644
index bc24c59aa7a3..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.81.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools desktop
-
-DESCRIPTION="A heavily multi-threaded pluggable audio player"
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ~sparc x86"
-IUSE="+alsa audiofile doc flac gtk id3tag jack mad mikmod nas nls ogg opengl oss vorbis xosd"
-
-RDEPEND="
-	media-libs/libsndfile:=
-	sys-libs/zlib:=
-	alsa? ( media-libs/alsa-lib )
-	audiofile? ( media-libs/audiofile )
-	flac? ( media-libs/flac )
-	gtk? ( >=x11-libs/gtk+-2.10:2 )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( >=media-sound/jack-audio-connection-kit-0.80 )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod:0 )
-	nas? ( media-libs/nas )
-	ogg? ( media-libs/libogg )
-	opengl? ( virtual/opengl )
-	vorbis? ( media-libs/libvorbis )
-	xosd? ( x11-libs/xosd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	nls? ( sys-devel/gettext )
-	oss? ( virtual/os-headers )"
-REQUIRED_USE="|| ( alsa jack nas oss )"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:AM_CFLAGS = $(AM_CXXFLAGS)::' \
-		output/jack/Makefile.am || die
-
-	sed -i \
-		-e 's:-O2 -funroll-loops -finline-functions -ffast-math::' \
-		configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_prog_HAVE_DOXYGEN=$(usex doc true false)
-	export ac_cv_lib_xosd_xosd_create=$(usex xosd)
-
-	econf \
-		--disable-esd \
-		$(use_enable nls) \
-		$(use_enable opengl) \
-		$(use_enable mikmod) \
-		$(use_enable vorbis oggvorbis) \
-		$(use_enable audiofile) \
-		$(use_enable flac) \
-		$(use_enable mad) \
-		$(use_enable id3tag) \
-		$(use_enable gtk systray) \
-		$(use_enable jack) \
-		$(use_enable alsa) \
-		$(use_enable oss) \
-		$(use_enable gtk gtk2) \
-		$(use_enable nas)
-}
-
-src_install() {
-	default
-	dodoc docs/*.txt
-
-	newicon interface/gtk2/pixmaps/logo.xpm ${PN}.xpm
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index d11c9dda03fe..d0e36965da94 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,3 @@
-DIST asunder-2.9.2.tar.bz2 279227 BLAKE2B 7b8e1a54e4577267d7c4b4fa3f3fd5b434bc52465d3c473de309f48ac196c2d40885acf08fe84669ccfd5c107d7e45e45069c1757fbc2b550cdb8eaa90e01475 SHA512 37b8ed7c7eed46e594807866d29c3bd37cba8d880c68e714168ae373a8d0dbc58cf837dbd704f95ddbe2544880470fb1f176ab6a67643a4a45b048eabb87e4c2
 DIST asunder-2.9.3.tar.bz2 275527 BLAKE2B a113fc2c380555550a5903919b78d5c7f304c3938665318d86dbbdd01d503641413bccc755621cefd948b10fb352f6995252fb548cc5730e1ff50d4b2d6a3634 SHA512 b6546e16c936285584480cf378be11e96717aeedc22a7c5163cc0791a41498597d8437369d00823710c56faabe1dea23e4be9c839eb1ee371415104f13d61296
-EBUILD asunder-2.9.2-r2.ebuild 1043 BLAKE2B b31247afc84f6cabf68b752e49b464470389de98fbcfa7c52fe90080802c16f3b4dfb796c79144713b08987a147db9f8a81e03d4bb40c2f4925e54f363f23583 SHA512 33aeebf7b9062697e34f58d0659fbc3caa306ca53671b218148861a1f5236902c015311ff8dc13fb88379d13ba15b73508e3bfb35a3afeb6718ecbb70b0558d2
-EBUILD asunder-2.9.3-r1.ebuild 915 BLAKE2B 2d7e88359336f93e594a2db8dee57ef036817d0d1a5b36e3cad8e6e1e88624e68956aa3be8a7ea099884a4990a71e4c089549254b20252bba1cdc70b204d8f1a SHA512 7e1138cae82654cd3042fccfe860a7fc717fa64916c988942db7fb48aa5fb6744ff86fb7fe4470a8eb28dcf31542e3f11c70d5adc5ca244dac730c05f41b2336
+EBUILD asunder-2.9.3-r1.ebuild 914 BLAKE2B c45c833d0f76953116802aab8c345209843fa28362fd321b7e643b2d726ab8febdef70fb6795a49f1433ffc514e86dff90a09c9775c323c430ab18bfcc5a29ee SHA512 50dd1394d95d7b441fd5a128e66155b312b5d5438ce568e660248bd5e732300154826e0abfcfa073f355eac44eccbfb785b9ca57cd711948816607948ead7de3
 MISC metadata.xml 345 BLAKE2B dc144dfa8d94c1293b6b84f24ecdedc8530c4fa19105e3deca1670ca1a43a261094635bb31abec0d027d1caaa4c72c884e4690f43d7af1b9f5b2dc9685502bf1 SHA512 aa6a8d66e2961a176722a5ab0d2db6a1edb246403ac81f2b282d14d0b4a231449d052c48c59f622c04b7582af0545fb97bb430ca89c33924ce24b354b0e2e47a
diff --git a/media-sound/asunder/asunder-2.9.2-r2.ebuild b/media-sound/asunder/asunder-2.9.2-r2.ebuild
deleted file mode 100644
index ed513c27d336..000000000000
--- a/media-sound/asunder/asunder-2.9.2-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit xdg-utils
-
-DESCRIPTION="A graphical Audio CD ripper and encoder with support for many output formats"
-HOMEPAGE="http://littlesvr.ca/asunder/"
-SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="flac mac mp3 musepack opus vorbis wavpack"
-
-COMMON_DEPEND=">=media-libs/libcddb-0.9.5
-	media-sound/cdparanoia
-	x11-libs/gtk+:2"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
-	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
-	mp3? ( media-sound/lame )
-	musepack? ( media-sound/musepack-tools )
-	opus? ( media-sound/opus-tools )
-	vorbis? ( media-sound/vorbis-tools )
-	wavpack? ( media-sound/wavpack )"
-
-src_prepare() {
-	default
-	sed -i -e 's:cd syslogng && $(MAKE) install:true:' Makefile.in || die
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/asunder/asunder-2.9.3-r1.ebuild b/media-sound/asunder/asunder-2.9.3-r1.ebuild
index ec065b26f72e..971ae6837692 100644
--- a/media-sound/asunder/asunder-2.9.3-r1.ebuild
+++ b/media-sound/asunder/asunder-2.9.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="flac mac mp3 musepack opus vorbis wavpack"
 
 BDEPEND="
diff --git a/media-sound/bluez-alsa/Manifest b/media-sound/bluez-alsa/Manifest
index 62426ef6d2d0..47d301a14a6c 100644
--- a/media-sound/bluez-alsa/Manifest
+++ b/media-sound/bluez-alsa/Manifest
@@ -1,9 +1,10 @@
 AUX bluealsa-conf.d-2 94 BLAKE2B 0e52dd17b7310b04759c160aaef8d7b50ee69e89c3b85fce5cade63163376f9b6400a1a4aaed90a09b8c87650e90f1c84f98199844e32f05b0d387ba3db4971e SHA512 6ddf5c4e82d30c1c56cdcdd0207d353dca4398d2e7e5e514b9dc1dd55bf1053876d0c12b3fd77dd7dff2c348b60bcf6f215f57f0c72aaf1b29e735e86f060406
 AUX bluealsa-init.d 368 BLAKE2B 62558866adfed1fffafa47f15d0704d228d31e38529c542093b21dc1e82d459068a545e3e033cec32ec2ac9c8185459365846ce97a4f1264535533a6e55a186f SHA512 d0ffcd77d6aa7fd97d72b3cdb4b938c98a59344c8e710e6063adcf46091a9c33077edc913caecd65443ff5e9062998b1299b20b5c3866825640f33f662d8c88d
+AUX bluealsa.service 184 BLAKE2B 94d33842a6d677b6e6078e2159e13198daede77be2e5ac435836f5b20056deac75cbfd9828bd2fe22ea30e544e2846f61be1194c555a166303514bbb48e4107a SHA512 108a86070b215d16e092c0f8fb869c969bc99b6aa479cb81c894fc6ae0c9e16655b14da27ee49c7f50549e4de7aa43a855954cc0dfe7430cdcf8822a97a4d889
 AUX bluez-alsa-1.4.0-ldac_pkgconfig_checks.patch 988 BLAKE2B e8a038a794a6ec4b8f78943d8371931ed110672b543d4e14d7e6c29baab7f658c6e02a6e7d8a2a9ab2caa73be9255f45b1923cb6ff5ae110bc0c924026c2bfc6 SHA512 32badb733ec3d7f7af07e03ae9f5c224b482fee7910ba9fe9067938d48c6b0d58d3535f1ba10609ecebb7df2b91a6af1048f2d19b4b48435e552800979ed0878
 DIST bluez-alsa-1.3.1.tar.gz 87333 BLAKE2B 0479baa103b9e6e5c26d061df59b0a36a24a74ee04c882a888d63458da96a980bc9f39a6219cd4ad9f8c04b0d58fb337a960584eb7b93455474111a71ddbeb9f SHA512 2b2f7b26b7b8cff70517bf8a24170330038be40f1a5a2fc75d20853b7beca6c9f9e2e6068f6b0f4fa9b6fc61f374ff59961434be8daa3b4d283abfd165be9cbf
 DIST bluez-alsa-1.4.0.tar.gz 102539 BLAKE2B 8e640ba5c0cadfa5478885dc6affef790bd50fe04821602156a598082efc8733f0917a91240af7881f980e89ec0e36801e537feedec3ce357087b040f852eeb0 SHA512 fa4ad21c7b9ac200cdc7628bf0276bbb0beac94066a6c5e69c47a5286f6e13a7dc61caab23acbb14a37c2b97894c425052a09adb8f967038f6fd99557208629f
 EBUILD bluez-alsa-1.3.1.ebuild 1439 BLAKE2B 3e09b00876dfc17692bcce8993a323cd41a932b7ad9552fef77fa01790580c40f895a0b2aa621f147be341df6b8e606bb09ede1190c29031e7903c88319879cc SHA512 e3ac668bf2df4ff4caff94751fb24626ade8ef36a799fe2cf5eb48faa52053ec3e66ba0e30307a770641368fdcee4cb8c0d8cb4e812888997533304afe629e21
 EBUILD bluez-alsa-1.4.0.ebuild 1643 BLAKE2B d7d0390bc854cf11bcc12fe2462b396b2ad42babc8856ea6b67d0d3ca8c19a1df3d7a33c2d6197e86942bc01443e6e1773555847d8aa2dab4fa89a912a520b1e SHA512 fdf75b1e90127d7ad4168848dbd96fccecf08b1c64549e8c759dd25a6e53983f612a803fc73018ac9da0f4637a7a9f8e289dd9d48e3fc175d8a235a81a26eded
-EBUILD bluez-alsa-9999.ebuild 1575 BLAKE2B e0d699a254f142dd4d242a0fec3dfc7aee14622af0e60f5db07c86d7616ccb2670a4ea208ef4c5d958b1ae13299eb48f63c2d9c4578d217a1b6c5d8b87f1f4c0 SHA512 3f286815b387693125e3f695ab4442608168da21661917cf75f98e641f6958270fbcc5f04df519270cbcff2e848d5e146217916101e714bc0020d52427fe77fb
+EBUILD bluez-alsa-9999.ebuild 1630 BLAKE2B eb77664e4585045703292e641800d35d632cb5e5ef23cdd4c4fedbc0f45e56a72240ef3af854d2664f87ab93533b0db6f2a8bd4f901188feddf4c882a4b1a4c8 SHA512 cb9ac7860b962ef95d8d29281196957db8f94379ecadcb2ff8094f4aa98189d2fb0f9ebc27ceba823ce1be38ec92d52a114e838e48c8ff887c6d5531bb6030ab
 MISC metadata.xml 583 BLAKE2B 169737f9ae65bf26204a56b0fbcd1479911895ccfc20433c01a8ea1711ceb75939531f395f7e882149ffde427f43d8410d19392040e5288f5dbca2e4f86fa71f SHA512 b767355e099b5c60ad8d439ba7db224a11638a3fca4a7cd7b3efaa3152a0660ca96176a08d8e352fece334e7a48cebcce555fe12cf9959749491eed360772054
diff --git a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
index cc7360650950..0e5b0d27ae84 100644
--- a/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
+++ b/media-sound/bluez-alsa/bluez-alsa-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal systemd
 
 DESCRIPTION="Bluetooth Audio ALSA Backend"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
@@ -58,6 +58,7 @@ multilib_src_install_all() {
 
 	newinitd "${FILESDIR}"/bluealsa-init.d bluealsa
 	newconfd "${FILESDIR}"/bluealsa-conf.d-2 bluealsa
+	systemd_dounit "${FILESDIR}"/bluealsa.service
 }
 
 pkg_postinst() {
diff --git a/media-sound/bluez-alsa/files/bluealsa.service b/media-sound/bluez-alsa/files/bluealsa.service
new file mode 100644
index 000000000000..12451ccb618c
--- /dev/null
+++ b/media-sound/bluez-alsa/files/bluealsa.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Bluetooth Audio ALSA Backend
+Requisite=dbus.service
+After=bluetooth.service dbus.service
+
+[Service]
+ExecStart=/usr/bin/bluealsa
+
+[Install]
+WantedBy=bluetooth.target
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 2b60f585ad76..e28d7b18e62c 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,7 +1,5 @@
 AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 BLAKE2B e02182d5035b863bb194bfcb1cfd84d78b7e75c89fd973f22c1fd79281923a76237159c974eeba40799128fa45a81548c827e3d2ae32f50ea6153d7040f31d5b SHA512 dd116c7e30ad94680fa355a765e8a39e8bb85ffb59d886e2c7ed6e77e6fd5c440c4db2490d5505042c5b57d06df8a14951a06f38348ff390832b39bfa1f47f53
-AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 BLAKE2B 6ff8c90887d262d3ee8c755ae695291d2c8c757758254c41f40bf8f07646d3810935f3c339b63525219c1358593e8e42b58a134917c83b4030ea80d5d8479e9e SHA512 6c32c51d621662be71dfc1801296e5766001ac645251f34e69de711f80ce8781bbacf329af51556c72fe70a6fbb823ea84cb55229a0ba667488d0c0ae79287a0
 AUX cvoicecontrol-0.9_alpha-tinfo.patch 561 BLAKE2B 5e67fdd31e96e10e005e03ffcb44e886b78086cc22705721b4efe26dc382d18de46ddf55f3d38beda4d9f45a54c4aa4877b6eddfe2df9dbff1dedfefdbb81c60 SHA512 e6616a1880be116aaf6ad00378ec434fee530bed56c7c11492f1ad3903c3302239599f49e7adcfbc884f59053639f3d73a937ceb5763bac24cd12a48ef4ee5a3
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 BLAKE2B 162557e9e85ee3e15142a1603a70a23d8e55f6180c006660c020c476aab45d37de3c66df8ebb1ac78ae7c5ddd79912a45dc4b29297899dfc8a0a4b5a67ede9f8 SHA512 c01d932edf563f7c50f5edf36ccc03401372915776489026fa69a12dc545f8698f542dcba054d0d1694a86ce78171bc9507feb47a924996cf3a22e865e0ed187
-EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 840 BLAKE2B 449ff6cd5a1aca419ff3afed3001469ad0a5cb4eef002c4aa9717d53a4c1c7004c7a4e758fdc5dc9092c2a2599c565a4c5f467fac2453939ccd8cc3bba55cb78 SHA512 cdca76eed057ffe0f901b695b8e3581218b700264ef0b684a1d50121c40c9adf1d865b583b61adef47f4eab6b8b531c991e68c783fb8d340c8dcf701ec12701d
-EBUILD cvoicecontrol-0.9_alpha.ebuild 951 BLAKE2B 9b1d2ba07c664826373679ed678d0f23eb12478160d8bb0f51f4e4f4280460f067b03096879da4aaad376c233c75cdcd699f76093baf63543ada542dc50f8e96 SHA512 04d08e6961d1e2d9cd7ca55cf62a5452286574f5a49feee282a0475f19f3cdda2bd90acf34d60f13471f23cf42465dcf0209a00983aff2c54cd5aa9bab650695
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 839 BLAKE2B 6a41b6a4091a632239d9c7466bb8418de7066f11efce8b59fb09cd88e670bc39bb1d7303cc14a4745e3b16dcbed16369c87cc38f850da345d36f3ef98dd550e7 SHA512 48269c53ce900570274cb4b58f440f19f9c09f47ed7b121aed077e7428122cb18b62ebc851f8a34181f12ee7dece4bd3494afcda60e3d34cbc94a6f76f5b121c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index e8555e78e0b3..e62b1944af1d 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
deleted file mode 100644
index 37dd3eaabfd5..000000000000
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-inherit eutils
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Console based speech recognition system"
-HOMEPAGE="http://www.kiecza.net/daniel/linux/"
-SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-
-KEYWORDS="amd64 ppc sparc x86"
-
-src_unpack() {
-	unpack ${A}
-
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-
-	#remove "docs" from SUBDIRS in Makefile.in
-	#Makefile will try to install few html files directly under the /usr
-	#much easier to do with dohtml
-	cd "${S}"/cvoicecontrol/
-	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" Makefile.in
-
-	cd "${S}"
-	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die
-
-	#install documentation
-	dodoc AUTHORS BUGS ChangeLog FAQ README
-	dohtml cvoicecontrol/docs/en/*.html
-}
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff
deleted file mode 100644
index c22dbb04d47b..000000000000
--- a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r -u cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha-gentoo/cvoicecontrol/cvoicecontrol.c
---- cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2000-02-17 22:59:41.000000000 +0000
-+++ cvoicecontrol-0.9alpha-gentoo/cvoicecontrol/cvoicecontrol.c	2002-06-03 23:39:46.000000000 +0000
-@@ -37,6 +37,8 @@
- #include<sys/select.h>
- #endif
- 
-+#include <values.h>
-+
- #include "cvoicecontrol.h"
- 
- #include "model.h"
diff --git a/media-sound/fapg/Manifest b/media-sound/fapg/Manifest
index 69b9898df469..d73907a9c77d 100644
--- a/media-sound/fapg/Manifest
+++ b/media-sound/fapg/Manifest
@@ -1,5 +1,3 @@
-DIST fapg-0.41.tar.gz 94315 BLAKE2B 9814ae7fff84060b647b2e82d0aae3b3fbaa290ea673a7fe9b539ea3efb82d5e310692a70b2d1d976b37714c227665897c5983bdd14e6e14c241e9bd1e4baa45 SHA512 17efde8cf0760f2eb3136814d9d332352b9c378213104a5540aee381482d3da72fd17e63e96360bcffe1850399124f1c6fcff9471a89881f746453a092d64ceb
 DIST fapg-0.42.tar.gz 94920 BLAKE2B b7da3a9df4b3f61022d237fe2b94238d56ceee456de54843062a887710f8faea17cfc6198487317797d9b16b006ccf311eb8e0f9e9e55a2e5d0aed173758457f SHA512 e3bbef35b9c845d80bcd1ee1116e4eb99b98e9d84cff034f2a49bbfcaa7664ab48b9453fb680fe7274fa74e9e0126950fbb15deb793eb95362f74c11151f8731
-EBUILD fapg-0.41.ebuild 628 BLAKE2B c4cd12fc4dcec2ad93660146ae2fdc0f437e7ace8a2b2892fb69e19f504682e8dd4583c9137277d14a6b3f8bf401644c529c618b27caafaad27bfa701f6faa55 SHA512 2a980502ca2761d3862846e1639c7d5dcd27429d8ae2f4eae8d286e95c3444e64555b5d864cda8b91f44e8e192c831452995584996490eb92454351caa283096
-EBUILD fapg-0.42.ebuild 554 BLAKE2B e9348b33ce32495b3199c7aaf53ba388466f967236ca6003b9c21a3f99577c0c671a6c50c46c8cf7935278f03a3cbe32811d784bacd8ceee5d72cafcf0466026 SHA512 4d365a7c8f72aa6fe1599355fd02db328b64fea9960c4303bd3c52767ef46cabc639eb34d3213680a3adab49a3fab589b1e22ed0f9257a1869d8b95eaa5dd934
+EBUILD fapg-0.42.ebuild 553 BLAKE2B b7251066be27d942369bc8d582b1eac3d7017829b316a2e183c19ae5d31fd51b5f7932d75005fed268c87d9e88d220eb81380700cc4e8c48cf293228a50c66bf SHA512 b57ffe49958596ac8a7f41e1d699c13fd0600aefd5626cd72f94e066d126d3748eb1df1152bca8c57923b5542902de1ea92b8a21f797d26acd86dd33a68f3e92
 MISC metadata.xml 345 BLAKE2B e790a1276e74a87344d475c26e041546981c9d72b52c87f4a059d455db310fa4bcf6423d46e44971fe0776cc3ef52163235d6ebf7dca68aae20d2339c1e946fb SHA512 d8286400b18dfe0d38bd49478c84c5d7bebb24a734a74cbdf60a9e91c51f4ecafa476868351a7f09c064887da841f79e0449910df1f3b2a49f460d74cbebccb6
diff --git a/media-sound/fapg/fapg-0.41.ebuild b/media-sound/fapg/fapg-0.41.ebuild
deleted file mode 100644
index 00f60a0813e9..000000000000
--- a/media-sound/fapg/fapg-0.41.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Fast Audio Playlist Generator"
-HOMEPAGE="http://royale.zerezo.com/fapg/"
-SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
-IUSE="xspf"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-RDEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	local myconf=""
-	use xspf || myconf="${myconf} --disable-xspf"
-	econf ${myconf}
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-}
diff --git a/media-sound/fapg/fapg-0.42.ebuild b/media-sound/fapg/fapg-0.42.ebuild
index 2ce675374d26..b6e485692da9 100644
--- a/media-sound/fapg/fapg-0.42.ebuild
+++ b/media-sound/fapg/fapg-0.42.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://royale.zerezo.com/fapg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="xspf"
 
 DEPEND="xspf? ( >=dev-libs/uriparser-0.6.3 )"
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index ef61ddd67c23..52a2556f632f 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,7 +1,3 @@
-DIST lollypop-0.9.612.tar.xz 452072 BLAKE2B 784a7df8baa0b87fb34b6ab8b506d5ce1c90e78e959c6dbd07809c2765e4528c67bf358efc0eaeb03542640290b9fe181f99b2cc19cef3a3fbbb6a9bfc07afdc SHA512 dd61d38f245e6a8ad8eb5fad35fb23aa4a31399c2d2f628266b19aa00f6b615de82a6af33f2f4ae40f768a3786fb991e5f48dbcb0d7ba075579c6779fd05a371
-DIST lollypop-0.9.908.tar.xz 468260 BLAKE2B 126ba0cf76f733cf05d50fc2e23e926e1e380c4f1bd6e2c100a2b2d3c25df4e1cad8cc8382021f80050dd1be3c0cb879fab829abf02acbfc18b960e8a49598c3 SHA512 a066e9d0854869b0d0ee3b0fb84b40a9a768934d475cf7c8bb3f88537eb18027b719660d717766b6ba2fd5ba0a2a25ff7adbda0219e99811e928150b448e6d7f
 DIST lollypop-1.0.7.tar.xz 436000 BLAKE2B 8b41a3378e39b0cba59323bbd7946226bcce29f80c878833ac920f337c036fcaca9c81caca2e360972295c6446c67d79e201093f86cad0685f7365a332d0e116 SHA512 ce537e60e3f1c678fcbf26d1305a178a3f2299abd4f75bb3c3a2cf717295e14aa73a8f21fb88d0c1fc790a80a572dbce84d01a0fe3229879124f89f8a5fa8305
-EBUILD lollypop-0.9.612.ebuild 1332 BLAKE2B 2e92e7d2f1f7ef4811a9b20c92f17178ad21964c5679236cb298e1a24e001a4b5e74620b8cd7fe861474d91ae5059fae5fdc4f9119ba476298e0787ae90a5582 SHA512 f4b33867027ca9ca2a219a18299a00daaa857d89cfa9aba63401442fab2c2c665bb2a6f05fb2eb45332347915a5608f37924013cfa7ebbc0c444bf910fd651b8
-EBUILD lollypop-0.9.908.ebuild 1332 BLAKE2B eb958a4f6485cfd37f744e7ee443e1ea4223c97ba89273b70c0d6906421e02c3476d7726eccaaf8e7bd50cd6536228abdde8ffc7b8adfca18091fe4dd6ab12d3 SHA512 ee6d04c61ffeb0c4d499f254e181a3662d7b1ebd0af70ebe2df6497ec21e5c4b3ea14759dce0e79d44c0d62d3552d2ffca47f52f3a1e8f0e5b86cc6fc361c3d1
 EBUILD lollypop-1.0.7.ebuild 1367 BLAKE2B 58e95f8666ace9c74cdba8e8ef4508b3ec8aadd40c5f07bbe1deb713f7da0f200827a66b23b28f73abbf130356cfced8e1309996ba793196e35c4d2ac233bf50 SHA512 8ddf6d570858bbdb8381ac75a419b2b6534d5c9165df166356783c7c02fe0ec6fca1cf79087a954680f17825d35ebfeae8e1ccf147ca701559e2415249825f32
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-0.9.612.ebuild b/media-sound/lollypop/lollypop-0.9.612.ebuild
deleted file mode 100644
index d6af6551036a..000000000000
--- a/media-sound/lollypop/lollypop-0.9.612.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="bff1777a53b289e2fbf4e92a13b14a1b"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-DEPEND="${CDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${CDEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/lollypop/lollypop-0.9.908.ebuild b/media-sound/lollypop/lollypop-0.9.908.ebuild
deleted file mode 100644
index 9f651d4b4249..000000000000
--- a/media-sound/lollypop/lollypop-0.9.908.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="d4818489885029d33e909e92e7c45c1f"
-inherit python-r1 gnome2-utils meson xdg-utils
-
-DESCRIPTION="Modern music player for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
-SRC_URI="https://gitlab.gnome.org/World/${PN}/uploads/${HASH}/${P}.tar.xz"
-KEYWORDS="~amd64"
-
-LICENSE="GPL-3"
-SLOT="0"
-
-CDEPEND="${PYTHON_DEPS}
-	dev-libs/appstream-glib[introspection]
-	dev-libs/glib:2
-	dev-libs/gobject-introspection[cairo]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/gnome-common
-	x11-libs/gtk+:3
-"
-DEPEND="${CDEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${CDEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	>=dev-python/pylast-1.0.0[${PYTHON_USEDEP}]
-	media-libs/gst-plugins-base:1.0[introspection]
-"
-
-RESTRICT="test"
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index cbcdbf423356..929b077f58e7 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -2,6 +2,5 @@ AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb2955342
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
-EBUILD mac-4.11.4.5.7-r1.ebuild 1317 BLAKE2B f79a904f9b8caee6810c5ebf3fe51b54296ffc31ef690f1b859d3bbfffec53c4e8f2c7a55ea57f8763a3c4190de8ef41ea95ac8d2403795c875826f2f0023b90 SHA512 10269b244873c47cb2dff9725bc25b23035dcb4149c1e435c841b7e40500a89dfc4af4450f0cc55bca7ede7769ad8c04d2b873a14b7f5bc260409781472d8123
-EBUILD mac-4.11.4.5.7.ebuild 1321 BLAKE2B c2f1b98f21ff7bc6c52868869f5b7155d8e88d7db3816c0543b3910fa2eb20de1a9bab983474e55f5ec11ce52a652289587182c740a057591e1d0ba5e805ae32 SHA512 fb1d912f512ed224a52f5899182ae40220f8e7c6cc2aa8f2c8a4d7ae3bf841e2a0e7607b685b7f07c82e348554b69f070f7a629f82b036ab04eed376dedd3404
+EBUILD mac-4.11.4.5.7-r1.ebuild 1316 BLAKE2B 8a5529d3e35d0e0855e8e3e80d11b0c8370f9aa47ad05159d4cb916a091ca5a39663019ba949565df1e340e8c4ce8caf55c115def2924a4f1bb37f160f84b772 SHA512 97d88167ac7a4a4e2cfb46042e0405500db22356595d6a225bd221dac638b05509fab89a3e982cb7f5efbbac69edd6d7e014dbb1e39f1ebf21c2164474dd57fb
 MISC metadata.xml 373 BLAKE2B e341287ecf4d69b3a6401db4ee2a465749e63a57fc0bb462928156eee49c89441eeb9dc2943fb7b0209ecbc966d6df0c6de9cf16a3ae9cb1c0dfa893a540458a SHA512 398ca3b9a13eede72e283f90a215d1e05a518f6b3eee9d8f6a74e3eba1e1f0f501443399906f09771ef1c7441667b5e991f98d9cabd9c6b8395af334312f02a9
diff --git a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
index 0f0018a5279b..04eb73b53285 100644
--- a/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
+++ b/media-sound/mac/mac-4.11.4.5.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.ta
 
 LICENSE="mac"
 SLOT="0"
-KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="cpu_flags_x86_mmx static-libs"
 
 RDEPEND=""
diff --git a/media-sound/mac/mac-4.11.4.5.7.ebuild b/media-sound/mac/mac-4.11.4.5.7.ebuild
deleted file mode 100644
index a76614813cea..000000000000
--- a/media-sound/mac/mac-4.11.4.5.7.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic versionator
-
-MY_PN=monkeys-audio
-MY_PV=$(version_format_string '$1.$2-u$3-b$4')
-PATCH=s$(get_version_component_range 5)
-MY_P=${MY_PN}_${MY_PV}-${PATCH}
-
-DESCRIPTION="Monkey's Audio Codecs"
-HOMEPAGE="http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"
-SRC_URI="http://www.deb-multimedia.org/pool/main/m/monkeys-audio/${MY_P}.orig.tar.gz"
-
-LICENSE="mac"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 x86"
-IUSE="cpu_flags_x86_mmx static-libs"
-
-RDEPEND=""
-DEPEND="sys-apps/sed
-	cpu_flags_x86_mmx? ( dev-lang/yasm )"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-output.patch
-	"${FILESDIR}"/${P}-gcc6.patch
-)
-
-DOCS=( AUTHORS ChangeLog NEWS TODO README src/History.txt src/Credits.txt ChangeLog.shntool )
-
-RESTRICT="mirror"
-
-src_prepare() {
-	default
-
-	sed -i -e 's:-O3::' configure || die
-}
-
-src_configure() {
-	append-cppflags -DSHNTOOL
-	use cpu_flags_x86_mmx && append-ldflags -Wl,-z,noexecstack
-
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable cpu_flags_x86_mmx assembly)
-}
-
-src_install() {
-	default
-
-	insinto /usr/include/${PN}
-	doins src/MACLib/{BitArray,UnBitArrayBase,Prepare}.h #409435
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-sound/mikmod/Manifest b/media-sound/mikmod/Manifest
index 5077a67f0b20..589c0808e170 100644
--- a/media-sound/mikmod/Manifest
+++ b/media-sound/mikmod/Manifest
@@ -1,7 +1,3 @@
-DIST mikmod-3.2.6.tar.gz 278754 BLAKE2B 18bf4c2ef471ab4608d65ef2759bf31310b07b4a9b60ef4174572c7111b4fa513b3f88cfb745753b7c8f7eb48bd52b22c47799e9e6cde6066efcbf502e262a4a SHA512 7a3fbbf7b0ceff92448224a7d9d58660c8f0ecdb26fe08b1b318abf2b07dd18d472467c226c72fcefd73aa9c42da813c65b236c91f5c582e41fad33b6ee96cc5
-DIST mikmod-3.2.7.tar.gz 279228 BLAKE2B 47c125c76446fed42ca4a40f1d745cef8261ac643f2e9ede7925629cfae43c69ef39ffa55e97e407066a5fb71f6f6d2f85b417e55a1823a30908582f917a5636 SHA512 cd68f46418af4fedd6fef35c48c120cc8ddb66c0160107528ee8816228cac1732fb3f474a850317022d2161cd619e5694645c78690792fee743130d380684c4d
 DIST mikmod-3.2.8.tar.gz 279763 BLAKE2B 27731a143d3483289ed0d6809c3ecf0ce504f8c4271e20d4405a99c39e605dc6c0b50c3cd4e689f7c417646f51141b2a8634e74cd55164e9b0e88be750db1a27 SHA512 fbccfd31c49fc1faa159e7174fb0886dc3742ef935b596176fafeb953498ceb04475bebf9b0a948f1e2de1b11a01b130d2f11f4f034199b501ca08823a3ea620
-EBUILD mikmod-3.2.6.ebuild 458 BLAKE2B 12a8b2456d6558e66a0f057f5c8ecb492b959610b387dd9f94b5b818bed7459bf7a546b3fcdc26dab60b0c9c958966b32ae59e5b45e889db572f97ef20edee80 SHA512 c955942a4a008790f189c27bc91e8f860ca61a3193383afa1cd68d5275e6b525deabc523e83418881f52d41495e71f2a177cdc04555d0426f905db8c2aa55678
-EBUILD mikmod-3.2.7.ebuild 466 BLAKE2B e01b40632ef1d1158804d7331a01049b159e8b7192bf6b066b437975715a5f5c2fb010938d3b4acc0bb07569bdbac1e4862d424825ce16cfd9cd8708bfd36417 SHA512 60a483907d1b11029944dcadb586c3c79ebccd9a4f5946ea1fcd7c41926bcb52aa5fee61ceb0420c25640668ca8e7acf4544b132bd059edd0c40a120f9e0826f
-EBUILD mikmod-3.2.8.ebuild 468 BLAKE2B 8d40871420d071b4db21a255f33c5a3ea060fef981cdcc82a5ae0b1334180407d4a04f868c92ac12939b865d5697ab2b1fe58f2b7c58cf286f9dc380922cf189 SHA512 911a8a354798b39b68051928bc5f170d2c19db66e2d0c94fa5d459a61c175a5ee326270b0cfc5847799fe5ff50e772bb9bbe095d8788576adca4c3c14527f4a4
+EBUILD mikmod-3.2.8.ebuild 466 BLAKE2B be42d643a18c25ca4304d771761310e792da729f772a0de2cdeeace9b43a8a7ed64e108c06268f81b7ca0eb6ea11814ea9d787e64f74b7475e35cb0f7e84f6e3 SHA512 f505bddf24d79d70962e087a9447bfd473a9b0d740497bc6bdf1e4cf066f0677da700296fa365d20ce895acd49abcc0c2ca7a69a9fd1f640ddcc450d072147d8
 MISC metadata.xml 329 BLAKE2B f5950a51c451bd95614667a932e0799427831bed04505850b99dc77173b773cb8c158b50053b6c3a41755c8a1bb87077fb538207d56fbcf94fdce44ea0709093 SHA512 5deced2e8ecff6e1098f1ff339281cebfb8027bb052af10c9d95c7ae1eb80db0448cf5b350d40e5d5f76ed9948ffb5e4f8802f200f9b7f139a40992311eedb55
diff --git a/media-sound/mikmod/mikmod-3.2.6.ebuild b/media-sound/mikmod/mikmod-3.2.6.ebuild
deleted file mode 100644
index 1c0e374a6911..000000000000
--- a/media-sound/mikmod/mikmod-3.2.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmikmod-3.3
-	>=sys-libs/ncurses-5.7-r7"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mikmod/mikmod-3.2.7.ebuild b/media-sound/mikmod/mikmod-3.2.7.ebuild
deleted file mode 100644
index e54e61c5ec34..000000000000
--- a/media-sound/mikmod/mikmod-3.2.7.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A console MOD-Player based on libmikmod"
-HOMEPAGE="http://mikmod.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=media-libs/libmikmod-3.3
-	>=sys-libs/ncurses-5.7-r7:0="
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-sound/mikmod/mikmod-3.2.8.ebuild b/media-sound/mikmod/mikmod-3.2.8.ebuild
index 4e9a21d09c4e..40972c329f96 100644
--- a/media-sound/mikmod/mikmod-3.2.8.ebuild
+++ b/media-sound/mikmod/mikmod-3.2.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mikmod/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/media-sound/moc/Manifest b/media-sound/moc/Manifest
index b7ab4cbb2074..42568d2933ba 100644
--- a/media-sound/moc/Manifest
+++ b/media-sound/moc/Manifest
@@ -2,5 +2,5 @@ AUX ffmpeg4.patch 1401 BLAKE2B 116679802c4acb9e843dbb8d656177ae133aefc49a270392e
 DIST moc-2.5.2.tar.bz2 602728 BLAKE2B 10b568404632f29ed5fd1d04ec424aa364a6e74c1a31d47cb9a3b377ccd04e2be53e57274e76daed29177368c944740fd26cc862fc498f950070f0b83b0acc7a SHA512 992d06809fb52e58dcee63704bde05795b99edbac46edd8381f314c564490013b18e1853926f419c2c3c7f1bb68ff35e97048de03ace3232b800cf4b3b7dbe0f
 DIST moc-2.6-alpha3.tar.xz 496676 BLAKE2B 3b4f31676c869a0cacd44cce1e4509304e3b00a15e578eb394510fbe0ddaf53f5c5628f2dccd60f4b3925f3e597d9fbc04bc2a8e090e2e05227b822f1aa05ef0 SHA512 e38e277e5e945827308f47a8f3614eb1e52c16271da372f50e7b6427a7dfc994e1c66761a9e46326bf483b91e9127efe7796a329c62e95524609edfb3a7603bf
 EBUILD moc-2.5.2.ebuild 2148 BLAKE2B 3039de5a7faa6b92c6b9c836a5268896eec61657dc9ce98075f39096df8b3b21494b2bcc1fe7b3178d6870be7505bd8db5aec1b9e08118ded7c315f4dcfec172 SHA512 9680c784f3dcf4a1ceb57c5df5b6c92e27bd3f144ff49d3805fbe8a3afb614b72c40160da15f3a204738a935d6fb84aa16dd329002c59a461e0550c15a80ed5b
-EBUILD moc-2.6_alpha3.ebuild 2306 BLAKE2B ed55a70360aa10640f72a7cfc240fb71a8e777fac2cbbf2200dcf97fbc7cea34b78d74eb819df46bc00ea76244e09c22c80e3aaa916cf643e1f3cf9cf3f7bc6a SHA512 e91d464c1671041ccd940da587a0f2aa2a0d9ab0f83e7107ebd6cd493d835cf71c47d34d67b19221840c7b6f88f4831318708f137402844b57d62f9822c27242
+EBUILD moc-2.6_alpha3.ebuild 2305 BLAKE2B 9c1ba7e34bbb91492fff3390954743937ca5dfd048ac8d164d177dd413b2c4ca287e94009b5e882d68d55c63b16533bcd2c6e727c167f89e96e261e2ddf1be64 SHA512 0979e27ab059b22eed01f67ddf3533b5220d34d34d83c9305c1981c1daf04d0d80db6df929816845ac88a1a44a208ed89bbb1894fb468d6d4269519ff1f3b387
 MISC metadata.xml 596 BLAKE2B 4ebc0826f9a0352909b2dfcfcbd7712d0af6b484b5801ee8e0b73be7a5966968af27d5fc4d56893d407e0bbb3809376f8336291901bc36aeb2e43e549e60bc44 SHA512 f2ca529805ed93256100396a8ee414ba1098097eb4a8379144d52fbdf02d98a05c399cb1be861c64eb712bd5160f3286c30e73875dce05ce2e974f7123b40699
diff --git a/media-sound/moc/moc-2.6_alpha3.ebuild b/media-sound/moc/moc-2.6_alpha3.ebuild
index 051b36098d98..eafc3dee94df 100644
--- a/media-sound/moc/moc-2.6_alpha3.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.daper.net/pub/soft/moc/unstable/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc ~x86"
 IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
 	oss sid sndfile speex timidity tremor +unicode vorbis wavpack"
 
diff --git a/media-sound/mp3splt/Manifest b/media-sound/mp3splt/Manifest
index 9828dcbd3b81..c0b26491e14b 100644
--- a/media-sound/mp3splt/Manifest
+++ b/media-sound/mp3splt/Manifest
@@ -1,5 +1,3 @@
-DIST mp3splt-2.6.1a.tar.gz 260476 BLAKE2B d40555eb98886ef229baade1c390498d2fb3bdb79f9efb3e8ff286c7db70165b9c18d5bf4c331c175fad937d2eb85d1419f5e15b8fc31fb60d07ed02d7e39e24 SHA512 5c0f6a56e09c0b33f83360bc4ea5d4c9398fa6ec9bc39e7e9ab34b0ff19e46ddacbbc69ff51953ee399f1a172f2d634c57c256abdfe51def593e5f981490cc17
 DIST mp3splt-2.6.2.tar.gz 260901 BLAKE2B 49b45f53fd1a646993aadb6c18fb0cf7530b61f3ab5ddcf7bf220a6cdbde9844dfa048f22c10c1c89ceff2a5f77744b17c70e1aae7120300c606316b0a48eb0a SHA512 c1cbdc905d4f19e8e20afeadf02a2967049d86e69613312c8855e03afc5b190a569ac63f970171384853961cbe6bf248fae47e5116c4fe9deb7a0787f299918b
-EBUILD mp3splt-2.6.1a.ebuild 701 BLAKE2B 5d5b33841e8cedc429f19f58bea0af6f0f88b96f84d270a11a9720b5e5659978f99a168c05b00d230e72cc99fdca455e80044a46d29eee992b01a6d5fd4fbdf1 SHA512 70cfd32c331223d21c33693d7b77018781b2a86dd7875cb80935a1868e95c0c474efa0dd5e315cf0ce0fbe7c0634508ceec653765824442d273de3088207605f
-EBUILD mp3splt-2.6.2.ebuild 704 BLAKE2B 21b9a7509d535417291a0f896f40f8acf0ae3cbb6ea3241c6d96983cb56fc5f87e494a80a068c3c64d05a681b41f05e71a2c235bd817438c65a140529d07ae63 SHA512 a621f19d46460a43d165410e4509d3808bca95d93e0e2dd9617901b9feac567822dff9c1e2662d0ff86c4604cd71cb32628e8ccb227d27d18e70f21f4f144faf
+EBUILD mp3splt-2.6.2.ebuild 702 BLAKE2B 32a97ee587e8832835daf376e587407ac470f2bd3838ba221aff0ac9588275847369ccbf0be261e3b0fa504c7ce7ff63b3a9d1c0c5a3cb578b23f24b1d2a3584 SHA512 88c1cb4dd85be55d5e8fca859875fc234dcb6b9e9dac8db5edaf191caf9d89b75e917827ffc8c80955e2da9bc49a6819bbbb1145b23ccf12078c437508b1e9f2
 MISC metadata.xml 330 BLAKE2B f237f66bdf5752ca2864a72cd27918776b88b73d113a2aff324dbbe53956973421724b3babd3e25892d0894184bf842dbe3cb48cd3514285e500110c7d7bb1ac SHA512 46486e0840a5f4891a1d611ba22e1e540d0e16d3cf61ef362e1085d188a75b5297e6ac2abf8c3af40eeabf246c076958dc2fc8b9cce5f5bdd248b282491afc38
diff --git a/media-sound/mp3splt/mp3splt-2.6.1a.ebuild b/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
deleted file mode 100644
index f562912f62d4..000000000000
--- a/media-sound/mp3splt/mp3splt-2.6.1a.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib
-
-DESCRIPTION="a command line utility to split mp3 and ogg files without decoding"
-HOMEPAGE="http://mp3splt.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
-IUSE="flac"
-
-RDEPEND="~media-libs/libmp3splt-0.9.1a[flac?]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-src_configure() {
-	econf \
-		--enable-oggsplt_symlink \
-		$(use_enable flac flacsplt_symlink) \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	default
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/media-sound/mp3splt/mp3splt-2.6.2.ebuild b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
index 0d1020409e7e..267738aeb643 100644
--- a/media-sound/mp3splt/mp3splt-2.6.2.ebuild
+++ b/media-sound/mp3splt/mp3splt-2.6.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~ppc64 sparc x86"
 IUSE="flac"
 
 RDEPEND=">=media-libs/libmp3splt-0.9.2-r1[flac?]"
diff --git a/media-sound/musescore/Manifest b/media-sound/musescore/Manifest
index 20aed140d9cc..9b645b8cd7d8 100644
--- a/media-sound/musescore/Manifest
+++ b/media-sound/musescore/Manifest
@@ -1,14 +1,7 @@
-AUX musescore-2.1.0-pch.patch 1045 BLAKE2B c6deca9a34f687d5f8f9048e91049a0706a39c5f9299c2a244193337b3cd1047efc145c12ee0abac01b936958b835f9946c01ad4cb271b8ea8f9a2df535d5bc7 SHA512 9fdbf8a8f9903051196c01513395dc38585ba64f216140bb728e7adb72cbb71669b414338ac9b7f0b53f8c98bf63b2a19d4c6b195c3ad110590db768927d01d1
-AUX musescore-2.1.0-qt-5.11.patch 575 BLAKE2B 1dd0dfea52f73dc3d031dcead6ba07ac55195b264f393c39f0c411d6fc3f9d974f78a6948a9918ca67381e5c2c0b67750a5ccf0ac4a2ed2a8d1000434157d8a8 SHA512 5a6ec5aedaae257223fec6137dcc5ded44d6a4478f183c61220cd7d3c4b96c0fe591ff12070e4962979bb5c6d93a8c87a3003d3bcb449b1fe0977072e55615ed
-AUX musescore-2.1.0-qt-5.12.patch 2451 BLAKE2B 5c4f0143f262a451551f438607d8d09ff98f2fb23bbea09a74c00b1699ac9d284e582acacbcb224e0a02878a65744a2c202ae80e8a9045056abe68888b52a6a5 SHA512 529d48f961c21b89195dcad44c9d5105724c71bacbd30846dfc183f0ff5654b20a58cdffbe0b8fc7730f851d39652e4315dbb407ebd91994ebc061c6dcee2447
-AUX musescore-2.1.0-qtsingleapplication.patch 1176 BLAKE2B 6218c930ba69595f6ad674d225b95a34e8b7fec4b93f9bd23ca7f0c3201c4af04056c1b23c191be2764d350afae36d1f586555358141e9efb50e6a622ab9c5ab SHA512 fc1300940b6101f985a607fa3c1e3ebc2d3b88335f57bb9cb2b442e0253c24cc31a5d1d07c1dfc507234a0146bfd480ea546ac8b63ffbfcef1635d5086326bf0
 AUX musescore-3.0.1-man-pages.patch 1779 BLAKE2B 345f06aaad337f0cd51f949bc210ec8efa06929c3c1663696f116c72dfc2fddbd0032bf4070464dc439dd0c6dbdfd39337d146764184aaef0723574fb501aa22 SHA512 64230965d6cd544bdee9ae52682812515bdef17abfc1e31d0a6f887d22c70ca5d82d22c0937e3ddd56ab478009cfc0e4170a9283b2fc7e0da242d84b984616fb
 AUX musescore-3.0.1-porttime.patch 637 BLAKE2B 2272e64f8b6944fd25567dc1eafcded49cf6f92ad8da3d16a897f4fa854e9638826fc1bc66a79e1d0032020b8217b9d65b4d9272ce0018effacb439ee64a4b63 SHA512 a3379adb9b8adc5fb6c430694bb34cd832948c68a5cdc2e3ddc148f34e8367ec7674c679da5881a417bdb90f8cec1415d41fefb7a5dd420c298b4bfa2ffb2a15
 DIST MuseScore_General-0.1.3.tar.bz2 33164726 BLAKE2B 88f41b76a11bc33dcaf2c8b41571f65c495b2b35095ad02f9549e98cb4bfe820e0a38dcbfa6fc1fe956fb284288eecf72b76895fec83799a5aa8ecdc3b63d7f5 SHA512 91e38a48ecb60c010f0b833bec790071db29ffa5c7895f653a8467eea1d179139c85415e8858eefc7eba22355d0a4887f462e1a1f0cca87b054bc5e1f8e4d38b
-DIST musescore-2.1.0-fix-buildsystem.patch.bz2 3736 BLAKE2B da2b1fa72c6fb59ff3d969ac8cf088bf034313ec8fe584f5f5fe335c7fd663a8f078d4d12a2ad439a086665384cfe7b24901c80707dd80403e1cdac1c2ebef1a SHA512 5f712ec046c0f53c24d61b43c79cd5e3e604c499ca95f47c79f29c5442b54d1867f699ea689de9328b5bece432ddaa4da557328ed6d069347870eba8e8695ffc
-DIST musescore-2.1.0.tar.gz 51131549 BLAKE2B 208377e786b83122402140bad2a9ac024d56a66316c74f52b7ca4d71f3dec9f91c3f0a7dd1b1c92e2bd5a81a63722593c2b41ac5f7af5dcb712e5de078df8852 SHA512 c8696685713cd4c4943f1ec2b69a6a93217449fa330105ed1ffb569918af293c1d6ef19cabe1e487f65ceadf27dff78185e286e82ac4517cd2b4de594a67beb2
 DIST musescore-3.0.1.tar.gz 60166011 BLAKE2B 8c8d1d063da9f14e21342313b58acffb88c375e42e2689bc572eb885be0d836cc946676482f0e58f95a773cc95ead5d767cc7a1052663389a0daad663844e1d9 SHA512 d480550b2c04c07f610d0ed7515a561fbb11a5b1af724e548827bb3817b586c78e5e9ee75730f5885c3f6ba076da52ef53713f10a9e3591e9a40a168af38d46d
-EBUILD musescore-2.1.0-r1.ebuild 2089 BLAKE2B bc9bb75457814eb081a678140065da6e2b9dce7f33f2047f81fe87960573631af79418eeefa52da485b2c60e809b6091e4347683e4803a59d7cf0758d97d1582 SHA512 d9279a30d2820169719a861702107d39d4a10ca055ddb29c16342a9bc23b09f7c65ad7e70b5afcadd13943ea0cc26a9073c177b9a1dc6ee4ea67ce87bb4ea569
-EBUILD musescore-3.0.1-r1.ebuild 2628 BLAKE2B 4b5b7e0ebfc7bb79d63832bd60604accacecc22cb87ef379ecce5e7f4e54af42a1279b15303c82a5e6f2be6b68e8fe25e40e93cb628ecce7b1e14a73f6dc45f1 SHA512 649f6970cf0fa353061d143977feb1d965ba6ac23259c0ad538f28f46808efb98e532abe0ff8e4d66951a3ba389e79885f20c2a5295eab7d04d2f19efafdb8a9
+EBUILD musescore-3.0.1-r1.ebuild 2433 BLAKE2B b41f19798c7702f5b31c29f2feee04e4c2973846e40ab08d3c1b5db7449448b9a14dc90aa16f5af3374b1d359227721f853a3e5d80468087bebe502b7f5398c0 SHA512 db33d86a72952ec81318fde0775ac70ea612928ff14b5b422b770299d09c2e05ff7a79e1c2784e15ba1739e2f3990595177b43cbe1a5b0d34b07fc78e099ffd2
 EBUILD musescore-9999.ebuild 2634 BLAKE2B b97c89d8ce5b5b63c762030be4d2912d8f7c658c568fb06210d06964ea046f7f189ab9685792cd328abee7d0b9eb2cb186e639e3f40b410fe0b41a5ce38e54dd SHA512 6de966e26fe26664bf7348fa35d0ce027c6703f4f23c86c131f3419ba72dc803caee766fb821339d84521175be2691c301ccec1e8c0d6b6379f5dbd0ada58454
 MISC metadata.xml 685 BLAKE2B 1ab11b407c05d18fa7fea53e4965f37dad96d2845fefc0ead84dab785a8c7684866e6455e500035d88a26ab3a59d18509e85811a5cc5a291bb033a78b55455b0 SHA512 3c9ad5c65edfafa2019ffeeabe13df04bbf5ef3dcee206284cf7e8b79543782da1312f7f443e4ab569248216410c4ac302ded74e074606f6ed8a3930344f483b
diff --git a/media-sound/musescore/files/musescore-2.1.0-pch.patch b/media-sound/musescore/files/musescore-2.1.0-pch.patch
deleted file mode 100644
index 6cce1bd81cfe..000000000000
--- a/media-sound/musescore/files/musescore-2.1.0-pch.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 5e8024c683891be677075d74cedfbf424e36bc31 Mon Sep 17 00:00:00 2001
-From: mirabilos <tg@debian.org>
-Date: Sun, 4 Mar 2018 16:38:21 +0100
-Subject: [PATCH] Fix numerous reports of missing all.h during compilation
-
-When disabling PCH, the all.h copying code is no longer run before
-AUTOMOC=caused *_autogen targets, so we must run it earlier.
-
-From Debian
----
- CMakeLists.txt | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 66b0ddfce8..7fdfffcc9b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -553,11 +553,8 @@ endif (NOT MINGW AND NOT APPLE)
- #
- 
- # all.h is expected in PROJECT_BINARY_DIR by subdirs
--add_custom_command(
--    OUTPUT ${PROJECT_BINARY_DIR}/all.h
--    COMMAND ${CMAKE_COMMAND}
--    ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
--    DEPENDS ${PROJECT_SOURCE_DIR}/all.h
-+execute_process(
-+    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
-     WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-     )
- 
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
deleted file mode 100644
index 2fa6afd9395d..000000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 9c8a8ffe0cbb00ee93a10fe245da01a4d32ca086 Mon Sep 17 00:00:00 2001
-From: Orcan Ogetbil <orcan@localhost.localdomain>
-Date: Thu, 31 May 2018 21:04:51 -0400
-Subject: [PATCH] added missing #include <QButtonGroup> required by qt >= 5.11
-
----
- all.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/all.h b/all.h
-index 72db72b0ec..2ee0e8e807 100644
---- a/all.h
-+++ b/all.h
-@@ -131,6 +131,7 @@
- #include <QProgressBar>
- #include <QProgressDialog>
- #include <QRadioButton>
-+#include <QButtonGroup>
- #include <QSplashScreen>
- #include <QFontComboBox>
- #include <QApplication>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch b/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
deleted file mode 100644
index 9d9a1cca7ef0..000000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qt-5.12.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ff014657939f30c0052a1d2d66d87d13833c5255 Mon Sep 17 00:00:00 2001
-From: Joachim Schmitz <jojo@schmitz-digital.de>
-Date: Tue, 18 Sep 2018 14:42:43 +0200
-Subject: [PATCH] changes needed for MuseScore to build with Qt 5.12 (Alpha)
-
-One needed for MSVC only (and only since Alpha, not with the previous
-preview), the other needed for MSVC and MinGW.
-Neither seems to cause issues with Qt 5.9 (like AppVeyor and Travis CI
-prove)
----
- mscore/editstringdata.cpp | 4 ++--
- mscore/prefsdialog.ui     | 1 -
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/mscore/editstringdata.cpp b/mscore/editstringdata.cpp
-index 21a621bac0..a86207e5db 100644
---- a/mscore/editstringdata.cpp
-+++ b/mscore/editstringdata.cpp
-@@ -52,7 +52,7 @@ EditStringData::EditStringData(QWidget *parent, QList<instrString> * strings, in
-                   strg = (*_strings)[numOfStrings - i - 1];
-                   _stringsLoc.append(strg);
-                   QTableWidgetItem *newCheck = new QTableWidgetItem();
--                  newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-+                  newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-                   newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
-                   stringList->setItem(i, 0, newCheck);
-                   QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
-@@ -168,7 +168,7 @@ void EditStringData::newStringClicked()
-             _stringsLoc.insert(i, strg);
-             stringList->insertRow(i);
-             QTableWidgetItem *newCheck = new QTableWidgetItem();
--            newCheck->setFlags(Qt::ItemFlag(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-+            newCheck->setFlags(Qt::ItemFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled));
-             newCheck->setCheckState(strg.open ? Qt::Checked : Qt::Unchecked);
-             stringList->setItem(i, 0, newCheck);
-             QTableWidgetItem *newPitch = new QTableWidgetItem(midiCodeToStr(strg.pitch));
-diff --git a/mscore/prefsdialog.ui b/mscore/prefsdialog.ui
-index 5dd493fdc7..21af750846 100644
---- a/mscore/prefsdialog.ui
-+++ b/mscore/prefsdialog.ui
-@@ -4276,7 +4276,6 @@ Adjusting latency can help synchronize your MIDI hardware with MuseScore's inter
-    </item>
-   </layout>
-  </widget>
-- <pixmapfunction>getPixmap</pixmapfunction>
-  <customwidgets>
-   <customwidget>
-    <class>Awl::ColorLabel</class>
diff --git a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch b/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
deleted file mode 100644
index 1e362dd3298a..000000000000
--- a/media-sound/musescore/files/musescore-2.1.0-qtsingleapplication.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4c28258db05dd6d33bbcd037a05a7fbbb66f67ab Mon Sep 17 00:00:00 2001
-From: Joachim Schmitz <jojo@schmitz-digital.de>
-Date: Wed, 8 Aug 2018 09:16:54 +0200
-Subject: [PATCH] Fix #52106: fails to compile with
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-
----
- CMakeLists.txt | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3a30c03d63..be6a50578a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -537,8 +537,13 @@ endif(APPLE)
- ##
- 
- if (USE_SYSTEM_QTSINGLEAPPLICATION)
-+    if (USE_PATH_WITH_EXPLICIT_QT_VERSION)
-+      find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES qt5/QtSolutions)
-+      find_library(QTSINGLEAPPLICATION_LIBRARIES Qt5Solutions_SingleApplication-2.6)
-+    else (USE_PATH_WITH_EXPLICIT_QT_VERSION)
-       find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
-       find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
-+    endif (USE_PATH_WITH_EXPLICIT_QT_VERSION)
- else(USE_SYSTEM_QTSINGLEAPPLICATION)
-       subdirs (thirdparty/singleapp)
-       set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
diff --git a/media-sound/musescore/musescore-2.1.0-r1.ebuild b/media-sound/musescore/musescore-2.1.0-r1.ebuild
deleted file mode 100644
index d2c6bf1f0939..000000000000
--- a/media-sound/musescore/musescore-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="WYSIWYG Music Score Typesetter"
-HOMEPAGE="https://musescore.org/"
-SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-fix-buildsystem.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis"
-REQUIRED_USE="portmidi? ( portaudio )"
-
-RDEPEND="
-	dev-qt/designer:5
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qthelp:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	>=dev-qt/qtsingleapplication-2.6.1_p20171024
-	dev-qt/qtsvg:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtxml:5
-	dev-qt/qtxmlpatterns:5
-	>=media-libs/freetype-2.5.2
-	media-libs/libsndfile
-	media-sound/lame
-	sys-libs/zlib:=
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	jack? ( virtual/jack )
-	portaudio? ( media-libs/portaudio )
-	portmidi? ( media-libs/portmidi )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${WORKDIR}/${P}-fix-buildsystem.patch"
-	"${FILESDIR}/${P}-qt-5.11.patch"
-	"${FILESDIR}/${P}-qtsingleapplication.patch"
-	"${FILESDIR}/${P}-pch.patch"
-	"${FILESDIR}/${P}-qt-5.12.patch"
-)
-
-S="${WORKDIR}/MuseScore-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
-		-DUSE_PATH_WITH_EXPLICIT_QT_VERSION=ON
-		-DUSE_SYSTEM_FREETYPE=ON
-		-DBUILD_ALSA="$(usex alsa)"
-		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME=ON
-		-DBUILD_PORTAUDIO="$(usex portaudio)"
-		-DBUILD_PORTMIDI="$(usex portmidi)"
-		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
-		-DSOUNDFONT3="$(usex vorbis)"
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${BUILD_DIR}" || die
-	cmake-utils_src_make -j1 lrelease manpages
-	cmake-utils_src_compile
-}
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/musescore/musescore-3.0.1-r1.ebuild b/media-sound/musescore/musescore-3.0.1-r1.ebuild
index a433e8b66362..379a593d84d6 100644
--- a/media-sound/musescore/musescore-3.0.1-r1.ebuild
+++ b/media-sound/musescore/musescore-3.0.1-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 CMAKE_MIN_VERSION="3.11"
-inherit cmake-utils xdg-utils gnome2-utils
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils xdg
 
 DESCRIPTION="WYSIWYG Music Score Typesetter"
 HOMEPAGE="https://musescore.org/"
@@ -16,10 +17,14 @@ SRC_URI="https://github.com/musescore/MuseScore/archive/v${PV}.tar.gz -> ${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug jack mp3 portaudio portmidi pulseaudio vorbis webengine"
+IUSE="alsa debug jack portaudio portmidi pulseaudio vorbis webengine"
 REQUIRED_USE="portmidi? ( portaudio )"
 
-RDEPEND="
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+DEPEND="
 	dev-qt/designer:5
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
@@ -34,20 +39,17 @@ RDEPEND="
 	dev-qt/qtxmlpatterns:5
 	>=media-libs/freetype-2.5.2
 	media-libs/libsndfile
+	media-sound/lame
 	sys-libs/zlib:=
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
 	jack? ( virtual/jack )
-	mp3? ( media-sound/lame )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( media-libs/libvorbis )
 	webengine? ( dev-qt/qtwebengine:5[widgets] )
 "
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/${P}-man-pages.patch"
@@ -72,7 +74,7 @@ src_configure() {
 		-DUSE_SYSTEM_FREETYPE=ON
 		-DBUILD_ALSA="$(usex alsa)"
 		-DBUILD_JACK="$(usex jack)"
-		-DBUILD_LAME="$(usex mp3)"
+		-DBUILD_LAME=ON # bug 678234
 		-DBUILD_PORTAUDIO="$(usex portaudio)"
 		-DBUILD_PORTMIDI="$(usex portmidi)"
 		-DBUILD_PULSEAUDIO="$(usex pulseaudio)"
@@ -87,15 +89,3 @@ src_compile() {
 	cmake-utils_src_make -j1 lrelease manpages
 	cmake-utils_src_compile
 }
-
-pkg_postinst() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index c78fa36abd8a..aa6502d63d6c 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,6 +1,4 @@
 AUX ncmpc-0.33-mandir.patch 884 BLAKE2B efe04cbaecc0c44511f9a4e9eb0bcc29da1ab53a72418cadfcf467ffe13490e243e05d268cddb7aea6150033df03bb01f2b49ecfee5854eaaa776f15d2e1259d SHA512 ca6afc19c2bf900abb770ed915ed8dd583bb0ad04d29291796f8b7bf083d6de1fecac2168aa0ca72413534ce74bf598132521c5b9c59c6aace51c20598935b23
-DIST ncmpc-0.31.tar.xz 249816 BLAKE2B c9c42fc1ba5cb79cab9a9cc86831ba8ca82bb57981885be81b218d57f529ac7ca9adfbb0de1e0bc7dca8215ecf5fdae1481b73ff6d0dfb69c2020390d0c6a1a2 SHA512 0d3fed08f54afd9aef6342928a3f3b63a973d86ec6510f54c59271316aad856cd1a493e193f676971d90c40ef26486789e8580f2df528bd031251265c48a5eac
 DIST ncmpc-0.33.tar.xz 226344 BLAKE2B d52fdcb17adda1d3d61645715029552804edbf8ed95d2f19e0a25ba11f66cf0e7921748aebceb63e8e32b8d31fbc2d387dfbed6bd5c6a735d5ffa4b17d9b4fa3 SHA512 47730003c9a8ad5b6e682de4b4d3c8882d3266659fcd73ea131d1bba3d6b4d9ac66bb1a3522d63cb238ca9e22d8035907b9d7621a0b5106763770b17325f53b9
-EBUILD ncmpc-0.31.ebuild 1783 BLAKE2B 897668f216ced813cc97c2ff2ca45d977f171fcb43603e859f8d36910e7bd3c1c0cf4868393484876cdd5c6111153bbf1762d5506a184d146dc8d36889f229f2 SHA512 dec7ce858c61367633a2a4ac2869067c37492eaef9455a209a275d3514fc3a15933daa129d111b0c828f0608f3d418ef3f3d5d225e9f682691c6e702f3bb8250
-EBUILD ncmpc-0.33-r1.ebuild 2071 BLAKE2B d21b5185449a5329b5b331a4249a020932d051b23454dc3cff44853dcf93b90e647f64a050a147a43708aa3be5738e2f6a6739577fa21ff4e9abbe3ba9025034 SHA512 ec31dcc1cbda6e5b7e52973552781b8300bf134ecb518695116d76ba73e7e346cccc3a85f88d8615d5d533d2599f1a73d11971f19db921113b31a60b0c7557e9
-MISC metadata.xml 1049 BLAKE2B 7b19b1d2c404f22864faeb30a96cf87a9eb7429eb4bd0372bc28e03a88a42f827c468fb13fb0b164b8019d8e54a7a8b0f4f6d37c9f33a4f410e930cd00092df8 SHA512 f4b1af0181ec32c85f15e2357db3dd59ea38a820ade7ce658195c61ee0bf2449b06d12a2dd67c40aaaa8895e51fbbd003edd84e54804368d00f0dd1225009cbe
+EBUILD ncmpc-0.33-r1.ebuild 2070 BLAKE2B e33419a69883824503a54b47a52d95a9f1ffe2ebe7f5c70fa457918198072d90305366236a8dea0c1b9ccbcb738273366aed8830c8e3d3c89c42b350003b140f SHA512 b9f8c0220bcee0a2b6e7deee2960b350b086eeae8a3dc6d1fcbb50790447a7b3fc4754f6e92d9c153ba4beaf4e95044f0043001cd83080afe55d47fd65d05894
+MISC metadata.xml 947 BLAKE2B de28ab3a9263d21b8a2727fb80a70467d4c086c18712bcc6ee51c434f512a7daab42832728a150a677a4552f36950038e08076fd2c1eaf0ec5c2f7e82408efed SHA512 19a555b3375402a4ff9931e2d1c17bb3146d963f3c4665216e9e63deb61b99313267eb9e3815aa9f6d3f4dabee1734131b9ee71ff41562b7e9aa881fe10b1760
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index f4eb96c015fc..43e440230e03 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<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="help-screen">Enable the help screen</flag>
@@ -17,7 +16,6 @@
 		<flag name="outputs-screen">Enable the outputs screen</flag>
 		<flag name="search-screen">Enable search screen</flag>
 		<flag name="song-screen">Enable song viewer screen</flag>
-		<flag name="tcp">Enable TCP support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">MusicPlayerDaemon/ncmpc</remote-id>
diff --git a/media-sound/ncmpc/ncmpc-0.31.ebuild b/media-sound/ncmpc/ncmpc-0.31.ebuild
deleted file mode 100644
index 6476c056f6db..000000000000
--- a/media-sound/ncmpc/ncmpc-0.31.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson
-
-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 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 )
-"
-
-DEPEND="
-	${RDEPEND}
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-	)
-	virtual/pkgconfig
-"
-
-DOCS=( doc/. AUTHORS README.rst )
-
-src_prepare() {
-	default
-	sed -i -e '/'-Wl,--gc-sections'./d' meson.build || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcurses=ncursesw
-		-Dcolors=true
-		-Dmini=false
-		-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
-		-Dartist_screen=$(usex artist-screen true false)
-		-Dasync_connect=$(usex async-connect true false)
-		-Dchat_screen=$(usex chat-screen true false)
-		-Ddocumentation=$(usex doc true false)
-		-Dhelp_screen=$(usex help-screen true false)
-		-Dkey_screen=$(usex key-screen true false)
-		-Dlyrics_screen=$(usex lyrics-screen true false)
-		-Doutputs_screen=$(usex outputs-screen true false)
-		-Dsearch_screen=$(usex search-screen true false)
-		-Dsong_screen=$(usex song-screen true false)
-		-Dlocale=$(usex nls true false)
-		-Dmultibyte=$(usex nls true false)
-		-Dnls=$(usex nls true false)
-		-Dlirc=$(usex lirc true false)
-		-Dmouse=$(usex mouse true false)
-		-Dtcp=$(usex tcp true false)
-		)
-	meson_src_configure
-}
diff --git a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 67297f834180..2746f5e2c156 100644
--- a/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://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="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
 
 BDEPEND="
diff --git a/media-sound/opus-tools/Manifest b/media-sound/opus-tools/Manifest
index 6498c98eece2..6f0bb8292225 100644
--- a/media-sound/opus-tools/Manifest
+++ b/media-sound/opus-tools/Manifest
@@ -1,5 +1,3 @@
-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 1004 BLAKE2B 36bdd5cde5b7a6c30cc28d2be883b5d0e8fa07cb55b424c1e2ad9b149cc9c12accb53de2c8eec1a7f7d7858a55c21dc865b2b6d7553f871dca9b79d98646ea26 SHA512 332691fd5dc0dbc2296fd0c3a901709deecf32f069b16f0fbf555c5f8c2e3e24c93637a7a9912c2e92ba9383a48964de44690c21ff064c2ea5011ae8d3f485c1
+EBUILD opus-tools-0.2.ebuild 1003 BLAKE2B efb6eed0682ecb5adfb85a83f6a5b8cad7d27636e61561f51136c04fc760553f6b871dc09d4009c2590cb399dfff47ac9b60c7a80cd9a4560c3066cd06d34eac SHA512 6a70ca44e6f26fe7a5c6d1f0fa9148d18701d1035319496b2b6cbd4e38c825efe4709ea6f294fa398ab590e385f5deec4c904ea2d20d3228426962adfa56c6d9
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/media-sound/opus-tools/opus-tools-0.1.10.ebuild b/media-sound/opus-tools/opus-tools-0.1.10.ebuild
deleted file mode 100644
index 652f98ca9693..000000000000
--- a/media-sound/opus-tools/opus-tools-0.1.10.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit 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 ~ppc ~ppc64 x86"
-IUSE="flac"
-
-RDEPEND=">=media-libs/libogg-1.3.0
-	 >=media-libs/opus-1.0.3
-	 flac? ( >=media-libs/flac-1.1.3 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-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/opus-tools/opus-tools-0.2.ebuild b/media-sound/opus-tools/opus-tools-0.2.ebuild
index c62c01416a15..7111b11302d1 100644
--- a/media-sound/opus-tools/opus-tools-0.2.ebuild
+++ b/media-sound/opus-tools/opus-tools-0.2.ebuild
@@ -18,7 +18,7 @@ fi
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="flac"
 
 RDEPEND="
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 861479120d4e..24c962c1a821 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,6 +1,4 @@
-DIST pianobar-2018.06.22.tar.bz2 47455 BLAKE2B f1d61709f7c95438352f29a075120c4794c666d9406fb9e6dea47930f2715a0538588d29510097487c5bc06d77ccc44f393fff1561545e21bb71f739151a712a SHA512 0fc2d90324da576266f063573549399e4354b8e83678632fadb80864e82c432a1a90a3092085f0155fc136b726ba59eabb26586a1ba11c5ce668c3a89a218133
 DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
-EBUILD pianobar-2018.06.22.ebuild 1074 BLAKE2B 1a92b84e3f89536777996c5c63b917229820e197b3170178e15b61107c92bdde532c750757c1c5ebf2bf0162f9328279a5a129c538b9b53069dead349bfb1e15 SHA512 b2e8b898cbf353bba7bca795c4bdeb773dbd1c21c780b65b948d08cd1219f08fa5766fe3d97c8214ba4a32c4dfadf14b83f8424ffc1d60fb8fc36cf0c407d542
-EBUILD pianobar-2019.01.25.ebuild 1072 BLAKE2B 9213e4877d31f1d9ff2d989387065b946287724467f4dd52cb98ced245e14ffc62f2db25d1cfe2053cf9d842c2fde65b4b3878ccc83ac934d1920842ace1ff27 SHA512 b73a7c48e7b3b2895891d6bfef6a290d7c11961f92e2de04d3ef4e92d98216d42d88ca2617e3be6932d4349733fbe59a34e40963ed8c820a13ee070d9150887f
+EBUILD pianobar-2019.01.25.ebuild 1071 BLAKE2B 4d1a529708ac10f91a1b50601e166bca7ee22edae65d7b7da8bd63f12afa018af10c731f02dde9649600dd4918e2596d274979e8ebf94cf5c8ef5f342efd5fb3 SHA512 c08cceff3ca128defb7cb96da8b302576b05717a7576529886176676f8b7ef01228b82fbe97c4bdaeb9c883dd1165221be3b4b7965034950cd93becc662de2f4
 EBUILD pianobar-9999.ebuild 1073 BLAKE2B 5d28f29d27cf29d32cedba2d8e1eea1cac17a7aa7181aa82d7cdfdf2dc866730baeb343cd4e4c3189e87dc900c77940876bfc665948c8f45d854de8adec82157 SHA512 95b6254277503f6920356d7b48aff0644a4441ae32bcfbeff35092ed56d4507fa7f3d4bea2e8cdf6b2d3e163435701f4a1b9cbb4e7b7998ab55893a1cf3c684c
 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
deleted file mode 100644
index 19f4cb3e3a1f..000000000000
--- a/media-sound/pianobar/pianobar-2018.06.22.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/PromyLOPh/pianobar.git"
-else
-	SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="https://6xq.net/pianobar/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="libav static-libs"
-
-RDEPEND="media-libs/libao
-	net-misc/curl
-	dev-libs/libgcrypt:0=
-	dev-libs/json-c:=
-	libav? ( >=media-video/libav-12:0= )
-	!libav? ( >=media-video/ffmpeg-3.1:0= )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	append-cflags -std=c99
-	tc-export AR CC
-	emake V=1 DYNLINK=1
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
-	dodoc ChangeLog README.md
-
-	use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
-
-	docinto contrib
-	dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
-	docompress -x /usr/share/doc/${PF}/contrib
-}
diff --git a/media-sound/pianobar/pianobar-2019.01.25.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
index 21ff5b2645ae..60e77da71e62 100644
--- a/media-sound/pianobar/pianobar-2019.01.25.ebuild
+++ b/media-sound/pianobar/pianobar-2019.01.25.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/playmidi/Manifest b/media-sound/playmidi/Manifest
deleted file mode 100644
index 5e72ff02aeaa..000000000000
--- a/media-sound/playmidi/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX CAN-2005-0020.patch 2512 BLAKE2B 097dd8cc621e33beb82e4cf8a7595adcea9c7328321f6ced7d2048049c882dd12f34692c63531c2ecfceeb1b83f833b5ad1acecabd896ea5fe2af9e05b91cb52 SHA512 8e878acb01ae570b7a2f39fd71569772b5d3a586ae2150c277691fe53265ad9c81880057294f9c8130fd3f25813a52c1a987c5e37bcfaafff360c76a435dc039
-AUX playmidi-2.5-includes.patch 2365 BLAKE2B 30a635afa0b515ef79cb93561f8acc51832097fdf324c1c4dc43cf1660df481066746f7780425d143374d69b56085144a09da7be7fcf31c8a253bef8497ac2a3 SHA512 d02a17ebda6b39ca938195bcebd385b63cea41e3a7448fcd8d7d9f547013d828f44dab4eb5fe1da08ddaa369b4b11faa2add22f76e0df3a646dd03fbbfbe7ed0
-AUX playmidi-2.5.patch 773 BLAKE2B 8f24518f55bc70350eb566752fe0931c9518a144cfc1ee3d25da9edea599d250781352a2148bab517cbb726153f741706890e6a1bc5f615fbd7bf1c4278981b8 SHA512 72914298cc9a54f4c596a69031f5b02b0155f6b9c68c1ad214e81b478a973250a26c7697b714f9f6b8490784febfd688ea5a603d8175c381b5fa2d02e8fbd42d
-DIST playmidi-2.5.tar.gz 147687 BLAKE2B 2f59f2f25672dd50ee4b142221c8dbf708b7210931bcca148a98892ee0865a57b0525ba9af3620fa405b45ee8d3df867aa65ba72611d2034d80b407003ba9b1d SHA512 246885e17c89469ed10ded2ccf47ac8b89396458315faf26e312ec0bfc2613ebf97c3634e0ec220d87e3ddaefe7291d1fb4d16bd99e32f18a053d2dcdbe1629b
-EBUILD playmidi-2.5-r2.ebuild 1254 BLAKE2B 0f723b234985f450cd0ce47dc88bfe7dc74684417f4c5dea9f195915ab51158509f989d265619b4a24827481180142e9587889300d193cb5fc44cf9430c8e1a2 SHA512 92422078b23850cf62b24fd8fda298b684423a0cf68daffb82c5209b201d1be9a072469456a725dd974500c9d3cf18e55660f2ba3e0c2b53326ef94dc01d0de6
-MISC metadata.xml 331 BLAKE2B cbd40c088c9dac4e86aff130ad42103d68ec5c6e91692028089228677a6830c0720f6415b27a2fb2d448b3676dbe62b6efd992a0f4d8673a47453e52f9330c0b SHA512 b3c5e539cd9a23bc7e5544d014f09f25eb7c68fb23df7b91a24215286c305c1289641d718fdb957197ee160df5d36997baa44e936f7268fe5a01d4c3cf2ca6db
diff --git a/media-sound/playmidi/files/CAN-2005-0020.patch b/media-sound/playmidi/files/CAN-2005-0020.patch
deleted file mode 100644
index 9cd120eddb59..000000000000
--- a/media-sound/playmidi/files/CAN-2005-0020.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- playmidi.c.orig	2005-01-17 17:43:20.578060936 -0500
-+++ playmidi.c	2005-01-17 17:48:55.022217696 -0500
-@@ -22,6 +22,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <sys/stat.h>
-+#include <errno.h>
- #include "playmidi.h"
- 
- SEQ_DEFINEBUF(SEQUENCERBLOCKSIZE);
-@@ -186,6 +187,15 @@
-     struct stat info;
-     int piped = 0;
- 
-+    /* CPhipps 2000/02/04 - this might be splaymidi, in which case we're
-+     * probably setuid root. Drop privs immediately.. io_svgalib.c can
-+     * regain them */
-+    if (getuid() != geteuid())
-+       if (seteuid(getuid())) {
-+           perror("seteuid");
-+           exit(EPERM); /* Seems appropriate */
-+       }
-+
-     printf("%s Copyright (C) 1994-1997 Nathan I. Laredo,"
- 	   " AWE32 by Takashi Iwai\n"
- 	   "This is free software with ABSOLUTELY NO WARRANTY.\n"
-@@ -439,9 +449,9 @@
-     for (i = optind; i < argc;) {
- 	filename = argv[i];
- 	if (stat(filename, &info) == -1) {
--	    if ((extra = malloc(strlen(filename) + 4)) == NULL)
-+	    if ((extra = malloc(strlen(filename) + 5)) == NULL)
- 		close_show(-1);
--	    sprintf(extra, "%s.mid", filename);
-+	    snprintf(extra, sizeof(extra), "%s.mid", filename);
- 	    if (stat(extra, &info) == -1)
- 		close_show(-1);
- 	    if ((mfd = fopen(extra, "r")) == NULL)
-@@ -452,7 +462,7 @@
- 	    if (ext && strcmp(ext, ".gz") == 0) {
- 		char temp[1024];
- 		piped = 1;
--		sprintf(temp, "gzip -l %s", filename);
-+		snprintf(temp, sizeof(temp), "gzip -l %s", filename);
- 		if ((mfd = popen(temp, "r")) == NULL)
- 		    close_show(-1);
- 		fgets(temp, sizeof(temp), mfd); /* skip 1st line */
-@@ -460,7 +470,7 @@
- 		strtok(temp, " "); /* compressed size */
- 		info.st_size = atoi(strtok(NULL, " ")); /* original size */
- 		pclose(mfd);
--		sprintf(temp, "gzip -d -c %s", filename);
-+		snprintf(temp, sizeof(temp), "gzip -d -c %s", filename);
- 		if ((mfd = popen(temp, "r")) == NULL)
- 		    close_show(-1);
- 	    } else if ((mfd = fopen(filename, "r")) == NULL)
---- io_svgalib.c.orig	2005-01-17 17:49:55.758984304 -0500
-+++ io_svgalib.c	2005-01-17 17:49:59.310444400 -0500
-@@ -259,6 +259,10 @@
-     tcgetattr(mytty, &newtty);
-     newtty.c_lflag &= ~(ICANON | ECHO | ICRNL | ISIG);
-     tcsetattr(mytty, TCSANOW, &newtty);
-+    /* CPhipps 2000/02/04 - restore euid root in order to start SVGALib.
-+     * We don't have to worry about errors, or dropping priv's afterwards,
-+     * SVGALib handles that safely for us. */
-+    seteuid(0);
-     vga_init();
-     if ((vgamode = vga_getdefaultmode()) == -1)
- 	vgamode = G640x480x256;
diff --git a/media-sound/playmidi/files/playmidi-2.5-includes.patch b/media-sound/playmidi/files/playmidi-2.5-includes.patch
deleted file mode 100644
index 0a93c5930892..000000000000
--- a/media-sound/playmidi/files/playmidi-2.5-includes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ur playmidi-2.4.orig/Makefile playmidi-2.4/Makefile
---- playmidi-2.4.orig/Makefile	1998-10-01 05:39:18.000000000 +0300
-+++ playmidi-2.4/Makefile	2007-07-25 16:22:23.000000000 +0300
-@@ -12,38 +12,38 @@
- 
- # ncurses usually /usr/lib, -L/usr/local/lib doesn't hurt
- # unless there's more than one ncurses floating around on your system
--LIBNC	= -L/usr/local/lib -lncurses
-+LIBNC	= -L/usr/lib -lncurses
- 
- ######### NOTE:  X11R6 or newer REQUIRED
--LIBX11	= -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
--LIBGTK	= -L/usr/X11R6/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
--LIBVGA	= -L/usr/local/lib -lvgagl -lvga
-+LIBX11	= -L/usr/lib -lXaw -lXmu -lXt -lX11 -lXext -lSM -lICE
-+LIBGTK	= -L/usr/lib -lgtk-1.1 -lgdk-1.1 -lglib-1.1 -lX11 -lXext -lm
-+LIBVGA	= -L/usr/lib -lvgagl -lvga
- 
- # ncurses is usually in /usr/include/ncurses, but you may need
- # to use /usr/local/include/ncurses depending on your setup.
- INCNC	= -I/usr/include/ncurses
- 
- # just in case you keep your X includes in an odd location.
--INCX11	= -I/usr/X11R6/include -DNARROWPROTO
-+INCX11	= -I/usr/include -DNARROWPROTO
- 
- # stuff for sound blaster awe32
- INCAWE  = -DVOXWARE_CONTROLLER_7_WORKING
- # awe_voice.h path
--INCAWE  += -I/usr/lib/oss/include/sys
-+INCAWE  += -I.
- 
- # usually in /usr/include, but -I/usr/local/include doesn't hurt
- # unless there's more than one svgalib floating around your system.
--INCVGA	= -I/usr/local/include
-+INCVGA	= -I/usr/include
- 
- # Directory where application defaults files are stored for X11 version
--XAPPDEFAULTS = /usr/X11R6/lib/X11/app-defaults
-+XAPPDEFAULTS = /usr/share/X11/app-defaults
- 
- INCLUDES= $(INCNC) $(INCX11) $(INCVGA) $(INCAWE)
- INSTALLDIR = /usr/bin
- INSTALL = install -s
- 
- # if you are using the GUS Ultra driver module, add -DULTRA_DRIVER
--CFLAGS	= -Wall -pipe -fomit-frame-pointer -O2 -m486 $(INCAWE)
-+CFLAGS	= -Wall $(INCAWE)
- LDFLAGS =
- 
- OBJECTS = playmidi.o readmidi.o playevents.o \
-diff -ur playmidi-2.4.orig/playmidi.h-dist playmidi-2.4/playmidi.h-dist
---- playmidi-2.4.orig/playmidi.h-dist	1997-05-12 00:26:36.000000000 +0300
-+++ playmidi-2.4/playmidi.h-dist	2007-07-25 16:22:44.000000000 +0300
-@@ -52,11 +52,7 @@
- #include <stdlib.h>
- #include <sys/soundcard.h>
- #include <sys/ioctl.h>
--#ifdef linux
--#include <linux/awe_voice.h>
--#else
- #include <awe_voice.h>
--#endif
- 
- struct chanstate {
-     int program;
diff --git a/media-sound/playmidi/files/playmidi-2.5.patch b/media-sound/playmidi/files/playmidi-2.5.patch
deleted file mode 100644
index 317b5c8734b7..000000000000
--- a/media-sound/playmidi/files/playmidi-2.5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- io_ncurses.c.orig	2003-11-30 19:23:34.000000000 -0800
-+++ io_ncurses.c	2003-11-30 19:23:46.000000000 -0800
-@@ -14,11 +14,7 @@
-    Kelly Drive, Lackland AFB, TX 78236-5128, USA.
-  *************************************************************************/
- #include "playmidi.h"
--#ifdef linux
--#include <ncurses/curses.h>
--#else
- #include <ncurses.h>
--#endif
- #include "gsvoices.h"
- #include <sys/time.h>
- #include <unistd.h>
---- playmidi.h-dist.orig	2003-11-30 19:49:35.000000000 -0800
-+++ playmidi.h-dist	2003-11-30 19:49:46.000000000 -0800
-@@ -1,4 +1,4 @@
--#define RELEASE "Playmidi 2.4"
-+#define RELEASE "Playmidi 2.5"
- /************************************************************************
-    playmidi.h  --  defines and structures for use by playmidi package
- 
diff --git a/media-sound/playmidi/metadata.xml b/media-sound/playmidi/metadata.xml
deleted file mode 100644
index 8c84a6074c44..000000000000
--- a/media-sound/playmidi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">playmidi</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-sound/playmidi/playmidi-2.5-r2.ebuild b/media-sound/playmidi/playmidi-2.5-r2.ebuild
deleted file mode 100644
index a1bcd8e8f0c0..000000000000
--- a/media-sound/playmidi/playmidi-2.5-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Command Line and GUI based MIDI Player"
-HOMEPAGE="https://sourceforge.net/projects/playmidi/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
-IUSE="svga X"
-
-RDEPEND="sys-libs/ncurses
-	svga? ( media-libs/svgalib )
-	X? ( x11-libs/libX11
-		x11-libs/libSM
-		x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${P/2.5/2.4}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/CAN-2005-0020.patch
-	epatch "${FILESDIR}"/${P}-includes.patch
-}
-
-src_compile() {
-	local targets="playmidi"
-
-	use svga && targets="$targets splaymidi"
-	use X && targets="$targets xplaymidi"
-
-	echo "5" | ./Configure
-
-	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		depend clean || die "emake failed."
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -I." LDFLAGS="${LDFLAGS}" ${targets} \
-		|| die "emake failed."
-}
-
-src_install() {
-	dobin playmidi
-	use svga && dobin splaymidi
-	use X && dobin xplaymidi
-	dodoc BUGS QuickStart README.1ST
-	docinto techref
-	dodoc techref/*
-}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index fbefe386cbe3..1fb96edf9ce2 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -4,6 +4,6 @@ AUX pulseaudio.init.d-5 2227 BLAKE2B 263c589ab81a70d5159c0ee81773a456b8acaefc3b7
 AUX pulseaudio.service 227 BLAKE2B f58fa701152e84f4d52426f6f76b5a01a1a315d09e5fb8e9e57860b44dc63b78b3f1c1629380b4345c53b003c677f729b3959419e8488e37607c56d6a700626a SHA512 567663b231fe7c2682b08b1059cdad1fcb3c4cb01c1b24aed9afb6fb767b30f250b78bbbed48aadfb06c6d1a4963a6db24877d79a1d36c4be2a128b479c086d6
 AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f906c88cdc778c6191f17c799f1db072f09d5a384485830e4d33266c224955bad22081255544642399b2f6 SHA512 f040850d81030ef04e1aa368d333a1ae1b7238adef5772280fc344c3068262d5ab8c9f3edb92db9c443f9d7d21abb27583ea1efc51ed733bbfa43e2edc68dde1
 DIST pulseaudio-12.2.tar.xz 1665092 BLAKE2B 2e36efc5142c1e379cc2b135f4126f03a31831b26efe60f7cdf128af6e23fab25706a5609644d0b387530021055f87525fe60d527cd3a087f51bfd58e810644f SHA512 877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e
-EBUILD pulseaudio-12.2-r1.ebuild 11540 BLAKE2B 05ac7f7da5fc1ca311e7e3e790b2e02811b4f3d041e369ae09a91d63334801e027c8b1d593d9d073ab389e7fc01a85073943cb3da034460ad4ec557dd6e3829d SHA512 c45300bf8a3dce5396ed9b65065390dac21d521d066d60efe3165ddbb2987b9685c5f04af88630c943adda8483639ba66769d0c04a495a044be9ea5f5f1cf805
+EBUILD pulseaudio-12.2-r1.ebuild 11539 BLAKE2B 25943f683cf0d62785d762508efb202aa7bb4609bb4411582b57ed4418f956caa06403d01d041d3f48651ecac14e3f686650dc304311dda77f5bab70a03d3f8b SHA512 b83f459ae4a5b1978c1598cf2636b96baaa3013975804a5f1bde85fe5548a139f4ee59b1b0a183d1de31972b6d927ced5c8babe9e59ef59e9c569ca6c4460a50
 EBUILD pulseaudio-12.2.ebuild 11111 BLAKE2B bd002a2bf9d7c0521eed3baec7d2b602302e8cd4bd7acd6ea22abeff54ee1be8042b44bcfd64a7f4d57f2855a958235d5b16fcf018f0377cd5f5faee040c84e2 SHA512 dd20835fb783428209dcffa07b0b4c1ec9f3e42b91faf07052df5f77f3eac388ee91dfbfe2da7f07890ae3631234a8a14bfafc41875c6716c6b8b9e839ba0f21
 MISC metadata.xml 3308 BLAKE2B 29baf3692d386ab71e112f1870649a38061b1c1bff7d6338d48e1486d56c5e937a7653650cc387db4242cfa3b6954ad072852db7373276fbdfcd4fc441380ea8 SHA512 a004e0e0e82e5c4b2e1953ea754bb47bf4b43bb60e422e5685131b3f3192eee6086a0582eb17879193877b66499e8cad22496fa5003ea4f3b617a320940eda31
diff --git a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
index 7ef205735e65..45fd8f297ab3 100644
--- a/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-12.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz"
 LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 )"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 
 # +alsa-plugin as discussed in bug #519530
 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer elogind gconf
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index bfdb338a1003..cfe44f2a8c15 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,10 @@
 DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
 DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
 DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
+DIST pulseeffects-4.6.0.tar.gz 1831433 BLAKE2B a5eda0e6880f8a3e62ad62b5e1ed3b5b44118d3ac14821f786532f567974fd40e78f0b4c4a7c51851bb48b94694bf473fe0996e7fb361db0c50b00a467b9c949 SHA512 acadff43f35f7ac5f5028e87efb1c8c0d4d8ed97d367b53fd231475243735ac149d8c1aac9c86281ec9a661814a665f67d43f7fc0d7e591b19524b5cb2124f92
 EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
 EBUILD pulseeffects-4.4.7.ebuild 1727 BLAKE2B ca64436e30a37e6a6f42bfec26eda83f55fdba724c15c63dc1f76deebaa504d21664cf14eb4ea8be713c8710e4a39a6fdd54dde84f18fd6c7082a646809911a9 SHA512 587856d36ad596a802eb9441571ba0b37290694dc5c466bbaa450e2dbfbb516c70ef107bd0b5a968e03bb15fa0ac6829219787b5819cbf7b7b473efb85e05e79
 EBUILD pulseeffects-4.5.9.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
+EBUILD pulseeffects-4.6.0.ebuild 1800 BLAKE2B 8dbf5e6ea883155e4a44f4aa259cdd214ecde1866826409b5ce0daa1b7ac8f9c8fd5814ccd96b7891563bb138d9efc15188a35e04ee1e5fa758802158abff058 SHA512 8af20d569a036a53c150c644b854fb837c395629aa059a071ebbab064ae027579d715605b4e73c3588a08856f34cfaa07e9c6ac769d0f981756f15595bf33562
 EBUILD pulseeffects-9999.ebuild 1792 BLAKE2B 4770e4f7f3fbd013166e2b5c694c5463a71ab4209fd8aac620015c654137ffb92b3e53fe338bad07b1fd69b00423eec2e4d9162730f4830352cc404c8051cafe SHA512 1bae5647fa6d7e53d5d97c60236e53af007ad4c2cff13ef385b45c0bd1cacadc154edce2dc677b008624bc7e41ab8f5edb332acd86c63e8ac70dcb78c32605b9
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild b/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
new file mode 100644
index 000000000000..451cdef35758
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.6.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="${HOMEPAGE}"
+else
+	SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/sonata/Manifest b/media-sound/sonata/Manifest
index ce3bcd15003b..a6e3f95d15c6 100644
--- a/media-sound/sonata/Manifest
+++ b/media-sound/sonata/Manifest
@@ -1,5 +1,4 @@
 AUX sonata-1.6.2.1-mpd18-compat.patch 820 BLAKE2B 473334fdd3f3b72352dbc2a35c842765cd8140c1ec65e905f50c48c234f13fd26c85267cae5db9e497d55229c1896feffb301d70df7a298dfc8a6bf1d09ae31d SHA512 b0d904edbb9d6e92408402d3b25b5e2dad452767d3030c2608335a86dd7242c135b121293a2f73b92a77a260d44806ffec99b309f4b394f558cd5f8ab318ac66
 DIST sonata-1.6.2.1.tar.bz2 314333 BLAKE2B a2d7f6f8b5fe4b774136c70e7a354a8b8d948f44e876e3d59b0a216cb482de6c9b5a38b1332347136466965bd0551a03ba53f9e554c969ce901e880fa691496e SHA512 8022b69380714e9c3c685c61d0f1e62be087fc2cbd77a55f32008edea53411f8493d416bd0a446ccb52b4b5603ba9f4a00b655af485d739932dc06af69345c27
-EBUILD sonata-1.6.2.1-r1.ebuild 966 BLAKE2B dd16bc734d1b82516bf58fdf2d68a3d8e2a6af2a24ffd0186a3df50293491db4220ada3dab009a989fe4f002cce671448a4f044dc8102545677137a742e549b9 SHA512 e21e1e906562b6a3d23a08ac0ecb2d3e05865a2a8ee931a106ec495c47694176bb78915baf6f3baa9df29beb60f4f36cd491e0e35280d79b0265cdc215ec7198
-EBUILD sonata-1.6.2.1-r2.ebuild 914 BLAKE2B 7922f3cac78d2fce81c210f8b54b9c808c36fc51f76156ed0e5e4cb826ee743f42f99e80fa1baf01545921d8d4e1e7a1d25880fe161816e8fd776c8a5333239c SHA512 d5c6f8c08d8bfce3890ce81893147aba4c3ccff604653faaa5c7fce4b3b833b2a1a24bb21ad2babdccc8f7110f6cb4063fd43c5956117d0d52c42ce6e357e5dd
-MISC metadata.xml 615 BLAKE2B 818b8486f6142d1816045cee963976f34d462f2b26662c242aef72155c180bf9ab6c739ae9925a2cf71434bddbf6f0fcb5487ebac018889bfae6ef6ad41e7f1f SHA512 bec106b2bd1a9ca9f55d833f822b0cd9eb9541989f030e7a6698c3428efe2d99ae7ad88d6ef572a4af4a07c1d1450e1a031842608b10f9891ca9fa40816affa4
+EBUILD sonata-1.6.2.1-r2.ebuild 913 BLAKE2B 846840b1896d13d3510498331c3e1c4663c6b0a013288c3eb6103a905a67c4b5299519f3eb2fde92dd8fa24b011588e02e6606993c7b82d4dafd03b25209123a SHA512 fb8abb6c69d16cb5a36f688a5b41473abf8a72acec5c70ea6395d178bb9f0962198d8c8bad94f697c2356876816077c96c1e78f3eebef9c47dec604cd79a4276
+MISC metadata.xml 554 BLAKE2B eb83a90fb0ad69e577369c4446edcdb2c1cc240958038fa776a61bce22d40fec23d0f4b1678b51edcec3110604fd7b5f273d67857ac9037dc93d82ca2fd7f708 SHA512 de93bd7c5f5425a2ee0d2179a2b3f4591d8507ba1caa9c5c2b133cc5888a94565d7b60af9890c114a3908797324475543659f54a78f23bdf884e98cc49fb7c7e
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
index 6a30df2dc8cb..ce109085d31b 100644
--- a/media-sound/sonata/metadata.xml
+++ b/media-sound/sonata/metadata.xml
@@ -12,6 +12,5 @@
   </longdescription>
   <use>
     <flag name="lyrics">Support for lyrics fetching</flag>
-    <flag name="trayicon">Enable support for trayicon</flag>
   </use>
 </pkgmetadata>
diff --git a/media-sound/sonata/sonata-1.6.2.1-r1.ebuild b/media-sound/sonata/sonata-1.6.2.1-r1.ebuild
deleted file mode 100644
index 8b9887bb4c3f..000000000000
--- a/media-sound/sonata/sonata-1.6.2.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=true
-inherit distutils-r1
-
-DESCRIPTION="An elegant GTK+ music client for the Music Player Daemon (MPD)"
-HOMEPAGE="http://www.nongnu.org/sonata/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-# now released at https://github.com/multani/sonata/releases
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="dbus lyrics taglib +trayicon"
-
-RDEPEND=">=dev-python/pygtk-2.12
-	|| ( x11-libs/gdk-pixbuf:2[jpeg] x11-libs/gtk+:2[jpeg] )
-	>=dev-python/python-mpd-0.2.1
-	dbus? ( dev-python/dbus-python )
-	lyrics? ( dev-python/zsi )
-	taglib? ( >=dev-python/tagpy-0.93 )
-	trayicon? ( dev-python/egg-python )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="CHANGELOG README TODO TRANSLATORS"
-PATCHES=( "${FILESDIR}"/${P}-mpd18-compat.patch )
-
-src_install() {
-	distutils-r1_src_install
-	rm -rf "${D}"/usr/share/sonata
-}
diff --git a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
index 84d5a419dbd5..e66283e07368 100644
--- a/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
+++ b/media-sound/sonata/sonata-1.6.2.1-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="dbus lyrics taglib"
 
 BDEPEND="
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index 8e35b9d911f6..dc0d7b619669 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,7 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
 DIST spotify-client_1.0.98.78.gb45d2a6b-10_amd64.deb 105135826 BLAKE2B e1641a738f8e03c86d9b28ac902ed9857e1bb406b03e7a1c59c522e86a211b13cfd442bf84f79af4302d32a4b1c041e8ef7297990e70912d8c0a5108838e0500 SHA512 f20f2c998a205f189a19f332b2e738a0ec98a34520765c0e1d27d95d92f7c9c2f78da32f9edcc61146be87e8d8df7d3521d2e84b427cd25586b9fe6bec8d1602
-DIST spotify-client_1.1.0.237.g378f6f25-11_amd64.deb 104760412 BLAKE2B d6cd695a41d80a47362b694e74b7d9d34a5c6480dbce189fa22d514126ab3022387871021a3d2a1301d9eb88c3b8f70755c1a5f880f9cc34c67c5faead7d84b8 SHA512 a1fcbf3463eea13a4ff38f4b40ae999c8e138abc8adf6988b4d764e597f166ef894baf449a6506a6b9b69ba3ed92c83dcb1a1eda23ab843c0441d2b71bbb0d51
+DIST spotify-client_1.1.5.153.gf614956d-16_amd64.deb 113728674 BLAKE2B bc7930a1935c0a05dba262abc384a699720be53e3bec83393c962761bee647a247d2ddf475a6812bdb969fc1f59e9d2c283de0da398a9b8f7ddfff8f1232fef1 SHA512 db354f161c35b5f1a2d633282fad8fccf565e0061e7d258012f28422d766630391d47d4dafe22448fb60f850bf4ccbfdf82443cf107e03727c077b2c62e524be
 EBUILD spotify-1.0.72-r1.ebuild 3204 BLAKE2B 8844b7707b35537320da75bd7417c320559abbc668249cc652e9e2d481cfc9a00328458a8ee8c242acc46e832a81127686f0a3bb93ee6d4e4cc2e9e24f8c18d7 SHA512 8f194869be7f6aa8a9330d8597e8a4419a19203f4dbe387de1aeeda9350de13e4596a01290ed452c358d72fc8e20e249b4fcbf17a1f38a688315e0c189e0cc4c
 EBUILD spotify-1.0.98.ebuild 3429 BLAKE2B 436b23f7857907ba883d7ade7eedfe1ecbfe15f2b2f787c1a832bc4d888c13aa5098b9a495f38c200795775476501465d6fb63e39e1b0cbf5e6da9093ee76c48 SHA512 9f431988b6adf74319efce9aee404684bf495604db5d5b1a0cfa241c43cd026e4646bfc19ad1d66572bf451423be832761750ebfda1a43b10d50f283b37d70f2
-EBUILD spotify-1.1.0.ebuild 3430 BLAKE2B c953ba10780cc5af2142d3f32a2d2a9f6dc2045896a3ef9c0a333430fc95ddf0ae39358e75b8972eb175dd47456e0f7d706f89d94b81acbcafb2a1f0fe0505cb SHA512 caa258ec7469691b5d2241c32495cf8c8f702a745948986be8102249430955afc9bc61edc100f61fe114abcbd35c72bc48025e1db1aa0b232da1f76f1490e6e0
+EBUILD spotify-1.1.5-r1.ebuild 3078 BLAKE2B 248485abac1f97b0f4cdfcdad4d6269b4ec9023f29a2b5332c7596899ef0deff97c37f8be7f3d63ca1bf37b162611f2825f792026bdb407359495f30e0e91f3c SHA512 72ed085363ad74d5ad4b1492936f885242d749d8432b616a8a7d39414d9cbfa2e14f25f6af427d737d45a9d854117f3f57530d073a7a7f60d724f6b7db4d3f09
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.1.0.ebuild b/media-sound/spotify/spotify-1.1.5-r1.ebuild
index c00dd57ac9fe..6bb9251f650c 100644
--- a/media-sound/spotify/spotify-1.1.0.ebuild
+++ b/media-sound/spotify/spotify-1.1.5-r1.ebuild
@@ -1,44 +1,42 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils pax-utils unpacker xdg-utils
+EAPI=7
+inherit desktop pax-utils unpacker xdg
 
 DESCRIPTION="Spotify is a social music platform"
 HOMEPAGE="https://www.spotify.com/ch-de/download/previews/"
 SRC_BASE="http://repository.spotify.com/pool/non-free/s/${PN}-client/"
-BUILD_ID_AMD64="237.g378f6f25-11"
-#BUILD_ID_X86=""
-#SRC_URI="amd64? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb )
-#	x86? ( ${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_X86}_i386.deb )"
+BUILD_ID_AMD64="153.gf614956d-16"
 SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
 LICENSE="Spotify"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
+IUSE="libnotify systray pax_kernel"
 RESTRICT="mirror strip"
 
-DEPEND=">=dev-util/patchelf-0.9_p20180129"
+BDEPEND=">=dev-util/patchelf-0.10"
 # zenity needed for filepicker
 RDEPEND="
-	dev-libs/openssl:0
 	dev-libs/nss
+	dev-libs/openssl:0
+	dev-python/dbus-python
+	dev-python/pygobject:3
 	gnome-base/gconf
 	gnome-extra/zenity
+	libnotify? ( x11-libs/libnotify )
 	media-libs/alsa-lib
-	media-libs/harfbuzz
 	media-libs/fontconfig
+	media-libs/harfbuzz
 	media-libs/mesa
 	net-misc/curl[ssl]
 	net-print/cups[ssl]
+	|| ( media-sound/pulseaudio media-sound/apulse )
+	systray? ( gnome-extra/gnome-integration-spotify )
 	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
-	dev-python/pygobject:3
-	dev-python/dbus-python
-	libnotify? ( x11-libs/libnotify )
-	pulseaudio? ( media-sound/pulseaudio )
-	systray? ( gnome-extra/gnome-integration-spotify )"
+"
 	#sys-libs/glibc
 
 S=${WORKDIR}/
@@ -100,17 +98,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 
 	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
 	ewarn "To remove the cache:"
 	ewarn "rm -rf ~/.cache/spotify"
 }
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index 86ee7dd0c262..670b5afd7a8d 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,6 +1,11 @@
+AUX teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch 4523 BLAKE2B e7193fae5efbaeac62e8366f89e8fc19cc32b0eb5269f74ba2108c2bf656f4fcd22d861e21e6512fab6240cef89a6aae7f1c2f77aba01be78af14aef68a8d223 SHA512 fdfe279bb69e7e48a28b64dd430eaeb74a51a3de7c3ea7ee32d0b399e386188f0d3f8f26064ea90f857d362639ad5cc019696cc28cf04691cb97c119cb47627e
 AUX ts3client-bin 323 BLAKE2B bfeb748c59492387139b70bd3d688bf0c21969566d7cbfafec9abc3974daad67f34ad00cef53a35f229e8434ad2a15454c29c1470214f47332cd606053cb515d SHA512 42c5ee014db58b99d4680e31a59ac8b53c3a005332478ed166128fd08867c0cdc167c5b74a97a0f3a630c8faff9e5edd9c96da28bdbebae1d56a896e7a50e95d
+AUX ts3client-bin-r1 474 BLAKE2B 79b29de7ea3ceabc88d681e96c871612e9ebcb1da291f2500c3e533433a31593cb9d32e82cf9fd305d2d9c04f7d6df62295594397eb447ffb9a6d3396541872f SHA512 27b6ac42ec3ca05868786ee62d0f9ac4900ed2db9dfed0f2fe9cb951669e7abee7e0d2f8d07db76b03c3fc965fb48f46d94b4e64a5e8dbcd6c24d22e724db938
 DIST TeamSpeak3-Client-linux_amd64-3.2.3.run 76247769 BLAKE2B 2fc226455bf839811ad82735c30f493ac9800e6f5f2f3af2d34bcbce3abd7478144feff329c3afa31d994a891990ecae5f51aa3fa001fe828d4ae0bba60fc6e9 SHA512 6f2a0e366589a3495be3ecbe3e866e1d05db3578ed1e2bf19195e6d6818acc1ddb44b46915aa88ff64ac6cc150d3b88b3347147bb0cde93e013aa7960c10dfab
+DIST TeamSpeak3-Client-linux_amd64-3.2.5.run 76619678 BLAKE2B b8d42a4d633124cab395ea69d3ccbebc65f4d9b5a148c6a81a6d9a3afab48dd59fd99ac3f5cc9551c89daabb7cc51a60c5587034a7a5bec5e3b530ecb3d6e220 SHA512 fdfaa863d3523fffdf46ca0cf9c2b0588e8d847e348ade75c8f82818920f493460740a5192d4cc8d1eafe1e7a03af93b09ae6ddecaa0b166552ab5409508a445
 DIST TeamSpeak3-Client-linux_x86-3.2.3.run 75997823 BLAKE2B 03403430d6409ceebcbdfcdb48b54142327a003c300a3bcbd63f9fb6e40c259f50ee9346fe54fbbb3a19143bacb782248f5b61d2a950f893e8227568a2df1839 SHA512 ad6ea2d5f8237585859c5deac11e0f0b6af6018b2a92fe0aab2a04cfdeab0bd57166bf4fec273d48fedd20819203cba2fd58c3a76b59ec3224e867fc10172808
+DIST TeamSpeak3-Client-linux_x86-3.2.5.run 76311914 BLAKE2B 4a8f4a6ce55bde680f2d9d1f28c1cabe2a01fa6c10f3f3f637931dbe2f652c87cd2a7b61f054b50a8faf3bce461e316ca2e9b68418271535a5f6a3cd0b9d3492 SHA512 90b46a840a6e43bbc7d4cfb526117a81cdb92fb8186194ab9f245e8e501608ec4740a198e8d1de5e3f69bea84ab6281384915193d4e6a1e90aff45b4b80d3d9a
 EBUILD teamspeak-client-3.2.3-r1.ebuild 2442 BLAKE2B 7d2564f54e92a7a78056210990b2f98698b29395640de75e8b1b6851a416580c868e7f5e6a7d3899c9e0ed53c546b76445f187dbcca80d330e8954507bb0f5e5 SHA512 7a3a782284fae46e4195a3273852e30744695fecaaf1f8494f86fcfdf651d48f9d79b08e764e10faf9289441d49a0a0cd5ce2f017944d4229db18809b9641876
 EBUILD teamspeak-client-3.2.3.ebuild 2379 BLAKE2B 057d9457649540a24310cbf2e41e00f13a03dbeef8ddf2eacbe0dc5252f83edc70acfa639d85b275c713fb262f382ca111cc8b0f503b092e2274e35e72c2a625 SHA512 6cb276274f2949f09df682d9479e127fb7191da51ed61e42e0fee1f97800b359f8e70390bf6543b4840e4cbcb4523d48e9eed0eaf43b4303d37f9964271f8de9
+EBUILD teamspeak-client-3.2.5.ebuild 2539 BLAKE2B 567bb70a3c72a3bf13a5cb9c721b40f292b2a7c18260e042b7f6a48401fb78aabd12f095b963336cca6baaf2681f9c41caffab961959d689fe13f1b4c1f2cc58 SHA512 65e2c1006054b428a8d230428abaaf9bf99b6df51c3fa13b8941e6aac4619d1f8e988e4bc0bdfc6bc50972a3ec642119fae23c277a0bc149de24f5fcf77b9540
 MISC metadata.xml 756 BLAKE2B 24d27da6d88662420d55ced31434390eeb7cdb354bdd09c7ae9381c1317d69e6aba654098a11efe3a0a9f86f5dafa53302ef6ba09a84463ab4267a4bcb5cc260 SHA512 5fea4c3f3823d53bb3ab6d9c05fc8e468f45c7441276e94eabb05b680f6253a920d92fff8735433121814b1fe80bf5f51c60cd001b42e714cb10bb22a5609cca
diff --git a/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
new file mode 100644
index 000000000000..ee5f78914d0b
--- /dev/null
+++ b/media-sound/teamspeak-client/files/teamspeak-client-3.2.5-qt-5.12-symbol-reexports.patch
@@ -0,0 +1,141 @@
+diff --git a/Makefile b/Makefile
+new file mode 100644
+index 0000000..c036d5f
+--- /dev/null
++++ b/Makefile
+@@ -0,0 +1,2 @@
++overrides.so: qt-5.12-overrides.o override-version.map
++	$(CXX) $(LDFLAGS) -shared -o $@ -Wl,--version-script override-version.map qt-5.12-overrides.o
+diff --git a/override-version.map b/override-version.map
+new file mode 100644
+index 0000000..991d98e
+--- /dev/null
++++ b/override-version.map
+@@ -0,0 +1 @@
++Qt_5 {};
+diff --git a/qt-5.12-overrides.cpp b/qt-5.12-overrides.cpp
+new file mode 100644
+index 0000000..002a1af
+--- /dev/null
++++ b/qt-5.12-overrides.cpp
+@@ -0,0 +1,120 @@
++/****************************************************************************
++**
++** Copyright (C) 2017 The Qt Company Ltd.
++** Contact: https://www.qt.io/licensing/
++**
++** This file is part of the QtWebEngine module of the Qt Toolkit.
++**
++** $QT_BEGIN_LICENSE:LGPL$
++** Commercial License Usage
++** Licensees holding valid commercial Qt licenses may use this file in
++** accordance with the commercial license agreement provided with the
++** Software or, alternatively, in accordance with the terms contained in
++** a written agreement between you and The Qt Company. For licensing terms
++** and conditions see https://www.qt.io/terms-conditions. For further
++** information use the contact form at https://www.qt.io/contact-us.
++**
++** GNU Lesser General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU Lesser
++** General Public License version 3 as published by the Free Software
++** Foundation and appearing in the file LICENSE.LGPL3 included in the
++** packaging of this file. Please review the following information to
++** ensure the GNU Lesser General Public License version 3 requirements
++** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
++**
++** GNU General Public License Usage
++** Alternatively, this file may be used under the terms of the GNU
++** General Public License version 2.0 or (at your option) the GNU General
++** Public license version 3 or any later version approved by the KDE Free
++** Qt Foundation. The licenses are as published by the Free Software
++** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
++** included in the packaging of this file. Please review the following
++** information to ensure the GNU General Public License requirements will
++** be met: https://www.gnu.org/licenses/gpl-2.0.html and
++** https://www.gnu.org/licenses/gpl-3.0.html.
++**
++** $QT_END_LICENSE$
++**
++****************************************************************************/
++
++#include <stdlib.h>
++#include <malloc.h>
++
++#define SHIM_ALIAS_SYMBOL(fn) __attribute__((weak, alias(#fn)))
++#define SHIM_SYMBOL_VERSION(fn) __asm__(".symver __" #fn "," #fn "@Qt_5")
++#define SHIM_HIDDEN __attribute__ ((visibility ("hidden")))
++
++extern "C" {
++
++SHIM_SYMBOL_VERSION(malloc);
++void* __malloc(size_t size)
++    SHIM_ALIAS_SYMBOL(ShimMalloc);
++
++SHIM_SYMBOL_VERSION(free);
++void __free(void* ptr)
++    SHIM_ALIAS_SYMBOL(ShimFree);
++
++SHIM_SYMBOL_VERSION(realloc);
++void* __realloc(void* ptr, size_t size)
++    SHIM_ALIAS_SYMBOL(ShimRealloc);
++
++SHIM_SYMBOL_VERSION(calloc);
++void* __calloc(size_t n, size_t size)
++    SHIM_ALIAS_SYMBOL(ShimCalloc);
++
++SHIM_SYMBOL_VERSION(cfree);
++void __cfree(void* ptr)
++    SHIM_ALIAS_SYMBOL(ShimCFree);
++
++SHIM_SYMBOL_VERSION(memalign);
++void* __memalign(size_t align, size_t s)
++    SHIM_ALIAS_SYMBOL(ShimMemalign);
++
++SHIM_SYMBOL_VERSION(valloc);
++void* __valloc(size_t size)
++    SHIM_ALIAS_SYMBOL(ShimValloc);
++
++SHIM_SYMBOL_VERSION(pvalloc);
++void* __pvalloc(size_t size)
++    SHIM_ALIAS_SYMBOL(ShimPvalloc);
++
++SHIM_SYMBOL_VERSION(posix_memalign);
++int __posix_memalign(void** r, size_t a, size_t s)
++    SHIM_ALIAS_SYMBOL(ShimPosixMemalign);
++
++SHIM_HIDDEN void* ShimMalloc(size_t size) {
++    return malloc(size);
++}
++
++SHIM_HIDDEN void ShimFree(void* ptr) {
++    free(ptr);
++}
++
++SHIM_HIDDEN void* ShimRealloc(void* ptr, size_t size) {
++    return realloc(ptr,size);
++}
++
++SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) {
++    return calloc(n,size);
++}
++
++SHIM_HIDDEN void ShimCFree(void* ptr) {
++    free(ptr);
++}
++
++SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) {
++    return memalign(align,s);
++}
++
++SHIM_HIDDEN void* ShimValloc(size_t size) {
++    return  valloc(size);
++}
++
++SHIM_HIDDEN void* ShimPvalloc(size_t size) {
++    return pvalloc(size);
++}
++
++SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) {
++    return posix_memalign(r,a,s);
++}
++}  // extern "C"
diff --git a/media-sound/teamspeak-client/files/ts3client-bin-r1 b/media-sound/teamspeak-client/files/ts3client-bin-r1
new file mode 100644
index 000000000000..3edbc2e7907a
--- /dev/null
+++ b/media-sound/teamspeak-client/files/ts3client-bin-r1
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Sets BASEDIR for teamspeak3-client
+BASEDIR="/opt/teamspeak3-client"
+
+# Work around DT_RPATH (.) security issue by chdir'ing into expected $LD_LIBRARY_PATH
+export LD_LIBRARY_PATH="${BASEDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}"
+
+# Preload the library that provides calloc@Qt_5 and such (gentoo bug 675874)
+export LD_PRELOAD="${BASEDIR}/overrides.so${LD_PRELOAD:+:}${LD_PRELOAD}"
+
+# Launch teamspeak3-client
+cd "${BASEDIR}" && exec "${BASEDIR}/ts3client" $*
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
new file mode 100644
index 000000000000..9204ab36f972
--- /dev/null
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs 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 || ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="0"
+IUSE="alsa pulseaudio"
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+RDEPEND="
+	app-arch/snappy:0/1
+	dev-libs/openssl:0
+	dev-libs/quazip
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5[accessibility,dbus,xcb]
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5[geolocation,widgets]
+	dev-qt/qtwidgets:5
+	net-libs/libsrtp:0
+	sys-libs/libcxx[libcxxabi]
+	sys-libs/zlib:0/1
+	virtual/udev
+	alsa? ( media-libs/alsa-lib )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="
+	opt/teamspeak3-client/error_report
+	opt/teamspeak3-client/package_inst
+	opt/teamspeak3-client/soundbackends/libalsa_linux_*.so
+	opt/teamspeak3-client/soundbackends/libpulseaudio_linux_*.so
+	opt/teamspeak3-client/ts3client
+	opt/teamspeak3-client/update
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.5-qt-5.12-symbol-reexports.patch"
+)
+
+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
+
+	tc-export CXX
+}
+
+src_install() {
+	exeinto /opt/teamspeak3-client
+	doexe error_report package_inst ts3client update overrides.so
+	newexe "${FILESDIR}"/ts3client-bin-r1 ts3client-bin
+
+	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/umix/Manifest b/media-sound/umix/Manifest
index f451f1282fce..abc7cd7972bf 100644
--- a/media-sound/umix/Manifest
+++ b/media-sound/umix/Manifest
@@ -1,5 +1,5 @@
 AUX umix-1.0.2-tinfo.patch 381 BLAKE2B b54721623167ae634b5e6e0243ffe9fb57c7af3f99236e23317163aa95926bf2c2a56b07eed1bdd228c7d92c21e0009dd5044e551e9d06bd3488bbb47a9666db SHA512 acd5f8c6a22ed857182fabba848b1718d1031cd6b7c15456e25f37387ed8cb6c354accd1e83781954c9beed88337889538dc1e38992a4ddadabc3077941c048e
 DIST umix-1.0.2.tar.gz 225866 BLAKE2B 8ab2b3246440fcab64edea366dafd5d8f734c42483fd78410a1f884c2b046a27fdb6959023d6c537900c64409ad0f606e7d2c2e91f23bdd03dda61940ba7d29b SHA512 9e59a26c0b6cd60bbcfa715694ed58e023c119840080ccb46d9e6b17a9613fd42c1346233a5185d02ece77e3f3e456e18be25573fd34e2f265c5b0b3dc593468
-EBUILD umix-1.0.2-r1.ebuild 697 BLAKE2B f5b49cb08ac56b2c8edc8e558d1f7085190e50e2243ed74db3dbcb93c3373eef5a3219f05bb020d9d5a75fb49da390b226d5625024d3e2cbb590459b7adf78e7 SHA512 2df75902cccfa19cf652acfba9f64affa27a55a36712a527dec4edd62e5fce73b33ccc44909b39cd693d6ecef1b6ecd461fd7aefb2adaadb4e57dc9aed656f36
+EBUILD umix-1.0.2-r1.ebuild 696 BLAKE2B 71cd2da90f3a1dc5b0ff4da2784da21eabca8f5f7a3b9aac9513ad4c43545ee82ffd77d4755257433fed1240bdf5fb0a35dbffe340455d476862dac21d4505b1 SHA512 618b58c883ef95d79f28c61a4c28b10039030da667507707d8834b5122d0bd98047edb206e4183cf3505d3ffb4780b35c8cf30d26db2778849169e37cb750fb8
 EBUILD umix-1.0.2.ebuild 627 BLAKE2B f08396b4ac2659b8511bcc8c1b44653cd07f657aa2a27b021a6f55cbab861301ecc95817d6898fe066deaf9cd9b9783f3903b89c78374bd5fdb974e84a085c9f SHA512 00c36690b96c9f6106657b229c884e7e7ee0d6a94e367c26e2bcddfd7645303be054d319c994c4204664441471f2fe655af747b31deae55efe6fb722c796a548
 MISC metadata.xml 327 BLAKE2B 8c7901bd5f9eac11aa6e16d5df9e6a2ea87475effc0623deb6fc73d741f1ea92b8dc00f77f5edc95b05fe9ef643478497aeb9ebf28274155c4d21b6ebec783ee SHA512 e46843a6b8a9feb294b713eb1766900dbebf7211212423c9e791f0ffa59faeb9fb0c909c4268d13d737d80818fc343d6c067b8dc3bf369515083e7f1fc3abb71
diff --git a/media-sound/umix/umix-1.0.2-r1.ebuild b/media-sound/umix/umix-1.0.2-r1.ebuild
index 6e460373a488..7a92f8ab81e8 100644
--- a/media-sound/umix/umix-1.0.2-r1.ebuild
+++ b/media-sound/umix/umix-1.0.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc ~x86"
 IUSE="ncurses oss"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5.2:= )"
diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index b24940d61458..8f9c6cc756b2 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -6,4 +6,6 @@ DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B ba306dfa4c6fa958735ab02bd262729d582acd
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 EBUILD umurmur-0.2.16a-r1.ebuild 2136 BLAKE2B e8ccba8b874014b89991f731abd0c2f1b724c126aeedd6563c4b118efcc630004d3cdd46a122678499f680d4e065f410bf5656e442d8c7ca560b64e05e96f406 SHA512 d65241e668ebb560a8f4ca482374c2d4a3738ee7eb700ae7273bb2c350b5b508678c19b174848f4b59adf3f077a108cca0aaf472fe87947473aac0a7d81251f3
 EBUILD umurmur-0.2.17-r1.ebuild 2163 BLAKE2B 95d724db07bd1f6b6a405a921d21569bcda8f4baa781ef2a6e1c21e167adbc61d9f8dd975caf2f228577f30b7fff4f0a713af3a630313f7b5a5d0a27a7625d88 SHA512 265168d48225f8df2263cdaf37bc665c7f624071a63fe33b9570cc3f5e1ca9121e61923e6e0f07f45f8c2750e6090882752327e1e031b527ceee722a759c5837
-MISC metadata.xml 1013 BLAKE2B 5547a85090de23015fa4a9e8a5682868d94b8f77aa23f30fe7b5421f4017fe066a0329ba58b28b50086a5d1ba14c6640893a2042cfc4c66e34dc93f8b949e6a8 SHA512 a65c363d2e0993d75dc85fdcea4da2a1cad62c3a54dd716fad9618b75c3448393055c8c79a3cfff7e1994e73dea0773008a2c5e49f321dc989443b17f4b630c5
+EBUILD umurmur-0.2.17-r2.ebuild 2637 BLAKE2B ba53c11f856daa510faeebbcf25cc33371f982003885ae351ef22f7b66affbbe0351372569b561acc1242f4e287a33095561c71e877ae1efbd0c941a7a66883d SHA512 778648ccf3fd20cf4304b628bf8cf4c9367f0e322890c991701b199e4b7fcaa094c25fef6fe219204fd8229e93d1af95d233914ba534d918f79ef374d664565e
+EBUILD umurmur-9999.ebuild 2637 BLAKE2B ba53c11f856daa510faeebbcf25cc33371f982003885ae351ef22f7b66affbbe0351372569b561acc1242f4e287a33095561c71e877ae1efbd0c941a7a66883d SHA512 778648ccf3fd20cf4304b628bf8cf4c9367f0e322890c991701b199e4b7fcaa094c25fef6fe219204fd8229e93d1af95d233914ba534d918f79ef374d664565e
+MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index adb73f1fed5d..e7684f6b35d1 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -11,6 +11,7 @@
 		of Mumble is called Murmur, hence the name uMurmur.
 	</longdescription>
 	<use>
+		<flag name="mbedtls">Use <pkg>net-libs/mbedtls</pkg> as TLS provider</flag>
 		<flag name="shm">Enable shared memory support</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
new file mode 100644
index 000000000000..4d9264eb15b2
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1 user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls libressl mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls )
+		!mbedtls? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+	use libressl && ssl_provider+=( libressl )
+
+	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur "" "" "" murmur
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[@]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/umurmur/umurmur-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
new file mode 100644
index 000000000000..4d9264eb15b2
--- /dev/null
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1 user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://github.com/umurmur/umurmur"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+LICENSE="BSD"
+SLOT="0"
+IUSE="gnutls libressl mbedtls shm"
+
+# ssl-provider precendence: gnutls, mbedtls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+	dev-libs/libconfig
+	gnutls? ( >=net-libs/gnutls-3.0.0 )
+	!gnutls? (
+		mbedtls? ( net-libs/mbedtls )
+		!mbedtls? (
+			libressl? ( dev-libs/libressl:0= )
+			!libressl? ( dev-libs/openssl:0= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
+	may	want to review it. See also\n
+	https://github.com/umurmur/umurmur/wiki/Configuration "
+
+S="${WORKDIR}/${P/_}"
+
+get_ssl_impl() {
+	local ssl_provider=()
+
+	use gnutls && ssl_provider+=( gnutls )
+	use mbedtls && ssl_provider+=( mbedtls )
+	use libressl && ssl_provider+=( libressl )
+
+	if ! use gnutls && ! use mbedtls && ! use libressl ; then
+		ssl_provider+=( openssl )
+	fi
+	echo ${ssl_provider[@]}
+}
+
+pkg_pretend() {
+	local ssl_provider=( $(get_ssl_impl) )
+
+	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
+		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
+		ewarn "defaulting to ${ssl_provider[0]}."
+	fi
+}
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur "" "" "" murmur
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+
+	local myeconfargs=(
+		--with-ssl="${ssl_provider[@]}"
+		$(use_enable shm shmapi)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	local confdir
+
+	emake DESTDIR="${D}" install
+
+	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
+	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
+	systemd_dounit "${FILESDIR}"/umurmurd.service
+
+	dodoc AUTHORS ChangeLog
+	newdoc README.md README
+
+	confdir="/etc/umurmur"
+	insinto "${confdir}"
+	doins "${FILESDIR}"/umurmur.conf
+
+	# Some permissions are adjusted as the config may contain a server
+	# password, and /etc/umurmur will typically contain the cert and the
+	# key used to sign it, which are read after priveleges are dropped.
+	fperms 0750 "${confdir}"
+	fowners -R root:murmur "${confdir}"
+	fperms 0640 "${confdir}"/umurmur.conf
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/xwax/Manifest b/media-sound/xwax/Manifest
index a2444ad52aa0..8cde974f380f 100644
--- a/media-sound/xwax/Manifest
+++ b/media-sound/xwax/Manifest
@@ -1,6 +1,4 @@
 AUX xwax-etc-security-limits.conf 18 BLAKE2B 7056521164d62b76e2cba2b7a128a160364ac191af87185e99d5ecaa951c125938b66d4f1928d3b13794e5f1be4446b0b8ee8eed1e2a0c92e25edc0582b38264 SHA512 fab914f078597e9c4ba4ffa289f559106d62354d5f97c0847855c08cd8a9a1bdfd9db3f74d9b3868e6150d39fadc4c2c8d51b4815bb6b19ccdbee1fb6ddf72e2
-DIST xwax-1.5.tar.gz 77582 BLAKE2B 5d02dbf1b4ee30f333b6df2ca63b657683aa15d5790fc474f54a6571314f5e506b4403e983889fc8afcca77489b3b15285907d61e33f080123d94ac4c20bd5ed SHA512 b5fb66c35dd5174277417b8973bab63232bdf471fe190ab3df1c37e386a9cdc9e2b5cbdc4f5715bf69d146846c13ce2acd5db6a0881412dabdcd234d6d199b61
 DIST xwax-1.6.tar.gz 79452 BLAKE2B 3cefded6fd39435d92ca07458048910e5e95169562c9dec17cd1411c992ca864124f3155b1a8a9313c86cfee01fe79d72a5c5bed9963b1740a1d4e89e9e249e9 SHA512 710a53a1b056bf6850a668a1f267b91664d5629998e6ee2d4853aa57d1ab351dd782716272ed4a4858168c0ac9f5c7d2e1fe0a8b330e26775677e1eb54249015
-EBUILD xwax-1.5.ebuild 2174 BLAKE2B 33f6a0373b5605036879f87e06064f48d870f6175d61d62f88d6ed536092bc72f8e725851b22f0b24801e685ca6a55e9ad70a874803403ce85d746db4f467cc4 SHA512 02324db41aad3424fcc9b8fa2f221ba95d74ecdae659fc84ea425ff262e6ed97f3c77f41a1f45268966cd83c5c9075ba73a9e0e299a49bafbf496343f969e04e
-EBUILD xwax-1.6.ebuild 2190 BLAKE2B 98205cb84e53dae453a09f528e490d0d2da752327c52e49ff30ff1a531a86f13fadcd504d2a1615e899dd7e86d75e94fd176e0744f633427a933931730c5b6bb SHA512 4d2e4630ed1a33129e8e6f1c5cb417a08a26f60ab165ee8da3bb16386a906ea48625d26167ab884a6fd1cae5781372fb2e332ad804d7aa86600e4bf1a79ac7c4
+EBUILD xwax-1.6.ebuild 2189 BLAKE2B 571d6d7dad37324bebadb7b3ec25d526b2dd1bb18d161a5b9de08450cc07373a4b330be77659538ae7fb627945729d5706fd23069f1844d9d75600a7084c4d8b SHA512 3f67a616c8ef5e392b55e180429e520fb8ec7cdd7967f3640bbc9c8e55f981f2c6e7c7b4531510ba23998b9f328ba2f2a8396b234fca4adcd53902ab980ee614
 MISC metadata.xml 803 BLAKE2B fe59d8229f2f7189451f99e0f4da36fbc0f2b39f04d152f927b7f6822fdb9160c570daa82c6d7d8e85dd0c9bac44e50f759334e9c5a547b224f52ea0cdb2bb84 SHA512 9d15deede88ee114e0ade78665996cfaf09443f8629b08415ae0bd1c486ff6a239567056aacde2d49883066d4d8dc3690a397d170effbfe5e4aa5cf7d24cbca8
diff --git a/media-sound/xwax/xwax-1.5.ebuild b/media-sound/xwax/xwax-1.5.ebuild
deleted file mode 100644
index 677a355aceb5..000000000000
--- a/media-sound/xwax/xwax-1.5.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs user
-
-DESCRIPTION="Digital vinyl emulation software"
-HOMEPAGE="http://xwax.org/"
-SRC_URI="http://xwax.org/releases/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="alsa jack oss cdda mp3 +fallback"
-REQUIRED_USE="|| ( cdda mp3 fallback )
-	|| ( alsa jack oss )"
-
-RDEPEND="sys-libs/glibc
-	sys-libs/pam
-	media-libs/libsdl
-	media-libs/sdl-ttf
-	media-fonts/dejavu
-	alsa? ( media-libs/alsa-lib )
-	jack? ( media-sound/jack-audio-connection-kit )
-	cdda? ( media-sound/cdparanoia )
-	mp3? ( media-sound/mpg123 )
-	fallback? ( virtual/ffmpeg )"
-DEPEND="${RDEPEND}"
-
-DOCS="README CHANGES"
-
-src_prepare() {
-	# Remove the forced optimization from 'CFLAGS' and 'LDFLAGS' in
-	# the Makefile
-	# Also remove the dependency on the .version target so we don't need
-	# git just to build
-	sed -i -e 's/\(^\(LD\|C\)FLAGS.*\)-O[0-9]\(.*\)/\1\3/g' \
-		-e 's/^xwax\.o:.*\.version//' \
-		Makefile || die "sed failed"
-}
-
-src_configure() {
-	tc-export CC
-	econf \
-		--prefix "${EROOT}usr" \
-		$(use_enable alsa) \
-		$(use_enable jack) \
-		$(use_enable oss)
-}
-
-src_compile() {
-	# EXECDIR is the default directory in which xwax will look for
-	# the 'xwax-import' and 'xwax-scan' scripts
-	emake EXECDIR="\$(BINDIR)" VERSION="${PV}" xwax
-}
-
-pkg_preinst() {
-	enewgroup ${PN}
-}
-
-src_install() {
-	# This is easier than setting all the environment variables
-	# needed, running the sed script required to get the man directory
-	# correct, and removing the GPL-2 after a 'make install' run
-	dobin xwax || die "failed to install xwax"
-	newbin scan xwax-scan || die "failed to install xwax-scan"
-	newbin import xwax-import || die "failed to install xwax-import"
-	doman xwax.1 || die "failed to install man page"
-
-	dodoc ${DOCS} || die "failed to install docs"
-
-	insinto "/etc/security/limits.d"
-	newins "${FILESDIR}/xwax-etc-security-limits.conf" xwax.conf
-}
-
-pkg_postinst() {
-	elog "Be sure to add any users that will be using ${PN} to the"
-	elog "\"${PN}\" group. Doing so will allow processes that user"
-	elog "runs to request realtime priority."
-}
diff --git a/media-sound/xwax/xwax-1.6.ebuild b/media-sound/xwax/xwax-1.6.ebuild
index 273bd31cd5cc..9565610d9290 100644
--- a/media-sound/xwax/xwax-1.6.ebuild
+++ b/media-sound/xwax/xwax-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xwax.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="alsa jack oss cdda mp3 +fallback"
 
 REQUIRED_USE="|| ( cdda mp3 fallback )
author	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-05-04 12:02:00 +0100
commit	eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 (patch)
tree	ce35c6d01b5ff5de95c3a20fef853b9a6518ad2e /media-sound
parent	b7ebc951da8800f711142f69d9d958bde67a112d (diff)