media-sound/ardour: Bump to 4.4 and changes how cflags get set

Package-Manager: portage-2.2.20.1

3 files changed, 186 insertions, 68 deletions

diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index d7c54593f637..6470b94381f4 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -7,3 +7,4 @@ DIST ardour-3.5.403.tar.gz 8583763 SHA256 46490623479d9a25e2ab98b817c1f5c42b1d04
 DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
 DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
 DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
+DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
diff --git a/media-sound/ardour/ardour-4.4.ebuild b/media-sound/ardour/ardour-4.4.ebuild
new file mode 100644
index 000000000000..edeb9ed201cd
--- /dev/null
+++ b/media-sound/ardour/ardour-4.4.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+	inherit git-r3
+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 lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
+
+RDEPEND="
+	>=dev-cpp/glibmm-2.32.0
+	>=dev-cpp/gtkmm-2.16:2.4
+	>=dev-cpp/libgnomecanvasmm-2.26:2.6
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
+	media-libs/alsa-lib
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
+	media-libs/libart_lgpl
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
+	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
+	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
+	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}
+	>=media-sound/jack-audio-connection-kit-0.120
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )"
+
+src_prepare(){
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
+		touch "${S}/libs/ardour/revision.cc"
+	fi
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			elog "You enabled sse but use an march that does not support sse!"
+			elog "We add sse to the flags now, but please consider switching your march in make.conf!"
+		fi
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
+		-i "${S}"/wscript
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
+	append-flags "-lboost_system"
+}
+
+src_configure() {
+	tc-export CC CXX
+	mkdir -p "${D}"
+	waf-utils_src_configure \
+		--destdir="${D}" \
+		--prefix=/usr \
+		--configdir=/etc \
+		--nls \
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
+}
+
+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 ardour4 ardour4 ardour4 AudioVideo
+}
+
+pkg_postinst() {
+	elog "If you are using Ardour and want to keep its development alive"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
+}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index e91dce0bb458..da43984fdba1 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -3,19 +3,16 @@
 # $Id$
 
 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=""
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
-	inherit git-2
+	inherit git-r3
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -23,37 +20,38 @@ fi
 
 LICENSE="GPL-2"
 SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
+IUSE="altivec doc jack lv2 cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow"
 
-RDEPEND="media-libs/aubio
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	media-libs/freetype:2
-	>=dev-libs/glib-2.10.1:2
+RDEPEND="
 	>=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
+	dev-libs/boost:=
+	>=dev-libs/glib-2.10.1:2
+	dev-libs/libsigc++:2
+	>=dev-libs/libxml2-2.6:2
+	dev-libs/libxslt
+	>=gnome-base/libgnomecanvas-2
 	media-libs/alsa-lib
-	x11-libs/pango
-	x11-libs/cairo
+	media-libs/aubio
+	media-libs/flac
+	media-libs/freetype:2
 	media-libs/libart_lgpl
-	virtual/libusb:0
-	dev-libs/boost
+	media-libs/liblo
+	>=media-libs/liblrdf-0.4.0-r20
+	>=media-libs/libsamplerate-0.1
+	>=media-libs/libsndfile-1.0.18
+	>=media-libs/libsoundtouch-1.6.0
+	media-libs/raptor:2
+	>=media-libs/rubberband-1.6.0
 	>=media-libs/taglib-1.7
+	media-libs/vamp-plugin-sdk
 	net-misc/curl
+	sci-libs/fftw:3.0
+	virtual/libusb:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-2.8.1:2
+	x11-libs/pango
 	jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
 	lv2? (
 		>=media-libs/slv2-0.6.1
@@ -66,63 +64,54 @@ RDEPEND="media-libs/aubio
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
-	virtual/pkgconfig
 	>=media-sound/jack-audio-connection-kit-0.120
 	sys-devel/gettext
+	virtual/pkgconfig
 	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
+	if ! [[ ${PV} == *9999* ]]; then
+		epatch "${FILESDIR}"/${PN}-4.x-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
-	sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
-	sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
-	sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
+	use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
+	sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
+	MARCH=$(get-flag march)
+	if use cpu_flags_x86_sse; then
+		if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then
+			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
+		OPTFLAGS="sse"
+	fi
+	if use cpu_flags_x86_mmx; then
+		if [[ ${MARCH} == "i486" ]]; then
+		    elog "You enabled mmx with i486 set as march! You have been warned!"
+		fi
+		OPTFLAGS="${OPTFLAGS} mmx"
+	fi
+	if use cpu_flags_x86_3dnow; then
+		OPTFLAGS="${OPTFLAGS} 3dnow"
+	fi
+	sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '${OPTFLAGS}' just some place holders\"/' \
+		-i "${S}"/wscript
+	sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
 	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 \
 		--nls \
-		$(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa  --libjack=weak") \
-		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
-		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
-		$(use doc && echo "--docs")
+		--optimize \
+		$(usex jack "--with-backends=alsa,jack" "--with-backends=alsa  --libjack=weak") \
+		$(usex lv2 "--lv2" "--no-lv2") \
+		$(usex doc "--docs" '') \
+		$({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
 }
 
 src_install() {
@@ -135,5 +124,5 @@ src_install() {
 
 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!"
+	elog "then please consider to make a donation upstream at ${HOMEPAGE}"
 }