From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 31870138330 for ; Sun, 11 Sep 2016 21:58:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67015E0B68; Sun, 11 Sep 2016 21:58:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 365D6E0B68 for ; Sun, 11 Sep 2016 21:58:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A30E340834 for ; Sun, 11 Sep 2016 21:58:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 165852473 for ; Sun, 11 Sep 2016 21:58:39 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1473631111.8070e24f0d096ad0c4df319f87f6550bd4ee7388.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/files/octave-3.8.0-fix-compile.patch sci-mathematics/octave/octave-4.0.0-r1.ebuild sci-mathematics/octave/octave-4.0.0.ebuild sci-mathematics/octave/octave-4.0.1-r1.ebuild sci-mathematics/octave/octave-4.0.1.ebuild sci-mathematics/octave/octave-4.0.2-r2.ebuild sci-mathematics/octave/octave-4.0.3.ebuild X-VCS-Directories: sci-mathematics/octave/ sci-mathematics/octave/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8070e24f0d096ad0c4df319f87f6550bd4ee7388 X-VCS-Branch: master Date: Sun, 11 Sep 2016 21:58:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4063b915-72a9-41ab-b5b6-f69c3944eaee X-Archives-Hash: 2bdcb9cae29e80bcff55caefccda3b11 commit: 8070e24f0d096ad0c4df319f87f6550bd4ee7388 Author: David Seifert gentoo org> AuthorDate: Sun Sep 11 21:58:12 2016 +0000 Commit: David Seifert gentoo 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& types) const - { - octave_idx_type numel = types.size (); -- numel = std::max (2, numel); -+ numel = std::max (static_cast(2), numel); - - Array idx (dim_vector (1, numel)); - for (octave_idx_type i = 0; i < static_cast (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 }