commit: 8070e24f0d096ad0c4df319f87f6550bd4ee7388 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Sun Sep 11 21:58:12 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Sep 11 21:58:31 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8070e24f
sci-mathematics/octave: Remove left-over 'use jit' calls * https://github.com/gentoo/gentoo/pull/2288 Package-Manager: portage-2.3.0 sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch | 11 ----------- sci-mathematics/octave/octave-4.0.0-r1.ebuild | 2 +- sci-mathematics/octave/octave-4.0.0.ebuild | 2 +- sci-mathematics/octave/octave-4.0.1-r1.ebuild | 2 +- sci-mathematics/octave/octave-4.0.1.ebuild | 2 +- sci-mathematics/octave/octave-4.0.2-r2.ebuild | 2 +- sci-mathematics/octave/octave-4.0.3.ebuild | 2 +- 7 files changed, 6 insertions(+), 17 deletions(-) diff --git a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch b/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch deleted file mode 100644 index 72931ee..00000000 --- a/sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- octave-3.8.0-orig/libinterp/corefcn/jit-typeinfo.cc 2013-12-28 08:57:41.000000000 +1100 -+++ octave-3.8.0/libinterp/corefcn/jit-typeinfo.cc 2014-02-14 15:45:47.388031654 +1100 -@@ -872,7 +872,7 @@ - jit_operation::to_idx (const std::vector<jit_type*>& types) const - { - octave_idx_type numel = types.size (); -- numel = std::max (2, numel); -+ numel = std::max (static_cast<octave_idx_type>(2), numel); - - Array<octave_idx_type> idx (dim_vector (1, numel)); - for (octave_idx_type i = 0; i < static_cast<octave_idx_type> (types.size ()); diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild index 52f52e8..d3b1bf3 100644 --- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild +++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild @@ -147,7 +147,7 @@ src_configure() { src_compile() { emake - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi } diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild index d846668..813c601 100644 --- a/sci-mathematics/octave/octave-4.0.0.ebuild +++ b/sci-mathematics/octave/octave-4.0.0.ebuild @@ -142,7 +142,7 @@ src_configure() { src_compile() { emake - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi } diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild index 666ac67..ab22a98 100644 --- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild +++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild @@ -142,7 +142,7 @@ src_configure() { src_compile() { emake - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi } diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild index d846668..813c601 100644 --- a/sci-mathematics/octave/octave-4.0.1.ebuild +++ b/sci-mathematics/octave/octave-4.0.1.ebuild @@ -142,7 +142,7 @@ src_configure() { src_compile() { emake - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi } diff --git a/sci-mathematics/octave/octave-4.0.2-r2.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild index 666ac67..ab22a98 100644 --- a/sci-mathematics/octave/octave-4.0.2-r2.ebuild +++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild @@ -142,7 +142,7 @@ src_configure() { src_compile() { emake - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi } diff --git a/sci-mathematics/octave/octave-4.0.3.ebuild b/sci-mathematics/octave/octave-4.0.3.ebuild index 117d917..408fc9e 100644 --- a/sci-mathematics/octave/octave-4.0.3.ebuild +++ b/sci-mathematics/octave/octave-4.0.3.ebuild @@ -144,7 +144,7 @@ src_configure() { src_compile() { default - if use java || use jit ; then + if use java; then pax-mark m "${S}/src/.libs/octave-cli" fi }
