summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2015-07-10 01:12:54 +0000
committerMark Wright <gienah@gentoo.org>2015-07-10 01:12:54 +0000
commitfedcebe38a88ccbaf225ea03edaf7293b73331c5 (patch)
treefab0708b69e3f43792894eb74b6253e58475bdcc /sci-mathematics
parentRevbump for libgudev, bug 552036. (diff)
downloadhistorical-fedcebe38a88ccbaf225ea03edaf7293b73331c5.tar.gz
historical-fedcebe38a88ccbaf225ea03edaf7293b73331c5.tar.bz2
historical-fedcebe38a88ccbaf225ea03edaf7293b73331c5.zip
Thanks to PL Hayes for pointing out in bug 554290 that it needs a fix for to work for USE=jit, llvm >= 3.5 installed, autoconf-archive not installed.
Package-Manager: portage-2.2.20/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'sci-mathematics')
-rw-r--r--sci-mathematics/octave/ChangeLog6
-rw-r--r--sci-mathematics/octave/Manifest10
-rw-r--r--sci-mathematics/octave/octave-4.0.0.ebuild9
3 files changed, 16 insertions, 9 deletions
diff --git a/sci-mathematics/octave/ChangeLog b/sci-mathematics/octave/ChangeLog
index 372f62ba3467..0aafd12c43aa 100644
--- a/sci-mathematics/octave/ChangeLog
+++ b/sci-mathematics/octave/ChangeLog
@@ -1,6 +1,10 @@
# 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.177 2015/07/09 14:24:51 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/ChangeLog,v 1.178 2015/07/10 01:12:45 gienah Exp $
+
+ 10 Jul 2015; Mark Wright <gienah@gentoo.org> octave-4.0.0.ebuild:
+ Thanks to PL Hayes for pointing out in bug 554290 that it needs a fix for to
+ work for USE=jit, llvm >= 3.5 installed, autoconf-archive not installed.
09 Jul 2015; Mark Wright <gienah@gentoo.org>
+files/octave-4.0.0-llvm-3.5-gnulib-hg.patch, octave-4.0.0.ebuild:
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 0d0e62ab6508..a64f8f266695 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -27,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 4709 SHA256 c95a303c740258fdcc06718e79891e16e1ebb1efee508e00fcc38cba0a96135c SHA512 49f86edd56e9ea1a5bbbadff48262269d2ca3d57ba43a4316cbe301ec8525b2ead157f290b46909f9c839f487762ee330bd2b9efa14b7f7a0217d48ff93899e1 WHIRLPOOL fc0f425ba1812b7aa7e0648d80924964a6a140f7ebdc2058324b3be99c26606c7947108d77033e15441116d5702d052ab54d2041c2186cf83b1450bb8935eb06
-MISC ChangeLog 41682 SHA256 0390c1b12729c5365464bc11e4dece477105e56423061243f535d11e72e149b2 SHA512 3ce251bbb042a57c8912909ca9814d55e73e896567efe57472758887fd4145ff96766f094ad191eab38eb75e2e7913995f91e4a4370a0e50812d21cc2d7d32ff WHIRLPOOL a4c61b246b3c90b0bd4e6df7b436e8861f8e84ce995fb73475253fd23573c2872858116d8ee888d064dbba1ba76f5f93835362f601eb1195bcd53e6d1f31cd34
+EBUILD octave-4.0.0.ebuild 4728 SHA256 4c64c37cd3fb087cffa42f273c8cf6cf473b572a89096a906c4d0406ba55a692 SHA512 69c98f3bd7b4cd36108a8401128aad8774433100c6629b321c06b5bfb43e9976bbf3d94dd17c82cebf3f57f6e923ec50e242d953482cd6f4e1361556a71310c3 WHIRLPOOL 436fd297124c2846193db7498c133460346aa42be272d1589c04c3a085fa7ec55c3b2e085b5666719c7c45508a2967e65f7ed7ed32b49892c92dcf5d6fbece9f
+MISC ChangeLog 41905 SHA256 3688b26c076960fc6333348eb2df642f2f8eb588413207b3dc295a2c1f50cb8e SHA512 ed629d1a6e5c0f8bb2f8e7e9a781d8e82423a50ac99f60050d41d183c39e60108cdf9709c09bf71a0a4e888c44d68be06579958d65f066473c248a348d52af85 WHIRLPOOL 0dff1cde4f4e65952c86b5a9f527b61edbb2c87320d7012f1827597bd1f04d9bec60246ecc1b2c55d05a389a5f5af35d7f579e3be9848d2ec6927d754f448060
MISC metadata.xml 1066 SHA256 e334e61be56a49bc98ef4c043256f1dacd978bff38870acbcefa7188eda0d4ff SHA512 a807577947d366ddcdd0d828e5fac276e8a1060752350f7dd680f415f56b9c50d1e2a69191ef0c55400944552181a97370f7c64c91ba1697fc4a9bd60e97b1d1 WHIRLPOOL d4d7d934483435c88c474b547d39e9153da6f1a2c31f8a6702fa2398b2104bb3ec1492ba38093f340cd3be48da42758e853db9e8e246a304b4f582ed0b2194bf
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlWepvYACgkQoBEVQmGOlx8I7gEA09dlTTFMCgNlDWtYFHLZTVle
-vLJsFualYF1qN2CpuxYA/0YTZTq54SiuXfpqLobn8e3SIxjCqM3A91klar7HWprp
-=4Ebu
+iF4EAREIAAYFAlWfPs4ACgkQoBEVQmGOlx8wNwEAtT1eWuvGfGH5M5gEfzSdaWoJ
+Bir1cl/ozti5jRbSU3oA/RvTuCos0JfS1kmuZ6ic0pD9ZLO+6ixuGyFkg2YqHmX2
+=pHvb
-----END PGP SIGNATURE-----
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 565f8416f1e9..ace67f0655ac 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.2 2015/07/09 14:24:51 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/octave/octave-4.0.0.ebuild,v 1.3 2015/07/10 01:12:45 gienah Exp $
EAPI=5
@@ -35,7 +35,9 @@ RDEPEND="
media-gfx/graphicsmagick[cxx]
media-gfx/imagemagick[cxx] ) )
java? ( >=virtual/jre-1.6.0:* )
- jit? ( >=sys-devel/autoconf-archive-2015.02.04 >=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=
@@ -88,7 +90,8 @@ src_prepare() {
fi
# Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061
- has_version ">=sys-devel/llvm-3.5" && \
+ use jit && \
+ 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-gnulib-hg.patch