Fix Bug 554290 - sci-mathematics/octave-4.0.0 fails to build - syntax error near unexpected token -std=c++11, AX_CHECK_COMPILE_FLAG(-std=c++11,' - thanks to Nikolaos Chatzidakis for reporting, PL Hayes, Francisco Vazquez for helping. Correct --without-64 to --disable-64. Apply octave-4.0.0-llvm-3.5-gnulib-hg.patch from http://savannah.gnu.org/bugs/?41061 to fix compile error with some configurations (gcc 4.8.3 in a mostly stable chroot with llvm 3.5.0, USE=jit)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 42 insertions, 10 deletions

diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 505268d116fb..372f62ba3467 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-mathematics/octave
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.176 2015/07/07 13:25:35 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.177 2015/07/09 14:24:51 gienah Exp $
+
+  09 Jul 2015; Mark Wright <gienah@gentoo.org>
+  +files/octave-4.0.0-llvm-3.5-gnulib-hg.patch, octave-4.0.0.ebuild:
+  Fix Bug 554290 - sci-mathematics/octave-4.0.0 fails to build - syntax error
+  near unexpected token -std=c++11, AX_CHECK_COMPILE_FLAG(-std=c++11,' - thanks
+  to Nikolaos Chatzidakis for reporting, PL Hayes, Francisco Vazquez for
+  helping. Correct --without-64 to --disable-64. Apply octave-4.0.0-llvm-3.5
+  -gnulib-hg.patch from http://savannah.gnu.org/bugs/?41061 to fix compile error
+  with some configurations (gcc 4.8.3 in a mostly stable chroot with llvm 3.5.0,
+  USE=jit)
 
 *octave-4.0.0 (07 Jul 2015)
 
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1a04594d644c..0d0e62ab6508 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -16,6 +16,7 @@ AUX octave-3.8.1-imagemagick.patch 5627 SHA256 ca2ca6df409d36e0f64b6c9b5c3be6ed1
 AUX octave-3.8.1-pkgbuilddir.patch 1417 SHA256 7b2e74e3e9b713a2c52d19aa4fb4c3dd637ee4887c358027289f394342560c07 SHA512 5f1aa2e1533223832045ea418e06b6fb1276f9d16aca6cd8f0e8708bcdd0fcc67421462b40b0bd8a4fe7d98abdc2cccc2a2383fb17c12fd73c812b148b06fd30 WHIRLPOOL fe5df789a0d0bdd387423685b6ab3ae636b87a64bd6e579ac7fac80797297dee25177c86c0d1bb8e045160b153622c6bd331331d17d270128f52be00eeaec620
 AUX octave-4.0.0-imagemagick-configure.patch 812 SHA256 7b2aa394d0b48d0e10870aaa6b8cb2daa89e16be60d715ffbe138ae7e1ca29f5 SHA512 d97ca8e3cc6cf7b4a89def29e5ff9edb6d28a77b701a7318d35eeca451a53e664d98808ed23bdebeadf26752f4a19474c62ac26ff7f9e6d0cf3d2e3bf24bcdf9 WHIRLPOOL 28249758478528c12c4f694341c1ad04ef0296689db98d9fa1a4b55d6f0296db703658c5ea194553e030480f502a9cbc9852d4498001029ef4691708b706969a
 AUX octave-4.0.0-imagemagick.patch 5716 SHA256 57549fe4eb2f0766fa9128e262c8e3f0a211522f3b6f2f37262ee361984d4492 SHA512 ee4769c06848c2c1829e7cf10d03ecee998464d2bb0717de5ea056521c034a4e149b090d5fc0d8fb9e6ce424f1383a5822b7c4fadd87a0cd45804c811411aa7b WHIRLPOOL 47c7a442faa03736c01ce1f1e360ac254f171463d4c42ca8adde5041b4be4bde134687768106da4de5b6f0f7d6e6a523ddccd73e30f2683ed15d0db9b0f45c92
+AUX octave-4.0.0-llvm-3.5-gnulib-hg.patch 437 SHA256 11de2c894dd1697e1ea3383f31d3219b7887830cb72052fac64e3ee68f8cd62c SHA512 f688d53f3a5b52e2bbb70084d1c31b5afc437204d6861625cac8855b6878fc9073dfd160993bb47432838a5ead5024e9faa66760244a8123d72c2fba464b564a WHIRLPOOL ec0bfce60f6758a64f421536ecfdc9c91744ff3c39b9528bc66848802561204040f02a7f8e98b95f60153d044e672019b0bb03e3551fc6a3f710b65198d74183
 AUX octave-4.0.0-llvm-3.5.patch 4410 SHA256 34a9efce2fd1761ee8845527a707ff036dae29aa452e0c60c6e91fa4caa1d859 SHA512 9e6d048b24cf3e45b1162010ea6ad26c32b70ac12ba2f2a313832c0ecee769a329fb5ec9c216778505b9f8cdd5635685a0e397e533dc188959cd968b9b2f3726 WHIRLPOOL 02ef03bb4ca57905dec25ae79089ed79a272e64bfcc0a7d256d9c64c5edc13f35b25955197e7e3a1a0139a146c5c6c9ed1f8e5d8810edc07d136231380188894
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
 DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
@@ -26,13 +27,13 @@ EBUILD octave-3.6.4.ebuild 3483 SHA256 73d4eea329f4a6c9472121f4397c5e9e82bcd1122
 EBUILD octave-3.8.1-r1.ebuild 4521 SHA256 79f192686b5af65269752607c3fa6f413c3a777b9cda8c5f672bc61e278cfff7 SHA512 21638b34a2129760bdff9ba85c98b742586e14b7548372968110e81d1b02059543d51768d3c8e7ce6d58dad95e8b3de5f8c0e4c53a1a2ea4e5c5422e076f50e0 WHIRLPOOL 0967504b081e1ae31148375c26274d868254c3f07e672008105f7ccf7dc6e20a5d76fcb594a91328044b2092cf3056bb1c5e6dd47d03efc17f9f0318ea5127d2
 EBUILD octave-3.8.1.ebuild 6051 SHA256 b6e270b2c8204e07eb30cada3420d781901ee1792b75bf5f15798c4c749f6b72 SHA512 c207ea878c6e42f6fd896b8a41fe2fa28d4972495528916902682f8639204b452eb94ecd9715eccc7e0bb409c3619eb93f2464cfa2bdc6bc1468b9ee8a096115 WHIRLPOOL eda840e1a3cc4de42835cdfbb41ad3499a055d4d7465b381b38bd203f6890cc7c5d0f5a8e79670d84bedfac25bf640967b8822f30975cab487011ca3f3f6d1af
 EBUILD octave-3.8.2.ebuild 4521 SHA256 fde0dd1a11ada633f1ce4bdd54a9f64b431f79fb833740681681ee863273a46e SHA512 68e35025ca5eab08e47f881fe5a6f5bc65a2252446de4e84ce4eb2d4ed5c456d8e84975e4510c2b3338bcd4ffb023e7ad55e78a9cae2675c7a011772cb858ec5 WHIRLPOOL 27cd17fcd64298f0f4d3f4102f755ab90344b0f8e30877db6638ea43aa5ad72da789d641a971562430594507ef06e200d29efd28447e664a6d10abc1b6687646
-EBUILD octave-4.0.0.ebuild 4529 SHA256 e60ac736a3516d6e7404c646e27aa09de25c4f55a93c7bc1dd56d31395ed3727 SHA512 d6b14b76808023c7c48a41ea4bf40d320ac69e6581d38b6d51706a4dccd1a3c234392a64fcb1e1394294fd0a901a9c5fba63b80d72dbc3aeca98cd3afe5eebf0 WHIRLPOOL 06441c1867e0a02366ea7b8ffd3a98f403d4c2eb2579f8bebfe75fbba62068a7d324ad3893aa1a3265d2e034f35c752bbc34c690dcac736e4f3abe95a809932e
-MISC ChangeLog 41084 SHA256 282891a554b4868883f3df68cc528f4c916014133e7c2b682b61ef7fbbae0d41 SHA512 86861025a64526d7967776df6cf41b1745aefc38d1294901924ff614d19f256fde35abed35593db05427394c3cf1468937f1b42293ddc9ed603d45096bcfb858 WHIRLPOOL 80afdfed7df1357bdcf6213e9a4688b8ddb879c21b9f5dcb44c99bb5891fad79b23f9f7f4d555c35d8b3831961138d76a4e1497aa750ddac7cf563b085f69564
+EBUILD octave-4.0.0.ebuild 4709 SHA256 c95a303c740258fdcc06718e79891e16e1ebb1efee508e00fcc38cba0a96135c SHA512 49f86edd56e9ea1a5bbbadff48262269d2ca3d57ba43a4316cbe301ec8525b2ead157f290b46909f9c839f487762ee330bd2b9efa14b7f7a0217d48ff93899e1 WHIRLPOOL fc0f425ba1812b7aa7e0648d80924964a6a140f7ebdc2058324b3be99c26606c7947108d77033e15441116d5702d052ab54d2041c2186cf83b1450bb8935eb06
+MISC ChangeLog 41682 SHA256 0390c1b12729c5365464bc11e4dece477105e56423061243f535d11e72e149b2 SHA512 3ce251bbb042a57c8912909ca9814d55e73e896567efe57472758887fd4145ff96766f094ad191eab38eb75e2e7913995f91e4a4370a0e50812d21cc2d7d32ff WHIRLPOOL a4c61b246b3c90b0bd4e6df7b436e8861f8e84ce995fb73475253fd23573c2872858116d8ee888d064dbba1ba76f5f93835362f601eb1195bcd53e6d1f31cd34
 MISC metadata.xml 1066 SHA256 e334e61be56a49bc98ef4c043256f1dacd978bff38870acbcefa7188eda0d4ff SHA512 a807577947d366ddcdd0d828e5fac276e8a1060752350f7dd680f415f56b9c50d1e2a69191ef0c55400944552181a97370f7c64c91ba1697fc4a9bd60e97b1d1 WHIRLPOOL d4d7d934483435c88c474b547d39e9153da6f1a2c31f8a6702fa2398b2104bb3ec1492ba38093f340cd3be48da42758e853db9e8e246a304b4f582ed0b2194bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlWb8EYACgkQoBEVQmGOlx9IZQD9GlqLf9i5Wj398/xM1TK3wBd9
-dhMC77L4qSIWHBtdLA0BAKiveo6jpfCmE57pQMhp75mADwlasseJQyS+2o7qnMzL
-=I6rG
+iF4EAREIAAYFAlWepvYACgkQoBEVQmGOlx8I7gEA09dlTTFMCgNlDWtYFHLZTVle
+vLJsFualYF1qN2CpuxYA/0YTZTq54SiuXfpqLobn8e3SIxjCqM3A91klar7HWprp
+=4Ebu
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
new file mode 100644
index 000000000000..e74d123b6418
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
@@ -0,0 +1,19 @@
+diff -r 7f19e7f2afa2 lib/stddef.in.h
+--- a/libgnu/stddef.in.h	Sat Feb 21 06:19:32 2015 -0800
++++ b/libgnu/stddef.in.h	Fri May 01 06:01:06 2015 +0200
+@@ -82,6 +82,7 @@
+ #endif
+ 
+ /* Some platforms lack max_align_t.  */
++#ifndef _GCC_MAX_ALIGN_T
+ #if !@HAVE_MAX_ALIGN_T@
+ typedef union
+ {
+@@ -91,6 +92,7 @@
+   long int __i;
+ } max_align_t;
+ #endif
++#endif
+ 
+ #  endif /* _@GUARD_PREFIX@_STDDEF_H */
+ # endif /* _@GUARD_PREFIX@_STDDEF_H */
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index b8b77603bff7..565f8416f1e9 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.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/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.1 2015/07/07 13:25:35 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.2 2015/07/09 14:24:51 gienah Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ RDEPEND="
 			media-gfx/graphicsmagick[cxx]
 			media-gfx/imagemagick[cxx] ) )
 	java? ( >=virtual/jre-1.6.0:* )
-	jit? ( >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
+	jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
 	opengl? (
 		media-libs/freetype:2=
 		media-libs/fontconfig:1.0=
@@ -87,8 +87,10 @@ src_prepare() {
 		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
 	fi
 
+	# Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061
 	has_version ">=sys-devel/llvm-3.5" && \
-		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
 
 	# Fix bug 501756
 	sed -i \
@@ -110,7 +112,7 @@ src_configure() {
 		--localstatedir="${EPREFIX}/var/state/octave"
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--without-64
+		--disable-64
 		$(use_enable doc docs)
 		$(use_enable java)
 		$(use_enable gui)