Bump to 3.5.14. Thanks Alexey McSakoff for the ebuilds and the updated patch. See Bug 488934.

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

5 files changed, 150 insertions, 8 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 7abce83d5251..0206acf8b66d 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.120 2013/09/10 20:14:00 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.121 2013/10/28 18:50:02 nativemad Exp $
+
+*ardour-3.5.14 (28 Oct 2013)
+
+  28 Oct 2013; Andreas Schuerch <nativemad@gentoo.org> +ardour-3.5.14.ebuild,
+  +files/ardour-3.5-syslibs.patch, ardour-9999.ebuild:
+  bump to 3.5.14. Thanks Alexey McSakoff for the ebuilds and the updated patch.
+  See Bug 488934
 
 *ardour-9999 (10 Sep 2013)
 *ardour-3.4 (10 Sep 2013)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 9e0b8e8928d2..3a414fc62f92 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -6,6 +6,7 @@ AUX ardour-2.8.14-boost-150.patch 446 SHA256 e4b463dc007bdfdbbafdaf686a2a52ff34b
 AUX ardour-2.8.14-syslibs.patch 3766 SHA256 44ad92ade9e0e06bf557b52ade3e20a9bb2631846efb08a84b40a92a81b3dcdc SHA512 16d1d37ea3474d0d393839d0e815096094fb3d5a914ccd041154cee11a627f7c236f070aff2379b1b4098b4da3909f0434aaa3ab52c9ac3be1ff7c8e6d3468eb WHIRLPOOL 28ded8c29de811b4dbcd6f3659d8787ec81d29718194d9877aebd9d25c06aae7dedf9530028cc410e03dc49b0fe4c1424d6e08a4064874e199263093bd76e23d
 AUX ardour-3.0-syslibs.patch 1743 SHA256 9ed8fecbc4ed28115a24675e987f41011afcfad299096060219a91b9dc0e6109 SHA512 c1303dc9c6c73c02a722c4ef90dc10eb940c0b65977159174b49a0cdcc9835d8a960419ea53cf5356f1f3780efd45050b37335333dfe2672306f5dfaed40c67f WHIRLPOOL 77eacac4eec1fa6e87f9f37c96742b79c2c63f5c99a171da549f73f9d33687094da84d4cc782d3b237c7db150555e1bec96e2200ae9d7c732750403fa15a692b
 AUX ardour-3.2-syslibs.patch 1743 SHA256 9ed8fecbc4ed28115a24675e987f41011afcfad299096060219a91b9dc0e6109 SHA512 c1303dc9c6c73c02a722c4ef90dc10eb940c0b65977159174b49a0cdcc9835d8a960419ea53cf5356f1f3780efd45050b37335333dfe2672306f5dfaed40c67f WHIRLPOOL 77eacac4eec1fa6e87f9f37c96742b79c2c63f5c99a171da549f73f9d33687094da84d4cc782d3b237c7db150555e1bec96e2200ae9d7c732750403fa15a692b
+AUX ardour-3.5-syslibs.patch 1568 SHA256 a69245a68df400d0961a189bdee5181ea84e95bf3fd6a68f20809096e26a5d02 SHA512 d086b48ef56292044570ac6d12474a60fac55d884b27a64720776538b5986651d4384d2b5c7f518fe608bb6c8e3ee184a27df62bfc6523456200fb60e4010474 WHIRLPOOL fef364e25ac1246ba6a08d08d7cee9fd8afeee4af9fd2ff50dd3f2438f70174f404d69a490f63feb098ce6ae4c5918a4fa0f5220aa3462144f4cb20c3502572d
 DIST Ardour3-3.2.tar.bz2 7313774 SHA256 7e0c5c1e7e5a664fcf940270b35526d1ed75028a8e04c8b725397b447c83eb6a SHA512 be7bc47058643e7d0a1256bcc75bebc312496b088627ab9abd9d430b6dbb5a6c434c1bcede3cc8bd0359b58b7452a299da022e66d3a4ca11283b426d42b11bb1 WHIRLPOOL 494d2522129ce28b2d96436e0b02f4e0d4744e0f49fbe5778db27c88ca94fdbd015818c9c336ceb120148135ff64a4ac893347095dd824ec29756bf1cf7bc43b
 DIST Ardour3-3.3.tar.bz2 7539302 SHA256 44f6596d5750bb3bf9babd6114f217f7ab7b281607e97631c8ce01d0749038e9 SHA512 31dade4a1343dd2a605f88adc3657d30ab2de9b7c45dbfaf4e57ce00b30aa52c528a6e821e0ad7ada1222f2bc1ede7a9c9a8e4b9808eeba4dbe6506ccebcdce8 WHIRLPOOL c5c0bee338d0090b6db508648fa6c48531933e994428da15bea9430768e08066261af64856443faf7514491a7f9112d9d4c3ff11ca30a7139b0bd2d93a2f44d7
 DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
@@ -18,13 +19,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-9999.ebuild 2272 SHA256 14571f1b365b34a5c46ef2e574c1e74495938b04b9d90706fa9b29aa540c6231 SHA512 79c0affbf36a1831037423a62a2cd9ad18fc82ac0187d012ee26199780536ae1cdc14956b440017c9858ff16421abf40bac1997d9cda06849afdeebe0aa4ac31 WHIRLPOOL a32e79c336e4912c8c213817a77c37bdb60a81bb8ad3c9e6525f8fb23de861041013134ee6d047831dc0b37371612d3daed2600de4a4c996163fc4d250f288bc
-MISC ChangeLog 19371 SHA256 d7ea3e6ebe9f195707903cc09bc3911b92f24e404bb413069a40bcd9b90690e5 SHA512 ffa58441e8602df76c1ead900af47d329c424042ec375c18344f0fc67d94dfda422b6ce91b2e4d185e9545a8d3454bc874706a15057be80378243ee492f34d20 WHIRLPOOL 7510b6269f642eb3989573ad3660a57889b1bb60be2d6c9da73546473b33937f52d2840aac1130e128208e93fc4ee3bbee6ce6658f692a90a29e06c164e65a87
+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
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIvfWsACgkQakKUmsHeVLIkqwCfZTVRi0kizxKAKd0Tfbu8TFJm
-fHEAniDfSMLLujwb7/TDp4P5wjyY5rPF
-=F0M9
+iEYEAREIAAYFAlJusVYACgkQakKUmsHeVLI4XgCaAoC1kFqOq8NM+2ZCZRn4QHii
+jmkAn05j6muZYitHC5OrU4CKSc1vukOs
+=gFrB
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.5.14.ebuild b/media-sound/ardour/ardour-3.5.14.ebuild
new file mode 100644
index 000000000000..39a1514ee2a7
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.14.ebuild
@@ -0,0 +1,96 @@
+# 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 $
+
+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=""
+else
+	EGIT_COMMIT="${PV}"
+	KEYWORDS="~amd64 ~x86"
+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
+
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen[dot] )"
+
+src_unpack() {
+	git-2_src_unpack
+}
+
+src_prepare(){
+	epatch "${FILESDIR}"/${PN}-3.5-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
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 960aa9b1adce..43ba284ba7e5 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2013/09/10 20:14:00 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.2 2013/10/28 18:50:02 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
@@ -69,7 +69,7 @@ src_unpack() {
 }
 
 src_prepare(){
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
+	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }
 
diff --git a/media-sound/ardour/files/ardour-3.5-syslibs.patch b/media-sound/ardour/files/ardour-3.5-syslibs.patch
new file mode 100644
index 000000000000..a80e3a34a7c5
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.5-syslibs.patch
@@ -0,0 +1,37 @@
+diff --git a/libs/ardour/wscript b/libs/ardour/wscript
+index 4d56983..41dd54a 100644
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -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','libvamphost',
+                         'libvampplugin','libtaglib','librubberband',
+                         'libaudiographer','libltc','libtimecode']
+diff --git a/wscript b/wscript
+index 3d01632..e84f4bf 100644
+--- a/wscript
++++ b/wscript
+@@ -24,9 +24,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/backends',