Added a dep on higher lv2 version - Thanks Martin Erdtmann in bug 490186. The git-2 eclass is now only used in 9999. Also 3.5.74 bump.

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

5 files changed, 180 insertions, 11 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 40b9d6f9ac36..cccf439eab82 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,14 @@
 # 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.123 2013/11/05 13:32:59 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.124 2013/11/08 12:34:31 nativemad Exp $
+
+*ardour-3.5.74 (08 Nov 2013)
+
+  08 Nov 2013; Andreas Schuerch <nativemad@gentoo.org>
+  +files/ardour-3.5.7-syslibs.patch, ardour-3.5.14.ebuild,
+  +ardour-3.5.74.ebuild, ardour-9999.ebuild:
+  Added a dep on higher lv2 version - Thanks Martin Erdtmann in bug 490186. The
+  git-2 eclass is now only used in 9999. Also 3.5.74 bump.
 
   05 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.14.ebuild,
   ardour-9999.ebuild:
diff --git a/media-sound/ardour/ardour-3.5.14.ebuild b/media-sound/ardour/ardour-3.5.14.ebuild
index 3f5214f12a21..6e4902c027a2 100644
--- a/media-sound/ardour/ardour-3.5.14.ebuild
+++ b/media-sound/ardour/ardour-3.5.14.ebuild
@@ -1,9 +1,9 @@
 # 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.3 2013/11/05 13:32:59 nativemad Exp $
+# $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 git-2 toolchain-funcs flag-o-matic waf-utils
+inherit eutils toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
@@ -11,7 +11,7 @@ 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"
@@ -57,7 +57,7 @@ RDEPEND="media-libs/aubio
 		media-libs/sratom
 		dev-libs/sord
 		>=media-libs/suil-0.6.10
-
+		>=media-libs/lv2-1.4.0
 	)"
 
 DEPEND="${RDEPEND}
diff --git a/media-sound/ardour/ardour-3.5.74.ebuild b/media-sound/ardour/ardour-3.5.74.ebuild
new file mode 100644
index 000000000000..d41345c92958
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.74.ebuild
@@ -0,0 +1,117 @@
+# 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!"
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 51495b895231..6891a91f581e 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,9 +1,9 @@
 # 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-9999.ebuild,v 1.4 2013/11/05 13:32:59 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.5 2013/11/08 12:34:31 nativemad Exp $
 
 EAPI=4
-inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
+inherit eutils toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
@@ -11,7 +11,7 @@ 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"
@@ -57,7 +57,7 @@ RDEPEND="media-libs/aubio
 		media-libs/sratom
 		dev-libs/sord
 		>=media-libs/suil-0.6.10
-
+		>=media-libs/lv2-1.4.0
 	)"
 
 DEPEND="${RDEPEND}
@@ -79,10 +79,13 @@ src_unpack() {
 
 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
+		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-syslibs.patch
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
 	sed 's/python/python2/' -i waf
 }
 
@@ -107,3 +110,8 @@ src_install() {
 	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/files/ardour-3.5.7-syslibs.patch b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
new file mode 100644
index 000000000000..2f8ab10cf3d7
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
@@ -0,0 +1,36 @@
+diff -rupN a/ardour-3.5.74/libs/ardour/wscript b/ardour-3.5.74/libs/ardour/wscript
+--- a/ardour-3.5.74/libs/ardour/wscript 2013-11-05 20:20:03.000000000 +0100
++++ b/ardour-3.5.74/libs/ardour/wscript 2013-11-08 09:51:41.553000000 +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)
+@@ -332,7 +333,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
+-                        'OSX','BOOST','CURL','DL']
++                        'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
+     obj.use          = ['libpbd','libmidipp','libevoral','libvampplugin',
+                         'libaudiographer','libltc','libtimecode']
+     if bld.is_defined('USE_EXTERNAL_LIBS'):
+diff -rupN a/ardour-3.5.74/wscript b/ardour-3.5.74/wscript
+--- a/ardour-3.5.74/wscript     2013-11-05 20:20:03.000000000 +0100
++++ b/ardour-3.5.74/wscript     2013-11-08 09:49:27.594000000 +0100
+@@ -56,9 +56,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/backends',
+