removed old ebuilds and bumped to 3.5.357

(Portage version: 2.2.7/cvs/Linux i686, signed Manifest commit with key C1DE54B2)

10 files changed, 12 insertions, 795 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index e60dac9e8661..f8bf612fa6ac 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.127 2014/02/07 14:22:44 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.128 2014/02/25 16:17:24 nativemad Exp $
+
+*ardour-3.5.357 (25 Feb 2014)
+
+  25 Feb 2014; Andreas Schuerch <nativemad@gentoo.org> -ardour-3.0.ebuild,
+  -ardour-3.2.ebuild, -ardour-3.3.ebuild, -ardour-3.4.ebuild,
+  -ardour-3.5.14.ebuild, -ardour-3.5.143.ebuild, -ardour-3.5.308.ebuild,
+  +ardour-3.5.357.ebuild:
+  remove old 3.X ebuilds and bump to 3.5.357
 
 *ardour-3.5.308-r1 (07 Feb 2014)
 
diff --git a/media-sound/ardour/ardour-3.0.ebuild b/media-sound/ardour/ardour-3.0.ebuild
deleted file mode 100644
index c4d5d98f4249..000000000000
--- a/media-sound/ardour/ardour-3.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.0.ebuild,v 1.4 2013/04/09 06:02:23 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug" && echo "--rt-alloc-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.2.ebuild b/media-sound/ardour/ardour-3.2.ebuild
deleted file mode 100644
index c8e4c3c56e73..000000000000
--- a/media-sound/ardour/ardour-3.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.2.ebuild,v 1.1 2013/06/25 17:19:07 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.3-r1.ebuild b/media-sound/ardour/ardour-3.3-r1.ebuild
deleted file mode 100644
index a87fc86c6576..000000000000
--- a/media-sound/ardour/ardour-3.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.3-r1.ebuild,v 1.3 2013/07/27 11:31:55 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.3.ebuild b/media-sound/ardour/ardour-3.3.ebuild
deleted file mode 100644
index cc880094cbbf..000000000000
--- a/media-sound/ardour/ardour-3.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.3.ebuild,v 1.1 2013/07/22 09:23:36 nativemad Exp $
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs waf-utils
-
-MY_PN="Ardour3"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	curl? ( net-misc/curl )
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use curl || echo "--no-freesound") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.4.ebuild b/media-sound/ardour/ardour-3.4.ebuild
deleted file mode 100644
index d3384872ef90..000000000000
--- a/media-sound/ardour/ardour-3.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.4.ebuild,v 1.1 2013/09/10 20:14:00 nativemad Exp $
-
-EAPI=4
-inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-else
-	EGIT_COMMIT="${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	lv2? (
-		>=media-libs/slv2-0.6.1
-		media-libs/lilv
-		media-libs/sratom
-		dev-libs/sord
-		>=media-libs/suil-0.6.10
-
-	)"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-
-src_unpack() {
-	git-2_src_unpack
-}
-
-src_prepare(){
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.5.14.ebuild b/media-sound/ardour/ardour-3.5.14.ebuild
deleted file mode 100644
index 6e4902c027a2..000000000000
--- a/media-sound/ardour/ardour-3.5.14.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.4 2013/11/08 12:34:31 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}
-		app-arch/unzip"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		sed -e '/cmd = "git describe --tags/,/utf-8/{s:cmd = \"git describe --tags HEAD\":rev = \"'${PV}'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
diff --git a/media-sound/ardour/ardour-3.5.143.ebuild b/media-sound/ardour/ardour-3.5.143.ebuild
deleted file mode 100644
index f37d965e7bc9..000000000000
--- a/media-sound/ardour/ardour-3.5.143.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.143.ebuild,v 1.1 2014/01/16 08:16:34 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}
diff --git a/media-sound/ardour/ardour-3.5.308.ebuild b/media-sound/ardour/ardour-3.5.357.ebuild
index 72668413e12c..4509976f9fce 100644
--- a/media-sound/ardour/ardour-3.5.308.ebuild
+++ b/media-sound/ardour/ardour-3.5.357.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308.ebuild,v 1.1 2014/01/29 13:38:35 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.357.ebuild,v 1.1 2014/02/25 16:17:24 nativemad Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -86,6 +86,7 @@ src_prepare(){
 	fi
 	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
 	sed 's/python/python2/' -i waf
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
 }
 
 src_configure() {
@@ -97,7 +98,7 @@ src_configure() {
 		--configdir=/etc \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
 		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
diff --git a/media-sound/ardour/ardour-3.5.74.ebuild b/media-sound/ardour/ardour-3.5.74.ebuild
deleted file mode 100644
index d41345c92958..000000000000
--- a/media-sound/ardour/ardour-3.5.74.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.74.ebuild,v 1.1 2013/11/08 12:34:31 nativemad Exp $
-
-EAPI=4
-inherit eutils toolchain-funcs flag-o-matic waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
-	KEYWORDS=""
-	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
-fi
-
-LICENSE="GPL-2"
-SLOT="3"
-IUSE="altivec debug doc nls lv2 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
-	>=media-sound/jack-audio-connection-kit-0.120
-	>=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
-	>=media-libs/taglib-1.7
-	net-misc/curl
-	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}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	doc? ( app-doc/doxygen[dot] )"
-	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}
-		app-arch/unzip"
-	fi
-
-src_unpack() {
-	if [ ${PV} = 9999 ]; then
-		git-2_src_unpack
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare(){
-	if ! [ ${PV} = 9999 ]; then
-		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
-		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
-		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
-		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
-
-	fi
-	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
-	sed 's/python/python2/' -i waf
-}
-
-src_configure() {
-	tc-export CC CXX
-	mkdir -p "${D}"
-	waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
-		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
-}
-
-src_install() {
-	waf-utils_src_install
-	mv ${PN}.1 ${PN}${SLOT}.1
-	doman ${PN}${SLOT}.1
-	newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
-	make_desktop_entry ardour3 ardour3 ardour3 AudioVideo
-}
-
-pkg_postinst() {
-	elog "If you are using Ardour and want to keep its development alive"
-	elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}