4 files changed, 143 insertions, 10 deletions
diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 6fe2ed20bb01..dd4ad6709295 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.65 2007/10/16 16:17:49 eldad Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.66 2008/01/15 22:34:47 aballier Exp $
+
+*ardour-2.2 (15 Jan 2008)
+
+  15 Jan 2008; Alexis Ballier <aballier@gentoo.org> +ardour-2.2.ebuild:
+  vesion bump
 
 *ardour-2.1 (16 Oct 2007)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 39fe450ead75..43be7de491a8 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -18,6 +18,7 @@ DIST ardour-0.99.3.tar.bz2 1316996 RMD160 e8e5891ef3783c87f9b58129adfe2be7b490ca
 DIST ardour-2.0.3.tar.bz2 2745744 RMD160 702dc6b234a7c36ba93377e4e8caffd25e75ff4d SHA1 78d70ec5211697dc014577b9e58c7599f27a8426 SHA256 36df4728b92aaab141ed7dbfab4c29f8a1fb83e4ebb95bc2ffa40c831f4d787e
 DIST ardour-2.0.5.tar.bz2 2777524 RMD160 eb278fbd7121707b9b7d4dfbb1e2088ef36cb1d4 SHA1 9a3adea22c5f182832b90506cb354097c21caa4f SHA256 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
 DIST ardour-2.1.tar.bz2 2788128 RMD160 70796eb07911c5301049fb2d2749cbaa7a04ba4d SHA1 fcfb1230b9e7ec42c0044be89a6e25aa31a75658 SHA256 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
+DIST ardour-2.2.tar.bz2 4296980 RMD160 ec1e00a546b51e3f8fd8afb0b6d661df66862cd1 SHA1 195ba17570102dcb7fb09d40457b4afefbd3e16a SHA256 fc0d405e1e1d31b3e353095db67b7dc874c201ff43954751b72f57ae836799ee
 EBUILD ardour-0.99.2.ebuild 2285 RMD160 1101edb57bbde1e2e3c4a9bf50baefc8fe2f95ed SHA1 38522c8cf2409fdf4d516f1573515106304fcfa4 SHA256 1de5ee5ef15e621f20f26f8a73e88919e62b4ab8a9e355f03a8b971595c69f19
 MD5 73d79e7e16994d8fbd48691e1f5a5e69 ardour-0.99.2.ebuild 2285
 RMD160 1101edb57bbde1e2e3c4a9bf50baefc8fe2f95ed ardour-0.99.2.ebuild 2285
@@ -38,10 +39,14 @@ EBUILD ardour-2.1.ebuild 3095 RMD160 ad3da0f723e841a8f7db036ebc6c325f85529d4e SH
 MD5 5bbc16fca579bebfc16d1b399f360447 ardour-2.1.ebuild 3095
 RMD160 ad3da0f723e841a8f7db036ebc6c325f85529d4e ardour-2.1.ebuild 3095
 SHA256 1a1c964ee5be418534c9f75831739cbb7e3f208c05b7f804f6075679194849ca ardour-2.1.ebuild 3095
-MISC ChangeLog 10166 RMD160 976fe5f3c784e5fd416d5cba292a9c1fd1b54c33 SHA1 278e586451baa9dad2dceb3a0c27e56f514e80e5 SHA256 aedddcd087ae29a52d246208ff95c8d3142edddc1cf708bdd6ce4a8c283f8778
-MD5 12f944a3815590814a67615ad58cab5a ChangeLog 10166
-RMD160 976fe5f3c784e5fd416d5cba292a9c1fd1b54c33 ChangeLog 10166
-SHA256 aedddcd087ae29a52d246208ff95c8d3142edddc1cf708bdd6ce4a8c283f8778 ChangeLog 10166
+EBUILD ardour-2.2.ebuild 3206 RMD160 ada3b2ee0cf4e6ea9e89b573563aef02cdd5a069 SHA1 34eb4528b750de2ffb5e085fbd77ffb88abd1c10 SHA256 7777f02a92f356df1a85f491c68681c6320f20d58fff30f128b29c314b74ca61
+MD5 2f85d6139b234d1f81ce53d6217144fc ardour-2.2.ebuild 3206
+RMD160 ada3b2ee0cf4e6ea9e89b573563aef02cdd5a069 ardour-2.2.ebuild 3206
+SHA256 7777f02a92f356df1a85f491c68681c6320f20d58fff30f128b29c314b74ca61 ardour-2.2.ebuild 3206
+MISC ChangeLog 10283 RMD160 478d9d5385dc951445af48b3a1ff3ddbd5e442a4 SHA1 973c9b681a61665a1e7ad6a26808a23bcd8aab22 SHA256 f0a2bee1700b064a8dc616fb81e67773a00100f82dbf18f00c74c6c14598c4c6
+MD5 d30f440a9ba1d9708a510c21ba3e159a ChangeLog 10283
+RMD160 478d9d5385dc951445af48b3a1ff3ddbd5e442a4 ChangeLog 10283
+SHA256 f0a2bee1700b064a8dc616fb81e67773a00100f82dbf18f00c74c6c14598c4c6 ChangeLog 10283
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -61,10 +66,13 @@ SHA256 48f72afd0ddf20dad4ae33fa0df501245c84607bbec7e31cceb5a011773ee002 files/di
 MD5 34a15db22902cbdd9aecc89b90a94725 files/digest-ardour-2.1 238
 RMD160 a437a96ac89954d96bb02515c380e739efebde9d files/digest-ardour-2.1 238
 SHA256 3980c175f3dbd4f97e7c7d6c444a6632da7bc6bfa98cc18f738840600b199da7 files/digest-ardour-2.1 238
+MD5 ec6ee73d0a1d705d30c5dbd71071782f files/digest-ardour-2.2 238
+RMD160 03756f315eda1dbdad0e118b7b627c6449a71eb1 files/digest-ardour-2.2 238
+SHA256 f6648b451bec6926272fd3dd79bfa684d44843a74204595f9d2486fb64f5e7c7 files/digest-ardour-2.2 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHFON8T+MN7JbqCpMRApxLAJ4lJnUFy9G+q6w8hLVAgzx5jdRHxgCeLEtC
-msLwhwX5zgm9+m5IvxjzHhQ=
-=eF+/
+iD8DBQFHjTV6vFcC4BYPU0oRAo2NAJ0cLU5ecYc2z9KL2kdgu1H5f8VPswCgh/Ks
+Gi+Yk2dgg2ZanSiQt1pbAcM=
+=ECBa
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-2.2.ebuild b/media-sound/ardour/ardour-2.2.ebuild
new file mode 100644
index 000000000000..831961aaa5e5
--- /dev/null
+++ b/media-sound/ardour/ardour-2.2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-2.2.ebuild,v 1.1 2008/01/15 22:34:47 aballier Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="multi-track hard disk recording software"
+HOMEPAGE="http://ardour.org/"
+SRC_URI="http://ardour.org/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="altivec debug nls sse"
+
+RDEPEND="media-libs/liblo
+	>=media-libs/liblrdf-0.4.0
+	>=media-libs/raptor-1.4.2
+	>=media-sound/jack-audio-connection-kit-0.101.1
+	>=dev-libs/glib-2.10.3
+	x11-libs/pango
+	>=x11-libs/gtk+-2.8.8
+	media-libs/flac
+	media-libs/alsa-lib
+	>=media-libs/libsamplerate-0.1.1-r1
+	>=dev-libs/libxml2-2.6.0
+	dev-libs/libxslt
+	>=media-libs/libsndfile-1.0.16
+	gnome-base/libgnomecanvas
+	x11-themes/gtk-engines
+	>=dev-cpp/gtkmm-2.10
+	dev-cpp/glibmm
+	>=dev-cpp/libgnomecanvasmm-2.10.0
+	dev-cpp/cairomm
+	>=dev-libs/libsigc++-2.0
+	media-libs/libsoundtouch
+	dev-libs/libusb
+	=sci-libs/fftw-3*"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	dev-libs/boost
+	dev-util/pkgconfig
+	>=dev-util/scons-0.96.1
+	nls? ( sys-devel/gettext )"
+
+pkg_setup() {
+	if ! built_with_use dev-cpp/gtkmm accessibility; then
+		eerror "dev-cpp/gtkmm needs to be built with use accessibility"
+		eerror "in order to build ${PN}"
+		die "gtkmm was not built with use accessibility"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-2.0.3-sndfile-external.patch"
+	epatch "${FILESDIR}/${PN}-2.0.3-cflags.patch"
+}
+
+ardour_use_enable() {
+	use ${2} && echo "${1}=1" || echo "${1}=0"
+}
+
+src_compile() {
+	# Required for scons to "see" intermediate install location
+	mkdir -p "${D}"
+
+	local FPU_OPTIMIZATION=$((use altivec || use sse) && echo 1 || echo 0)
+	cd "${S}"
+
+	tc-export CC CXX
+
+	# Avoid compiling x86 asm when building on amd64 without using sse
+	# bug #186798
+	use amd64 && append-flags "-DUSE_X86_64_ASM"
+
+	scons \
+		$(ardour_use_enable DEBUG debug) \
+		FPU_OPTIMIZATION=${FPU_OPTIMIZATION} \
+		DESTDIR="${D}" \
+		$(ardour_use_enable NLS nls) \
+		FFT_ANALYSIS=1 \
+		SYSLIBS=1 \
+		CFLAGS="${CFLAGS}" \
+		PREFIX=/usr || die "scons make failed"
+}
+
+src_install() {
+	scons install || die "make install failed"
+
+	dodoc DOCUMENTATION/*
+
+	doicon "${S}/icons/icon/ardour_icon_mac.png"
+	make_desktop_entry ardour2 Ardour2 ardour_icon_mac.png AudioVideo
+}
+
+pkg_postinst() {
+	ewarn "---------------- WARNING -------------------"
+	ewarn ""
+	ewarn "Do not use Ardour 2.0 to open the only copy of sessions created with Ardour 0.99."
+	ewarn "Ardour 2.0 saves the session file in a new format that Ardour 0.99 will"
+	ewarn "not understand."
+	ewarn ""
+	ewarn "MAKE BACKUPS OF THE SESSION FILES."
+	ewarn ""
+	ewarn "The simplest way to address this is to make a copy of the session file itself"
+	ewarn "(e.g mysession/mysession.ardour) and make that file unreadable using chmod(1)."
+	ewarn ""
+	ewarn "---------------- WARNING -------------------"
+	ewarn ""
+	ewarn "If you use KDE 3.5, be sure to uncheck 'Apply colors to non-KDE applications' in"
+	ewarn "the colors configuration module if you want to be able to actually see various"
+	ewarn "texts in Ardour 2."
+}
diff --git a/media-sound/ardour/files/digest-ardour-2.2 b/media-sound/ardour/files/digest-ardour-2.2
new file mode 100644
index 000000000000..d0d49546431b
--- /dev/null
+++ b/media-sound/ardour/files/digest-ardour-2.2
@@ -0,0 +1,3 @@
+MD5 151dcc194dfdba3cd7f61faeed6e06f5 ardour-2.2.tar.bz2 4296980
+RMD160 ec1e00a546b51e3f8fd8afb0b6d661df66862cd1 ardour-2.2.tar.bz2 4296980
+SHA256 fc0d405e1e1d31b3e353095db67b7dc874c201ff43954751b72f57ae836799ee ardour-2.2.tar.bz2 4296980