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)

1 files changed, 14 insertions, 6 deletions

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!"
+}