A more sophisticated attempt at bug 526608

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

4 files changed, 45 insertions, 33 deletions

diff --git a/media-sound/ardour/ChangeLog b/media-sound/ardour/ChangeLog
index 5fb0ebff2637..f6d350553f3c 100644
--- a/media-sound/ardour/ChangeLog
+++ b/media-sound/ardour/ChangeLog
@@ -1,6 +1,10 @@
 # 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.135 2014/10/24 19:14:34 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.136 2014/10/27 15:58:35 nativemad Exp $
+
+  27 Oct 2014; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.403.ebuild,
+  ardour-9999.ebuild:
+  A more sophisticated attempt at bug 526608
 
   24 Oct 2014; Andreas Schuerch <nativemad@gentoo.org> ardour-9999.ebuild:
   update 9999 to 3.5.403 again
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 6c43fb4099af..2da3ae6a1755 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -20,14 +20,14 @@ EBUILD ardour-2.8.16.ebuild 2007 SHA256 4158499194ec45dae26c1d1d2dbe8de5ae4c4207
 EBUILD ardour-3.5.308-r1.ebuild 3119 SHA256 ea9b25fbed8fa708fbacb9f0e99ddb49c34fcb7a39c715d7bdee5ab7d55cb3e8 SHA512 417c0d34645a8c2fa60301b820c5496684f508237a42943c74d65c437a37e9b076b9a0fb7b7aa3424f6747068f1b4ace2e195544887a32eaa1947b0753073ee5 WHIRLPOOL 6a98dae2279d502d77f87212ce177a4f1a11135d4ee624c59d3725409b7590b5159abd320792844557bef8572c7a970d8fe92bbc825b9b5b6c2a31b462333287
 EBUILD ardour-3.5.357.ebuild 3116 SHA256 cbba15965a485f5d042e48e70a7e119068391761f91dd5c27713328228cb0250 SHA512 0a9c60fed8c20f22edd3441f60ee9eb3e00dd2606b7ae175c8f621069237bfbd44a44b56ed147faa20886f0202878d85ec19fd81795a00cf18a35c157dcabe98 WHIRLPOOL 4e846646ff18c890a672ffb752143094477f8b4707ffd035d058de59b68160e51db24a04614bfa0ebbe44d633e61e2337a1090b57a63554994415a8f9bf5cb5d
 EBUILD ardour-3.5.380.ebuild 3230 SHA256 a5f5a81d0a69585436320cc14eda035e0d31468c2d15034c834f63290b9f666d SHA512 74541abdd14081aee5a63c8ce77df304392941a9c4594ba075a27caceb37b4a559c733fffc586ca39f98d2094539b44d445ce00391650f718ed15a61b6c663cc WHIRLPOOL ea5519ddabb9e2f91bfb312bc5c9055658793279179086dd5fdc8c30234e222b8d415abafea44bf5076e5c4da70ab32042dc3314fcf4fe648740f44150887a02
-EBUILD ardour-3.5.403.ebuild 3516 SHA256 c06b4f632dcf4dea0bcb86ad0541678320b7fc92cd61baed71187f63bf2d7c40 SHA512 f99f6c8b2e88459ac9f2c55a718ded0ff9a4f5fbdb63c42313872b58a395f14e7b8be7ccd1301ad43c0a25112013a5c52ca610611747ca2df6ece554e8615f1f WHIRLPOOL 8e0ae1823a814bcf24ac0c0fb6eb17617e218ac9e90cc458bb1bbcfd6748de3a1d1de8582d2688f1e5b71f981f6cde05db205e3dea84619015b9d4a7a7e98f1d
-EBUILD ardour-9999.ebuild 3514 SHA256 d1ac1145dab016dc5f33f91e5d74768c6a3cd30c1077f94f4ca34748be0c3a62 SHA512 4310cb8cb30fa7b02f363a80ea7cbfc23a6077264a9cfe11c4fc2e515bdb726ba52548c0ebe8aa42cc9c67a443885e7441a78801fe4f2edf977bf5553db55894 WHIRLPOOL 825aa47e68335bb1baa39005c49d93ece346bbd3294e54cf028d31edd2650ea0402fb3d735fed62fe9adbbcb222e3bb0b8a37fb8e15d4ca335b76aad31320da5
-MISC ChangeLog 22177 SHA256 8b1951374dfa7d3427d4f5416c29da58894b7cb3ef17d0e68125d2dcfe6bbc69 SHA512 9c421fdc1cd0b60c830a58638b33a15bc73bddf9ac6ea0b1b4daacc76173ddcf70ce0b987cf3efc71c3da6f54b7f3384b717392c93c059241ecfc50ed7bff4ce WHIRLPOOL 3e9919a292037c917526ac44b4e66b80181993e341bdb8f877fe0902809f049340a64ec18ec2a014f77ffaead41d724ff3b671512bc54cec21769fbd07d93cd4
+EBUILD ardour-3.5.403.ebuild 3688 SHA256 6942724741c8800744746f1daabeb5a03a89da9f7258887fbc402448e41fae61 SHA512 4660ad805e0c69e45cb203c3b8a6fd6c3443cc8d01d884739ceb14ac2c25dc10d04223381535570fb33a189922ee77da7b2cdc096a8c5ebc688db400a51b9383 WHIRLPOOL 149267f3725fe5b1e0eec0d36a4a52a312144d6f86c60da21887ca2663fb57c81bb791b6eca0c79c17bfb8f663d7af37b0e0726892e38e62b1f4f8e6ccbc1ada
+EBUILD ardour-9999.ebuild 3686 SHA256 92b7a9f330a0dc9d23a098515247848f40aa70d8f7016d79795814a3ea03c988 SHA512 2121ba63319b9ff3fa3153ad9e2b7548d5fe4c26cd88aea2ef0c5e807c19e1f259fbbb5852c7d82050d6e33fbe9127517fa9873755c721dfa3754974f278450f WHIRLPOOL c5654f7fcb2133eca7c92c49aabe43a05f61e6f91a395cce03e26af0d408d1988a4a2f54bee09aabbece9ebf722a0142f9f2fb93686f8822ddf3180ec045dce8
+MISC ChangeLog 22323 SHA256 550ca63340cbe43615298f7235aa28e61e514b7db4d732955809761efa0b8976 SHA512 7c23970404fc769019c684018a1881dfd295fa03f651b15aed232df83154ac69c96000819962103b8b1e8c902c06bcb6cb9df3c01ca0d56e1f6755f3133be0d6 WHIRLPOOL fcb0a5bb4d00cff23ef55a5c51f537cad50c70a002c73dc375da5aa50eae159d9c70bcb6c13490d0a33e260177104a4dc2c9f74aa341589f77474728e5b462a1
 MISC metadata.xml 234 SHA256 20428aad08fee2f7a7507f1b456c7ee3ebccd0eba59b90bd70d78b972d2b0799 SHA512 ed4a455e15b346baee30ba9c76637a199fda7c1d7c144cee546d45e7312dc7cd1f50be64d80b0900834a5b7e3851ce82158b676696c3ee1b34809a341edca2a9 WHIRLPOOL 68998d2804aab1645e9cb386ecd149680486b967ccd65b281327247a5617ef3f7c5ee25be285a502d397e6c414db70f39111716a2fe5f7b7a012c327fbe5abae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRKpRAACgkQakKUmsHeVLJu0gCfdDUbP+kj6KhU4Hv+gbUPNf8J
-llgAn0Zop/aUQcfYa5fCbnsmynYcNRh7
-=1sTQ
+iEYEAREIAAYFAlROa50ACgkQakKUmsHeVLJU5QCfcjjzDOegiV2sVzoaOhQX44aj
+k1YAnjrUsdcVXsB40gZ2rpVgeNIl90n7
+=OZZl
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ardour/ardour-3.5.403.ebuild b/media-sound/ardour/ardour-3.5.403.ebuild
index 1e82c20a127c..459fa1cfb15b 100644
--- a/media-sound/ardour/ardour-3.5.403.ebuild
+++ b/media-sound/ardour/ardour-3.5.403.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-3.5.403.ebuild,v 1.2 2014/10/24 19:07:19 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.3 2014/10/27 15:58:35 nativemad Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -76,17 +76,6 @@ src_unpack() {
 	fi
 }
 
-pkg_pretend() {
-	if use sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				is-flag -msse || is-flag -msse2 || die "Ardour fails to build with USE=sse and an march that is not sse capable, unless the -msse or -msse2 cflag are set also!"
-			fi
-		done
-	fi
-}
-
 src_prepare(){
 	if ! [ ${PV} = 9999 ]; then
 		PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
@@ -102,6 +91,21 @@ src_prepare(){
 }
 
 src_configure() {
+	if use 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 \
@@ -111,7 +115,7 @@ src_configure() {
 		$(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 altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }
 
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 6f7c9e538994..9eb8e5c550cf 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.11 2014/10/24 19:14:34 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.12 2014/10/27 15:58:35 nativemad Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs flag-o-matic waf-utils
@@ -76,17 +76,6 @@ src_unpack() {
 	fi
 }
 
-pkg_pretend() {
-	if use sse; then
-		MARCH=$(get-flag march)
-		for ARCHWOSSE in i686 i486; do
-			if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
-				is-flag -msse || is-flag -msse2 || die "Ardour fails to build with USE=sse and an march that is not sse capable, unless the -msse or -msse2 cflag are set also!"
-			fi
-		done
-	fi
-}
-
 src_prepare(){
 	if ! [ ${PV} = 9999 ]; then
 		PVTEMP=$(echo "${PV}" | sed "s/\./-/2")
@@ -102,6 +91,21 @@ src_prepare(){
 }
 
 src_configure() {
+	if use 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 \
@@ -111,7 +115,7 @@ src_configure() {
 		$(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 altivec || use sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
 		$(use doc && echo "--docs")
 }