new ebuild for ardour-3.0 and slotmove as well as an icon correction for ardour-2.0.

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

5 files changed, 135 insertions, 9 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index f2aea2855438..9e1e6eb7f405 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.110 2013/01/04 21:47:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.111 2013/03/18 12:34:30 nativemad Exp $
+
+*ardour-3.0 (18 Mar 2013)
+
+  18 Mar 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-2.8.14-r1.ebuild,
+  ardour-2.8.16.ebuild, +ardour-3.0.ebuild, +files/ardour-3.0-syslibs.patch:
+  new ebuild for ardour-3.0 and slotmove and icon correction for ardour-2.0
 
   04 Jan 2013; Tim Harder <radhermit@gentoo.org>
   -files/ardour-2.8.11-soundtouch.patch, -ardour-2.8.12.ebuild,
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
index 8881c690d6ec..b3f9822fda0b 100644
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ b/media-sound/ardour/ardour-2.8.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2.8.14-r1.ebuild,v 1.3 2012/11/24 00:48:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.14-r1.ebuild,v 1.4 2013/03/18 12:34:30 nativemad Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -10,7 +10,7 @@ HOMEPAGE="http://ardour.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="altivec curl debug nls lv2 sse"
 
@@ -80,5 +80,5 @@ src_install() {
 	escons install
 	doman ${PN}.1
 	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 ardour AudioVideo
+	make_desktop_entry ardour2 ardour2 ardour AudioVideo
 }
diff --git a/media-sound/ardour/ardour-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16.ebuild
index c54d777d4f89..e166dcbe23bb 100644
--- a/media-sound/ardour/ardour-2.8.16.ebuild
+++ b/media-sound/ardour/ardour-2.8.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2.8.16.ebuild,v 1.1 2012/12/05 09:57:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.16.ebuild,v 1.2 2013/03/18 12:34:30 nativemad Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -10,7 +10,7 @@ HOMEPAGE="http://ardour.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="altivec curl debug nls lv2 sse"
 
@@ -79,5 +79,5 @@ src_install() {
 	escons install
 	doman ${PN}.1
 	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 ardour AudioVideo
+	make_desktop_entry ardour2 ardour2 ardour AudioVideo
 }
diff --git a/media-sound/ardour/ardour-3.0.ebuild b/media-sound/ardour/ardour-3.0.ebuild
new file mode 100644
index 000000000000..92906258449a
--- /dev/null
+++ b/media-sound/ardour/ardour-3.0.ebuild
@@ -0,0 +1,85 @@
+# 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.1 2013/03/18 12:34:30 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
+	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 )"
+
+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 \
+		--jobs=${MAKEOPTS:2} \
+		$(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")
+#		$(use test && echo "--test")
+}
+
+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/files/ardour-3.0-syslibs.patch b/media-sound/ardour/files/ardour-3.0-syslibs.patch
new file mode 100644
index 000000000000..6b8deb641711
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.0-syslibs.patch
@@ -0,0 +1,35 @@
+diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
+--- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
++++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
+@@ -287,7 +287,8 @@ def configure(conf):
+ 
+     # we don't try to detect this, since its part of our source tree
+ 
+-    conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
++    autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
++    autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
+     conf.define('USE_RUBBERBAND', 1)  # controls whether we actually use it
+ 
+     conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
+@@ -378,7 +379,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvamphost',
+                         'libvampplugin','libtaglib','librubberband',
+                         'libaudiographer','libltc']
+diff -rupN ardour-3.0/wscript newardour-3.0/wscript
+--- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
++++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
+@@ -31,9 +31,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/timecode',