version bump and move to the github tarball. removed unzip from deps again. see bug 484674.

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

4 files changed, 136 insertions, 12 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index cccf439eab82..0b68505d417e 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,13 @@
 # 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.124 2013/11/08 12:34:31 nativemad Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.125 2014/01/16 08:16:34 nativemad Exp $
+
+*ardour-3.5.143 (16 Jan 2014)
+
+  16 Jan 2014; Andreas Schuerch <nativemad@gentoo.org> +ardour-3.5.143.ebuild,
+  ardour-9999.ebuild:
+  version bump and move to the github tarball. removed unzip from deps again.
+  see bug 484674.
 
 *ardour-3.5.74 (08 Nov 2013)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 014d23977f96..0d99cd033be9 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -14,6 +14,7 @@ DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b
 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
+DIST ardour-3.5.143.tar.gz 8557867 SHA256 c9bc6a89358158b84916ccb45a977dc6d82b475372d7a1806df62f94dee34daf SHA512 2ff8a693eb74f2f37a9765844e574fdc40c4c757953ca2de99ebec856e59b00f93a4b2a093fb47f85465ceccfed95124ca7402a2c749a27325333999289fb8e1 WHIRLPOOL a5287cfe7913bb9c7034dac9c0d77acef54479baa19ddc80b8e03c90b04e5f8c6aa27d7eefdc44777b240f3386d3571adab8df40ac37dde373437d4014e8a8d6
 DIST ardour-3.5.74.zip 10326171 SHA256 fc47a990d7a0e602e015f0415540a9449de1b546da55da604e071ded68c0119a SHA512 bc8fb4761f2972a41b213c17c712126e794997dd1e16199afb7c03410b41f830c0ed8e90bbacfca1ced050d0748dca0756d8dc359227e91decfa3fb31aea0ac5 WHIRLPOOL 2a34f4939a3df5c042d07d209067fd22a9e7ebe7f1519279741185ef078d9a78c3c6b0d52cc519e24a482f12bcd510fd4445b4499e6f5d2037cfab50b0511b68
 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
@@ -23,14 +24,15 @@ EBUILD ardour-3.3-r1.ebuild 2212 SHA256 64e53e6ba502c04c5b065393ff42d0f7d35003c3
 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 2729 SHA256 0d14003a5a74ef508d95bfa63ce7ea05fc0c02053fccc051ba13beb97808ae0b SHA512 a5273a808ea770efb4195fe2efd4e2c5f06a6f0d4c20e718cc66e257f426c5353d8f49ac690fccd1714c03b8180b7a016739b0f906f83b30223dca81b6f47c58 WHIRLPOOL abc3c7c23162e8330bd811ba9b0f5be6614c752d9bf898f12bd0ac39ca7060c8961d8d5f7795c5d07a99719e37ad4665b50fe34081a9dc91d5a361c779d4112b
+EBUILD ardour-3.5.143.ebuild 3016 SHA256 a8da0e03d4549f618b89109c5089a7a92455d09d8d2e7a75f8eca6ecd2ee3117 SHA512 d7b52cd134c02e48dcfb849cef0f8843d67c6c5a1c30d162691263cfc649a47e05e10061a85830bc3123eba133cc1e8579ec3c445804d85600b1c3418989db45 WHIRLPOOL 83431687aae7d6eee6777dda9eea6da644c25131e7fcc978f6c1c1d389b4d50f05de75ea78514591b36ac48dc240640036475f978b6c1c61e57dca44ade5edeb
 EBUILD ardour-3.5.74.ebuild 3026 SHA256 5ad264d14d03c95b834a80805213ee75bd6a5e6e7b2d792305e0e2ba2ee9180d SHA512 9a5ee4f035a4ed5a539ef69aa88317fe90b38e0b8e4f8d39780e3668a45a0520013658fe5fb706013155d401d0d23ee9034c35e35d2b0dadbdb4a557a85ccbae WHIRLPOOL 65e6a3b370fd3770b92b84d0412b3a367495e4d2dd5ccb45d31b399162c956f30c2ab686f5d486b2f07cb97d5665d2cb95afaba6fa9a9ff29fa338215a1ce8cc
-EBUILD ardour-9999.ebuild 3024 SHA256 f95cbd075eba4c2c13bbc1ba812c05b731ef5f921f52796c8806e019592e270a SHA512 4e7982157e5ac8c1fe54f0540ce377f1cb7d76c1e1676e9ec63de79a6c1c263ff8e77a2365ff5629308cc7c869ef86d1d4563049982e8a45f6e92d02ce243d94 WHIRLPOOL 028c19b4c07dfcc769772e9866d7d4eaabb6959e9081dac567cc769a4df13e1b31342e4ed3329c3fc3272c34f3979d4f511809bc0089a9f27af1bd49d97b1b46
-MISC ChangeLog 20322 SHA256 69b61a1eeb40cfdd83ff1c21179a22aacf71cbd823331a35e902f955ff736896 SHA512 e72cd962166675c1eb444920e5ac7205882c7f59ed52c3597f51c733a3dce41376528d781fd816a230b07d3ff329787c15332fc42eb7f329b997fed7603d93f3 WHIRLPOOL 091e179fefd18285f6bd243eeaf00842711729b6c56c667643f5737ac673fe48af4bef38a420458cbad29a88cd83e35c5ecba26db4d03fd1965bd055b47cdd0e
+EBUILD ardour-9999.ebuild 3013 SHA256 b16a269c76e5191683a55c48e83e0df09fdc471962a13a899bf2b26fb5382d52 SHA512 a920fb76466d5276551d63e46ad781b47292f4f2149f73dc6ce6b39bf4c92a7aaa43e05615256bc65cb5e30e73ce612c4f0d262d4e35efe84c8d1ed9efe4aea8 WHIRLPOOL 8b99be8056b3797b72939ab9096837afafdd71624c2414af40524d17a64c4f2aaae2b0ff9d966dd312386faa4e94b7ae0371fbcb4f71798a67f4e6982387a2cb
+MISC ChangeLog 20551 SHA256 97320552903d9cdb05bc543125eedad23ea1e13c9372b30ffe2753e56970967d SHA512 787d9bae2619b34c76718882e0f0fd7446119acd1a629779643fab1d314d9071f1ccf8ffe925170a84f37ef306c4fe3c31d40c44e9d0f0ee17cbf49cb5490cf7 WHIRLPOOL 1e521354e3852c283c11473a7859ebed9500c381252b8038c13bed70066460fe03130d77e3b3553e6dad6e9c81f64c258003618874f2af5c4cf5eca1c98f788f
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJ82b8ACgkQakKUmsHeVLLfbgCdFey2YZQj7wOIGyDOz28wozRS
-gCcAn2MH8l3aQb/WBkkYed4JPtSSqQYL
-=ExlR
+iEYEAREIAAYFAlLXlD4ACgkQakKUmsHeVLLDsACcC+j++lrJCONqG6oPTIVLN756
+aecAnRGbbgyo00/UEpW1NKv70LdYtVN8
+=cP7Z
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.5.143.ebuild b/media-sound/ardour/ardour-3.5.143.ebuild
new file mode 100644
index 000000000000..f37d965e7bc9
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.143.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.143.ebuild,v 1.1 2014/01/16 08:16:34 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}.tar.gz -> ${P}.tar.gz"
+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}"
+	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 6891a91f581e..6afacdd1e4b1 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 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.5 2013/11/08 12:34:31 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.6 2014/01/16 08:16:34 nativemad Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -14,7 +14,7 @@ if [ ${PV} = 9999 ]; then
 	inherit git-2
 else
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
 LICENSE="GPL-2"
@@ -65,8 +65,7 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen[dot] )"
 	if ! [ ${PV} = 9999 ]; then
-		DEPEND="${DEPEND}
-		app-arch/unzip"
+		DEPEND="${DEPEND}"
 	fi
 
 src_unpack() {