gentoo resync : 16.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
commit: f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree: c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /media-sound
parent: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
50 files changed, 547 insertions, 1993 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 71dfde6f13d9..d0a7be950c9b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/alsamixer-app/Manifest b/media-sound/alsamixer-app/Manifest
index 6dbd88a7de75..8068d66793d9 100644
--- a/media-sound/alsamixer-app/Manifest
+++ b/media-sound/alsamixer-app/Manifest
@@ -1,4 +1,4 @@
-AUX alsamixer-app-0.1-Makefile.patch 964 BLAKE2B e6f1bfeee8f41002c9652c3a729c8d3ea1e09580bd1193459bf18900a5d4677654482321bfd109ca300fe7e2d391449c9a56789555d26d5003a3da373c24e6d8 SHA512 105ef485de8339760608f9b95ff9ffc5059deff3f63d02c5ab4a82e7957e9cf52e878a35a06d58e5e4ed6bb73e074c22f977ec68afb8ab11703690e67c541a2f
+AUX alsamixer-app-0.1-Makefile.patch 890 BLAKE2B d883baf7436816d10c9794b3909235306252ded8c222d057d0a50945c2d97bf7aba266a5cdbec8fbb346559d12ed258d9bcae84b954eac8caeb83081eb5c4ee0 SHA512 f9c7ad5daf98b9b02e79c069fd4a31984659c198b0c16af21e41651b75a8a62bf8a3cb488165989f4f76c44f8d49590a55da9143b19c4f16f2465c0996af8932
 DIST AlsaMixer.app-0.1.tar.gz 26939 BLAKE2B f581aedc043c12bcbf43014b04fa92614b0acc8e49802bdb87ec550fdf2649a7ceb902e01b4ed7c2fc038a1a396a7ad6169e0d418c55df91733038a7bcb524c1 SHA512 48f741c578b51a10d2bcaac375be07d9c2ed705c876fa17d69565b41ade6dc28e72af1509b7d817b452199e8ad60f4e24b78565c134b90ac7f29623b89765e24
-EBUILD alsamixer-app-0.1.ebuild 772 BLAKE2B 82e0faf7682f837775a22628445c8ebe09eefe3fa878d3d8fc3fead66054aed644ada032073a54e943ea9cb25c16a4abb7be40ab8917264d5d90931807e1466a SHA512 757f6fb3113cd4e4336ce7b23eb19e33f182f3d6471ddacb97c18bfb3946e42396f28d9ea9aa722762cd1fd98d188782b1c4329619ec7145cbf8453ab6673923
+EBUILD alsamixer-app-0.1-r1.ebuild 623 BLAKE2B 54e52a76e68defe61aa1598973cd8a40ee2a7e1255951fc2df8584e195686a7522e3ed27523fe571c34df96ea21dd264ed479379fc25111d9dbf7b8c14f4a80d SHA512 d2857dfdcd0d36faa10711f298d532d8bf60667af3fc3f12839dab7c6e00505d08d8032bacc5307de150aaff9b3cf90b1b2a7945388ef46fc7a616a15b4d435d
 MISC metadata.xml 360 BLAKE2B 77601ae25e278b9d7941342cf3e4f5bdcd30a17d7d61c3bd9476a7ed2f16e89434999b59f77518af2938120fdc4565eca01eb6d7a12f1f500bfc37e82ee1df0d SHA512 94dbf40a7a9a38902608e108dedc3c6667e436e7b04c00a7bb4bc9d90d05a88e2f3275facf275709c181a9650f954d31fb97a5c24bd775cdd2277bfe4f84bae1
diff --git a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild b/media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
index 47b54c20984a..7a212477239b 100644
--- a/media-sound/alsamixer-app/alsamixer-app-0.1.ebuild
+++ b/media-sound/alsamixer-app/alsamixer-app-0.1-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 MY_PN=AlsaMixer.app
 MY_P=${MY_PN}-${PV}
 
-DESCRIPTION="AlsaMixer.app is a simple mixer dockapp"
-HOMEPAGE="http://www.dockapps.net/alsamixerapp"
-SRC_URI="http://www.dockapps.net/download/${MY_P}.tar.gz"
+DESCRIPTION="simple alsa mixer dockapp"
+HOMEPAGE="https://www.dockapps.net/alsamixerapp"
+SRC_URI="https://www.dockapps.net/download/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -26,18 +26,9 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
 
 src_compile() {
 	tc-export CXX
-	emake || die "emake failed."
-}
-
-src_install() {
-	dobin ${MY_PN} || die "dobin failed."
-	dodoc README
+	default
 }
diff --git a/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch b/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch
index c260ad1c88bf..7ecdcc4027fd 100644
--- a/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch
+++ b/media-sound/alsamixer-app/files/alsamixer-app-0.1-Makefile.patch
@@ -1,6 +1,6 @@
-diff -ur AlsaMixer.app-0.1.orig/Makefile AlsaMixer.app-0.1/Makefile
---- AlsaMixer.app-0.1.orig/Makefile	2004-09-30 23:44:06.000000000 +0300
-+++ AlsaMixer.app-0.1/Makefile	2008-06-28 08:40:28.000000000 +0300
+diff -ur a/Makefile b/Makefile
+--- a/Makefile	2004-09-30 23:44:06.000000000 +0300
++++ b/Makefile	2008-06-28 08:40:28.000000000 +0300
 @@ -4,22 +4,22 @@
  
  DESTDIR =
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 2fe121133c33..822bd2880b92 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,27 +1,5 @@
-AUX ardour-2.8.11-flags.patch 926 BLAKE2B 8fdf07f8b3e6ae05939f2e0897876a6fc1709047bceda9c69c5286930650f15d40ae0fc70968f770c32c0cf15ac3e0003387ad6b65c571bf6e76844032ce814e SHA512 fbce5a750aad9eb2ffb1546a61b247bd39ffd37f757cdd545c319bbe427a2077a7334ff9171bc40d32ed0c0c25ac4ff170da159f0628ab4af6976127dcf70499
-AUX ardour-2.8.14-boost-150.patch 446 BLAKE2B 13bc40dc19e7b21b8d2b3a47a28e59cf88204c71000bb43e3586e358c3338f84ed4942f106f2927f3b76c140a22a3f05f049590a3fe466a042a5a17656f80e5d SHA512 3bccf463afd7a647f398c60498566b7103ca88702e630215afe4b75954a4eb96a333aab2f02c056bed7499eb7e64454c430a81c3d5d7abe0a7cb323b3111f0ef
-AUX ardour-2.8.14-syslibs.patch 3766 BLAKE2B 672dfd25f80ee22169871dba0f21c13d5e59d2048621e631f5423de6b6787634ebf75b32f94f99a02afa459d50ff93576fb9cd6398a53f5ce93dc5df562e320b SHA512 16d1d37ea3474d0d393839d0e815096094fb3d5a914ccd041154cee11a627f7c236f070aff2379b1b4098b4da3909f0434aaa3ab52c9ac3be1ff7c8e6d3468eb
-AUX ardour-4.0-lv2.patch 2095 BLAKE2B 33abbfa4affc525b7e43106fad29c3d1b18154aa58996b1a3ed50ca7bcf90fdea0e5fbbf870a35d6c43991afa0bc63cfb8b08f2bfa3427b910cc392b73e99efd SHA512 77688faf865874b8d64785b33d3837a47c16de640bcfc5ef20006aaf2f21df0b5a81c89c8d7cf1456dbf160cdea91c5c02488a15fad202d9bfdb5aff04cf1c73
-AUX ardour-4.7-gcc.patch 3081 BLAKE2B 88b56365ed3ad4fd02986573ec4091ce64304988a1591ef238f687dcbc191e44a9d9533315ff8a6228a624daac0dd610331d2e8eb469ded40498b1069b7ed845 SHA512 f01b60d00f2e66731cc0265a4c5fefb154eefd2b2a68bbfbefe483c37480c5b66e4978804e32fc700f20d75a67cff7076eec58ffff9efdfe4b3475d4f2c823af
 AUX ardour-4.x-revision-naming.patch 1107 BLAKE2B 18378f1cbc3bb7871ed599dd03c963e7d808796477838b84e9a1010bf31d175edcbba62dc076a37ff3cdf20868f32fc42c2fb2a687616be27a0ecf00b97afc3e SHA512 f9c742345b4f89bc0cabc7a7fe86c4084c99f962c3b3770a0e14b259fa4ca9a3f2cdac35c3b9214816f895fd083befab16e38d2b753cbe6ab94ca7da7b251580
-DIST ardour-2.8.16.tar.bz2 2169916 BLAKE2B 47db892002f439312efdeec9840d96045a9852b078d4cd88de2fe089f510b904028cb7b0a2d2d39cf004a1bf60127bbfa91af6b9ff1118f3729f9c6d2363d14f SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d
-DIST ardour-4.7.tar.gz 9863149 BLAKE2B 1b81230a1add69506ad703b09cd683fad0ba5c78c30c1701b913ed42690665201541ff01ada9e5b913fc7000df1622cc9fb9b56fa95e46a48d6608ac4fc90f13 SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
-DIST ardour-5.10.tar.bz2 8844840 BLAKE2B 5dd0834b96e56d6ae215f30ab70a28e1cc5f1045ce1c118977fc7dd58e80b8093f1337d4836ca1b68035da7f6f600b36009c6d853e9e001f4f7d549ea62626e2 SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8
 DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
-DIST ardour-5.3.tar.bz2 8244811 BLAKE2B d2635ef720c03ec84bf481f09244c6fad78b857dcda52d7a40e0da9ce5c0a37f9cf5c8355429f86e17ddccb857a7b75c07481408dae2f10b8c71215e9ef8fa9e SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f
-DIST ardour-5.5.tar.bz2 9237459 BLAKE2B 71e967202e46a7e7db1fc2717a8d27470e411dd686a5fd858da57aff72be1e277e20bd9f2568073cc91d21b6124af3ac3bf6024781fae344b83f4900025dc838 SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c
-DIST ardour-5.6.tar.bz2 8590451 BLAKE2B ffafbac62d5bddfff2f4b4bda92692c1c7644050eec444e209f6b4d3b5c300c7ee39d46cd249196ca64b8a43c8716e5fc35272895dd059061669de629100697a SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9
-DIST ardour-5.8.tar.bz2 8669692 BLAKE2B 6628d0c6f81feb96f1d3bc5453cbeb3d5d7c012a2efa1e800d84fd1101c651bb4092e599ef6725507c6243a94107242a496b1b4f6df884bcaa8954c0f71a6861 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e
-DIST ardour-5.9.tar.bz2 8830842 BLAKE2B 4c025475528f7b0b58b18b9a075abab4805efa538af774bd7aa4b86da98c4df1ee639bb253f4326a11924d577c49a7af8c77098edf63a76205c60880bdac31b3 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413
-EBUILD ardour-2.8.16-r1.ebuild 1885 BLAKE2B 25f568c1cd44b7d920d172e660697fcc89f35320d1e94b912f8920a11566fec2503524cdba603077a8887e30698b731ef0f3fda1f474abf99373de7cc276571f SHA512 f635237138d56fb03c6dd4704b76ebc6e7a667b50175324f5c83a4ae5b3cf581d987899efa50830a5608492a18067fc583d9c40d619a1309b64bf41f067b15a3
-EBUILD ardour-4.7-r1.ebuild 3751 BLAKE2B dcc961eeeda107714c8528d442d03216b31d91d422c49ef4ea040c958ec8d01acbfd53ba340481841e7c4d571d0cc37a7ddd667f6f9c666ae7abea4a04455183 SHA512 4dd4e31544c7ad9ac7d011bcb26c5c9fe6749fff0832283191b18b89d5812ede37449eb839af0668a7b28ecac7559396a1c0f5da7cb180edefef20edebbff43e
-EBUILD ardour-4.7-r2.ebuild 3803 BLAKE2B 5d7a6b407cce616401c7d33f6954c0d0cd1cfd4fa733b29ae2e1d6a8faffd581bc3de6e77da20cb8fbdf8155fb72e0822c1825834747cbeace146f54827a78b0 SHA512 24006c9507e275cda278ccc18bc07acf7e04e5b11d29c233e91f57f07ca061644a1e05380b558f76ffebbab43bd503af1c4966c5a2101b3cf6536e9d2885d054
-EBUILD ardour-5.10.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
 EBUILD ardour-5.12.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
-EBUILD ardour-5.3-r1.ebuild 4021 BLAKE2B deb2d21fe2696353cc9c3a6cd6e8d8775b80b7c51757b55d530272a729d11c36a0adb499a81da164409a541f5888b6afa6f1ee41b931a5740e82a63616d46e68 SHA512 5a369fb2317720d8ede4ecb266acef8d69e963c20b1300ab5a47d2dc69d8df2860c2a8c5363f20148c0c71c5f988bfdc6f9a62c92291bf3863b03357d4cfdf13
-EBUILD ardour-5.5-r1.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
-EBUILD ardour-5.6-r1.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
-EBUILD ardour-5.8-r1.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
-EBUILD ardour-5.9.ebuild 3921 BLAKE2B f92f46309bd1a483874a3e0aac09c9c26f03791425c20879b8246e9b512e28ae1ba4b28f95c2e40e0d7b0ca4cac5bdb94144545d332ea9718977489c36eb9eb5 SHA512 c65c934f7a275c814d609e372940c58ca85e6515a31506157087d0fd4d6e6f53ca50ab1a9545c0fc2971693b351a642937019419b203f8013b1c16b1cb823a92
 EBUILD ardour-9999.ebuild 3920 BLAKE2B 0a23255880d7efdfd715f6bed4836578f221621c95e23eb98bd6390a9e22a8ab2b0ecaf69db5e5260d46d678d82918582532abec8d8ebcebc61ed85394bec5ab SHA512 5d9ad35b47af782156639584e2c6c420d45f60fbfa5b98317f12e5c31cac06087c420ec0a62576443ffd9b175479a0d7b92fa745883d066b1d4204b4be7b6556
-MISC metadata.xml 418 BLAKE2B 8be1361084d44af6bea8055e71aeb9ab7692f717ac3bfdfdba672da0cc846d741e54fde6b7dd974958f0514f2534fe19e5a01add2a4e7608d6fc08e77fbd0546 SHA512 763a4192a9cd9d124a11d5f65449f68ac20bca1689f03ef97112d2e988b49949f82ca3478285b85644284982a9c267e6bd41938fb8298ddd0e84aaa7d617d27f
+MISC metadata.xml 347 BLAKE2B 055877000b928bdbc38be9fec8b34e2b5ad6b0c9533e59406bfa6ebdc81fcb2990cfebe577f920f110aa57bc8e20a26f896f4ce8e5ab949177727905656119c3 SHA512 30f231423671c8c1a0911b9591a6239431d55860679c45452b430ce974defafeaa86e8a0f5b950e6176fccb986259780f3a13fa73df0e03c4a5f7e5e60cbcb63
diff --git a/media-sound/ardour/ardour-2.8.16-r1.ebuild b/media-sound/ardour/ardour-2.8.16-r1.ebuild
deleted file mode 100644
index 20db704fb18c..000000000000
--- a/media-sound/ardour/ardour-2.8.16-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs scons-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
-	dev-cpp/glibmm:2
-	>=x11-libs/gtk+-2.8.1:2
-	>=dev-libs/libxml2-2.6:2
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/flac
-	media-libs/raptor:2
-	>=media-libs/liblrdf-0.4.0-r20
-	virtual/jack
-	>=gnome-base/libgnomecanvas-2
-	media-libs/vamp-plugin-sdk
-	dev-libs/libxslt
-	dev-libs/libsigc++:2
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
-	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/suil
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-2.8.11-flags.patch \
-		"${FILESDIR}"/${PN}-2.8.14-syslibs.patch \
-		"${FILESDIR}"/${PN}-2.8.14-boost-150.patch
-}
-
-src_compile() {
-	local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
-	tc-export CC CXX
-	mkdir -p "${D}"
-
-	escons \
-		DESTDIR="${D}" \
-		FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
-		PREFIX=/usr \
-		SYSLIBS=1 \
-		$(use_scons curl FREESOUND) \
-		$(use_scons debug DEBUG) \
-		$(use_scons nls NLS) \
-		$(use_scons lv2 LV2)
-}
-
-src_install() {
-	escons install
-	doman ${PN}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 ardour2 ardour AudioVideo
-}
diff --git a/media-sound/ardour/ardour-4.7-r1.ebuild b/media-sound/ardour/ardour-4.7-r1.ebuild
deleted file mode 100644
index 166114e42cd3..000000000000
--- a/media-sound/ardour/ardour-4.7-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sci-libs/fftw:3.0
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	if ! [[ ${PV} == *9999* ]]; then
-		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex lv2 "--lv2" "--no-lv2") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
-	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-4.7-r2.ebuild b/media-sound/ardour/ardour-4.7-r2.ebuild
deleted file mode 100644
index dfce82a22d08..000000000000
--- a/media-sound/ardour/ardour-4.7-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	if ! [[ ${PV} == *9999* ]]; then
-		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		epatch "${FILESDIR}"/${PN}-4.7-gcc.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex lv2 "--lv2" "--no-lv2") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
-	make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-5.10.ebuild b/media-sound/ardour/ardour-5.10.ebuild
deleted file mode 100644
index 8998723b5075..000000000000
--- a/media-sound/ardour/ardour-5.10.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-5.3-r1.ebuild b/media-sound/ardour/ardour-5.3-r1.ebuild
deleted file mode 100644
index d6f899d24322..000000000000
--- a/media-sound/ardour/ardour-5.3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-		>=media-libs/lv2-1.4.0
-	)"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	if ! [[ ${PV} == *9999* ]]; then
-		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex lv2 "--lv2" "--no-lv2") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-5.5-r1.ebuild b/media-sound/ardour/ardour-5.5-r1.ebuild
deleted file mode 100644
index 8998723b5075..000000000000
--- a/media-sound/ardour/ardour-5.5-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-5.6-r1.ebuild b/media-sound/ardour/ardour-5.6-r1.ebuild
deleted file mode 100644
index 8998723b5075..000000000000
--- a/media-sound/ardour/ardour-5.6-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-5.8-r1.ebuild b/media-sound/ardour/ardour-5.8-r1.ebuild
deleted file mode 100644
index 8998723b5075..000000000000
--- a/media-sound/ardour/ardour-5.8-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/ardour-5.9.ebuild b/media-sound/ardour/ardour-5.9.ebuild
deleted file mode 100644
index 8998723b5075..000000000000
--- a/media-sound/ardour/ardour-5.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-r3
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
-
-RDEPEND="
-	>=dev-cpp/glibmm-2.32.0
-	>=dev-cpp/gtkmm-2.16:2.4
-	>=dev-cpp/libgnomecanvasmm-2.26:2.6
-	dev-libs/boost:=
-	>=dev-libs/glib-2.10.1:2
-	dev-libs/libsigc++:2
-	>=dev-libs/libxml2-2.6:2
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2
-	media-libs/alsa-lib
-	media-libs/aubio
-	media-libs/flac
-	media-libs/freetype:2
-	media-libs/libart_lgpl
-	media-libs/liblo
-	>=media-libs/liblrdf-0.4.0-r20
-	>=media-libs/libsamplerate-0.1
-	>=media-libs/libsndfile-1.0.18
-	>=media-libs/libsoundtouch-1.6.0
-	media-libs/raptor:2
-	>=media-libs/rubberband-1.6.0
-	>=media-libs/taglib-1.7
-	media-libs/vamp-plugin-sdk
-	net-misc/curl
-	sys-libs/readline:0=
-	sci-libs/fftw:3.0[threads]
-	virtual/libusb:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-2.8.1:2
-	x11-libs/pango
-	jack? ( virtual/jack )
-	>=media-libs/slv2-0.6.1
-	media-libs/lilv
-	media-libs/sratom
-	dev-libs/sord
-	>=media-libs/suil-0.6.10
-	>=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	jack? ( virtual/jack )
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
-	if has_version \>=dev-libs/libsigc++-2.6 ; then
-		append-cxxflags -std=c++11
-	fi
-	python-any-r1_pkg_setup
-}
-
-src_prepare(){
-	eapply_user
-	if ! [[ ${PV} == *9999* ]]; then
-		eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
-		touch "${S}/libs/ardour/revision.cc"
-	fi
-	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
-	MARCH=$(get-flag march)
-	OPTFLAGS=""
-	if use cpu_flags_x86_sse; then
-		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
-			elog "You enabled sse but use an march that does not support sse!"
-			elog "We add -msse to the flags now, but please consider switching your march in make.conf!"
-		fi
-		OPTFLAGS="sse"
-	fi
-	if use cpu_flags_x86_mmx; then
-		if [[ ${MARCH} == "i486" ]]; then
-		    elog "You enabled mmx with i486 set as march! You have been warned!"
-		fi
-		OPTFLAGS="${OPTFLAGS} mmx"
-	fi
-	if use cpu_flags_x86_3dnow; then
-		OPTFLAGS="${OPTFLAGS} 3dnow"
-	fi
-	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \
-		-i "${S}"/wscript || die
-	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die
-	append-flags "-lboost_system"
-	python_fix_shebang "${S}"/wscript
-	python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--nls \
-		--optimize \
-		--lv2 \
-		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
-		$(usex doc "--docs" '') \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
-	make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to make a donation upstream at ${HOMEPAGE}."
-	elog "Please do _not_ report problems with the package to ${PN} upstream."
-	elog "If you think you've found a bug, check the upstream binary package"
-	elog "before you report anything to upstream."
-}
diff --git a/media-sound/ardour/files/ardour-2.8.11-flags.patch b/media-sound/ardour/files/ardour-2.8.11-flags.patch
deleted file mode 100644
index 607b072cffa2..000000000000
--- a/media-sound/ardour/files/ardour-2.8.11-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ardour-2.8.11/SConstruct.orig
-+++ ardour-2.8.11/SConstruct
-@@ -414,6 +414,15 @@
-     if os.environ.has_key('CXX'):
- 	context['CXX'] = os.environ['CXX']
- 
-+	if os.environ.has_key('CFLAGS'):
-+		env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+
-+	if os.environ.has_key('CXXFLAGS'):
-+		env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+
-+	if os.environ.has_key('LDFLAGS'):
-+		env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
-     if os.environ.has_key('DISTCC_HOSTS'):
- 	context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
- 	context['ENV']['HOME'] = os.environ['HOME']
-@@ -807,9 +816,6 @@
- if env['DEBUG'] == 1:
-     env.Append(CCFLAGS=" ".join (debug_flags))
-     env.Append(LINKFLAGS=" ".join (debug_flags))
--else:
--    env.Append(CCFLAGS=" ".join (opt_flags))
--    env.Append(LINKFLAGS=" ".join (opt_flags))
- 
- if env['STL_DEBUG'] == 1:
-     env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG")
diff --git a/media-sound/ardour/files/ardour-2.8.14-boost-150.patch b/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
deleted file mode 100644
index 0d23568a309c..000000000000
--- a/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /home/mad/ardour-2.8.14/SConstruct      2012-11-21 00:30:54.000000000 +0100
-+++ SConstruct  2012-11-21 17:34:02.000000000 +0100
-@@ -955,7 +961,9 @@
- # FLAC ....
- #
-
--# boost (we don't link against boost, just use some header files)
-+# boost (we need to link against boost with >=1.50. header files alone will not work anymore)
-+
-+env.Append(LIBS=['boost_system'])
-
- libraries['boost'] = LibraryInfo ()
- prep_libcheck(env, libraries['boost'])
diff --git a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
deleted file mode 100644
index a06c3b04e276..000000000000
--- a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -891,39 +891,6 @@
- 
- 
- #
--# these are part of the Ardour source tree because they are C++
--# 
--
--libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
--                                 LIBPATH='#libs/vamp-sdk',
--                                 CPPPATH='#libs/vamp-sdk')
--libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
--                                 LIBPATH='#libs/vamp-sdk',
--                                 CPPPATH='#libs/vamp-sdk')
--
--env['RUBBERBAND'] = False
--
--conf = Configure (env)
--
--if conf.CheckHeader ('fftw3.h'):
--    env['RUBBERBAND'] = True
--    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
--                                           LIBPATH='#libs/rubberband',
--                                           CPPPATH='#libs/rubberband',
--                                           CCFLAGS='-DUSE_RUBBERBAND')
--else:
--    print ""
--    print "-------------------------------------------------------------------------"
--    print "You do not have the FFTW single-precision development package installed."
--    print "This prevents Ardour from using the Rubberband library for timestretching"
--    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
--    print "pitchshifting will not be available."
--    print "-------------------------------------------------------------------------"
--    print ""
--
--conf.Finish()
--
--#
- # Check for libusb
- 
- libraries['usb'] = LibraryInfo ()
-@@ -1109,10 +1076,22 @@
-     # Comment the previous line and uncomment this for old versions of Debian:
-     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
- 
--    libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
--                                            LIBPATH='#libs/appleutility',
--                                            CPPPATH='#libs/appleutility')
-+    #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
-+    #                                        LIBPATH='#libs/appleutility',
-+    #                                        CPPPATH='#libs/appleutility')
-     
-+    env['RUBBERBAND'] = True
-+    env.Append (CXXFLAGS="-DUSE_RUBBERBAND")
-+    libraries['rubberband'] = LibraryInfo()
-+    libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband')
-+
-+    libraries['vamp-sdk'] = LibraryInfo()
-+    libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
-+    libraries['vamp'] = LibraryInfo()
-+    libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
-+    libraries['vamphost'] = LibraryInfo()
-+    libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk')
-+
-     coredirs = [
-         'templates',
-         'manual'
-@@ -1122,7 +1101,6 @@
-         'libs/pbd',
-         'libs/midi++2',
-         'libs/ardour',
--        'libs/vamp-sdk',
-         'libs/vamp-plugins/',
-     # these are unconditionally included but have
-     # tests internally to avoid compilation etc
-@@ -1138,8 +1116,7 @@
-     gtk_subdirs = [
- #        'libs/flowcanvas',
-         'libs/gtkmm2ext',
--        'gtk2_ardour',
--        clearlooks_version
-+        'gtk2_ardour'
-         ]
- 
- else:
-@@ -1251,9 +1228,9 @@
- # timestretch libraries
- #
- 
--timefx_subdirs = []
--if env['RUBBERBAND']:
--    timefx_subdirs += ['libs/rubberband']
-+#timefx_subdirs = []
-+#if env['RUBBERBAND']:
-+#    timefx_subdirs += ['libs/rubberband']
- 
- #
- # Tools
-@@ -1441,7 +1418,7 @@
- for subdir in coredirs:
-     SConscript (subdir + '/SConscript')
- 
--for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
-+for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
-     for subdir in sublistdir:
-         SConscript (subdir + '/SConscript')
- 
diff --git a/media-sound/ardour/files/ardour-4.0-lv2.patch b/media-sound/ardour/files/ardour-4.0-lv2.patch
deleted file mode 100644
index a79e3f20c447..000000000000
--- a/media-sound/ardour/files/ardour-4.0-lv2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -rupN ardour-4.0-vanilla/libs/ardour/automatable.cc ardour-4.0/libs/ardour/automatable.cc
---- ardour-4.0-vanilla/libs/ardour/automatable.cc       2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/automatable.cc       2015-04-21 16:32:14.943812000 +0200
-@@ -34,7 +34,11 @@
- #include "ardour/plugin.h"
- #include "ardour/plugin_insert.h"
- #include "ardour/session.h"
-+
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
-+#endif
-+
- #include "ardour/value_as_string.h"
- 
- #include "i18n.h"
-diff -rupN ardour-4.0-vanilla/libs/ardour/buffer_set.cc ardour-4.0/libs/ardour/buffer_set.cc
---- ardour-4.0-vanilla/libs/ardour/buffer_set.cc        2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/buffer_set.cc        2015-04-21 16:40:44.216812000 +0200
-@@ -34,8 +34,8 @@
- #include "ardour/midi_buffer.h"
- #include "ardour/port.h"
- #include "ardour/port_set.h"
--#include "ardour/uri_map.h"
- #ifdef LV2_SUPPORT
-+#include "ardour/uri_map.h"
- #include "ardour/lv2_plugin.h"
- #include "lv2_evbuf.h"
- #endif
-diff -rupN ardour-4.0-vanilla/libs/ardour/event_type_map.cc ardour-4.0/libs/ardour/event_type_map.cc
---- ardour-4.0-vanilla/libs/ardour/event_type_map.cc    2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/event_type_map.cc    2015-04-21 16:47:28.489812000 +0200
-@@ -24,7 +24,9 @@
- #include "ardour/event_type_map.h"
- #include "ardour/parameter_descriptor.h"
- #include "ardour/parameter_types.h"
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
-+#endif
- #include "evoral/Parameter.hpp"
- #include "evoral/ParameterDescriptor.hpp"
- #include "evoral/midi_events.h"
-diff -rupN ardour-4.0-vanilla/libs/ardour/globals.cc ardour-4.0/libs/ardour/globals.cc
---- ardour-4.0-vanilla/libs/ardour/globals.cc   2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/globals.cc   2015-04-21 16:54:33.404812000 +0200
-@@ -106,8 +106,9 @@
- #include "ardour/runtime_functions.h"
- #include "ardour/session_event.h"
- #include "ardour/source_factory.h"
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
--
-+#endif
- #include "audiographer/routines.h"
- 
- #if defined (__APPLE__)
-
diff --git a/media-sound/ardour/files/ardour-4.7-gcc.patch b/media-sound/ardour/files/ardour-4.7-gcc.patch
deleted file mode 100644
index 685eb2ab1178..000000000000
--- a/media-sound/ardour/files/ardour-4.7-gcc.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- libs/gtkmm2ext/actions.cc.old	2016-02-19 02:28:56.000000000 +0100
-+++ libs/gtkmm2ext/actions.cc	2017-06-05 03:32:48.762688016 +0200
-@@ -401,7 +401,7 @@
- 	   gtkmm2.6, so we fall back to the C level.
- 	*/
- 
--	if (ui_manager == 0) {
-+	if (ui_manager == (Glib::RefPtr<Gtk::UIManager>) 0) {
- 		return RefPtr<Action> ();
- 	}
- 
---- libs/gtkmm2ext/fastmeter.cc.old	2016-02-19 02:28:56.000000000 +0100
-+++ libs/gtkmm2ext/fastmeter.cc	2017-06-05 05:01:57.075834979 +0200
-@@ -731,7 +731,7 @@
- 
- 	Glib::RefPtr<Gdk::Window> win;
- 
--	if ((win = get_window()) == 0) {
-+	if ((win = get_window()) == (Glib::RefPtr<Gdk::Window>) 0) {
- 		queue_draw ();
- 		return;
- 	}
-
---- gtk2_ardour/editor.cc.old	2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/editor.cc	2017-06-05 05:38:20.971481110 +0200
-@@ -714,16 +714,16 @@
- 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- 	Glib::RefPtr<Gdk::Pixbuf> icon;
- 
--	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_16px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_22px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_32px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_48px")) {
- 		window_icons.push_back (icon);
- 	}
- 	if (!window_icons.empty()) {
-
---- gtk2_ardour/fft_graph.cc.old	2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/fft_graph.cc	2017-06-05 06:21:56.644212996 +0200
-@@ -203,7 +203,7 @@
- 
- 
- 
--	if (graph_gc == 0) {
-+	if (graph_gc == (Glib::RefPtr<Gdk::GC>) 0) {
- 		graph_gc = GC::create( get_window() );
- 	}
- 
-@@ -213,7 +213,7 @@
- 
- 	graph_gc->set_rgb_fg_color( grey );
- 
--	if (layout == 0) {
-+	if (layout == (Glib::RefPtr<Pango::Layout>) 0) {
- 		layout = create_pango_layout ("");
- 		layout->set_font_description (get_style()->get_font());
- 	}
-
---- gtk2_ardour/startup.cc.old	2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/startup.cc	2017-06-05 06:41:27.091051601 +0200
-@@ -79,23 +79,23 @@
- 	set_position (WIN_POS_CENTER);
- 	set_border_width (12);
- 
--	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
-+	if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == (Glib::RefPtr<Gdk::Pixbuf>) 0) {
- 		throw failed_constructor();
- 	}
- 
- 	list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- 	Glib::RefPtr<Gdk::Pixbuf> icon;
- 
--	if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_16px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_22px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_32px")) {
- 		window_icons.push_back (icon);
- 	}
--	if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+	if (icon = ::get_icon ("ardour_icon_48px")) {
- 		window_icons.push_back (icon);
- 	}
- 	if (!window_icons.empty ()) {
-
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index c770fdfe0e97..20dec2c8d4e9 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -5,9 +5,6 @@
     <email>proaudio@gentoo.org</email>
     <name>Gentoo ProAudio Project</name>
   </maintainer>
-  <use>
-    <flag name="lv2">Add support for Ladspa V2</flag>
-  </use>
   <upstream>
     <remote-id type="github">Ardour/ardour</remote-id>
   </upstream>
diff --git a/media-sound/pnmixer/Manifest b/media-sound/pnmixer/Manifest
index 1fe1c603119c..e6694b9c703e 100644
--- a/media-sound/pnmixer/Manifest
+++ b/media-sound/pnmixer/Manifest
@@ -3,6 +3,6 @@ AUX pnmixer-0.6_pre20111213-desktopfile.patch 328 BLAKE2B 283d3e2e791b0ef3de7a2a
 DIST pnmixer-0.6_pre20111213.tar.xz 131328 BLAKE2B dabfa6e8270116eb325dc6dfd59c6f650975f1efce27603b0495f11efebd743aaba17ad19efba82d4c1d75753418a89295277853c9095d6a4fffdf6b17c5b9fe SHA512 967a685593256f9f2e8ab2ef955a91a03c3710d96956087ac55301d5232e6f01897efbb064bd6dc1804836af1b66c038cb3d04203043462de5246e4f14dd37c4
 DIST pnmixer-0.7.1.tar.gz 237949 BLAKE2B 87b309f3dd844009abe5f5bb2c5ca16ba80069932c2833a9d472130a6f0d7c36a050dc393bca097372c44fca5f90742cfad07c40a6f51ff877080f5eee25b2d2 SHA512 08d83424d921ef6112700fe8c3b55e147ace7767698a9d3ee4bb79ed0e727be7bcc82d55d3debc4b805e75f07c5702443be157e1bccce44d76072c36f8825816
 EBUILD pnmixer-0.6_pre20111213.ebuild 955 BLAKE2B 37cf36212e41748bddc0a8231c1d791616f558391f2360b632f0368108e49071b27cf23c4a2d57141fd20ad379458b022f6c5118deccfe29778fc9c62ef7bb86 SHA512 d8a62a6cee60a1095167a60c78ee11b509f68a7f3f925083bd0c079ac8129bbc867af63fe0132133fb49589ecf04202e59a0e0ee6b39f1b3e48d87aebb1234f5
-EBUILD pnmixer-0.7.1.ebuild 817 BLAKE2B aeb53c81444386fc20facb2765cc93474837b329ec40718622e37c92b01709dfbcf0091fae0fb997e571e77f969bd61a411de36e1c7a9ecab30ea7324424de80 SHA512 c648143edc699c2a4eeeed324436d01328eae8177be4bf34535d8dda648b0a4b3353f1b5b07c5c328dd4be8a470d35e0cd57a784efa3281f51e2bac74228e42a
+EBUILD pnmixer-0.7.1.ebuild 822 BLAKE2B c850a1505199c93ec357e4b48d614e4fe7adc38770e0d904b3380c3676fb0bac5e77d16a3f9c3b038dc09cebf0b6c71c92f8843ad17cae86a0681a9fc4f46754 SHA512 b7e0aeb58745a2f90c01b5c0e83bda74c78ae1a06df62bb3eb7ac39f8cf02a288717e6e6e893a8703530faeb073350483ef4df5032f2e5dd3e34f51a00e38608
 EBUILD pnmixer-9999.ebuild 819 BLAKE2B f11e945d77d82fd0d22b3c8f62f67bc563f7d5672528c71c1ad04d778d35cef8516a372e5586387afa1b5caca2ffe0c70a97af176b058d87a871df4da80c86c6 SHA512 126ae9a4c6e539fc34dec05d9210ceffe01fd1279958e4e89df7295c8cc4e6dcb95c81cef9f8c0839190ed826b0b143f38538310190d0e8fa16372d0c7094189
 MISC metadata.xml 2085 BLAKE2B 0408ed12d5d83f1c71d058902dc9c5e7afaba5d36fc2177e7cc393714f46c111188f28ed09eb622d7e3250995f136173e185a201c38387b34e7665680d4d8860 SHA512 57421f90ca52f34dc76db9fef86c7e01bb35222ff9bf37e4ca98a245289bcdeb3e77b6e1a8224394ba07d6def209065cfc81e2e48dac3338f0dca96db85f2f9e
diff --git a/media-sound/pnmixer/pnmixer-0.7.1.ebuild b/media-sound/pnmixer/pnmixer-0.7.1.ebuild
index 830c6b74c7ec..a2496770d3d6 100644
--- a/media-sound/pnmixer/pnmixer-0.7.1.ebuild
+++ b/media-sound/pnmixer/pnmixer-0.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nicklan/pnmixer/archive/v${PV/_rc/-rc}.tar.gz -> ${P
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="libnotify"
 
 RDEPEND="dev-libs/glib:2
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index b66252866bae..a2c09cca2218 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,7 +1,5 @@
 AUX notest.patch 1545 BLAKE2B f0d6f44eed7811ce3a9c12f1044844a806214489787b90d2d27590fc2bff746d2fb8511a75874e3bfbfd5c5563dd642534e904706dd029d057986344c207c900 SHA512 c3e9fbb8f1844d9faa35b318ffebfe6c64672f329ac584a101bf1e3c5736916666e7c100863de7db50f89b8f98b8a2e267e82e4aad457cbbaa875da0322bb0f6
 AUX piper.capnp 19756 BLAKE2B f852a7e9890e8e3fe3742115a10ffaa5d9793f48b37afc3d608f01f4548d799b00c7770186548384e9f5e85378c6b51167693cf25648aa5cdbf1e2ee353cce78 SHA512 c520116c978f8abbc747d3a465c006ec800cf1dd5f8f96f7c5879d88ae81fcc09f3a2640f9212b74f41f5b28269a17f35aac3521be946c66b599419c39a95720
-DIST sonic-visualiser-2.5.tar.gz 4112133 BLAKE2B 19a7c61b99c77ebb0b4d53f014aad282244b89b3a527cf69d465812468b87f97f6d33f2d8553066eb8aa9d985a913bf796cca5290426cdfc1f0082fce2eece23 SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6
 DIST sonic-visualiser-3.0.2.tar.gz 5123229 BLAKE2B 767be64ae74a47e2d1fb2e1b9a93384999c3567613f0b9662d3c5063fd0d951398c6bf4f3ce118545f83f707647461a92e152cabb0596a80dae0284f8415188c SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825
-EBUILD sonic-visualiser-2.5.ebuild 2311 BLAKE2B e803a1126adb6bca848b0bef7b948d34a7334dff14bd0fc90827cca46dfdc2baf01fdf0caabbdd06a15ab063e1538e2266343e033973b7a783f74b684bc7c228 SHA512 8241cc2323ad9f58db098a6c8401e7d2f35e5e8795a390ca0e6c1f4951a8c2fbd6721d8353b40e7ed0a147b361fa975426bd712d6a31e7a16a6cb865e9c872fd
 EBUILD sonic-visualiser-3.0.2.ebuild 2639 BLAKE2B 589b386d5d208d4d93d4ef6a160f233769ff89d9145a46d36426617586bb21176d105122cc94c80dc9b713f0063e69a8d129b59b70f094987a546fac7d378cc1 SHA512 c5704adef2c1ff04ef12e1b20a566e583a0d68deb6ffa1be41a7c0131030f77e329d0d59cd7df97b96f4d008e0684ff18ebe886879b311683738e2439c3153ac
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
deleted file mode 100644
index bf3165115d06..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-2.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit eutils qmake-utils autotools xdg-utils
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/1675/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	media-libs/ladspa-sdk
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	dev-libs/sord
-	dev-libs/serd
-	sci-libs/fftw:3.0
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-}
-
-src_compile() {
-	# de parallelize a bit otherwise it fails...
-	emake sub-dataquay-lib-pro
-	emake sub-svcore
-	emake sub-svgui
-	emake sub-svapp
-	emake sub-sv-pro
-}
-
-src_test() {
-	emake sub-svcore-base-test
-	emake sub-svcore-data-fileio-test
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 5d4173464d20..ed26087c5f07 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,3 +1,14 @@
+AUX sox-14.4.2-CVE-2017-11332.patch 792 BLAKE2B 07da752434571a68102c0b712656ca9642b85a67c9f0e740a75fff979c4f8746b152aa0e060dc490ed6b6bdf62eaab29b562ef929cbada035a12fcc76ce6bf15 SHA512 8c26bea077b503c8ec420880539f2a6e275d2b3c26eb5b4c5af38aae16b258a29ceb946aeb2252e47aeea22e5b6513c628a7ee3eb3d201d6fa541456b16bd399
+AUX sox-14.4.2-CVE-2017-11333.patch 1635 BLAKE2B 9dad961dd2679bc87dbf0422de01c3777362a382364db060a08db5265c087d0a943b9be970e886b1ae89c9a451aba13613f13233a5338e6d0100f114543ed4ac SHA512 5e87a6cd045cd499da0af495e09c178c342b36ff3f753d90bb73bca3745223746b3c704db85f60a2d9867d9ac37e715ae819f0a4f90039551c722c0c90af2b27
+AUX sox-14.4.2-CVE-2017-11358.patch 987 BLAKE2B 499968de437944f9261756d3cbc9dd54c60f10eaac02b074348e390fcfe8b3d3c4adb7f599b98e47596bbb87b88d0c9dfc5f3ba027a798b4aeb6038fd7b40be8 SHA512 b2a096659cc98bd50322441d3611e607b71c54025feaf7c2acc322fff8c0ef5a83f06bef31099c4adf1794009b050a3f2dca71c7926892c60081261384891ac4
+AUX sox-14.4.2-CVE-2017-11359.patch 903 BLAKE2B 89bcfbca682ec4ba1529b974e9d767c5a6a87632c92324d2794db5c45e48b7723b334564143037f17c27ffb0d2e330dadc274ef3f0a9fa9ee5ad3f45ad8239e9 SHA512 6fb075c09cfedaec6bb6760ba2e0d55446478c8e2873884b6a940d42f44ad8e840809f8b31b59ff3d40307dd48d74dadf809859dfef190269da8800185b462a6
+AUX sox-14.4.2-CVE-2017-15370.patch 1065 BLAKE2B 1e8609d127c146f378b0c5ae2195fdcabc33230d4685aab3b93c217b748998a82d3d7a46888a32fc61260672b64d9da266d339311142d630f418ae727d91d847 SHA512 e5c079f8e8e4603e068a092db86ec6dea4da395f75fb4bfa284736edce2d8ea3441deda51ca7dce8865e1ac5914cdf9c6767ed74203726f26992e9d76f4d8b0b
+AUX sox-14.4.2-CVE-2017-15371.patch 1313 BLAKE2B 9b6a97d4b2fda76295e2ae260cba76c3a97dc90ec409f450c4eb20367ed8038aac533cf6147d8efb840054fa28e85238c89e85783c082ccefd55a086b94cbb58 SHA512 122783ba75b4ed9062071ace42f7d702e5b37b8d81e479d37ad0e1c4addbf3efd167f4d56c32e9518b3dcb8d20e54f53cb2b573343195823dd871764d1b24fd9
+AUX sox-14.4.2-CVE-2017-15372.patch 3745 BLAKE2B 966abb4f59894e8dec2a29376c4b548640838f489467e9e31b8f1720196ae825f4c401fe738b0252742fa412a220aff98dbe2bad6d9184c0ea037ece610ad0d4 SHA512 ba8e52d02eb453fbdc7cf066c42c2c00591a355026508406029882ab665ec2567dc03efcc7e0ebec9309b7606ba44d2377c25b9e4eeadbb30457304852bfc31c
+AUX sox-14.4.2-CVE-2017-15642.patch 852 BLAKE2B b6d32a2d7909b601953f0603caa678e62a9c5ef6cbce9609f2ad221af0555a2d1990bce38db24c5e127a05b2784ded42faed15a2a018fb73b6416f3c1be4b5a5 SHA512 dfccffbf6be7951c217e8b98a96a6cd48c31d077a535c0e03beffc8f2fea82aa71c0e5d941caa1364771aa0cef8ae915aa5c3e7be8948375151537cc1a8ebdb8
+AUX sox-14.4.2-CVE-2017-18189.patch 1109 BLAKE2B 1014eb9427b4735e08da68707e108a0c04b89ec75c91440a0ce833327af0ed152a1eba1ef46402f198f6394c1787ae899ee1ffc9748d1ec91544fe8f127cecb6 SHA512 dd4023a6bc98f510c2256537e747a20c9b3b8ec35e0f98d19d188a3973f1774566c5d70f8de6cd9083547ade69670d34d10b848836d0724896993e1e56c85c75
+AUX sox-14.4.2-wavpack-chk-errors-on-init.patch 1328 BLAKE2B 0a1f6c0ef96d5508f11901b28b57feda0be79f0af6ead0af51eb97db7a3a97497aa446389904bc9457efd8dc4f9738f5482841caa096d3449d3b1ab5d77b746a SHA512 ae95d810f489efb749f808c6e46b0412f4cfd6ee60fce0289c0c1d689bb599fd2516a79fcd24ac9ddd30fab6f0437a6876dccfb61db2f6c612fe680f6eff13b5
 DIST sox-14.4.2.tar.gz 1134299 BLAKE2B 9fae987d421fc733b84746f8dc8f09ced1c3ce066643a426d7c64c4ed4ceeb18e5d00165108b39065a4ce40ff39e9d020fc6e734ff1121ee39bfeed4ad822bc5 SHA512 b5c6203f4f5577503a034fe5b3d6a033ee97fe4d171c533933e2b036118a43a14f97c9668433229708609ccf9ee16abdeca3fc7501aa0aafe06baacbba537eca
+EBUILD sox-14.4.2-r1.ebuild 2626 BLAKE2B 83929fbf6c871b74ad53c136792ed2bd19e2c34ac6d30c0f0ae1438a92d5b48fed6c659dbac89da3991d5dd5af2a458fb22dfebbbd42d9cd286e28c4f4770db4 SHA512 6f480918d4b518e014adaef92abf1e54b1a569561e173b9b8e16ce41141c296e0864801d82bac874d21dc31e0fa16e83f4898f8432e2b0a493146c9604f63495
 EBUILD sox-14.4.2.ebuild 2162 BLAKE2B acf1642bd7003f6d19bc454196f4b6cf6fe9e7088363b3c3b530a973d874a3261faca50c26fc6d4e076064ebf10a87d39a5d647e4feccacc49d8c4cc052a1d62 SHA512 8bacb2ece8bc4808ad1b5db0a854e3c4c7eb4febaabdc18675bec344c8454243ba0d5530d87c6ae7b0b8416bf726a1d392cc8d6f0ef936dbd4fea01fe02ef825
 MISC metadata.xml 640 BLAKE2B f02bbb657d1f43a5c9394cca0f74a88d56163cbeabccdc481651e52abfb0ddaa00750c1578a6ff7c697848357c9382a537044a4364c9c5dfc35906f665011bec SHA512 0c7363b16df0333f4496a8e2ecb8c267cd1b23b1d946964fd2ff096a98313384f4f9d94e30791464076fe318d6bf7e5f1d4ef6f6a41a020ef1c197988c811862
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch
new file mode 100644
index 000000000000..2b4448ed2d71
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-11332.patch
@@ -0,0 +1,25 @@
+From 7405bcaacb1ded8c595cb751d407cf738cb26571 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 16:29:28 +0000
+Subject: [PATCH] wav: fix crash if channel count is zero (CVE-2017-11332)
+
+---
+ src/wav.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/wav.c b/src/wav.c
+index 3e80e692..3eaebfa7 100644
+--- a/src/wav.c
++++ b/src/wav.c
+@@ -712,6 +712,11 @@ static int startread(sox_format_t * ft)
+     else
+         lsx_report("User options overriding channels read in .wav header");
+ 
++    if (ft->signal.channels == 0) {
++        lsx_fail_errno(ft, SOX_EHDR, "Channel count is zero");
++        return SOX_EOF;
++    }
++
+     if (ft->signal.rate == 0 || ft->signal.rate == dwSamplesPerSecond)
+         ft->signal.rate = dwSamplesPerSecond;
+     else
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch
new file mode 100644
index 000000000000..a9a5b2762199
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-11333.patch
@@ -0,0 +1,43 @@
+From 93b6e4b5b0efa47b318151d39c35277fc06525f1 Mon Sep 17 00:00:00 2001
+Message-Id: <93b6e4b5b0efa47b318151d39c35277fc06525f1.1511192342.git.agx@sigxcpu.org>
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Wed, 15 Nov 2017 18:36:58 +0100
+Subject: [PATCH] Handle vorbis_analysis_headerout errors
+
+This is related to
+
+    https://github.com/xiph/vorbis/pull/34
+
+but could also happen today with on other errors in the called function.
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=882236
+Forwarded: sox-devel@lists.sourceforge.net
+---
+ src/vorbis.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+Index: sox/src/vorbis.c
+===================================================================
+--- sox.orig/src/vorbis.c
++++ sox/src/vorbis.c
+@@ -270,8 +270,11 @@ static int write_vorbis_header(sox_forma
+       vc.comment_lengths[i] = strlen(text);
+     }
+   }
+-  vorbis_analysis_headerout(    /* Build the packets */
+-      &ve->vd, &vc, &header_main, &header_comments, &header_codebooks);
++  if (vorbis_analysis_headerout(    /* Build the packets */
++      &ve->vd, &vc, &header_main, &header_comments, &header_codebooks) < 0) {
++      ret = HEADER_ERROR;
++      goto cleanup;
++  }
+ 
+   ogg_stream_packetin(&ve->os, &header_main);   /* And stream them out */
+   ogg_stream_packetin(&ve->os, &header_comments);
+@@ -280,6 +283,7 @@ static int write_vorbis_header(sox_forma
+   while (ogg_stream_flush(&ve->os, &ve->og) && ret == HEADER_OK)
+     if (!oe_write_page(&ve->og, ft))
+       ret = HEADER_ERROR;
++cleanup:
+   for (i = 0; i < vc.comments; ++i)
+     free(vc.user_comments[i]);
+   free(vc.user_comments);
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch
new file mode 100644
index 000000000000..6cd8c2bb15f6
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-11358.patch
@@ -0,0 +1,26 @@
+From 6cb44a44b9eda6b321ccdbf6483348d4a9798b00 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 16:43:35 +0000
+Subject: [PATCH] hcom: fix crash on input with corrupt dictionary
+ (CVE-2017-11358)
+
+---
+ src/hcom.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/hcom.c b/src/hcom.c
+index c62b020c..1b0e09dd 100644
+--- a/src/hcom.c
++++ b/src/hcom.c
+@@ -150,6 +150,11 @@ static int startread(sox_format_t * ft)
+                 lsx_debug("%d %d",
+                        p->dictionary[i].dict_leftson,
+                        p->dictionary[i].dict_rightson);
++                if ((unsigned) p->dictionary[i].dict_leftson >= dictsize ||
++                    (unsigned) p->dictionary[i].dict_rightson >= dictsize) {
++                        lsx_fail_errno(ft, SOX_EHDR, "Invalid dictionary");
++                        return SOX_EOF;
++                }
+         }
+         rc = lsx_skipbytes(ft, (size_t) 1); /* skip pad byte */
+         if (rc)
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch
new file mode 100644
index 000000000000..180d7d1c867b
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-11359.patch
@@ -0,0 +1,27 @@
+From 8b590b3a52f4ccc4eea3f41b4a067c38b3565b60 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 17:02:11 +0000
+Subject: [PATCH] wav: fix crash writing header when channel count >64k
+ (CVE-2017-11359)
+
+---
+ src/wav.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/wav.c b/src/wav.c
+index 3eaebfa7..fad334cf 100644
+--- a/src/wav.c
++++ b/src/wav.c
+@@ -1379,6 +1379,12 @@ static int wavwritehdr(sox_format_t * ft, int second_header)
+     long blocksWritten = 0;
+     sox_bool isExtensible = sox_false;    /* WAVE_FORMAT_EXTENSIBLE? */
+ 
++    if (ft->signal.channels > UINT16_MAX) {
++        lsx_fail_errno(ft, SOX_EOF, "Too many channels (%u)",
++                       ft->signal.channels);
++        return SOX_EOF;
++    }
++
+     dwSamplesPerSecond = ft->signal.rate;
+     wChannels = ft->signal.channels;
+     wBitsPerSample = ft->encoding.bits_per_sample;
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch
new file mode 100644
index 000000000000..473c383a663a
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-15370.patch
@@ -0,0 +1,25 @@
+From ef3d8be0f80cbb650e4766b545d61e10d7a24c9e Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 16:21:23 +0000
+Subject: [PATCH] wav: ima_adpcm: fix buffer overflow on corrupt input
+ (CVE-2017-15370)
+
+Add the same check bad block size as was done for MS adpcm in commit
+f39c574b ("More checks for invalid MS ADPCM blocks").
+---
+ src/wav.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/wav.c b/src/wav.c
+index 5202556c..3e80e692 100644
+--- a/src/wav.c
++++ b/src/wav.c
+@@ -127,7 +127,7 @@ static unsigned short  ImaAdpcmReadBlock(sox_format_t * ft)
+         /* work with partial blocks.  Specs say it should be null */
+         /* padded but I guess this is better than trailing quiet. */
+         samplesThisBlock = lsx_ima_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t) 0);
+-        if (samplesThisBlock == 0)
++        if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock)
+         {
+             lsx_warn("Premature EOF on .wav input file");
+             return 0;
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch
new file mode 100644
index 000000000000..cde253da4ecb
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-15371.patch
@@ -0,0 +1,37 @@
+From 818bdd0ccc1e5b6cae742c740c17fd414935cf39 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Sun, 5 Nov 2017 15:57:48 +0000
+Subject: [PATCH] flac: fix crash on corrupt metadata (CVE-2017-15371)
+
+---
+ src/flac.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+Index: sox/src/flac.c
+===================================================================
+--- sox.orig/src/flac.c
++++ sox/src/flac.c
+@@ -119,9 +119,10 @@ static void decoder_metadata_callback(FL
+     p->total_samples = metadata->data.stream_info.total_samples;
+   }
+   else if (metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) {
++    const FLAC__StreamMetadata_VorbisComment *vc = &metadata->data.vorbis_comment;
+     size_t i;
+ 
+-    if (metadata->data.vorbis_comment.num_comments == 0)
++    if (vc->num_comments == 0)
+       return;
+ 
+     if (ft->oob.comments != NULL) {
+@@ -129,8 +130,9 @@ static void decoder_metadata_callback(FL
+       return;
+     }
+ 
+-    for (i = 0; i < metadata->data.vorbis_comment.num_comments; ++i)
+-      sox_append_comment(&ft->oob.comments, (char const *) metadata->data.vorbis_comment.comments[i].entry);
++    for (i = 0; i < vc->num_comments; ++i)
++      if (vc->comments[i].entry)
++        sox_append_comment(&ft->oob.comments, (char const *) vc->comments[i].entry);
+   }
+ }
+ 
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch
new file mode 100644
index 000000000000..8671213a98f3
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-15372.patch
@@ -0,0 +1,97 @@
+From 3f7ed312614649e2695b54b398475d32be4f64f3 Mon Sep 17 00:00:00 2001
+From: Mans Rullgard <mans@mansr.com>
+Date: Wed, 8 Nov 2017 00:29:14 +0000
+Subject: adpcm: fix stack overflow with >4 channels (CVE-2017-15372)
+
+---
+ src/adpcm.c | 8 +++++++-
+ src/adpcm.h | 3 +++
+ src/wav.c   | 5 ++++-
+ 3 files changed, 14 insertions(+), 2 deletions(-)
+
+Index: sox/src/adpcm.c
+===================================================================
+--- sox.orig/src/adpcm.c
++++ sox/src/adpcm.c
+@@ -71,6 +71,11 @@ const short lsx_ms_adpcm_i_coef[7][2] =
+                         { 392,-232}
+ };
+ 
++extern void *lsx_ms_adpcm_alloc(unsigned chans)
++{
++        return lsx_malloc(chans * sizeof(MsState_t));
++}
++
+ static inline sox_sample_t AdpcmDecode(sox_sample_t c, MsState_t *state,
+                                sox_sample_t sample1, sox_sample_t sample2)
+ {
+@@ -102,6 +107,7 @@ static inline sox_sample_t AdpcmDecode(s
+ 
+ /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
+ const char *lsx_ms_adpcm_block_expand_i(
++        void *priv,
+         unsigned chans,          /* total channels             */
+         int nCoef,
+         const short *coef,
+@@ -113,7 +119,7 @@ const char *lsx_ms_adpcm_block_expand_i(
+   const unsigned char *ip;
+   unsigned ch;
+   const char *errmsg = NULL;
+-  MsState_t state[4];  /* One decompressor state for each channel */
++  MsState_t *state = priv;  /* One decompressor state for each channel */
+ 
+   /* Read the four-byte header for each channel */
+   ip = ibuff;
+Index: sox/src/adpcm.h
+===================================================================
+--- sox.orig/src/adpcm.h
++++ sox/src/adpcm.h
+@@ -29,8 +29,11 @@
+ /* default coef sets */
+ extern const short lsx_ms_adpcm_i_coef[7][2];
+ 
++extern void *lsx_ms_adpcm_alloc(unsigned chans);
++
+ /* lsx_ms_adpcm_block_expand_i() outputs interleaved samples into one output buffer */
+ extern const char *lsx_ms_adpcm_block_expand_i(
++	void *priv,
+ 	unsigned chans,          /* total channels             */
+ 	int nCoef,
+ 	const short *coef,
+Index: sox/src/wav.c
+===================================================================
+--- sox.orig/src/wav.c
++++ sox/src/wav.c
+@@ -82,6 +82,7 @@ typedef struct {
+     /* following used by *ADPCM wav files */
+     unsigned short nCoefs;          /* ADPCM: number of coef sets */
+     short         *lsx_ms_adpcm_i_coefs;          /* ADPCM: coef sets           */
++    void          *ms_adpcm_data;   /* Private data of adpcm decoder */
+     unsigned char *packet;          /* Temporary buffer for packets */
+     short         *samples;         /* interleaved samples buffer */
+     short         *samplePtr;       /* Pointer to current sample  */
+@@ -175,7 +176,7 @@ static unsigned short  AdpcmReadBlock(so
+         }
+     }
+ 
+-    errmsg = lsx_ms_adpcm_block_expand_i(ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
++    errmsg = lsx_ms_adpcm_block_expand_i(wav->ms_adpcm_data, ft->signal.channels, wav->nCoefs, wav->lsx_ms_adpcm_i_coefs, wav->packet, wav->samples, samplesThisBlock);
+ 
+     if (errmsg)
+         lsx_warn("%s", errmsg);
+@@ -791,6 +792,7 @@ static int startread(sox_format_t * ft)
+ 
+         /* nCoefs, lsx_ms_adpcm_i_coefs used by adpcm.c */
+         wav->lsx_ms_adpcm_i_coefs = lsx_malloc(wav->nCoefs * 2 * sizeof(short));
++        wav->ms_adpcm_data = lsx_ms_adpcm_alloc(wChannels);
+         {
+             int i, errct=0;
+             for (i=0; len>=2 && i < 2*wav->nCoefs; i++) {
+@@ -1216,6 +1218,7 @@ static int stopread(sox_format_t * ft)
+     free(wav->packet);
+     free(wav->samples);
+     free(wav->lsx_ms_adpcm_i_coefs);
++    free(wav->ms_adpcm_data);
+     free(wav->comment);
+     wav->comment = NULL;
+ 
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch
new file mode 100644
index 000000000000..d43ef50d1012
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-15642.patch
@@ -0,0 +1,28 @@
+Description: This fixes a use after free and double free if an empty comment
+chunk follows a non-empty one.
+Author: Mans Rullgard <mans@mansr.com>
+Forwarded: not-needed
+---
+ src/aiff.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: sox/src/aiff.c
+===================================================================
+--- sox.orig/src/aiff.c
++++ sox/src/aiff.c
+@@ -62,7 +62,6 @@ int lsx_aiffstartread(sox_format_t * ft)
+   size_t ssndsize = 0;
+   char *annotation;
+   char *author;
+-  char *comment = NULL;
+   char *copyright;
+   char *nametext;
+ 
+@@ -270,6 +269,7 @@ int lsx_aiffstartread(sox_format_t * ft)
+       free(annotation);
+     }
+     else if (strncmp(buf, "COMT", (size_t)4) == 0) {
++      char *comment = NULL;
+       rc = commentChunk(&comment, "Comment:", ft);
+       if (rc) {
+         /* Fail already called in function */
diff --git a/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch b/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch
new file mode 100644
index 000000000000..fd04bcdff131
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-CVE-2017-18189.patch
@@ -0,0 +1,30 @@
+Description: A corrupt header specifying zero channels would send read_channels()
+into an infinite loop.  Prevent this by sanity checking the channel
+count in open_read().  Also add an upper bound to prevent overflow
+in multiplication.
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881121
+Author: Mans Rullgard <mans@mansr.com>
+ Jaromír Mikeš <mira.mikes@seznam.cz>
+Forwarded: not-needed
+
+---
+ src/xa.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+Index: sox/src/xa.c
+===================================================================
+--- sox.orig/src/xa.c
++++ sox/src/xa.c
+@@ -143,6 +143,12 @@ static int startread(sox_format_t * ft)
+         lsx_report("User options overriding rate read in .xa header");
+     }
+ 
++    if (ft->signal.channels == 0 || ft->signal.channels > UINT16_MAX) {
++        lsx_fail_errno(ft, SOX_EFMT, "invalid channel count %d",
++                       ft->signal.channels);
++        return SOX_EOF;
++    }
++
+     /* Check for supported formats */
+     if (ft->encoding.bits_per_sample != 16) {
+         lsx_fail_errno(ft, SOX_EFMT, "%d-bit sample resolution not supported.",
diff --git a/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch b/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch
new file mode 100644
index 000000000000..4ebb31c0ae94
--- /dev/null
+++ b/media-sound/sox/files/sox-14.4.2-wavpack-chk-errors-on-init.patch
@@ -0,0 +1,35 @@
+Description: wavpack: check errors when initializing
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881145
+Author:  Eric Wong <normalperson@yhbt.net>
+ Jaromír Mikeš <mira.mikes@seznam.cz>
+Forwarded: not-needed
+
+ src/wavpack.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/wavpack.c b/src/wavpack.c
+index 9e525cd4..b7e8dafa 100644
+--- a/src/wavpack.c
++++ b/src/wavpack.c
+@@ -65,6 +65,10 @@ static int start_read(sox_format_t * ft)
+   char msg[80];
+ 
+   p->codec = WavpackOpenFileInputEx(&io_fns, ft, NULL, msg, OPEN_NORMALIZE, 0);
++  if (!p->codec) {
++    lsx_fail_errno(ft, SOX_EHDR, "%s", msg);
++    return SOX_EOF;
++  }
+   ft->encoding.bits_per_sample = WavpackGetBytesPerSample(p->codec) << 3;
+   ft->signal.channels   = WavpackGetNumChannels(p->codec);
+   if (WavpackGetSampleRate(p->codec) && ft->signal.rate && ft->signal.rate != WavpackGetSampleRate(p->codec))
+@@ -108,6 +112,10 @@ static int start_write(sox_format_t * ft)
+   uint64_t size64;
+ 
+   p->codec = WavpackOpenFileOutput(ft_write_b_buf, ft, NULL);
++  if (!p->codec) {
++    lsx_fail_errno(ft, SOX_ENOMEM, "WavPack error creating output instance");
++    return SOX_EOF;
++  }
+   memset(&config, 0, sizeof(config));
+   config.bytes_per_sample  = ft->encoding.bits_per_sample >> 3;
+   config.bits_per_sample   = ft->encoding.bits_per_sample;
diff --git a/media-sound/sox/sox-14.4.2-r1.ebuild b/media-sound/sox/sox-14.4.2-r1.ebuild
new file mode 100644
index 000000000000..112f0b571607
--- /dev/null
+++ b/media-sound/sox/sox-14.4.2-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="The swiss army knife of sound processing programs"
+HOMEPAGE="http://sox.sourceforge.net"
+SRC_URI="mirror://sourceforge/sox/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
+
+RDEPEND="
+	dev-libs/libltdl:0=
+	>=media-sound/gsm-1.0.12-r1
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ao? ( media-libs/libao )
+	encode? ( >=media-sound/lame-3.98.4 )
+	flac? ( >=media-libs/flac-1.1.3 )
+	id3tag? ( media-libs/libid3tag )
+	ladspa? ( media-libs/ladspa-sdk )
+	mad? ( media-libs/libmad )
+	ogg? (
+		media-libs/libogg
+		media-libs/libvorbis
+	)
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
+	png? (
+		media-libs/libpng:0=
+		sys-libs/zlib
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	sndfile? ( >=media-libs/libsndfile-1.0.11 )
+	twolame? ( media-sound/twolame )
+	wavpack? ( media-sound/wavpack )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-CVE-2017-11332.patch
+	"${FILESDIR}"/${P}-CVE-2017-11333.patch
+	"${FILESDIR}"/${P}-CVE-2017-11358.patch
+	"${FILESDIR}"/${P}-CVE-2017-11359.patch
+	"${FILESDIR}"/${P}-CVE-2017-15370.patch
+	"${FILESDIR}"/${P}-CVE-2017-15371.patch
+	"${FILESDIR}"/${P}-CVE-2017-15372.patch
+	"${FILESDIR}"/${P}-CVE-2017-15642.patch
+	"${FILESDIR}"/${P}-CVE-2017-18189.patch
+	"${FILESDIR}"/${P}-wavpack-chk-errors-on-init.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die #386027
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with alsa) \
+		$(use_with amr amrnb) \
+		$(use_with amr amrwb) \
+		$(use_with ao) \
+		$(use_enable debug) \
+		$(use_with encode lame) \
+		$(use_with flac) \
+		$(use_with id3tag) \
+		$(use_with ladspa) \
+		$(use_with mad) \
+		$(use_enable openmp) \
+		$(use_with ogg oggvorbis) \
+		$(use_with oss) \
+		$(use_with opus) \
+		$(use_with png) \
+		$(use_with pulseaudio) \
+		$(use_with sndfile) \
+		$(use_enable static-libs static) \
+		$(use_with twolame) \
+		$(use_with wavpack) \
+		--with-distro="Gentoo"
+}
+
+src_install() {
+	default
+	# libltdl is used for loading plugins, keeping libtool files with empty
+	# dependency_libs what otherwise would be -exec rm -f {} +
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f8420f7d0ede..4bdb21ebdd26 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -1,7 +1,5 @@
 DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b3c64a0398e0790203a7826e290a27542fa39ebbd6c7198d8ad1fd3fb06e8b030b64e1e61e0624ef20aafda08189266486cd073cb779ebff62ef502 SHA512 51d60f7592e5f31ea4b7e67736a85271cb48d4108459630da61c4ab67d2a470038240c1d6ff577280cb4498cf44f14d7bc7e0312f63d34265bcd1e70cd13142f
-DIST spotify-client_1.0.77.338.g758ebd78-41_amd64.deb 96717978 BLAKE2B 91a4e8099076e7ccb9f44e67f2ba4ee2899ef6c5c818093a62fafd7e31e84b3bd6f44aa1439d4c0c9b8818be89c6898067ca1694946bf92da19fd92ecde6d2e7 SHA512 c0c08d4f6af8ffef3d9784e176c6112975ce56c7eec961df11821f4ac52785dc090e794c25874fce004da5f3e42979402e921ef12fbe1cfc80f02034448724db
 DIST spotify-client_1.0.80.480.g51b03ac3-13_amd64.deb 97542898 BLAKE2B a89f3f607c9fb03327886fc1b6eb8d433b32913aa7ff32e95f626a8ef7710c4d6102721b76e9a83f1342d1ac6f6941d85376b4cb878cf641f42f3c3756582eb9 SHA512 a46b1d28e6c40dbe9a86a38794186f2cdf31341fff953eaa5a5fdbb37c27c00ffe14a918b2552df0996d2842f009e6700bf8683e0667fc671dfd5b343251f20e
 EBUILD spotify-1.0.72.ebuild 3417 BLAKE2B ea84409bbe8dc6eb029fe6ee0393aacb9e8fbc15f018cca4887e4f7c1ff13c6417aa0b750fe0bc08860126a0c53e39e14f2ab8f291deca5536ce5b436b3e58d4 SHA512 a9d1fced3b9ec9518a7e0eab950895c270e77d377211ee68d8a49b673bf1ee77dceb9180e417b8dc5323b82f1a44b44e15b28b287602218bb7bcca86a88ba51b
-EBUILD spotify-1.0.77-r1.ebuild 3643 BLAKE2B e1b1c93e01a3782b45d6b4d6424c0ae109933dbbc1275325db295f493ba513bd4d2c4ff1e06750d9c1417b0300cead228f6f17d2bef27e1eac686ff1cc3e178d SHA512 33caa3cd3b4e9f8e90409ba7f001a6d81320a5825dc51efbcb3e34d67a4e173875a6406feb74cf301a512306e94484f8fa8e2671e39adc38cd9f945b31b0c983
 EBUILD spotify-1.0.80.ebuild 3643 BLAKE2B 6e890c7c44aefb42842f51febc5e357b4df6600e904dbb6a189beba956e511fadd91f0936113dbcfa6f7b7959ea2e02496902a68137c09b2ad643e89697b1505 SHA512 59490d8f948f090c7c101f0f3d489b7955bedca2d19b7c080c038e13c36c2b2c9d823f462033f021dabad3b50f8ef9b461080cf547f7be1ea464381117b65b9a
 MISC metadata.xml 459 BLAKE2B e06fc9b572f5d677194d78f04fc172cc13e7cd369bf5933f16e081a6bb05e3312b917d1de15fa6557777ba30f51907c43851d7a3c2bc4fb58de232634a4d4ed9 SHA512 e78bee1d25c70aeea5de11587a4017770b9a7df847f9371f612aead36cce440f070e91b37f802250ddf2aa1ec91fe87540cdbd85f6fd669ec4e1aaf01349c316
diff --git a/media-sound/spotify/spotify-1.0.77-r1.ebuild b/media-sound/spotify/spotify-1.0.77-r1.ebuild
deleted file mode 100644
index 45262d923a56..000000000000
--- a/media-sound/spotify/spotify-1.0.77-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils xdg-utils gnome2-utils pax-utils unpacker
-
-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="338.g758ebd78-41"
-#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 )"
-SRC_URI="${SRC_BASE}${PN}-client_${PV}.${BUILD_ID_AMD64}_amd64.deb"
-LICENSE="Spotify"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="libnotify systray pax_kernel pulseaudio"
-RESTRICT="mirror strip"
-
-DEPEND=">=dev-util/patchelf-0.9_p20180129"
-# zenety needed for filepicker
-RDEPEND="
-	dev-libs/openssl:0
-	dev-libs/nss
-	gnome-base/gconf
-	gnome-extra/zenity
-	media-libs/alsa-lib
-	media-libs/harfbuzz
-	media-libs/fontconfig
-	media-libs/mesa
-	net-misc/curl[ssl]
-	net-print/cups[ssl]
-	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}/
-
-QA_PREBUILT="opt/spotify/spotify-client/spotify"
-
-src_prepare() {
-	# Fix desktop entry to launch spotify-dbus.py for systray integration
-	if use systray ; then
-		sed -i \
-			-e 's/spotify \%U/spotify-dbus.py \%U/g' \
-			usr/share/spotify/spotify.desktop || die "sed failed"
-	fi
-	default
-
-	# Spotify links against libcurl-gnutls.so.4, which does not exist in Gentoo.
-	patchelf --replace-needed libcurl-gnutls.so.4 libcurl.so.4 usr/bin/spotify \
-		|| die "failed to patch libcurl library dependency"
-}
-
-src_install() {
-	dodoc usr/share/doc/spotify-client/changelog.gz
-
-	SPOTIFY_PKG_HOME=usr/share/spotify
-	insinto /usr/share/pixmaps
-	doins ${SPOTIFY_PKG_HOME}/icons/*.png
-
-	# install in /opt/spotify
-	SPOTIFY_HOME=/opt/spotify/spotify-client
-	insinto ${SPOTIFY_HOME}
-	doins -r ${SPOTIFY_PKG_HOME}/*
-	fperms +x ${SPOTIFY_HOME}/spotify
-
-	dodir /usr/bin
-	cat <<-EOF >"${D}"/usr/bin/spotify || die
-		#! /bin/sh
-		exec ${SPOTIFY_HOME}/spotify "\$@"
-	EOF
-	fperms +x /usr/bin/spotify
-
-	local size
-	for size in 16 22 24 32 48 64 128 256 512; do
-		newicon -s ${size} "${S}${SPOTIFY_PKG_HOME}/icons/spotify-linux-${size}.png" \
-			"spotify-client.png"
-	done
-	domenu "${S}${SPOTIFY_PKG_HOME}/spotify.desktop"
-	if use pax_kernel; then
-		#create the headers, reset them to default, then paxmark -m them
-		pax-mark C "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark z "${ED}${SPOTIFY_HOME}/${PN}" || die
-		pax-mark m "${ED}${SPOTIFY_HOME}/${PN}" || die
-		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
-		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
-		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
-		eqawarn "you suspect that ${PN} is being broken by this modification,"
-		eqawarn "please open a bug."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-
-	ewarn "If Spotify crashes after an upgrade its cache may be corrupt."
-	ewarn "To remove the cache:"
-	ewarn "rm -rf ~/.cache/spotify"
-	ewarn
-	ewarn "If you use KDE and are upgrading from 0.9 to 1.0, you might still see the old icon."
-	ewarn "Run"
-	ewarn "$ rm /var/tmp/kdecache-\$USER/icon-cache.kcache"
-	ewarn "Then log out and log in back to KDE."
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/twolame/Manifest b/media-sound/twolame/Manifest
index a8a570718c42..fdfb391605c6 100644
--- a/media-sound/twolame/Manifest
+++ b/media-sound/twolame/Manifest
@@ -1,5 +1,4 @@
 AUX 0.3.13-perl-tests.patch 779 BLAKE2B eba221a58a16dc22ec7e6a10388045db6a2b2535a9f0a55e47a01315aa0c0121c1473aa6ff9f53b7bcf4b70a849a0b19bfe3125213f558c17ecb1d4fd1349376 SHA512 1c483daf75991fa6d390360d9108803f65fa894745140d3955f73ce8e87eb813a068efa810988ac462ed22ae0bf3d0f95b63feb5c823ce3bfa3a0dc9b9a8f413
 DIST twolame-0.3.13.tar.gz 660415 BLAKE2B 741e91983546241b984ce95ef3b1c3b00ff2c1e84f496961749b13b932a1c3fdcd44a3fde3a24e44d9a3ff9e859e64780ad60949f827d986608c51c1afe44912 SHA512 241ae5faebf05cb919959bb0545cb89e9b71cfb07f92a7118d864499ea4f0065ddaa646ab1482ffbcbca427d52c2436764074bd67fd19a1eb9979987f23163f7
-EBUILD twolame-0.3.13-r1.ebuild 1146 BLAKE2B 6c17c95181b776543a337aa300a3625af37a28175b8b243a1b88b54f87c6389a892bf81f91d94940e8ba149dcd20bf4b5da56cf96d08bedb5a2f60125a84acb1 SHA512 4735e199fa1b0482db53b121de62f4078d0dacacb46878fa380ebb75f627aeff7b28cf90c0f8486b2fedc34ba5e1f5dd8fff9c0dff5879bf3f44a1e1f6940e5a
 EBUILD twolame-0.3.13-r2.ebuild 1261 BLAKE2B 20a6322e8e62e9f8a4d7b5cd26db1278062cd3079821a161fcb61c83136cf0441e47a2fc9671c05b4e608d4d9b083db68014d5dfdd6866e015b3a4577e315479 SHA512 3287ad1c81f237be46ef79a2197e0d7d22edf805da6cec5360be8319c46edc9a5144e944b388f82d3fb0a0813705bb62ea037adf4fb841b36f486db741a550a4
 MISC metadata.xml 330 BLAKE2B 71d39da341e5e41047c01d3b77c1090a4d1304c7ae915832d6cebe103c52cee3d0d27dd0b09c66d775efb4ee3bec3696bd6f27ca5cb78acc2a563f3992a26fc2 SHA512 4ef98f0ddd18034ac0ea2e93a84560e62b02c3ee6186f980b20733d88f68e36f3724f2b2b8c138393f9c6da1b4b943f318fcc85b5f57817fbaac33d68e4b6ea8
diff --git a/media-sound/twolame/twolame-0.3.13-r1.ebuild b/media-sound/twolame/twolame-0.3.13-r1.ebuild
deleted file mode 100644
index f3080949bd24..000000000000
--- a/media-sound/twolame/twolame-0.3.13-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
-inherit autotools-multilib
-
-DESCRIPTION="An optimised MPEG Audio Layer 2 (MP2) encoder"
-HOMEPAGE="http://www.twolame.org"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=media-libs/libsndfile-1.0.25[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_prepare() {
-	sed -i -e '/CFLAGS/s:-O3::' configure || die
-
-	if [[ ${CHOST} == *solaris* ]]; then
-		# libsndfile doesn't like -std=c99 on Solaris
-		sed -i -e '/CFLAGS/s:-std=c99::' configure || die
-		# configure isn't really bourne shell (comment 0) or dash (comment 6)
-		# compatible, bug #388885
-		export CONFIG_SHELL=${BASH}
-	fi
-
-	autotools-multilib_src_prepare
-}
-
-src_install() {
-	autotools-multilib_src_install \
-		pkgdocdir="${EPREFIX}/usr/share/doc/${PF}"
-}
diff --git a/media-sound/vorbis-tools/Manifest b/media-sound/vorbis-tools/Manifest
index 263c12f32cf9..0f0f922d4132 100644
--- a/media-sound/vorbis-tools/Manifest
+++ b/media-sound/vorbis-tools/Manifest
@@ -1,9 +1,10 @@
-AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2572 BLAKE2B 465dc4f49dc486500a7b63544430c9064b36d69e6dc2ecfdae0ab2939089e0d9a4986c43a7eeb218fb0786069e998e33509a0bab907c7b12dc55b14985a48bb2 SHA512 da79f329d4d28c597b1efe734c75bbc4176337173b4a9d7d8e54c48cc99655300db8674ce617fc5327480dd91d464c1a0d7a22ebabacb87e99933aecf7f21d27
+AUX vorbis-tools-1.4.0-CVE-2014-9638.patch 2579 BLAKE2B e568ba19d7905546672e31d3bf3e119df2cf7ba521e500bbd348e1c19e7498ddaaf8bb39b188b87d11adf2aee0c7a9f9bdeed671a4e1737550b7f8634a117655 SHA512 f7e05deb226e6f32088f55519cfc17849e0bf6ddfc27aa582f77b4e7fb9ba3962f509d86af895e1b867f29a50ec5550aeb8fda780f5875fd2e2564aa4b723f1e
 AUX vorbis-tools-1.4.0-CVE-2014-9640.patch 691 BLAKE2B bdf2e1f18ddddf90afb26e6814afbf67032509570d9671a7f90b6188897e7494f0832d888f4fe4c854de75151d6e4c4811ad6d0dee3da3d65446402b7aa9fa71 SHA512 f9dd54fa2d09f2ad1a45bbf576884aa00148334452c478914566713bd149572f9c4e05b301aa8bd2aeb299a095cbae5cde09dcb762eaa6c2e8bbd33c91fec2f0
 AUX vorbis-tools-1.4.0-aiff-buffer-overflow.patch 1039 BLAKE2B 60cdd1c197072eb6ed7f2efadb0eb7e37dbbed93d7c841f5c469a25db85608851e32bac3a4c3db2f8114ada899295519666b80b0e03e8d8be0dc036670e0a96e SHA512 6a411e0857a6b4a56ef82db6e0a22ebf5dd5ff4695e7a4f6bb652f5bdda62e9f18ca60c68d97724932d692bd6ec23c3017edf7e52cb72d0a965e1c45b59e3506
+AUX vorbis-tools-1.4.0-docdir.patch 340 BLAKE2B 147fa0212acd6a7df359d3eeb120465ca962532263c8cfa8815a91c5f0a43c230d52b2693e9ff1167a17191edf4f70592778249857ff91641b99ca19f572ea87 SHA512 080e70054ef9583430c1675f5cba1cef1ad6cf76068fe1881b0771a08d9d3651cd2adfe92388ad8974fbbc64f2066b3aaeb8de790ba5bfaeae68b5618c733646
 AUX vorbis-tools-1.4.0-format-security.patch 367 BLAKE2B ed537460519c4fb7c9743afe660ae1a741d8bb7b2790823936a089c4a8667a41160d6d1b79ec6027f4bf77dbbd8110bc65d2503bcd87c51f4f1e675566ff2dc6 SHA512 319451c4317e2224cb56c791528c8ba4722a142b5c85f63fd606e3a1acadc95904cfab3bee7ad4634fa982f59a92ebeb30d8698d8f697640d6579b6a80eadd93
-AUX vorbis-tools-1.4.0-underlinking.patch 2360 BLAKE2B ecadf5c8b2c7df2b94a8548b815894616a3cd1977224043cac821ef45585147fd842680f696586d4e8f368263f5513309fc09c6536b54666bfce4f40a63d505f SHA512 9d93d6bd39ccdcdd90870388022d7c2eea8263cced4d6f140321bee0100215d6db1eef3d379d6a80168c6b1c1703eb0553f976b8fa3b275f663114ede35cca9a
+AUX vorbis-tools-1.4.0-underlinking.patch 2368 BLAKE2B 8752f76eb1875932d8695d73cbd41c1127c93443436007da94108caac86ad246a8a200ea1429982caeb882c9418dce9e22d104a7122d191338b02740d81cc9fd SHA512 208347b22bc4144f796cc1cbea68dba890e0620db7f3b9005ca20d87069204e0b474f0dfaab0ea248d37e8d9efb685a70f47def41367281464561edfb5192147
 DIST vorbis-tools-1.4.0.tar.gz 1346532 BLAKE2B 37a915c522bc7ec3746d96bef3982f59aa590098425609d8d9a5cd522d15fe7ca5f0cf6cceb8eadf1a14b732f812b56206ec20c04121e20f34b9df0755d8bd18 SHA512 d2473f2e8e6726b5a5083f567797ae42bbb7fa3f26aec3f7b83e641e028c64726299f71a9d75258595a53cf29c18acb84841bcbc39509258d2c8df859e4e3b99
 EBUILD vorbis-tools-1.4.0-r3.ebuild 1174 BLAKE2B 3369ef56b23523dbb981341bc6e1bc745be8cc405604b9c633a8cc636356075ea2eea4e849718e29428688d877adad0eb8a91e64c4b482a4446fbb9884209f25 SHA512 e0868673ea0b1af427118f502d54bf4b25be9148fcb06e5f47a9fd5415505db2d94f98cff4736ff496119382354a0de8390956c596bdfbd56e172802ad9c2f51
-EBUILD vorbis-tools-1.4.0-r4.ebuild 1223 BLAKE2B 54de2709bc473ff606af3e97163401ef0d2a2285f658783f04c906f37b89f6f343f85dce427d9190e10610e383139a31219bd40e8533f592de03866b1bf2668d SHA512 d6946f5cf257dab774405329951cc1282083e80ac117e7aff12bab421c0fc06e827c0c4de195786fe727d04913966413715b63aa2272367166698ba931ad8abc
+EBUILD vorbis-tools-1.4.0-r5.ebuild 1213 BLAKE2B 9fe8176586af6870d07534000b5aadcba3c53aa10588e2447f8fe7415d14ffef245be769f6c0feb70b2e222dd242fe8bb909bb28fb5fb13c821298bc69818635 SHA512 1ebb48a1a75c0010a5d87aa427fd9211ff380cdb5d3c2313ab877e5c19b0353635d85e16f3343891c425aab3049aa3604ad8bf457c88ad42d05651ee6e17f33b
 MISC metadata.xml 427 BLAKE2B 5a3d7b5384086ba3575fd479f1fb99db4aec140b6438389db4b1857ef41cc963053a57baa3d0a18b90cde721b508bb1985cebd23c20445e93e3362af1eb08aa4 SHA512 fe38791f10b0312286c49042e5c24303418ab755d5300b64b7dc406be5dfda993bbe804eae1124c2484d6a1f2e823895e174a522f8710e4b12129e856674d65c
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
index 79859df0274f..a643f1cb82f6 100644
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-CVE-2014-9638.patch
@@ -5,8 +5,8 @@ To fix bug report:
 http://www.openwall.com/lists/oss-security/2015/08/29/1
     https://bugs.gentoo.org/show_bug.cgi?id=559170
 https://bugs.gentoo.org/show_bug.cgi?id=537422
---- oggenc/audio.h
-+++ oggenc/audio.h
+--- a/oggenc/audio.h
++++ b/oggenc/audio.h
 @@ -25,7 +25,7 @@
  
  typedef struct {
@@ -25,8 +25,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=537422
      int totalframes;
      short samplesize;
      int rate;
---- oggenc/audio.c	
-+++ oggenc/audio.c
+--- a/oggenc/audio.c
++++ b/oggenc/audio.c
 @@ -245,8 +245,8 @@
  int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen)
  {
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
new file mode 100644
index 000000000000..d3fdde0e11d7
--- /dev/null
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-docdir.patch
@@ -0,0 +1,14 @@
+Thanks-to: Chris Mayo
+https://bugs.gentoo.org/533774
+
+--- a/ogg123/Makefile.am
++++ b/ogg123/Makefile.am
+@@ -19,7 +19,7 @@
+ localedir = $(datadir)/locale
+ DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = @docdir@
+ mandir = @MANDIR@
+ 
+ bin_PROGRAMS = ogg123
diff --git a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
index aaa10fbb54f9..9aee38e0b19e 100644
--- a/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
+++ b/media-sound/vorbis-tools/files/vorbis-tools-1.4.0-underlinking.patch
@@ -23,8 +23,8 @@ using functions from the mathlib.
 
 Therefore, always link to mathlib:
 
---- ogg123/Makefile.am
-+++ ogg123/Makefile.am
+--- a/ogg123/Makefile.am
++++ b/ogg123/Makefile.am
 @@ -30,7 +30,7 @@
  ogg123_LDADD = @SHARE_LIBS@ \
  	       @VORBISFILE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @AO_LIBS@ \
@@ -34,8 +34,8 @@ Therefore, always link to mathlib:
  
  ogg123_DEPENDENCIES = @SHARE_LIBS@
  ogg123_SOURCES = audio.c buffer.c callbacks.c \
---- oggenc/Makefile.am
-+++ oggenc/Makefile.am
+--- a/oggenc/Makefile.am
++++ b/oggenc/Makefile.am
 @@ -23,7 +23,7 @@
  
  oggenc_LDADD = @SHARE_LIBS@ \
diff --git a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
index 7f85f35db517..db2e90e09898 100644
--- a/media-sound/vorbis-tools/vorbis-tools-1.4.0-r4.ebuild
+++ b/media-sound/vorbis-tools/vorbis-tools-1.4.0-r5.ebuild
@@ -1,37 +1,44 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=6
 
-DESCRIPTION="tools for using the Ogg Vorbis sound file format"
+inherit autotools
+
+DESCRIPTION="Tools for using the Ogg Vorbis sound file format"
 HOMEPAGE="http://www.vorbis.com"
 SRC_URI="http://downloads.xiph.org/releases/vorbis/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 IUSE="flac kate nls +ogg123 speex"
 
-RDEPEND=">=media-libs/libvorbis-1.3.0
+RDEPEND="
+	>=media-libs/libvorbis-1.3.0
 	flac? ( media-libs/flac )
 	kate? ( media-libs/libkate )
 	ogg123? (
 		>=media-libs/libao-1.0.0
 		net-misc/curl
 	)
-	speex? ( media-libs/speex )"
+	speex? ( media-libs/speex )
+"
 DEPEND="${RDEPEND}
+	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
+"
 
-DOCS="AUTHORS CHANGES README"
+PATCHES=(
+	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-CVE-2014-9640.patch
+	"${FILESDIR}"/${P}-CVE-2014-9638.patch
+	"${FILESDIR}"/${P}-docdir.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-underlinking.patch
-	epatch "${FILESDIR}"/${P}-format-security.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-9640.patch
-	epatch "${FILESDIR}"/${P}-CVE-2014-9638.patch
+	default
 	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #515220
 	eautoreconf
 }
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 7008e77aa663..3424b57de5ab 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,9 +1,4 @@
-AUX zynaddsubfx-2.5.2-docs.patch 536 BLAKE2B 83bf70e8b7becadec45a7523019a4b6d02c499dc3cfcd27eadcf59d604c78ed5671e088b35041da2ec156eb5b4e3420605fe5a27ccd227839d445d1ca5fb0327 SHA512 a2ac81dbc36c44678733fd43569a9cc1431d1491a5ef5d43253db6086107e49feaf4154b938b8c05111a5174361351338f0dc9db377218b1805598e1780f6d18
 AUX zynaddsubfx-3.0.3-docs.patch 559 BLAKE2B cde5e6e4a3bfe0c03e013549a723f2415d0b3a5809ca3fac268e537af5cfdac71e1d9cc108ce708b2e509bc1705bb8dfd2aed31a15e5bb58356979f38fcfdbc5 SHA512 3771f0ea2d3fb3c3df4749e95312f026765af20b8531e93d37033d50ede8c4ecb90ab0879ce474db7ec9c9d6a606c8e64a22e82116ff85b8775a8ad804f5d448
-DIST zynaddsubfx-3.0.1.tar.bz2 6811606 BLAKE2B 4dc400b97381f03c4bc6ff749f1bcb6e4bb41c796a97b0ccf2cf3c8dd0b98235dec40f726e838934923719b8d3378be92a5e70b6a613ee8b9922632c22b0b691 SHA512 49592e46872ae966461dfc5f7cbd2ebcf3f3a6d43139f6cd0eba65e098fb33370840c0e1f4f224a18adfc97eae9fa5583eca6a48f43b9200d5522cc413b0ce43
-DIST zynaddsubfx-3.0.2.tar.bz2 7979193 BLAKE2B 9c77ef24de20a694477bf2d433fc2ee4ca3ad9d34c33e24ebabd91c4449fbabeae9d146645ce95d25355e9e8c277dd677f4c30032e65a22e6c8a336cd344fb50 SHA512 96d1df903a6afbaee991221ca30b21a20d97bc6d1cbe5c9fef94f2d1c3fb88e0294c263aec282559885d6e2f5841ad2c80d863af9f58f161791a33a9c0c08f57
 DIST zynaddsubfx-3.0.3.tar.bz2 7989258 BLAKE2B 7b71dc358ed3d0248eafb1c4638b05cc7ea8dbb05fd36c40643bb8f9160ee462c229d1604a52e795b6787d9131cea92512ad783c137c9cbe17cf8d56461a581f SHA512 e60e22656388d444114959859c12014ec79d7ba555b0d217ad98ad06e273916eea0eee521bb9dbfdef5be34205280d355b44a8f15760eeff06b16410d560b5d7
-EBUILD zynaddsubfx-3.0.1-r1.ebuild 1571 BLAKE2B 1e1cab6adc6ad3f2657269ae245f95ff9fe445dafea4d9d2f44e7f72cd12f0905b32e831b2c9da81ca1615b8b3ebdf2e3818ea21bdac27fdc834d0dae3eab6bf SHA512 163faa12e7e0028d9c426e1b2668a6c71f9f2362ba1057d3a943ac3dffcf5dfdf744519b906d6a6377464215eb4e196543f99082436ef9f612931f9ddcd3fdfd
-EBUILD zynaddsubfx-3.0.2.ebuild 1573 BLAKE2B 8e4374f2e7a9bc3f3c8f669537dbaef564dad959ef690c52890fa5a3a5272725ad7a520de5ed02a4d21ad8a53d346eb98147598e89efb038857e1c57a688af6b SHA512 6ef70dd65df30cd77c4f278248e7dfe83f811d7b26af7bc58804016cd8c08d0df14f2ade82c3e43d6d4e6c411b3ed6a336b3d1a9f9d90b7be14c9185ac531e49
-EBUILD zynaddsubfx-3.0.3.ebuild 1573 BLAKE2B 4aa8c9d99c5f9d871eba76a94c854fec463e9c5c6e52c20787bc4e7aa4e22eb8010cc7b86a4800dbab22b398ddbc338ddd7520c5820cc7a50698242e9dff2c11 SHA512 2578616821af9f69a9cca8510614fbca592f57457c63dfa208d6ec1839abbb0d6f6a534feb45326369c08126bf710730b675b18d847024e3e1d4feec7d9022fa
+EBUILD zynaddsubfx-3.0.3.ebuild 1571 BLAKE2B f0a66394c74568fd2ec8ff6321e3da4e55027adf229d906d4352eb32411bf3cdf041e0baf189f7e604e3ccebfad646c11bfff7538f7ff34e620c7b0f8cc4edb3 SHA512 47fd2b5be892cf03baf8192627a82a9f2e1ae9462dc3802fd835d2d09f5536da383f65b91700e67f5d2e5244ea812e1dd4d38276247de7e1ba880991e4c6ed6a
 MISC metadata.xml 340 BLAKE2B 1e630f1735f05b15bcc045f0146e81e932bfe6f08262a40518d15ababe8fe73e04f597b0aa7dd026e316a501276885fe5b842ccf7177c0880f754d1481c46c82 SHA512 c59fcb3065e3b34c3e3e23a8db07dbe245a8addcf7a6958834b5715bc0a8319c8d0cfa3b40925e7e9838df031843a5218bbcf91721ce57bee2632111dc27d4a3
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
deleted file mode 100644
index e3cc2784cdaa..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-2.5.2-docs.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: zynaddsubfx-2.5.2/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.2.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.2/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
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
deleted file mode 100644
index 0060de73b304..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic multilib
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
-	sci-libs/fftw:3.0
-	media-libs/liblo
-	alsa? ( media-libs/alsa-lib )
-	fltk? ( >=x11-libs/fltk-1.3:1 )
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-docs.patch
-)
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_configure() {
-	append-cxxflags "-std=c++11"
-	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
-	mycmakeargs=(
-		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
-		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
-		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
-		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
-		-DPluginLibDir=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${S}"/instruments/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
deleted file mode 100644
index b07ade848065..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils cmake-utils flag-o-matic multilib
-
-DESCRIPTION="ZynAddSubFX is an opensource software synthesizer"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="alsa +fltk jack lash"
-
-RDEPEND=">=dev-libs/mini-xml-2.2.1
-	sci-libs/fftw:3.0
-	media-libs/liblo
-	alsa? ( media-libs/alsa-lib )
-	fltk? ( >=x11-libs/fltk-1.3:1 )
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )"
-#	portaudio? ( media-libs/portaudio )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-# Upstream uses the following preferences: alsa > jack > portaudio
-# At least one of them must be enabled
-# We do not support portaudio, so if alsa is disabled force jack.
-REQUIRED_USE="!alsa? ( jack )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-docs.patch
-)
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_configure() {
-	append-cxxflags "-std=c++11"
-	use lash || sed -i -e 's/lash-1.0/lash_disabled/' "${S}"/src/CMakeLists.txt
-	mycmakeargs=(
-		`use fltk && echo "-DGuiModule=fltk" || echo "-DGuiModule=off"`
-		`use alsa && echo "-DOutputModule=alsa" || echo "-DOutputModule=jack"`
-		`use alsa && echo "-DAlsaMidiOutput=TRUE" || echo "-DAlsaMidiOutput=FALSE"`
-		`use jack && echo "-DJackOutput=TRUE" || echo "-DJackOutput=FALSE"`
-		-DPluginLibDir=$(get_libdir)
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	insinto /usr/share/${PN}
-	doins -r "${S}"/instruments/*
-}
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
index a2778f8b90eb..988efc1b9940 100644
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 +fltk jack lash"
 
 RDEPEND=">=dev-libs/mini-xml-2.2.1
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
commit	f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree	c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /media-sound
parent	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)