gentoo resync : 16.06.2018

16 files changed, 1 insertions, 1538 deletions

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>