Version bump.

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

6 files changed, 80 insertions, 231 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 17db91c3775c..91330c653a0b 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.89 2009/11/07 18:09:09 volkmar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.90 2010/04/24 23:32:04 ssuominen Exp $
+
+*ardour-2.8.7 (24 Apr 2010)
+
+  24 Apr 2010; Samuli Suominen <ssuominen@gentoo.org> +ardour-2.8.7.ebuild:
+  Version bump wrt #293624 by Maciej Mrozowski.
 
   07 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> ardour-2.8.2.ebuild:
   Re-Keywording for ppc, bug 282006
diff --git a/media-sound/ardour/ardour-2.7.1.ebuild b/media-sound/ardour/ardour-2.7.1.ebuild
deleted file mode 100644
index 1d0a16c16bb0..000000000000
--- a/media-sound/ardour/ardour-2.7.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.5 2009/08/01 06:22:59 ssuominen 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
-	>=media-libs/libsamplerate-0.1.1-r1
-	>=dev-libs/libxml2-2.6.0
-	dev-libs/libxslt
-	>=gnome-base/libgnomecanvas-2.20
-	>=media-libs/libsndfile-1.0.16
-	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.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_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
-	epatch "${FILESDIR}/${PN}-2.4-cflags.patch"
-	epatch "${FILESDIR}/${PN}-2.7.1-gcc44.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.8.7.ebuild b/media-sound/ardour/ardour-2.8.7.ebuild
new file mode 100644
index 000000000000..c91425d5d95f
--- /dev/null
+++ b/media-sound/ardour/ardour-2.8.7.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.7.ebuild,v 1.1 2010/04/24 23:32:04 ssuominen Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="altivec curl debug nls lv2 sse"
+
+# FIXME: Bundled libraries in libs/
+RDEPEND="media-libs/aubio
+	media-libs/liblo
+	lv2? ( >=media-libs/slv2-0.6.1 )
+	sci-libs/fftw:3.0
+	media-libs/freetype:2
+	>=dev-libs/glib-2.10.1:2
+	>=x11-libs/gtk+-2.8.1:2
+	>=dev-libs/libxml2-2.6
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsamplerate-0.1
+	media-libs/libsoundtouch
+	media-libs/flac
+	>=media-libs/raptor-1.4.2
+	>=media-libs/liblrdf-0.4
+	>=media-sound/jack-audio-connection-kit-0.109
+	>=gnome-base/libgnomecanvas-2
+	media-libs/vamp-plugin-sdk
+	dev-libs/libxslt
+	dev-libs/libsigc++:2
+	>=dev-cpp/gtkmm-2.16
+	>=dev-cpp/libgnomecanvasmm-2.26
+	media-libs/alsa-lib
+	curl? ( net-misc/curl )"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/pkgconfig
+	>=dev-util/scons-1
+	nls? ( sys-devel/gettext )"
+
+ardour_use_enable() {
+	use ${2} && echo "${1}=1" || echo "${1}=0"
+}
+
+src_compile() {
+	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
+	tc-export CC CXX
+	mkdir -p "${D}"
+
+	scons \
+		CFLAGS="${CFLAGS}" \
+		$(ardour_use_enable DEBUG debug) \
+		DESTDIR="${D}" \
+		$(ardour_use_enable FREESOUND curl) \
+		FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
+		$(ardour_use_enable NLS nls) \
+		PREFIX=/usr \
+		SYSLIBS=1 \
+		$(ardour_use_enable LV2 lv2) \
+		|| die
+}
+
+src_install() {
+	scons install || die
+	newicon icons/icon/ardour_icon_mac.png ${PN}.png
+	make_desktop_entry ardour2 Ardour
+}
diff --git a/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch b/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch
deleted file mode 100644
index 02fd68327652..000000000000
--- a/media-sound/ardour/files/ardour-2.0.3-sndfile-external.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ardour-2.0.3/SConstruct
-===================================================================
---- ardour-2.0.3.orig/SConstruct
-+++ ardour-2.0.3/SConstruct
-@@ -459,8 +459,8 @@ libraries = { }
- 
- libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs')
- 
--#libraries['sndfile'] = LibraryInfo()
--#libraries['sndfile'].ParseConfig('pkg-config --cflags --libs sndfile')
-+libraries['sndfile-ardour'] = LibraryInfo()
-+libraries['sndfile-ardour'].ParseConfig('pkg-config --cflags --libs sndfile')
- 
- libraries['lrdf'] = LibraryInfo()
- libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf')
-@@ -861,9 +861,9 @@ if env['SYSLIBS']:
- # cannot use system one for the time being
- #
-     
--    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
--                                    LIBPATH='#libs/libsndfile',
--                                    CPPPATH=['#libs/libsndfile/src'])
-+#    libraries['sndfile-ardour'] = LibraryInfo(LIBS='libsndfile-ardour',
-+#                                    LIBPATH='#libs/libsndfile',
-+ #                                   CPPPATH=['#libs/libsndfile/src'])
- 
- #    libraries['libglademm'] = LibraryInfo()
- #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
-@@ -883,7 +883,6 @@ if env['SYSLIBS']:
-     ]
-     
-     subdirs = [
--        'libs/libsndfile',
-         'libs/pbd',
-         'libs/midi++2',
-         'libs/ardour',
diff --git a/media-sound/ardour/files/ardour-2.4-cflags.patch b/media-sound/ardour/files/ardour-2.4-cflags.patch
deleted file mode 100644
index 9f3007b7d19a..000000000000
--- a/media-sound/ardour/files/ardour-2.4-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: ardour-2.4/SConstruct
-===================================================================
---- ardour-2.4.orig/SConstruct
-+++ ardour-2.4/SConstruct
-@@ -27,6 +27,7 @@ subst_dict = { }
- opts = Options('scache.conf')
- opts.AddOptions(
-     ('ARCH', 'Set architecture-specific compilation flags by hand (all flags as 1 argument)',''),
-+    ('CFLAGS', 'Set custom CFLAGS',''),
-     ('WINDOWS_KEY', 'Set X Modifier (Mod1,Mod2,Mod3,Mod4,Mod5) for "Windows" key', 'Mod4'),
-     BoolOption('AUDIOUNITS', 'Compile with Apple\'s AudioUnit library. (experimental)', 0),
-     BoolOption('COREAUDIO', 'Compile with Apple\'s CoreAudio library', 0),
-@@ -771,14 +772,18 @@ if env['ARCH'] != '':
- # prepend boiler plate optimization flags
- #
- 
--opt_flags[:0] = [
--    "-O3",
--    "-fomit-frame-pointer",
--    "-ffast-math",
--    "-fstrength-reduce",
--    "-pipe"
-+if env['CFLAGS'] != '':
-+    opt_flags[:0]=env['CFLAGS'].split()
-+else:
-+    opt_flags[:0] = [
-+        "-O3",
-+        "-fomit-frame-pointer",
-+        "-ffast-math",
-+        "-fstrength-reduce",
-+        "-pipe"
-     ]
- 
-+
- if env['DEBUG'] == 1:
-     env.Append(CCFLAGS=" ".join (debug_flags))
-     env.Append(LINKFLAGS=" ".join (debug_flags))
diff --git a/media-sound/ardour/files/ardour-2.7.1-gcc44.patch b/media-sound/ardour/files/ardour-2.7.1-gcc44.patch
deleted file mode 100644
index 5ed3b5cb1208..000000000000
--- a/media-sound/ardour/files/ardour-2.7.1-gcc44.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur ardour-2.7.1.orig/libs/pbd/convert.cc ardour-2.7.1/libs/pbd/convert.cc
---- ardour-2.7.1.orig/libs/pbd/convert.cc	2008-12-09 15:34:12.544005281 -0500
-+++ ardour-2.7.1/libs/pbd/convert.cc	2008-12-09 15:34:47.962006119 -0500
-@@ -17,6 +17,7 @@
- 
- */
- 
-+#include <cstdio>
- #include <cmath>
- #include <locale>
- #include <algorithm>
-diff -Naur ardour-2.7.1.orig/libs/pbd/pbd/convert.h ardour-2.7.1/libs/pbd/pbd/convert.h
---- ardour-2.7.1.orig/libs/pbd/pbd/convert.h	2008-12-09 15:34:12.546005001 -0500
-+++ ardour-2.7.1/libs/pbd/pbd/convert.h	2008-12-09 16:01:25.177005281 -0500
-@@ -20,6 +20,7 @@
- #ifndef __pbd_convert_h__
- #define __pbd_convert_h__
- 
-+#include <stdint.h>
- #include <string>
- #include <vector>
- #include <sstream>
-diff -Naur ardour-2.7.1.orig/libs/pbd/shortpath.cc ardour-2.7.1/libs/pbd/shortpath.cc
---- ardour-2.7.1.orig/libs/pbd/shortpath.cc	2008-12-09 15:34:12.550005001 -0500
-+++ ardour-2.7.1/libs/pbd/shortpath.cc	2008-12-09 15:44:23.709005001 -0500
-@@ -17,6 +17,7 @@
- 
- */
- 
-+#include <stdint.h>
- #include <pbd/shortpath.h>
- 
- using namespace Glib;
-diff -Naur ardour-2.7.1.orig/libs/pbd/stacktrace.cc ardour-2.7.1/libs/pbd/stacktrace.cc
---- ardour-2.7.1.orig/libs/pbd/stacktrace.cc	2008-12-09 15:34:12.550005001 -0500
-+++ ardour-2.7.1/libs/pbd/stacktrace.cc	2008-12-09 15:46:27.671005281 -0500
-@@ -17,6 +17,7 @@
- 
- */
- 
-+#include <cstdio>
- #include <pbd/stacktrace.h>
- #include <iostream>
-