new ebuild for ardour-3.0 and slotmove as well as an icon correction for ardour-2.0.

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

6 files changed, 144 insertions, 19 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index f2aea2855438..9e1e6eb7f405 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # 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.110 2013/01/04 21:47:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.111 2013/03/18 12:34:30 nativemad Exp $
+
+*ardour-3.0 (18 Mar 2013)
+
+  18 Mar 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-2.8.14-r1.ebuild,
+  ardour-2.8.16.ebuild, +ardour-3.0.ebuild, +files/ardour-3.0-syslibs.patch:
+  new ebuild for ardour-3.0 and slotmove and icon correction for ardour-2.0
 
   04 Jan 2013; Tim Harder <radhermit@gentoo.org>
   -files/ardour-2.8.11-soundtouch.patch, -ardour-2.8.12.ebuild,
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 52ab68205584..9345eab1e2d2 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -4,20 +4,19 @@ Hash: SHA256
 AUX ardour-2.8.11-flags.patch 926 SHA256 1b4762c15c329dbc89dba7149358ba5f82670f4d3e550dc166d55dda4e243304 SHA512 fbce5a750aad9eb2ffb1546a61b247bd39ffd37f757cdd545c319bbe427a2077a7334ff9171bc40d32ed0c0c25ac4ff170da159f0628ab4af6976127dcf70499 WHIRLPOOL e887017f5c64d60cba6eb88122ad8e5ef12c177973a0991e66249a3a880a838788398f35f9c35c6ee77277bb5fa4dcc39508dcb5b67f68bc45b480955d72f0ca
 AUX ardour-2.8.14-boost-150.patch 446 SHA256 e4b463dc007bdfdbbafdaf686a2a52ff34b5a519c26ef68364f3c27b2947a685 SHA512 3bccf463afd7a647f398c60498566b7103ca88702e630215afe4b75954a4eb96a333aab2f02c056bed7499eb7e64454c430a81c3d5d7abe0a7cb323b3111f0ef WHIRLPOOL 4c53083e420042d3ff6fb8e97852b5b70b619e8c5664b6127e6dcb50cb660db1f0e575b28da76e249a2bc395ba5bce67d74082871ab89720dcb3ab8d5552ce5f
 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
 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
-EBUILD ardour-2.8.14-r1.ebuild 1987 SHA256 76a91db0cf48ddb442c72fcbb1bdbcc453d75f19111126ccb982a1497f52fd09 SHA512 a8e567c9ae93c7e8df8b7b1b80cd3fbd58f9903543a95dbcfd2c338b6cf09c683082d530ee9820d2d0ca57a6ee2690d9b890336d8b02f219514199fc6b110dbb WHIRLPOOL 80d0927bac71cf39f6b328652d86f00445618b4e41edcc4a5eb5e59d7d53d3c128115bfbb142175b2f6be50268d64dbb3543d45d8caf141c7c5f330160328036
-EBUILD ardour-2.8.16.ebuild 1999 SHA256 747b71987a9a1d13108dd1d3bc9a1448a0f012a0ece163c8f63e15336f0a0bcd SHA512 ab518e0bf1e1b8dc72c3f58619a9f10ab4e04eb915b4b3ca4e6f76af37d5dd2a7f78af7a979a31bfe0d38a15aec74528b7291b27d0ab45f08ac4698f5fe1065d WHIRLPOOL 1ac71c687209092e6d3ae6dc4092b1de0f30d9636b7e09cdb237b8bbc6d4bd61925045440fd24ad5464653e4d8ccea6f9d310a44d0ed8e0d32c0020af131c8c5
-MISC ChangeLog 17627 SHA256 9d1c60e6de6554eef6506e5f7330b81bfb593f324511a26527a888aa053e50c8 SHA512 7843be269f816026d364f871388b5f9ac6aff883e7dc4b02d5b490e06b9311e3b76cdee17bc9b8aa8cce1e144385c2fe4dee30c65a65c8b54351f15d9ede1bff WHIRLPOOL bf40beaebb14b0d7f9d1adb7748fcfe464c849264fe85fe344aebb7dd4961d6855d97fa14db80f710bbf09290468875bb1cfc3684761438226bbe75106febf43
+DIST ardour-3.0.tar.bz2 8173156 SHA256 2a77f2cd506d66c93ae0b7ce2c36a1e8f7f85a5cf2540f6419e9ef431b36760b SHA512 fc9dede5fbf1de1e78b66b59a67df72f0f3a7d6fe5a7e7df52f5c978cbfb41ff8538b1474736cfddbd5ba4a78cc257f254cdab25634348a42171906bb4e43093 WHIRLPOOL 94eb6adc2ca4f6dddb2b939b7df932ecf18fb169a3300857e9c438a9c73094a49dc12abdb1a693577fe78411c051c2910f24f89cd56e220cb1c129f245d2834f
+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 2200 SHA256 4e8a56dca5a27011bba80c7fb90f21b613415fe113dad5fa2c59b005ed4b6ba8 SHA512 002b196c01eac13a170ff3b4e3015282f36e995bc15f35b9b74012c55a9608cf811e97a9ee9fe098cc02a728d3e03eeec4818348c42de6efda9ff2ced4c8ccf7 WHIRLPOOL a8850a520b0cf21450a52924bf5919711fdbc9f4315838ea00e76387f40a2a67edf29fe09213a1912d6af83a38ecf307af71f4fec99d5a8f1d9e13c869af1007
+MISC ChangeLog 17888 SHA256 3e02d08c6dd4c4be760cc8a8b7b1932cffe6bd654adbf42ccd1fe9f867ccfadd SHA512 09ab20d0ebfb1a69ce05c976af1670196c53c7d348073bc80bf82a1ac0f9c776eb850c9df4edad06fe044f0507758102e8dd8d6bae36f1a177fc0dd03532272c WHIRLPOOL b6320a053cf3d3f94445039dea19a5b9c2aa1347e2ce0f15257899cce81786a048eb027009946e6bf5be9558acad905c42b4ebc77e4c842c166d38787c7abfb7
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ504SAAoJEEqz6FtPBkyjvPAH/3hV11jDMK670YFG/RbcnlxL
-+DPL+6vAicue3cCk1VC1psWAIQen/DnBCQh3cX7oqXHg3NVPRUqEWRWN3ZGUxkjB
-QM5qBkMFaYL5ngP3TYSIUG7MqGSxVk4NJQsK8xBbtFVWUZ5ab3RWk2SdlBlpM/iB
-gLX4zIWj9ZcgIYwajQhz47JeEr7b8AHBKEZqkP0LGPPoOzqyikUr0XJzo6YbSH8W
-W87GCEbj0zo69ZXgq83sepv+c79q5oxJ+wT3MhKFG1+jKUmwOQsV8lHCmFBjFj1O
-pUQw7ADdQ4wS4MvLPuASOJg/5F+40hfEhmcpnMkM+ibGsJA4D1xhcRqdIl59a3w=
-=ofI1
+iEYEAREIAAYFAlFHCWAACgkQakKUmsHeVLJ0vwCeL+cj+bDAxPJ15Ix+7aEXtqZl
+DwwAoICr8wOFUgyqi7FfgkgOSyQvqb1Y
+=r1a3
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
index 8881c690d6ec..b3f9822fda0b 100644
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ b/media-sound/ardour/ardour-2.8.14-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2.8.14-r1.ebuild,v 1.3 2012/11/24 00:48:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.14-r1.ebuild,v 1.4 2013/03/18 12:34:30 nativemad Exp $
 
 EAPI=4
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -10,7 +10,7 @@ HOMEPAGE="http://ardour.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="altivec curl debug nls lv2 sse"
 
@@ -80,5 +80,5 @@ src_install() {
 	escons install
 	doman ${PN}.1
 	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 ardour AudioVideo
+	make_desktop_entry ardour2 ardour2 ardour AudioVideo
 }
diff --git a/media-sound/ardour/ardour-2.8.16.ebuild b/media-sound/ardour/ardour-2.8.16.ebuild
index c54d777d4f89..e166dcbe23bb 100644
--- a/media-sound/ardour/ardour-2.8.16.ebuild
+++ b/media-sound/ardour/ardour-2.8.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-2.8.16.ebuild,v 1.1 2012/12/05 09:57:19 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.8.16.ebuild,v 1.2 2013/03/18 12:34:30 nativemad Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs scons-utils
@@ -10,7 +10,7 @@ HOMEPAGE="http://ardour.org/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="altivec curl debug nls lv2 sse"
 
@@ -79,5 +79,5 @@ src_install() {
 	escons install
 	doman ${PN}.1
 	newicon icons/icon/ardour_icon_mac.png ${PN}.png
-	make_desktop_entry ardour2 ardour AudioVideo
+	make_desktop_entry ardour2 ardour2 ardour AudioVideo
 }
diff --git a/media-sound/ardour/ardour-3.0.ebuild b/media-sound/ardour/ardour-3.0.ebuild
new file mode 100644
index 000000000000..92906258449a
--- /dev/null
+++ b/media-sound/ardour/ardour-3.0.ebuild
@@ -0,0 +1,85 @@
+# 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.0.ebuild,v 1.1 2013/03/18 12:34:30 nativemad Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs waf-utils
+
+DESCRIPTION="Digital Audio Workstation"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE="altivec curl 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
+	curl? ( net-misc/curl )
+	lv2? (
+		>=media-libs/slv2-0.6.1
+		media-libs/lilv
+		media-libs/sratom
+		dev-libs/sord
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-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 \
+		--jobs=${MAKEOPTS:2} \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$(use debug && echo "--stl-debug" && echo "--rt-alloc-debug") \
+		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
+		$(use curl || echo "--no-freesound") \
+		$(use doc && echo "--docs")
+#		$(use test && echo "--test")
+}
+
+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/files/ardour-3.0-syslibs.patch b/media-sound/ardour/files/ardour-3.0-syslibs.patch
new file mode 100644
index 000000000000..6b8deb641711
--- /dev/null
+++ b/media-sound/ardour/files/ardour-3.0-syslibs.patch
@@ -0,0 +1,35 @@
+diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
+--- ardour-3.0/libs/ardour/wscript      2013-03-10 22:13:52.000000000 +0100
++++ newardour-3.0/libs/ardour/wscript   2013-03-15 08:04:07.428001597 +0100
+@@ -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)
+@@ -378,7 +379,7 @@ def build(bld):
+     obj.target       = 'ardour'
+     obj.uselib       = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
+                         'JACK','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']
+diff -rupN ardour-3.0/wscript newardour-3.0/wscript
+--- ardour-3.0/wscript  2013-03-10 22:13:59.000000000 +0100
++++ newardour-3.0/wscript       2013-03-15 08:03:00.639999789 +0100
+@@ -31,9 +31,7 @@ children = [
+         'libs/vamp-sdk',
+         'libs/qm-dsp',
+         'libs/vamp-plugins',
+-        'libs/taglib',
+         'libs/libltc',
+-        'libs/rubberband',
+         'libs/surfaces',
+         'libs/panners',
+         'libs/timecode',