Moved the versioned build to the github zip instead of using git directly. See bug 484674.

Package-Manager: portage-2.2.1/cvs/Linux i686
Manifest-Sign-Key: 0xC1DE54B2

4 files changed, 40 insertions, 16 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 0206acf8b66d..f4ed70e7315e 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # 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.121 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.122 2013/11/05 09:12:19 nativemad Exp $
+
+  05 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.14.ebuild,
+  ardour-9999.ebuild:
+  Moved the versioned build to the github zip instead of using git directly.
+  See bug 484674
 
 *ardour-3.5.14 (28 Oct 2013)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 3a414fc62f92..a3003c3baf6d 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -12,6 +12,7 @@ DIST Ardour3-3.3.tar.bz2 7539302 SHA256 44f6596d5750bb3bf9babd6114f217f7ab7b2816
 DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
 DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
 DIST ardour-3.0.tar.bz2 8173156 SHA256 2a77f2cd506d66c93ae0b7ce2c36a1e8f7f85a5cf2540f6419e9ef431b36760b SHA512 fc9dede5fbf1de1e78b66b59a67df72f0f3a7d6fe5a7e7df52f5c978cbfb41ff8538b1474736cfddbd5ba4a78cc257f254cdab25634348a42171906bb4e43093 WHIRLPOOL 94eb6adc2ca4f6dddb2b939b7df932ecf18fb169a3300857e9c438a9c73094a49dc12abdb1a693577fe78411c051c2910f24f89cd56e220cb1c129f245d2834f
+DIST ardour-3.5.14.zip 10570934 SHA256 e7c43842859992358ceb80f80032ea1a87e4655764e147057c3749e97dc079a8 SHA512 9aa4319141ea8b011001cada1c7228ce78cb42f1588d5850e61dc5c023dc39ceb94147d4f3c190dd426e3f2788b16edf301eb3f51459219da5ffbef1a7e6f95f WHIRLPOOL c3b3d5da1118a87ec0ccabeba3f7580e34ccaffe8bf4b62d8e7e6d4437dd0723e9bdaa38f23adc9db1bb97f052da85880a443574114c014f6caee14ba07c6c93
 EBUILD ardour-2.8.14-r1.ebuild 1995 SHA256 5217fea5b18e164f4e340d64d86e7deb8853ddc707dbdcfa02b1ba76aa00281d SHA512 3a71c41baa07c6c3f9e98715b064a655aa65ec430f88fc1a52a9926b65dcd544d79dc32287a1fe2c45cb94d799d32f2274d6b67793bae7deea1b589a33a45e37 WHIRLPOOL 088ad8ecda65d6a39a81334228783758eef0d18ed7553941f6efc1d5673f875ec5e7b488739c32ddc417ea7c427c97804ca2907aa5a83d12cf23eb6afbc286fb
 EBUILD ardour-2.8.16.ebuild 2007 SHA256 4158499194ec45dae26c1d1d2dbe8de5ae4c42073b8c021b34ffd22b0639fc3e SHA512 245ff5fa0156cb1e3a645f1b1dd711f0041b42a41e79e4832e4a3c7e4999f4e193a6b005291aef15ca94239212ed65f52801d519fed8aa80a3f49d5963ec3122 WHIRLPOOL a6604007ab9a11bbf99c4972527838285b422da66901c422b72a6c41569314409a50ce312043ce72cd5121ef9964ecd97c874d880cab2d12975e54e3f6977dea
 EBUILD ardour-3.0.ebuild 2173 SHA256 32d5ddb7d093f92e172c6009b41101c1a7d6af6ef581f93105b3a3a224ee146f SHA512 251fe23480f12226a1537c7d800de252260a202b7a7246d4a6743cb4f62882b273b13e0b640c035ae413a42413f8a0bd2114ba0c7a96282836fa1f58c3779859 WHIRLPOOL 05bc560451fbf605bff5e06f70cf7ef262523a7114a814dde2e5b73e5035d4ae45b2f8c90598e55e69f0c45c10e584d6acfca574fdb7bdda8dde8af73a88e945
@@ -19,14 +20,14 @@ EBUILD ardour-3.2.ebuild 2239 SHA256 4e991181f740780b229196f27fd26fce9a3c8bf2e2e
 EBUILD ardour-3.3-r1.ebuild 2212 SHA256 64e53e6ba502c04c5b065393ff42d0f7d35003c3fe7d25e2a4686fafd33a4c1f SHA512 a2b43166401a58030cb41515ea96e2f8766334efa432ce7438280a20587c847e578989c88e6463ebd118c366c70f87aba13242c1e7fa8225c973a9ab90e5dd2f WHIRLPOOL a904b917e8ca236cf2145416c23e44e1eea5ea208186b3dfb2d626b77a7ed79e8866be55219fb6aa242c7aab8aa704e81ed9ceedb4bb1091d650143b09c6ed6b
 EBUILD ardour-3.3.ebuild 2244 SHA256 1485c09e0a43b4d1c7d7f0c8041be571b7d78c705b5e18bc7f1cff11d03de83d SHA512 39ad90008d2fd28c0f3722dd790b1e25afc65076e8fa31dfce77f53fd0906ff2d5923d96b238a0001020bca7269e4c183742720d2680143c89b5e1a03657a2b7 WHIRLPOOL 8fc1149abe7ef7104f11058890f3d22ecb637455192bdcedae775edfbc359902734159addc375a1aa7f89e17fb30957c3ea40656a3b928ad77ed2586b6dcf3e0
 EBUILD ardour-3.4.ebuild 2271 SHA256 ec523813fe81ab54f93a0601ab684ea7ecfd8431dfbc482430fcdf981db93f88 SHA512 e171a425f02f4f02437cf03f5ad68917b864d54877a7e8b3a0ae41028b2c5ca53545c4febf0194b36b4c8074c23143f7c931dd7fce47011205441292bf9f84a7 WHIRLPOOL 4b0549fef78560ac248432e67cda96257c11447b048e519839891d5265a3a601f1b67e28943799e06ab8ac26cb49f4883070a8db25e0186169d591892e33d34c
-EBUILD ardour-3.5.14.ebuild 2275 SHA256 6e67b52c360f282cdb86a88151182d96cd0c928bb30c1d65bce6531569bc762c SHA512 acda0bdd20cc2d1d718210f3714af0712c770a06762a4e9ad81fd74e648a07e48baf326ad147797fab10a796d2beb855def4256f0252628ed899430a291739d4 WHIRLPOOL 1f4066a2c0782ed6e6bfc2ae988e6db8da178becba7bccf73b7cdd28c3a3f8e64f28b636197c74064720b7af26e7d1be9ff35b9b2f9c2a3a691072d26bbebffb
-EBUILD ardour-9999.ebuild 2272 SHA256 39eebb999b5b2611e2b6c0e3de2d70df9db2c6f60676df126474650aa9d1f916 SHA512 66accf292b4b05cef12bb71de0b74c45d7ad7a184ec4f5eee07d2c400ecb4ce16f1e174982cbd4e8f77627af6cd2c63c46e13d79e049997af1052937c2a1dd4f WHIRLPOOL c603b94fcb0a28f4351b9825cc0e8b800c1926f3081eea58700db81df66c071258619d88ebc29e04b6c60fbe8ab2515f612555f576a21343b3d2b8c05d9c7e59
-MISC ChangeLog 19632 SHA256 b8da06602260f37ca3fbd28c7db53a986efbc606583b71b3edf743fb5692aa79 SHA512 bb65568654e090152c67305a8b97e42b63a4f0e4d43d8ebaed7ee221d1671e671fbc00be97cb452b268fb7398219693516f7cad6db607b8283cf12ea3aa04da2 WHIRLPOOL 3c2491e5fc94f2c00dd36f41e52117ac4c7536dcce7acbe8a0d3e0a791a6294fff693d8a0d3c09e3316584261866cf58cc109cda31344975d307d091eb7ba92a
+EBUILD ardour-3.5.14.ebuild 2626 SHA256 41db3c1882273afa00f3c0724a7bed585a4e826cf0d7d4b1626c102d473cd7c3 SHA512 606279025d6f2715cd0451237d014425006d2108a496a3602e85af2703dca0b8ac1637f44f243a3d806166279e6232e06edb2dbd5fc4abcb1bc15b15191c63c5 WHIRLPOOL ec59cecc42101b61189e58f3f78e81c7131141e2b75ccbf168905efbbc9d9fc7d88707d8c6afbfc12536995c455fcc614b15cefcc467e3b11772a8d1bb5e0fcd
+EBUILD ardour-9999.ebuild 2624 SHA256 ccc42b0b3317de5f21775b9e198ac7e970d2ec18df00441ff0e8395fbe8d6b0f SHA512 dbda2b34ddda8e8134207420877728a1fe24a63ac648559defcf8579d12650f5c239aefc2cc5d693b2bbc85f4dc5b354d8cbfcdb67aa10489da4c561efb13efa WHIRLPOOL 6c5899ee938858fa935f51fb4658d677e80ded7d68e11642ac724be4ede38860f753be31819e2fa43db62e32b1e64827a6286d34ab64ced1b98120058516a084
+MISC ChangeLog 19826 SHA256 48e36f9372538b367e21bcf6ca00ad9b62f9f7f955c9750eeb23016eac9300de SHA512 f2d35ecea0c4e66aa0c6fa598c09ad15def7eba9fbd9f388b70cf6b173a5ca8cfe004aa7e3292b55d0f0c55a7aeb34d7f77fad72de857ef010b4f59996853670 WHIRLPOOL 026cf6d7f7b4b99ad58e54e30c906017403dce809d0d93bf750ca034e74ba474207392d64f9457031d09c68eced27d54ba7452868d61d9cd09a346b84acd3764
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJusVYACgkQakKUmsHeVLI4XgCaAoC1kFqOq8NM+2ZCZRn4QHii
-jmkAn05j6muZYitHC5OrU4CKSc1vukOs
-=gFrB
+iEYEAREIAAYFAlJ4teEACgkQakKUmsHeVLIrPACfbGFZiDv6+SgYt8dIfg1xVWOn
+48cAn0yX/nJs3nMjVmle5hoNthQeFSEf
+=ISwI
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.5.14.ebuild b/media-sound/ardour/ardour-3.5.14.ebuild
index 39a1514ee2a7..30ec2650e852 100644
--- a/media-sound/ardour/ardour-3.5.14.ebuild
+++ b/media-sound/ardour/ardour-3.5.14.ebuild
@@ -1,19 +1,20 @@
 # 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.1 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.2 2013/11/05 09:12:19 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
 
 if [ ${PV} = 9999 ]; then
 	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+
 else
-	EGIT_COMMIT="${PV}"
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
 fi
 
 LICENSE="GPL-2"
@@ -65,10 +66,18 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 
 src_unpack() {
-	git-2_src_unpack
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
 }
 
 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
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+	fi
 	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 43ba284ba7e5..01a83f5b7e85 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,19 +1,20 @@
 # 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.2 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.3 2013/11/05 09:12:19 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
 
 if [ ${PV} = 9999 ]; then
 	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+
 else
-	EGIT_COMMIT="${PV}"
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
 fi
 
 LICENSE="GPL-2"
@@ -65,10 +66,18 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 
 src_unpack() {
-	git-2_src_unpack
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
 }
 
 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
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+	fi
 	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }