use dependant alsa and jack backend and build without jack-metadata even for use=jack. See Bug 547428.

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0x60373227

4 files changed, 164 insertions, 27 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 9ae1851957a3..b5e3110a5761 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.140 2015/04/22 13:42:22 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.141 2015/04/23 07:15:26 nativemad Exp $
+
+*ardour-4.0-r1 (23 Apr 2015)
+
+  23 Apr 2015; Andreas Schuerch <nativemad@gentoo.org> +ardour-4.0-r1.ebuild,
+  ardour-9999.ebuild:
+  use dependant alsa and jack backend and build without jack-metadata even for
+  use=jack. See Bug 547428
 
 *ardour-4.0 (22 Apr 2015)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d8caf6478ba0..8777744003e5 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -24,24 +24,25 @@ EBUILD ardour-3.5.308-r1.ebuild 3200 SHA256 3c93b1b99a5d17d2183531705ccb623646a3
 EBUILD ardour-3.5.357.ebuild 3197 SHA256 13ec34b6c51f469da1f2b713347c8bba27d3cf076ed2c946e24f0ced1c9513cf SHA512 c52a354231caa078cc04d147454526b2a8f161bf089c4a6acfd0ffa8e4eafcd2ac36afc0cadcf154d387ea2ac133d70e3cbe7eeea4871aa07d214501b13433dd WHIRLPOOL 1bdf2ef5710f21cdf48bf77a47c0d7ab02c0a5ce54c2332c23fd7093805369a53637d20da1580b76a24a120e8278995a63d235c4c6eb6d1c6748d9f2163ce2ae
 EBUILD ardour-3.5.380.ebuild 3311 SHA256 6d1f06ca01a8c775247a87d7fc8c3e2c66b2bd847386d6c9ed32f1ff98ed4494 SHA512 3ef5b97f108a3e1a63e175cf0847f67c3c519828f424e8b06c752874269a69fd9c6fa808df013f62f3c28eebdd4a68279d75dedbee6b7465d22447fcfdd73235 WHIRLPOOL b80335eef5690cf01db84834413d929b30bc88f9b723581e2400dffb13dc44f474eab65e50dfe0d9e8381015cfb55f59073695f526ee509eadcc134584dea731
 EBUILD ardour-3.5.403.ebuild 3732 SHA256 43b03f5333a2d89743484b9330d1ce9e57efbf13b828f6588b8d2698d9e1bd5d SHA512 227767a07bb2318d4b5191a0418b4a53fbc8411c02e8b431afe6d390d4caab2a7304a6570bf147cd0936bdd79a5a8e885374fb1b7364906b5141f2e47907d616 WHIRLPOOL 4fb8486e2ecff3b829abb55d7d06a00f67305c256b9222280360abfec32aefafa6846a702b6518aa854aea440589d17606cd79359f1a83e9e1583187c160a639
+EBUILD ardour-4.0-r1.ebuild 3617 SHA256 35038e4bfbcfc8ce82e12b74acb3be5441a335713175f497f68e81405671724e SHA512 ced9ccb54a00db96253070a96cd525b12304be1d58f37adf8190f5628319f6da0ed97c5d4bcd0e99305ffa843560a7d59c16cffe40113f806b41af9cdf6a6a71 WHIRLPOOL d5c2bbe91af1af7f282f756f5a5fa6b9828c7b0c5ca25a3ab706fee5f5193cf5a3b32ff163ddb4c9dd134ce2604fe6c507c4b05d222a515dcf00e539769ad067
 EBUILD ardour-4.0.ebuild 3900 SHA256 e9fd51b51b49e29d3b32e50dfebfe866cfbf1a05d00fc2d66e89117af899cef7 SHA512 d5161a54d11886b030928b45ea7d0cb2e231f86ad045d4f48641d26f6a445918cae29d87d38ae4d3b438d1daafd72e0b4a34365cd3c0959fa151a325337137fa WHIRLPOOL c8cc6ba1967dc0a7d740acce8b77756408f5b0ea9742772ce0c63ac97791b840653aa43eb7490f7a2f108e2790436b213f9f85fc53b3691ed5dda402d80d9582
-EBUILD ardour-9999.ebuild 3902 SHA256 d1662436fab53f3871afedc92371ae9926b3142bb5ab1d1817e965274e578439 SHA512 b0543f4f25f70bf0c15dfa8461facf067723620304d1b31fe8e3a9b2f39c439d94a5524b4c92e39a0707638359f09cebce512753c683ed6938aa15f9a65a75ff WHIRLPOOL 22addb436bd3e8a99b947def6ce2d58471ae8783c4a7770b1f749588f43d1e04c53171479b87e02218898470ff145302d852486af2ee6b1597b905aa4fc1a3c3
-MISC ChangeLog 23196 SHA256 063b6b6e351651631d7632198284b9719213040813be0f5cf8ddf41a820da6bb SHA512 090b9348c05d395e420cf1e6e510aab512351d16c5ae99aae642ff2ae8bad7e837c58b3a2949d6e7f6f38df1ff5d16d444f05e4b49114fc47176cf0604035791 WHIRLPOOL 1e050bc05b89b0288a018098c84011842ec0cdad52a635fc323b480c2f2c93997e9889aab68f58d0bf8e829dc76edfcaf1bbc9fd51e09c14969b879a9fe629bd
+EBUILD ardour-9999.ebuild 3616 SHA256 cd7969b20a90feb7200e1865725493fa44ca89ac8cf94a7e769f38eede4109f1 SHA512 809e66b4677aa21f13e1d7cc4ec4afd7197a11d668592f7d614a77ba3c799f1796353931403db9073450f8a5f38682b59e4cb61b417892e391bc6d430a055131 WHIRLPOOL e16f6f3dccce08d02c7ce7555958f0aa64cfe5242ed5e2648a291091335dfae7a990e52227b45f370037372eb01d7d3762d7a6321ca54e94e0bd923d1513e9ce
+MISC ChangeLog 23433 SHA256 fcb0e23fe2ecac42740b08368ec939a28ff1ec46a0665f121ed205e950c3fbb8 SHA512 c8e87fd2816363385a0582ec907a41ed91b833d837e60113fc3b5639babba446a94a8738e584312a5b87a3670cd5502cd04e067569690b97dbbc3f9b87f38ba3 WHIRLPOOL 8c76a9cdc88586a61b774c1234f960a2d22631f5721488acafa90f1e2713273d18b3d1ad0c23200d2fce737735c410adbdf4b88c62f8d47049ff7120a5fafba0
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVN6UZAAoJEIug43o+kWudKFAQALov2QjHUgS4o5AFIEfJ9Ccy
-YP3MAN2H5Klik6mqitRi/fLnHJ8TggA/XmR92SGkQ3A5ssqjp+U8l0xhcSpaYG6X
-dxY7nvYS08K1OYNO9DfNBC9Gc9n1bEF8e5SybH1yGytMAUm+3HiU8jqu5igwXWEw
-rBTcIynnZWBYGxcwBdBJ7shYpm/2RF7fnCytOoFJNYgkqiKXAkEy3BdXYw7YmFhf
-01+BYLvT6rRtoQeDY9nA8t4E+A/2Go6a+8tAB/EeHwMy4MZxRnMgGpydoFm5DUmp
-FElpkdz1omkfTE2D8v4oHVtaUrL71biVLQyS1PV98cIoJZag8JoRafFHQ5hPQZcH
-8LxMx4aSGslkIojMMBR5yScU8E4YBWWew1hE+t1DyGVqWysIIbc/a2HWFxdr+fyS
-h1knXtpQNANwX/5/UnQ3xNVJZUj1ufX0npClRkSbi4l3Z6aAFOmcTwTEF1jptv3c
-y8tBbyNbDa25zPXwDtNzOFL3q0TyyALf9ntm/rZO5cOoNb71JAM6zuB8GdZWR4c5
-1Am50V+X2U+7XMpaa5QBwn08LbfV4WmGmhVPsfWIw7KM53fB6XXnz2bQHGdahGPx
-HOkKuwwct5vy7cr0psXRO/b5di5ENdqgApfcRCxcnghAQzH1HEoD6fSY8LZ7oJ+6
-A+1/YDEapFwyq7OHw2NY
-=c365
+iQIcBAEBCAAGBQJVOJvpAAoJEIug43o+kWudJpIP/jzA9/GmrwvA2/npWsN0LLRT
+T9ySNSiogpGYj15SyqYCb3Ma9oYc8Diz7Ep/qo5XnAc0YgLyImQYxba5YYYCcywG
+w40/nZ+2NesG54tjjCM8sGfhSforx7k5wEaqvu4RtkEPFqwwqVCmpjW/fvPdrZ2l
+j3yV780m6nhAu2SIUCw+eEdIesWCtLLMiBrqW9vAS95Nlq69/3zcD+4bNdVQx7Um
+oO9D/oyyNCFUqxZxlRhz6cw6OTTmBZd5NmYsKOTndQ7ivtkK+uvN+F8LkQGFEKav
+p4wiUTEI5qePGnH3AoiJp3DviUoLwewvFKtFRtpsPg3mz39ZvN9GOLZ7bmy2wUxg
+YPXpc/Nkqwo5sPg4+dp1oIYGy5NJWJaAWykxxgKSxd/n7XYHgK9d6AIf86PyavsJ
+e769Oak7hHkKMnbvF0Kt4tn/XFsgsPEfUEcEJNo8VvMZnAvNqLB3dVHR9qy7G6lu
+hlOp/VcUzNjmyWTGJJQjnGnfVf4xwOb18CxMddIo6rh0fNxz6i/pb0qdbq13Uu25
+1lBCmGCq5UfHTv/F26dM21rIEDrofYHhNoG/idAaUEOs7jUidAnPkrNfIX9fKmtE
+zZeH3XTK1kUsReFvZBzzZz6Qwivc/l+Ro3isWp2ePqxv7JqoXzQqLp2WDSORTmBK
+uzoOcwvYsYr7eWNIohj/
+=HxQc
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-4.0-r1.ebuild b/media-sound/ardour/ardour-4.0-r1.ebuild
new file mode 100644
index 000000000000..b86015e13dfa
--- /dev/null
+++ b/media-sound/ardour/ardour-4.0-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r1.ebuild,v 1.1 2015/04/23 07:15:26 nativemad Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils toolchain-funcs flag-o-matic python-any-r1 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="4"
+IUSE="altivec doc jack nls lv2 cpu_flags_x86_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.32.0
+	>=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
+	>=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
+	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
+	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}
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	>=media-sound/jack-audio-connection-kit-0.120
+	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
+		epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
+	epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	if use cpu_flags_x86_sse; then
+		MARCH=$(get-flag march)
+		for ARCHWOSSE in i686 i486; do
+			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
+				for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
+					is-flag ${SSEOPT} && SSEON="yes"
+				done
+				if [ -z ${SSEON} ]; then
+					append-flags -msse
+					elog "You enabled sse but use an march that does not support sse!"
+					elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
+				fi
+			fi
+		done
+	fi
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--optimize \
+		--no-jack-metadata \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
+		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
+		$(use nls && echo "--nls" || echo "--no-nls") \
+		$({ use altivec || use cpu_flags_x86_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 136f44a5f723..f21d6cd3e82e 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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.15 2015/04/22 13:42:22 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.16 2015/04/23 07:15:26 nativemad Exp $
 
 EAPI=5
 
@@ -110,21 +110,13 @@ src_configure() {
 	fi
 	tc-export CC CXX
 	mkdir -p "${D}"
-	echo waf-utils_src_configure \
-		--destdir="${D}" \
-		--prefix=/usr \
-		--configdir=/etc \
-		--optimize \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$(use nls && echo "--nls" || echo "--no-nls") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
 	waf-utils_src_configure \
 		--destdir="${D}" \
 		--prefix=/usr \
 		--configdir=/etc \
 		--optimize \
-		$(use jack || echo "--no-jack --libjack=weak --no-jack-metadata") \
+		--no-jack-metadata \
+		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
 		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \