From: Andreas Schuerch <nativemad@gentoo.org>
Date: Mon, 17 Aug 2015 15:06:47 +0000 (+0200)
Subject: corrected rev-numbering patch wrt 557990. Thanks Lars Wendler for the patch and Danie... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e54afaad3f3a5a669be1c81df85984d0ebb58f90;p=gentoo.git

corrected rev-numbering patch wrt 557990. Thanks Lars Wendler for the patch and Daniel Bautista for reporting

Package-Manager: portage-2.2.20.1
---

diff --git a/media-sound/ardour/ardour-4.1.ebuild b/media-sound/ardour/ardour-4.1.ebuild
index 4830a49f33ea..29167b33e061 100644
--- a/media-sound/ardour/ardour-4.1.ebuild
+++ b/media-sound/ardour/ardour-4.1.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
 
 src_prepare(){
 	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
 	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
diff --git a/media-sound/ardour/ardour-4.2.ebuild b/media-sound/ardour/ardour-4.2.ebuild
index 4830a49f33ea..29167b33e061 100644
--- a/media-sound/ardour/ardour-4.2.ebuild
+++ b/media-sound/ardour/ardour-4.2.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
 
 src_prepare(){
 	if ! [ ${PV} = 9999 ]; then
-		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
 		touch "${S}/libs/ardour/revision.cc"
 	fi
 	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
new file mode 100644
index 000000000000..d558f4792a84
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
@@ -0,0 +1,38 @@
+--- ardour-4.2/wscript
++++ ardour-4.2/wscript
+@@ -162,7 +162,7 @@
+ if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+     rev = fetch_git_revision ()
+ else:
+-    rev = fetch_tarball_revision ()
++    rev = os.environ['PV']
+ 
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+@@ -238,16 +238,16 @@
+     return version
+ 
+ def create_stored_revision():
+-    rev = ""
+-    if os.path.exists('.git'):
+-        rev = fetch_git_revision();
+-        print("Git version: " + rev + "\n")
+-    elif os.path.exists('libs/ardour/revision.cc'):
+-        print("Using packaged revision")
+-        return
+-    else:
+-        print("Missing libs/ardour/revision.cc.  Blame the packager.")
+-        sys.exit(-1)
++    rev = os.environ['PV'] + "-gentoo"
++#    if os.path.exists('.git'):
++#        rev = fetch_git_revision();
++#        print("Git version: " + rev + "\n")
++#    elif os.path.exists('libs/ardour/revision.cc'):
++#        print("Using packaged revision")
++#        return
++#    else:
++#        print("Missing libs/ardour/revision.cc.  Blame the packager.")
++#        sys.exit(-1)
+ 
+     try:
+         #