19 files changed, 64 insertions, 410 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ac923ceb2ace..d42ff03b7e96 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 3d6f36a2e700..3f0f91d5d2b2 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,3 @@
-DIST elisa-0.3.0.tar.xz 1248496 BLAKE2B 8a52c35ca1e7a81927d8e95020854725407700e93e15bb778366946e7c19578df6939daec058743d9dffeece43dbb946c0f0ce6612c9ae50ff51c3c023cece1d SHA512 8097f8f2bbcb6199adf856d0786e77a33c46c3ead8f55fb29839862ec96db5ba957a8181af013650e4d8c9ecf32b104f17c26921204e6c7478c0a3a7152c9b9a
-DIST elisa-0.4.0.tar.xz 1272596 BLAKE2B ed11dcba82766e11581806f1153d64c157c8bd8549a374e32fcb5c28369bed853b4a6a18ae42c6d3dab86d297d2699a292fad2de62b0ab9fec97b9cb1f1d3e1f SHA512 976370b9f0395b990d05cc1d5adebe150398090c5f1df94e1ad5761a8af36c0c83ed14087a3bc02e09c21740724f1505b99c4ab5f4995f0c46f21948f4705e61
-EBUILD elisa-0.3.0-r1.ebuild 1411 BLAKE2B 43edb77ed78a798787dac60534278659637b35fa47b7a1d312bf4ccf0269d7f2ea58d5d16266d28cfd5cdf0ea61ccdc95d68834d484423ae19c7d64c4abb35fb SHA512 db066616b3f067a629fe077bf3fc6f287041a428d63ca6c3d36431a24e07785382a5d54a5478b0af6db627b904e1f537462cd6f4485f3a496e79476e5616f866
-EBUILD elisa-0.4.0.ebuild 1517 BLAKE2B 7f9013fdf4d739e4e587c34b0d00f028c2f3b44b5698b2461c1325c260bd01b2440d41870d28a3280e6fa1b83be43811d062da8c7fdde23fc10f9160f30a019e SHA512 e4cf1afc6846c64947ef62755366f0821d06f7f876c090573f43bcecf577c0da6635ef17b80b1fb86a103ce5f3f916bfb849d9171638e5cc8f2670ff23bdd998
+DIST elisa-0.4.1.tar.xz 1273516 BLAKE2B 017ba82435c9189436f4555b9dfd64e13550fdfdcd0c4c88b03062a85dc514d957ded3dbd9d6ce1b2dfc2a5fe06f27bc18bf1db398a429132b1f4295c798bf5b SHA512 39f711132587faed72793a678c7d25495b611350a434633b449b3b995b3d4706f919c652d178d9a061e772eff2ffc3d44e70b2c72c57082a728304c9dabb88e7
+EBUILD elisa-0.4.1.ebuild 1517 BLAKE2B 7f9013fdf4d739e4e587c34b0d00f028c2f3b44b5698b2461c1325c260bd01b2440d41870d28a3280e6fa1b83be43811d062da8c7fdde23fc10f9160f30a019e SHA512 e4cf1afc6846c64947ef62755366f0821d06f7f876c090573f43bcecf577c0da6635ef17b80b1fb86a103ce5f3f916bfb849d9171638e5cc8f2670ff23bdd998
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-0.3.0-r1.ebuild b/media-sound/elisa/elisa-0.3.0-r1.ebuild
deleted file mode 100644
index 179c74eabb5a..000000000000
--- a/media-sound/elisa/elisa-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
-LICENSE="LGPL-3+"
-IUSE="mpris semantic-desktop"
-
-BDEPEND="
-	sys-devel/gettext
-"
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia 'gstreamer')
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	mpris? (
-		$(add_frameworks_dep kdbusaddons)
-		$(add_qt_dep qtdbus)
-	)
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-sound/elisa/elisa-0.4.0.ebuild b/media-sound/elisa/elisa-0.4.0.ebuild
deleted file mode 100644
index 59c4f96313ab..000000000000
--- a/media-sound/elisa/elisa-0.4.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://community.kde.org/Elisa"
-LICENSE="LGPL-3+"
-IUSE="mpris semantic-desktop vlc"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kfilemetadata)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kirigami)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtmultimedia 'gstreamer')
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	mpris? (
-		$(add_frameworks_dep kdbusaddons)
-		$(add_qt_dep qtdbus)
-	)
-	semantic-desktop? (
-		$(add_frameworks_dep baloo)
-	)
-	vlc? ( media-video/vlc:= )
-"
-RDEPEND="${DEPEND}
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtquickcontrols)
-	$(add_qt_dep qtquickcontrols2)
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package mpris KF5DBusAddons)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package vlc LIBVLC)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 202ad3c67937..a112bfd5a11f 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
-DIST lollypop-1.0.11.tar.xz 448424 BLAKE2B 80cbd622b46d667ca566e8aac9f523a83cf8b43e61abe06eb0aeaa6fd22a45611ba38fdfd64dfce7b1e1f946bea8b7a2b589152c6b3c762cbdffb041c4c7de08 SHA512 9a885a88af8a4d58b12ef7da82d35bbc3256cabd2a38ac0b35e8a0753b1e10dfa7e69e8e5f6c7f8ba68d2557cfe47c6003ee1f68ecf6c434e5ab81f18c2ae935
-DIST lollypop-1.0.7.tar.xz 436000 BLAKE2B 8b41a3378e39b0cba59323bbd7946226bcce29f80c878833ac920f337c036fcaca9c81caca2e360972295c6446c67d79e201093f86cad0685f7365a332d0e116 SHA512 ce537e60e3f1c678fcbf26d1305a178a3f2299abd4f75bb3c3a2cf717295e14aa73a8f21fb88d0c1fc790a80a572dbce84d01a0fe3229879124f89f8a5fa8305
-EBUILD lollypop-1.0.11.ebuild 1367 BLAKE2B 53a960bd753f365062a5b188ee12854f1a443225c88dfa83fddb1257f47ca4a3b41c3ca656fc249e19728c99d5dcbc599dfe5ceb9df330680e884a107fb9421f SHA512 275448e4e320a520352a7fe2297545dc6b4901c7520e649f89c4c16630b776011fd1932a4c853b79e219f6d26f0feead6c3b3865b7ca5187b4e3dc9977fac1b0
-EBUILD lollypop-1.0.7.ebuild 1367 BLAKE2B 58e95f8666ace9c74cdba8e8ef4508b3ec8aadd40c5f07bbe1deb713f7da0f200827a66b23b28f73abbf130356cfced8e1309996ba793196e35c4d2ac233bf50 SHA512 8ddf6d570858bbdb8381ac75a419b2b6534d5c9165df166356783c7c02fe0ec6fca1cf79087a954680f17825d35ebfeae8e1ccf147ca701559e2415249825f32
+DIST lollypop-1.0.12.tar.xz 448864 BLAKE2B 65681bc29f8256ad8f9d6dadac7a6d147150a8f779e25c85744a39428176c6887e3a9f90f0af81f432db771806351301712ec2431c3a79bcb230c8c0e6fb055b SHA512 d6ad6fb638ac994c2c0367234c8ab35b79d619b3669c46f27bc1df221e41410f464a0a157faccf0ed1b2b5fbdb9f1ecad10ec7466bdff03231e4724948c8c3a2
+DIST lollypop-1.1.0.tar.xz 456100 BLAKE2B 328940422280b812ac8a677d4053ffd319f405bf26a6d4b84b80d6c9e3447e7e47003818c7e201d56f06a1ae1e339594dc455d267e1f44ccc3d22fff78249bb0 SHA512 f11651982bafae70a4451baa752ae21ed05c8f3c10c57e556ff2ad58d4d5c89f291c74e7b82b0a221d400484992526d9d5ee4f51f2428c725cf488b80f774f05
+EBUILD lollypop-1.0.12.ebuild 1367 BLAKE2B bd2259b32288dd0ddf52de8f8c17660e9107bfa7bb4487dbd91e21226fb127f756f152c5d2cd30c7b62a9d1ef9b58a2aa6caa434a1adda3b35246cf5e259ea3d SHA512 24b820039ea3542e405ff996ed3785ebd67b96ba409d5d65a5af3d2bcf08dfb4fcec0e82ec4e16f85160b1ff237cbc9649120ceb01a09074a54ee96d48d97cfc
+EBUILD lollypop-1.1.0.ebuild 1367 BLAKE2B b1a1a2fd05ec6df8208b9329c464fc99f6ae205c9aa0c1681daef7e406c0cb647688e911cf3fbfb7ec864f1fc9edf05e8965226fd86de0f16645acddd679f882 SHA512 9d58b41629671bad12f91c25136f632ad633f808b1a7fd901d4d212cb769f57869f87ef5dffc66bf4564d7811c43ec5edd091b60547c300a7d0f71c4fef51b36
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.0.11.ebuild b/media-sound/lollypop/lollypop-1.0.11.ebuild
deleted file mode 100644
index d8b5658aa634..000000000000
--- a/media-sound/lollypop/lollypop-1.0.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="7127b40865afb12d6a07435c4396f34a"
-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"
-
-DEPEND="${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
-"
-BDEPEND="${DEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=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-1.0.7.ebuild b/media-sound/lollypop/lollypop-1.0.7.ebuild
deleted file mode 100644
index 80d94cea4023..000000000000
--- a/media-sound/lollypop/lollypop-1.0.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-PYTHON_REQ_USE="sqlite"
-HASH="04b4d9bdafd176f98dbd233c564bafb8"
-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"
-
-DEPEND="${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
-"
-BDEPEND="${DEPEND}
-	dev-python/pkgconfig[${PYTHON_USEDEP}]
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	dev-util/intltool
-"
-RDEPEND="${DEPEND}
-	app-crypt/libsecret[introspection]
-	dev-libs/totem-pl-parser
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	dev-python/dbus-python
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=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/mp3check/Manifest b/media-sound/mp3check/Manifest
index f885d15ae6ab..3a4298b07d48 100644
--- a/media-sound/mp3check/Manifest
+++ b/media-sound/mp3check/Manifest
@@ -1,5 +1,5 @@
-DIST mp3check-0.8.4.tgz 71396 BLAKE2B fcc25d9dfc474753cf97ead6cde175c5d836ba99971490f8a9ade6726a7af70418339d2da580f402e8d708659a44c5af3024199a0854c66b90bd637f15dc0362 SHA512 383633e673ae124a7beccb4dc9fd4caeaedbddd7939284a7737f1d0f230424b24f1a967ad1d380800d4345e7bbf6f7796cdd9a9816251180e25723a2e24903b5
+AUX mp3check-0.8.7-fix-buildsystem.patch 351 BLAKE2B 434f3b8cc626576d8ae21b3b1683bd0af917e8dfd974acc51ff486e4d4ad4535897fe2c5d2dece4425ef83c3a4d1f4fa94c410a34ed3b9e4bf8bcd1b9cd2e02f SHA512 bfe66d2d4e1664a4e322452c919af28d6ef70b6dc3503ec904a508ab45abf6d97a3710ddbedfee7a379fa3c413914d1afcb9b0f2f7d62eb1f65d7c80e994ee14
+AUX mp3check-0.8.7-fix-c++14-operator-delete.patch 759 BLAKE2B 25d15e48f7ca1b7e6d7e153f37b66d5feb5e77a5b65aa84fc3bff67979b7cd36c580201bd47b95f28f989ad54c3b295b87b0960099d0826f7ed97cb48248b017 SHA512 e97d139bfefa737ef05c177760df0b255991dcdc97675efe7092383721d6a71323baec23e7afcede6b3beebd4d9b954245c04ff84a28b8f33135162d8a251e8e
 DIST mp3check-0.8.7.tgz 71629 BLAKE2B 2ba73374fd9935b39aeca8f9a1e72e95d449309fed8e667b15808a548e34a75d71d811b725654bc590e8ada0f2a65f29b8f8174d614a8626e77281c0ea322eb5 SHA512 5b5c9bde0cc7fd9dc02de53e4ccc3e403001547c06121be57f8f693b9224302d24f0c84f928b329b0f69c67dd4fb51fa3b60368f57a9446476d8344417bd09fd
-EBUILD mp3check-0.8.4.ebuild 549 BLAKE2B 50f08fde2e6061700188c497ff9bf9cabbe4496e5914ba97fdb704ecfccb2aa648abdd03d0ce88583f483573e4a36a1eca7b0a5279f1394492cb7ad5abb39df1 SHA512 e208519149247b01b282fcbca17475315d3ae491fd075bb0988630db24b090f0abdf452bce4417f0c0774e2368118ffcfc3e403ac30df9fedcc65a822cff7ac2
-EBUILD mp3check-0.8.7.ebuild 749 BLAKE2B bb06bd0fae693aa612d5a4562a52dbe11d25e7f9798b3079f3990177fcd9c9036cf88ffb34ebb4b589a9a6d857a66925b32a1d41bf98aa3c2bc7b1972b26c0bc SHA512 4948fe0313a7a932fb3716411e09b7a5838d53feff15a1e107ae12efdb4e09dde448518a3ae8e906d609a5e6b75c88b17864b09ffc7c91db16c38df2db684be1
+EBUILD mp3check-0.8.7.ebuild 751 BLAKE2B 2dbeb155b1cf77f3e8b1cfd22689b6e2fcaf81b7eb965ccd6849dd86c08fb7e5dabb4e4d7a4802df2cd3374edc699d63c244eb9453f093dae0179388392ee859 SHA512 fc27a1640825ccfe7d889b996c15beb0ef9d1e42fc862b0bd598a13b3df7fead4f68aef42c44077a355e217808fb2cb4e7db3f2d25a4d7566d550ff9112e5604
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/mp3check/mp3check-0.8.4.ebuild b/media-sound/mp3check/mp3check-0.8.4.ebuild
deleted file mode 100644
index 98d0ca55455c..000000000000
--- a/media-sound/mp3check/mp3check-0.8.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit toolchain-funcs
-
-DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
-HOMEPAGE="http://jo.ath.cx/soft/mp3check/index.html"
-SRC_URI="http://jo.ath.cx/soft/mp3check/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	sed -i -e "/^WARN/s/-g//" Makefile || die
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
-}
-
-src_install() {
-	dobin mp3check
-}
diff --git a/media-sound/mp3check/mp3check-0.8.7.ebuild b/media-sound/mp3check/mp3check-0.8.7.ebuild
index ee78058978c7..97e7d314e0c2 100644
--- a/media-sound/mp3check/mp3check-0.8.7.ebuild
+++ b/media-sound/mp3check/mp3check-0.8.7.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
+
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Checks mp3 files for consistency and prints several errors and warnings"
@@ -11,20 +12,18 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
-src_prepare() {
-	sed -i -e '/^WARN/s:-g::' Makefile || die
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.7-fix-buildsystem.patch
+	"${FILESDIR}"/${PN}-0.8.7-fix-c++14-operator-delete.patch
+)
 
 src_configure() {
 	# tfiletools.h:59:50: warning: dereferencing type-punned pointer will break
 	# strict-aliasing rules [-Wstrict-aliasing]
 	append-cxxflags -fno-strict-aliasing
-}
 
-src_compile() {
-	emake CXX="$(tc-getCXX)" OPT="${CXXFLAGS}"
+	tc-export CXX
 }
 
 src_install() {
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index f9460e1e60e6..af0d0019fec5 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,7 @@
 DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c
 DIST mumble-1.3.0_pre20190313.tar.xz 2904672 BLAKE2B 4f7b9b63b35c04ee646364cdccd8dd171ba63e41cdede79098ae68d551dd2aee7d2ee74711f92eb0da9998a199061d4438bebdaa1807f980cdfdfccf7e0460b6 SHA512 623103c846103e306ce9fb527130ecda8b65f8486819cc189fb21a4b313fbf987b29a63838c1eb29d0cbd71ae464b2acba4110fb500365115636c3d23827eec0
 EBUILD mumble-1.3.0_pre20190313.ebuild 3088 BLAKE2B cdff0f4080cbf9c84c1d7e197f4b3bdb4003cbae271d2135045363fb047dd307760ab3c37456256a1476e9b672ee1201668d989a910590859f0b5384fffd82b9 SHA512 2b50226bb3e2416010e4b5e55129d551138703800ef2b3ce0d7f5690eaecdec19ea5bb03559ab2662dd67bf7a8e645ced2ff025684f87c8c5ef3922bd6ee662f
+EBUILD mumble-1.3.0_rc1-r1.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1
 EBUILD mumble-1.3.0_rc1.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
-EBUILD mumble-9999.ebuild 3143 BLAKE2B df209f9629aa68e547c0f5144b10c963fc291be93f688f2cdc1d9751ac816bc0dbf921cf9ab22e9814eb1089d87d8516f8dd93478ac7944491b5b5f6ecf47a96 SHA512 3579c261f7b7219c56a0d6e44c19b95c02a43ed46e6be3c994f9fdcf9bf91c412f2837c5cf847a46d86d7e2d5c16d72e706e8e30ffa6d58ace568284c35ed00b
+EBUILD mumble-9999.ebuild 3740 BLAKE2B 7f25922b5de9c8165204258f7807e2d7b95459d742461e3420049b8d1964ddbc726a143da1c75266aef782c611302612dde416e5f1b8a9141a1445d4fadcf6fe SHA512 5a69d06a03be98f11447eefc44a9f6c31b5fb51f686e8afc0a89905b6e91d27295d84f1129518a4a6d62fb88ba2890754859d03e086a59edbc5298e5a0f29bc1
 MISC metadata.xml 758 BLAKE2B 72c530c5bb4db48b3ab9cd915dbf68abec74f609d796acc12b70426b40065f09407a0e4daf9668ec140fc6a185ff17d3bb21ead13a2b5abe28ceb3d232b3f073 SHA512 ecff83ea1a0b3dda39884cced8fb657475ae98f9a15e07f9a1a8f01bcb411382024d47d9da70c1e066654757b6ce7262ab3f7b03780a13257bdfa895e6417ec9
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index d15c4124e796..30b2055c37fb 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop qmake-utils xdg
+inherit desktop multilib-build qmake-utils xdg
 
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="https://wiki.mumble.info"
@@ -63,6 +63,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+# NB: qmake does not support multilib but it's fine to configure
+# for the native ABI here
 src_configure() {
 	myuse() {
 		[[ -n "${1}" ]] || die "myuse: No use option given"
@@ -97,16 +99,36 @@ src_configure() {
 		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
 }
 
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
+multilib_src_compile() {
+	local emake_args=(
+		# place libmumble* in a subdirectory
+		DESTDIR_ADD="/${MULTILIB_ABI_FLAG}"
+		{C,L}FLAGS_ADD="$(get_abi_CFLAGS)"
+	)
+	# build only overlay library for other ABIs
+	multilib_is_native_abi || emake_args+=( -C overlay_gl )
+	emake "${emake_args[@]}"
+	emake clean
+}
+
+src_compile() {
+	multilib_foreach_abi multilib_src_compile
+}
 
-	local dir=release
-	if use debug; then
-		dir=debug
+multilib_src_install() {
+	local dir=$(usex debug debug release)
+	dolib.so "${dir}/${MULTILIB_ABI_FLAG}"/libmumble.so*
+	if multilib_is_native_abi; then
+		dobin "${dir}"/mumble
+		dolib.so "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
 	fi
+}
+
+src_install() {
+	multilib_foreach_abi multilib_src_install
 
-	dobin "${dir}"/mumble
+	newdoc README.Linux README
+	dodoc CHANGES
 	dobin scripts/mumble-overlay
 
 	insinto /usr/share/services
@@ -118,8 +140,6 @@ src_install() {
 
 	doman man/mumble-overlay.1
 	doman man/mumble.1
-
-	dolib.so "${dir}"/libmumble.so* "${dir}"/libcelt0.so* "${dir}"/plugins/lib*.so*
 }
 
 pkg_preinst() {
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 7ae6edf9f7a3..ff0a6a7c38b3 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -2,9 +2,11 @@ DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84
 DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
 DIST pulseeffects-4.6.1.tar.gz 1878597 BLAKE2B 5db87915f5e008780bc063580cee95202460f9932533d4227eec89ba49d8ba760d2be44e0268d53279868b07da1556ddae648ff6339cc10304a0c429a8d55eb9 SHA512 336ab9c3a2987a8ca0887fd87c836776619e6989c22bb7442c7e6f3d8603537ea2789e012fea11c142dd943d0a670549fcbfff69949cacbda2621e2da95456b3
 DIST pulseeffects-4.6.3.tar.gz 1885423 BLAKE2B 404ab653c187270d879b497b819206815f47f7bbb74762fb6b4ae055169093599fa5350df53292eec4eea46ab380a058db80c693022a854a71bfb4245fc49e10 SHA512 645a19a6f5f1726474a675edc0048eccd37e7236fd863ecbd8c382028344cd3d4a2cbd5c4a8e830e5fb793ddf50c0b24c45f5d93acb7a880ae32c3c940e8d2ea
+DIST pulseeffects-4.6.4.tar.gz 1881021 BLAKE2B bca21f9a3bf925f6bac289f6256340d1fc52ec9f94f73bf6cfdb570360d9f1e8599e8495e603987be80e2d87b664a187807a53122c76dfd42ac750ae49b903f8 SHA512 eb450db882bfd0d8aea45ea25219122b88cd66054d189ba990e3c95b1b8c7760514e80b7e9c4dc7c4a14cf133dbdedd02d7a8f6f48c1a569f530c62c1254e8de
 EBUILD pulseeffects-3.2.3-r1.ebuild 1506 BLAKE2B 561117695d98390d646cc6d36263aae5f375b1d6ebbdb4baa271a8ff009e788218952b8bb63d5088e1ce647e2e7fb7f38a1ea27ae634d341bd8e7dd3bc332e65 SHA512 ed37577b50ead9ae9d4a007f343ada566df3ed7dbde12a2114bdce793c1ec2a123296f4e4b059619644d6c293b917bbbb26cf2936c55211c89fbaa2abb68df25
 EBUILD pulseeffects-4.5.9.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
 EBUILD pulseeffects-4.6.1.ebuild 1799 BLAKE2B e6ba4eb6229e8aaf31eaef655f770989ef0a5794e06c8673f565b3e3e49689ba5c6745c551e6e2bc5cb6aef84bc79e5eaa68b58c7ca5a4a606feed443b2dc2db SHA512 952d00097cf90bd69273ad8f67a4f8caae9ec2d84d0c424972d5c340a0bd1406442fb0e4b9005489da1691f72b98ddc124e2e148b4ecabdeaf7781a56a76948a
 EBUILD pulseeffects-4.6.3.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
+EBUILD pulseeffects-4.6.4.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 EBUILD pulseeffects-9999.ebuild 1805 BLAKE2B e6b844dbb1dbd88270af8f19a430ece4abdde4709d34c76d7d61c8254997ffa264021080ad5a3a9b0e34ee8974a2b8d44c9f7d9fedef07dfa3476e9ecc182ed1 SHA512 224b1d44ecd71496a9cca236bfc0104050b5912c3489885a1eedfd2aa8a6c9b8508b5bfcd32d8b1e0c9a43c0bf8a667dd0d7b3a824dcd6b499b587fa97ea6f35
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 91a2fd83fb9b..3864a887dd72 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,4 +1,6 @@
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
+DIST qmmp-1.3.3.tar.bz2 1244817 BLAKE2B 913f52915f30607044168d906b151cde8e7ac5e3c5b82c452b4f297c5e5eaa05ff2fe139c671a46beba351f34bfb013a8eb4d98483dcfe260fd63d8f6b09e244 SHA512 92deda33ed90d5e802258ae014452e5ce384c6ce0d437675b28ead8a838bcbbb2d0b4242b98b2a0f32cc922e7af69b72479fdf8a7946f1fe041a6803a6934c8c
 EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
-EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
+EBUILD qmmp-1.3.3.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
+EBUILD qmmp-9999.ebuild 4270 BLAKE2B c9e7ba05de9d12abdca56bcaee34767960e656be3461c52c5e01dd2d6a0c7272938d245f75500e4258bb111feb3efe538bb14673fed0bf192d25fd0b5015b743 SHA512 affd8b3ecd07dffdea15558805788a8082e490f991922dfc3a612ab523010c4c21f0ff172e9f6db955c30643eb94d2a2df923c02f1878ac03a4ab36f93b99c19
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 70985023af4a..13f7bd0c2f20 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
 else
-	QMMP_DEV_BRANCH="1.2"
+	QMMP_DEV_BRANCH="1.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
@@ -34,6 +34,7 @@ RDEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/taglib
@@ -61,7 +62,10 @@ RDEPEND="
 		media-sound/jack-audio-connection-kit
 	)
 	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index b5937545625e..7c8b31d69bd6 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,7 +1,4 @@
-AUX zynaddsubfx-3.0.3-docs.patch 414 BLAKE2B 7988269f161ae948e63a05f9d84b986cf2a5c8644c594d14b431bb3366ac3e468d1668d1b03d1ad3e899e93a992c2b9722338f1a6ea1052994613ff7acce8eff SHA512 867cb63e0b057bf0930f8a2d7dfe50a547df740cb135dc21824b986f194c2384dd57e882f0ed2617c1e1306a88804849878eee4d825bf02908378acf0e00fb75
 AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
-DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
 DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
-EBUILD zynaddsubfx-3.0.3-r1.ebuild 1918 BLAKE2B 501fa7c5c93f9cf71722e1a3db38857ecdb90a58552c5d4218c641b4ebf8708100d73eb9fcacd87a9c39e645c667ffb6b51af4b36637fdc57b92f6b28efdaa5c SHA512 b42788152ab56c7df2ea4ecddfcecf486bc5ad5166656b1657ffceb8ead452a41c12488b169c1d6e12785608d9510ea27021c80fe6cc7c429bbce490968a7e9d
-EBUILD zynaddsubfx-3.0.5.ebuild 2029 BLAKE2B 4d2683782c8df03c57384934cf30e1445301a601bcb7e24d51d8c58a01e45a59fa49c236e7b633e81aa76673e6156b81e672aa5b94c39dfcfbbc4136343b322c SHA512 04ffdb4f907618c1e23f159cb8f1754f21642116bf9c9c70398f76fe6a5201b393ff75a56b6bd99dae6d388150789f6b1886773e419cedbc7c7340a6b59f87a8
+EBUILD zynaddsubfx-3.0.5.ebuild 2028 BLAKE2B 6599985b323d85d40af8cf731bf646315fe46c8b6be4021c0bef47d5339bf01031df85926d55e6881353ee08afa2f1a6bc5ce58d7a662d61abc031b7b59cb08b SHA512 cde23e5fa31b984bc84772fde0f56c6e4308f4e00405d54c46748355eebc8a6aa02d07169d046814f8895897abf6800400723a3007116cfb1bba5cd2d307549b
 MISC metadata.xml 427 BLAKE2B 80fb772abd373ede6be0c3b99fd252f059ebbc6efa5ab1dffee1c0a517289cb199a7ca58c7db4942565dd96c2749fbecf0a9e82382a2387e5c785ced868b4312 SHA512 dc8afdd20a8f6e7d052dc69f4a17698b481db997ef36e199fce32e8ed586a0a0c6d9c881fc378bcd20e57ffe0f4ec1389680ee9ed0fa04ad8b13aa082112e490
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
deleted file mode 100644
index 2a35e0544c8a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
- #Currently the only directory that uses cmake
- add_subdirectory(src)
-
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
--	DESTINATION share/doc/zynaddsubfx
--	)
- install(FILES zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
deleted file mode 100644
index 82a682845d5a..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa doc dssi +fltk jack lash portaudio"
-
-REQUIRED_USE="|| ( alsa jack portaudio )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-libs/mxml-2.2.1
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	dssi? ( media-libs/dssi )
-	fltk? (
-		>=x11-libs/fltk-1.3:1
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-docs.patch )
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use dssi; then
-		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use jack; then
-		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
-	fi
-	if ! use lash; then
-		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use portaudio; then
-		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DPluginLibDir=$(get_libdir)
-		$(cmake-utils_use_find_package alsa Alsa)
-		$(cmake-utils_use_find_package doc Doxygen)
-		$(cmake-utils_use_find_package fltk FLTK)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	use doc && cmake-utils_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r instruments/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
index e3cbf1ed9217..01b612a4bcdb 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="alsa doc dssi +fltk jack lash portaudio"
 
 REQUIRED_USE="|| ( alsa jack portaudio )"