Corrected some cflag issues. See bug 500516. Thanks Mikkl!

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

4 files changed, 133 insertions, 8 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 77ab9ff8d435..e60dac9e8661 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.126 2014/01/29 13:38:35 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.127 2014/02/07 14:22:44 nativemad Exp $
+
+*ardour-3.5.308-r1 (07 Feb 2014)
+
+  07 Feb 2014; Andreas Schuerch <nativemad@gentoo.org>
+  +ardour-3.5.308-r1.ebuild, ardour-9999.ebuild:
+  added -r1 to reflect bug 500516. Thanks Mikkl!
 
 *ardour-3.5.308 (29 Jan 2014)
 
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 674f82b22f17..a32b5ae3c502 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -26,15 +26,16 @@ EBUILD ardour-3.3.ebuild 2244 SHA256 1485c09e0a43b4d1c7d7f0c8041be571b7d78c705b5
 EBUILD ardour-3.4.ebuild 2271 SHA256 ec523813fe81ab54f93a0601ab684ea7ecfd8431dfbc482430fcdf981db93f88 SHA512 e171a425f02f4f02437cf03f5ad68917b864d54877a7e8b3a0ae41028b2c5ca53545c4febf0194b36b4c8074c23143f7c931dd7fce47011205441292bf9f84a7 WHIRLPOOL 4b0549fef78560ac248432e67cda96257c11447b048e519839891d5265a3a601f1b67e28943799e06ab8ac26cb49f4883070a8db25e0186169d591892e33d34c
 EBUILD ardour-3.5.14.ebuild 2729 SHA256 0d14003a5a74ef508d95bfa63ce7ea05fc0c02053fccc051ba13beb97808ae0b SHA512 a5273a808ea770efb4195fe2efd4e2c5f06a6f0d4c20e718cc66e257f426c5353d8f49ac690fccd1714c03b8180b7a016739b0f906f83b30223dca81b6f47c58 WHIRLPOOL abc3c7c23162e8330bd811ba9b0f5be6614c752d9bf898f12bd0ac39ca7060c8961d8d5f7795c5d07a99719e37ad4665b50fe34081a9dc91d5a361c779d4112b
 EBUILD ardour-3.5.143.ebuild 3016 SHA256 a8da0e03d4549f618b89109c5089a7a92455d09d8d2e7a75f8eca6ecd2ee3117 SHA512 d7b52cd134c02e48dcfb849cef0f8843d67c6c5a1c30d162691263cfc649a47e05e10061a85830bc3123eba133cc1e8579ec3c445804d85600b1c3418989db45 WHIRLPOOL 83431687aae7d6eee6777dda9eea6da644c25131e7fcc978f6c1c1d389b4d50f05de75ea78514591b36ac48dc240640036475f978b6c1c61e57dca44ade5edeb
+EBUILD ardour-3.5.308-r1.ebuild 3119 SHA256 ea9b25fbed8fa708fbacb9f0e99ddb49c34fcb7a39c715d7bdee5ab7d55cb3e8 SHA512 417c0d34645a8c2fa60301b820c5496684f508237a42943c74d65c437a37e9b076b9a0fb7b7aa3424f6747068f1b4ace2e195544887a32eaa1947b0753073ee5 WHIRLPOOL 6a98dae2279d502d77f87212ce177a4f1a11135d4ee624c59d3725409b7590b5159abd320792844557bef8572c7a970d8fe92bbc825b9b5b6c2a31b462333287
 EBUILD ardour-3.5.308.ebuild 3016 SHA256 f9ad98be33fb0b24b480502951ba69d3401f881c601e3d82afb8aab246365d74 SHA512 64bef0ea966a98e91fe192ca1911f6166101f6ec0e85ddd75f15078498e30ddbf981f01c85295fa22157288b0aca5a2be431c5b30b7c89e9a74d604df9dc185c WHIRLPOOL 40105e262e4c041c3becef502cf5e40ff1b686eb6d4108bc89d4cd0429ed80474982b6a758999dec0fe50bc65a33cc2c00663b6b085903303aac427fdede87b9
 EBUILD ardour-3.5.74.ebuild 3026 SHA256 5ad264d14d03c95b834a80805213ee75bd6a5e6e7b2d792305e0e2ba2ee9180d SHA512 9a5ee4f035a4ed5a539ef69aa88317fe90b38e0b8e4f8d39780e3668a45a0520013658fe5fb706013155d401d0d23ee9034c35e35d2b0dadbdb4a557a85ccbae WHIRLPOOL 65e6a3b370fd3770b92b84d0412b3a367495e4d2dd5ccb45d31b399162c956f30c2ab686f5d486b2f07cb97d5665d2cb95afaba6fa9a9ff29fa338215a1ce8cc
-EBUILD ardour-9999.ebuild 3013 SHA256 b16a269c76e5191683a55c48e83e0df09fdc471962a13a899bf2b26fb5382d52 SHA512 a920fb76466d5276551d63e46ad781b47292f4f2149f73dc6ce6b39bf4c92a7aaa43e05615256bc65cb5e30e73ce612c4f0d262d4e35efe84c8d1ed9efe4aea8 WHIRLPOOL 8b99be8056b3797b72939ab9096837afafdd71624c2414af40524d17a64c4f2aaae2b0ff9d966dd312386faa4e94b7ae0371fbcb4f71798a67f4e6982387a2cb
-MISC ChangeLog 20678 SHA256 ab96afea63d73dbe3d5dcb2cdf61cb737c0e64a85b6ee4f98f1d4c07e74bcb33 SHA512 223979fbb6f8ca7d739a6cb06ba7eb3ec85e4ff97d6275d1d9813fb4ac91f79c1ebf1e09f6d34f1c20a095372d42bae4f1376594b414acc0e139d025f623c044 WHIRLPOOL 8d267da9db591eea351f08008b244693061013d1295612c42aba919fa16e56a0734497991eeadbfc399c34e89a7e7298498d8b9f55bd0144b589a190bf68a769
+EBUILD ardour-9999.ebuild 3113 SHA256 acca9097fbcd869072e3716871b65355abcc0679fba55a006b0da12925012a7b SHA512 d47064a2471725317f07a2f7e881bec955611f2030f3ad4cb2430a2b1c8c204a4bcf31f43dc0bbe0de08f5e83226367b2aaa140d04a805c9e4cbda8557643365 WHIRLPOOL 40dd9d07e4a912be5ae8a0d0c31dd5e33f5c22c353265101569687219bf292dcbe723750cf8cf095d5d2c55d6a28d518f387d2f38c99f0f9fc2e57c0154cf19d
+MISC ChangeLog 20866 SHA256 263eb8c37cedc4a3b1dd17f0fe2c3cf2063633b33c625b1ce5aa349c91e4120d SHA512 56c081e5b4f3bcb9f364596f029ebe0c5232cc03e8bdff659832810994e6dcd0a29e4c4c4d865a5d5d6fe8e700c39e91ab7f8bf791271ec0ad26e0a4af1b93ea WHIRLPOOL aefd7d66845113fdaeb8c59ba5ceca6d2d75bd45ad15767b7c615ddb98c5e4be5b7de9e3f75352b8a198a057721e9245b951a084b804aa90d69a4abd9399c3c0
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLpAxwACgkQakKUmsHeVLKnfACeLPY3OA8P40D7etMauGvklAl3
-XmIAn1pgTM2HZV1ZMMKTeSkGqyBsSwhO
-=Y1s1
+iEYEAREIAAYFAlL06uEACgkQakKUmsHeVLLT7QCfZyuilff8b+BlIJDHtlaHUSYG
+FGUAn2a8W5sJOH/XpfFbUuWqKFG3JH5C
+=sIdJ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.5.308-r1.ebuild b/media-sound/ardour/ardour-3.5.308-r1.ebuild
new file mode 100644
index 000000000000..82cfc846235a
--- /dev/null
+++ b/media-sound/ardour/ardour-3.5.308-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.308-r1.ebuild,v 1.1 2014/02/07 14:22:45 nativemad Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs flag-o-matic 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="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
+		>=media-libs/lv2-1.4.0
+	)"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+		PVTEMP=`echo "${PV}" | sed "s/\./-/2"`
+		sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+
+	fi
+	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
+	sed 's/python/python2/' -i waf
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
+}
+
+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" || echo "--optimize") \
+		$((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
+}
+
+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 6afacdd1e4b1..7b1cb4796062 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.6 2014/01/16 08:16:34 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.7 2014/02/07 14:22:45 nativemad Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -86,6 +86,7 @@ src_prepare(){
 	fi
 	epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch
 	sed 's/python/python2/' -i waf
+	sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript
 }
 
 src_configure() {
@@ -97,7 +98,7 @@ src_configure() {
 		--configdir=/etc \
 		$(use lv2 && echo "--lv2" || echo "--no-lv2") \
 		$(use nls && echo "--nls" || echo "--no-nls") \
-		$(use debug && echo "--stl-debug") \
+		$(use debug && echo "--stl-debug" || echo "--optimize") \
 		$((use altivec || use sse) && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }