remove usedep on gtkmm[accessibility] now that its always enabled and remove old

(Portage version: 2.2_rc27/cvs/Linux x86_64)

8 files changed, 10 insertions, 512 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 523f4f1104dd..0f29a6d833c9 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.84 2009/01/14 09:08:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.85 2009/03/25 07:50:45 aballier Exp $
+
+  25 Mar 2009; Alexis Ballier <aballier@gentoo.org>
+  -files/ardour-2.3.1-soundtouch.patch, -files/ardour-2.5-gcc43.patch,
+  -ardour-2.5.ebuild, -ardour-2.5-r1.ebuild, -ardour-2.6.1_p4010.ebuild,
+  -ardour-2.7_p4225.ebuild, ardour-2.7.1.ebuild:
+  remove usedep on gtkmm[accessibility] now that its always enabled and
+  remove old
 
   14 Jan 2009; Alexis Ballier <aballier@gentoo.org> ardour-2.7.1.ebuild:
   require at least gnomecanvas 2.20, by Jimmy.Jazz@gmx.net, bug #254692
diff --git a/media-sound/ardour/ardour-2.5-r1.ebuild b/media-sound/ardour/ardour-2.5-r1.ebuild
deleted file mode 100644
index 3a659bb0a9f4..000000000000
--- a/media-sound/ardour/ardour-2.5-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.5-r1.ebuild,v 1.1 2008/09/29 05:40:14 flameeyes Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug freesound nls sse"
-
-RDEPEND="media-libs/liblo
-	media-libs/aubio
-	>=media-libs/liblrdf-0.4.0
-	>=media-libs/raptor-1.4.2
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	>=dev-libs/glib-2.10.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.8.8
-	media-libs/flac
-	>=media-libs/alsa-lib-1.0.14a-r1[midi]
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=dev-libs/libxml2-2.6.0
-	dev-libs/libxslt
-	>=media-libs/libsndfile-1.0.16
-	gnome-base/libgnomecanvas
-	x11-themes/gtk-engines
-	>=dev-cpp/gtkmm-2.12.3[accessibility]
-	>=dev-cpp/glibmm-2.14.2
-	>=dev-cpp/libgnomecanvasmm-2.20.0
-	dev-cpp/cairomm
-	>=dev-libs/libsigc++-2.0
-	media-libs/libsoundtouch
-	dev-libs/libusb
-	=sci-libs/fftw-3*
-	freesound? ( net-misc/curl )"
-# slv2? ( >=media-libs/slv2-0.6.0 )
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	dev-libs/boost
-	dev-util/pkgconfig
-	>=dev-util/scons-0.98.5
-	nls? ( sys-devel/gettext )"
-
-#S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
-	epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch"
-	epatch "${FILESDIR}/${PN}-2.5-gcc43.patch"
-}
-
-ardour_use_enable() {
-	use ${2} && echo "${1}=1" || echo "${1}=0"
-}
-
-src_compile() {
-	# Required for scons to "see" intermediate install location
-	mkdir -p "${D}"
-
-	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
-	cd "${S}"
-
-	tc-export CC CXX
-
-	# Avoid compiling x86 asm when building on amd64 without using sse
-	# bug #186798
-	use amd64 && append-flags "-DUSE_X86_64_ASM"
-
-	scons \
-		$(ardour_use_enable DEBUG debug) \
-		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
-		DESTDIR="${D}" \
-		$(ardour_use_enable NLS nls) \
-		$(ardour_use_enable FREESOUND freesound) \
-		FFT_ANALYSIS=1 \
-		SYSLIBS=1 \
-		CFLAGS="${CFLAGS}" \
-		LV2=0 \
-		PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	scons install || die "make install failed"
-
-	dodoc DOCUMENTATION/*
-
-	doicon "${S}/icons/icon/ardour_icon_mac.png"
-	make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo
-}
-
-pkg_postinst() {
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
-	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
-	ewarn "not understand."
-	ewarn ""
-	ewarn "MAKE BACKUPS OF THE SESSION FILES."
-	ewarn ""
-	ewarn "The simplest way to address this is to make a copy of the session file itself"
-	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
-	ewarn ""
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
-	ewarn "the colors configuration module if you want to be able to actually see various"
-	ewarn "texts in Ardour 2."
-}
diff --git a/media-sound/ardour/ardour-2.5.ebuild b/media-sound/ardour/ardour-2.5.ebuild
deleted file mode 100644
index 82f5f5e24661..000000000000
--- a/media-sound/ardour/ardour-2.5.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.5.ebuild,v 1.3 2008/08/05 23:25:40 aballier Exp $
-
-inherit eutils toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug freesound nls sse"
-
-RDEPEND="media-libs/liblo
-	media-libs/aubio
-	>=media-libs/liblrdf-0.4.0
-	>=media-libs/raptor-1.4.2
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	>=dev-libs/glib-2.10.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.8.8
-	media-libs/flac
-	>=media-libs/alsa-lib-1.0.14a-r1
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=dev-libs/libxml2-2.6.0
-	dev-libs/libxslt
-	>=media-libs/libsndfile-1.0.16
-	gnome-base/libgnomecanvas
-	x11-themes/gtk-engines
-	>=dev-cpp/gtkmm-2.12.3
-	>=dev-cpp/glibmm-2.14.2
-	>=dev-cpp/libgnomecanvasmm-2.20.0
-	dev-cpp/cairomm
-	>=dev-libs/libsigc++-2.0
-	media-libs/libsoundtouch
-	dev-libs/libusb
-	=sci-libs/fftw-3*
-	freesound? ( net-misc/curl )"
-# slv2? ( >=media-libs/slv2-0.6.0 )
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	dev-libs/boost
-	dev-util/pkgconfig
-	>=dev-util/scons-0.98.5
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if ! built_with_use dev-cpp/gtkmm accessibility; then
-		eerror "dev-cpp/gtkmm needs to be built with use accessibility"
-		eerror "in order to build ${PN}"
-		die "gtkmm was not built with use accessibility"
-	fi
-	if ! built_with_use --missing true media-libs/alsa-lib midi; then
-		eerror ""
-		eerror "To be able to build ${PN} you need"
-		eerror "to have built media-libs/alsa-lib with midi USE flag."
-		die "Missing midi USE flag on media-libs/alsa-lib"
-	fi
-}
-
-#S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
-	epatch "${FILESDIR}/${PN}-2.3.1-soundtouch.patch"
-	epatch "${FILESDIR}/${PN}-2.5-gcc43.patch"
-}
-
-ardour_use_enable() {
-	use ${2} && echo "${1}=1" || echo "${1}=0"
-}
-
-src_compile() {
-	# Required for scons to "see" intermediate install location
-	mkdir -p "${D}"
-
-	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
-	cd "${S}"
-
-	tc-export CC CXX
-
-	# Avoid compiling x86 asm when building on amd64 without using sse
-	# bug #186798
-	use amd64 && append-flags "-DUSE_X86_64_ASM"
-
-	scons \
-		$(ardour_use_enable DEBUG debug) \
-		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
-		DESTDIR="${D}" \
-		$(ardour_use_enable NLS nls) \
-		$(ardour_use_enable FREESOUND freesound) \
-		FFT_ANALYSIS=1 \
-		SYSLIBS=1 \
-		CFLAGS="${CFLAGS}" \
-		LV2=0 \
-		PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	scons install || die "make install failed"
-
-	dodoc DOCUMENTATION/*
-
-	doicon "${S}/icons/icon/ardour_icon_mac.png"
-	make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo
-}
-
-pkg_postinst() {
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
-	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
-	ewarn "not understand."
-	ewarn ""
-	ewarn "MAKE BACKUPS OF THE SESSION FILES."
-	ewarn ""
-	ewarn "The simplest way to address this is to make a copy of the session file itself"
-	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
-	ewarn ""
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
-	ewarn "the colors configuration module if you want to be able to actually see various"
-	ewarn "texts in Ardour 2."
-}
diff --git a/media-sound/ardour/ardour-2.6.1_p4010.ebuild b/media-sound/ardour/ardour-2.6.1_p4010.ebuild
deleted file mode 100644
index 62392b39c87c..000000000000
--- a/media-sound/ardour/ardour-2.6.1_p4010.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.6.1_p4010.ebuild,v 1.1 2008/11/03 21:48:43 aballier Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="http://ardour.org/files/releases/${P/_p/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug freesound nls sse"
-
-RDEPEND="media-libs/liblo
-	media-libs/aubio
-	>=media-libs/liblrdf-0.4.0
-	>=media-libs/raptor-1.4.2
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	>=dev-libs/glib-2.10.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.8.8
-	media-libs/flac
-	>=media-libs/alsa-lib-1.0.14a-r1[midi]
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=dev-libs/libxml2-2.6.0
-	dev-libs/libxslt
-	>=media-libs/libsndfile-1.0.16
-	gnome-base/libgnomecanvas
-	x11-themes/gtk-engines
-	>=dev-cpp/gtkmm-2.12.3[accessibility]
-	>=dev-cpp/glibmm-2.14.2
-	>=dev-cpp/libgnomecanvasmm-2.20.0
-	dev-cpp/cairomm
-	>=dev-libs/libsigc++-2.0
-	media-libs/libsoundtouch
-	dev-libs/libusb
-	=sci-libs/fftw-3*
-	freesound? ( net-misc/curl )"
-# slv2? ( >=media-libs/slv2-0.6.0 )
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	dev-libs/boost
-	dev-util/pkgconfig
-	>=dev-util/scons-0.98.5
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P%_p*}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
-}
-
-ardour_use_enable() {
-	use ${2} && echo "${1}=1" || echo "${1}=0"
-}
-
-src_compile() {
-	# Required for scons to "see" intermediate install location
-	mkdir -p "${D}"
-
-	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
-	cd "${S}"
-
-	tc-export CC CXX
-
-	scons \
-		$(ardour_use_enable DEBUG debug) \
-		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
-		DESTDIR="${D}" \
-		$(ardour_use_enable NLS nls) \
-		$(ardour_use_enable FREESOUND freesound) \
-		FFT_ANALYSIS=1 \
-		SYSLIBS=1 \
-		CFLAGS="${CFLAGS}" \
-		LV2=0 \
-		PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	scons install || die "make install failed"
-
-	dodoc DOCUMENTATION/*
-
-	doicon "${S}/icons/icon/ardour_icon_mac.png"
-	make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo
-}
-
-pkg_postinst() {
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
-	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
-	ewarn "not understand."
-	ewarn ""
-	ewarn "MAKE BACKUPS OF THE SESSION FILES."
-	ewarn ""
-	ewarn "The simplest way to address this is to make a copy of the session file itself"
-	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
-	ewarn ""
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
-	ewarn "the colors configuration module if you want to be able to actually see various"
-	ewarn "texts in Ardour 2."
-}
diff --git a/media-sound/ardour/ardour-2.7.1.ebuild b/media-sound/ardour/ardour-2.7.1.ebuild
index a7fe2e02f4fc..de04878d1666 100644
--- a/media-sound/ardour/ardour-2.7.1.ebuild
+++ b/media-sound/ardour/ardour-2.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7.1.ebuild,v 1.2 2009/01/14 09:08:30 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7.1.ebuild,v 1.3 2009/03/25 07:50:45 aballier Exp $
 
 EAPI=2
 
@@ -31,7 +31,7 @@ RDEPEND="media-libs/liblo
 	>=gnome-base/libgnomecanvas-2.20
 	>=media-libs/libsndfile-1.0.16
 	x11-themes/gtk-engines
-	>=dev-cpp/gtkmm-2.12.3[accessibility]
+	>=dev-cpp/gtkmm-2.12.3
 	>=dev-cpp/glibmm-2.14.2
 	>=dev-cpp/libgnomecanvasmm-2.20.0
 	dev-cpp/cairomm
diff --git a/media-sound/ardour/ardour-2.7_p4225.ebuild b/media-sound/ardour/ardour-2.7_p4225.ebuild
deleted file mode 100644
index a0d3ae4a96aa..000000000000
--- a/media-sound/ardour/ardour-2.7_p4225.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.7_p4225.ebuild,v 1.1 2008/11/23 12:25:43 aballier Exp $
-
-EAPI=2
-
-inherit eutils toolchain-funcs flag-o-matic versionator
-
-DESCRIPTION="multi-track hard disk recording software"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="http://ardour.org/files/releases/${P/_p/-}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="altivec debug freesound nls sse"
-
-RDEPEND="media-libs/liblo
-	media-libs/aubio
-	>=media-libs/liblrdf-0.4.0
-	>=media-libs/raptor-1.4.2
-	>=media-sound/jack-audio-connection-kit-0.109.2
-	>=dev-libs/glib-2.10.3
-	x11-libs/pango
-	>=x11-libs/gtk+-2.8.8
-	media-libs/flac
-	>=media-libs/alsa-lib-1.0.14a-r1[midi]
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=dev-libs/libxml2-2.6.0
-	dev-libs/libxslt
-	>=media-libs/libsndfile-1.0.16
-	gnome-base/libgnomecanvas
-	x11-themes/gtk-engines
-	>=dev-cpp/gtkmm-2.12.3[accessibility]
-	>=dev-cpp/glibmm-2.14.2
-	>=dev-cpp/libgnomecanvasmm-2.20.0
-	dev-cpp/cairomm
-	>=dev-libs/libsigc++-2.0
-	media-libs/libsoundtouch
-	dev-libs/libusb
-	=sci-libs/fftw-3*
-	freesound? ( net-misc/curl )"
-# slv2? ( >=media-libs/slv2-0.6.1 )
-
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-	dev-libs/boost
-	dev-util/pkgconfig
-	>=dev-util/scons-0.98.5
-	nls? ( sys-devel/gettext )"
-
-S=${WORKDIR}/${P%_p*}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
-}
-
-ardour_use_enable() {
-	use ${2} && echo "${1}=1" || echo "${1}=0"
-}
-
-src_compile() {
-	# Required for scons to "see" intermediate install location
-	mkdir -p "${D}"
-
-	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
-	cd "${S}"
-
-	tc-export CC CXX
-
-	scons \
-		$(ardour_use_enable DEBUG debug) \
-		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
-		DESTDIR="${D}" \
-		$(ardour_use_enable NLS nls) \
-		$(ardour_use_enable FREESOUND freesound) \
-		FFT_ANALYSIS=1 \
-		SYSLIBS=1 \
-		CFLAGS="${CFLAGS}" \
-		LV2=0 \
-		PREFIX=/usr || die "scons failed"
-}
-
-src_install() {
-	scons install || die "make install failed"
-
-	dodoc DOCUMENTATION/*
-
-	doicon "${S}/icons/icon/ardour_icon_mac.png"
-	make_desktop_entry ardour2 Ardour2 ardour_icon_mac AudioVideo
-}
-
-pkg_postinst() {
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
-	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
-	ewarn "not understand."
-	ewarn ""
-	ewarn "MAKE BACKUPS OF THE SESSION FILES."
-	ewarn ""
-	ewarn "The simplest way to address this is to make a copy of the session file itself"
-	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
-	ewarn ""
-	ewarn "---------------- WARNING -------------------"
-	ewarn ""
-	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
-	ewarn "the colors configuration module if you want to be able to actually see various"
-	ewarn "texts in Ardour 2."
-}
diff --git a/media-sound/ardour/files/ardour-2.3.1-soundtouch.patch b/media-sound/ardour/files/ardour-2.3.1-soundtouch.patch
deleted file mode 100644
index 545454ad57e1..000000000000
--- a/media-sound/ardour/files/ardour-2.3.1-soundtouch.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: ardour-2.3/SConstruct
-===================================================================
---- ardour-2.3.orig/SConstruct
-+++ ardour-2.3/SConstruct
-@@ -1006,9 +1006,9 @@ if env['SYSLIBS']:
- 
- #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
-     libraries['soundtouch'] = LibraryInfo()
--    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-     # Comment the previous line and uncomment this for Debian:
--    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
-+    #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
- 
-     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
-                                             LIBPATH='#libs/appleutility',
diff --git a/media-sound/ardour/files/ardour-2.5-gcc43.patch b/media-sound/ardour/files/ardour-2.5-gcc43.patch
deleted file mode 100644
index acc73e95dd79..000000000000
--- a/media-sound/ardour/files/ardour-2.5-gcc43.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://tracker.ardour.org/view.php?id=2181
-
-diff -up ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43 ardour-2.4/libs/surfaces/tranzport/screen.cc
---- ardour-2.4/libs/surfaces/tranzport/screen.cc.gcc43	2008-04-05 16:55:26.000000000 -0400
-+++ ardour-2.4/libs/surfaces/tranzport/screen.cc	2008-04-05 16:55:39.000000000 -0400
-@@ -19,6 +19,7 @@
-  *   */
- 
- #include <tranzport_control_protocol.h>
-+#include <cstring>
- 
- void
- TranzportControlProtocol::screen_clear ()