[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: cefa83cc9eafe62faf7785efaafe4d0b2640c7cf
Author: Sam James gentoo org>
AuthorDate: Thu May 5 00:38:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu May 5 00:39:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefa83cc
sci-mathematics/octave: patch 6.4.0 for Qt as well
... given 7 doesn't seem to build with SSL?
Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James gentoo.org>
...-qtchooser-qtver.patch => octave-6.4.0-omit-qtchooser-qtver.patch} | 0
.../octave/{octave-6.4.0-r1.ebuild => octave-6.4.0-r2.ebuild} | 4 +++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
similarity index 100%
rename from sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
rename to sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
diff --git a/sci-mathematics/octave/octave-6.4.0-r1.ebuild
b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-6.4.0-r1.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r2.ebuild
index 3ef75b4b879f..23efecfc1a2a 100644
--- a/sci-mathematics/octave/octave-6.4.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
@@ -99,9 +99,12 @@ PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
+ "${FILESDIR}"/${PN}-7.1.0-omit-qtchooser-qtver.patch
)
src_prepare() {
+ default
+
# nasty prefix hacks for fltk:1 linking
if use prefix; then
use opengl && append-ldflags
-Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
@@ -110,7 +113,6 @@ src_prepare() {
# occasional fail on install, force regeneration (bug #401189)
rm doc/interpreter/contributors.texi || die
- default
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: f2d3cf076d6cb1630bbe576aeb35083a60a1ea27
Author: Sam James gentoo org>
AuthorDate: Wed May 4 23:57:24 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu May 5 00:11:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d3cf07
sci-mathematics/octave: style tweaks
Signed-off-by: Sam James gentoo.org>
...ser-qtver.patch => octave-7.1.0-omit-qtchooser-qtver.patch} | 0
sci-mathematics/octave/octave-7.1.0.ebuild | 10 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
similarity index 100%
rename from sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
rename to sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild
b/sci-mathematics/octave/octave-7.1.0.ebuild
index fe852460a5bb..29b80b554192 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -8,8 +8,8 @@ inherit autotools flag-o-matic fortran-2 java-pkg-opt-2
pax-utils qmake-utils to
DESCRIPTION="High-level interactive language for numerical computations"
HOMEPAGE="https://www.gnu.org/software/octave/;
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
+LICENSE="GPL-3"
SLOT="0/${PV}"
IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
@@ -98,10 +98,13 @@ BDEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
- "${FILESDIR}/${PN}-6.4.0-slibtool.patch"
+ "${FILESDIR}"/${PN}-6.4.0-slibtool.patch
+ "${FILESDIR}"/${PN}-7.1.0-omit-qtchooser-qtver.patch
)
src_prepare() {
+ default
+
# nasty prefix hacks for fltk:1 linking
if use prefix; then
use opengl && append-ldflags
-Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
@@ -110,9 +113,6 @@ src_prepare() {
# occasional fail on install, force regeneration (bug #401189)
rm doc/interpreter/contributors.texi || die
- default
- # patch for unknown option 'qt' (bug #839285)
- eapply "${FILESDIR}/${PN}-6.4.0-omit-qtchooser-qtver.patch"
eautoreconf
}
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 133a5fab561cdd253fcf32b426c8838ede7efba5
Author: Michael Orlitzky gentoo org>
AuthorDate: Thu Mar 17 14:26:07 2022 +
Commit: Michael Orlitzky gentoo org>
CommitDate: Thu Mar 17 14:26:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133a5fab
sci-mathematics/octave: add upstream patch for slibtool support.
Closes: https://bugs.gentoo.org/776583
Bug: https://savannah.gnu.org/bugs/?61905
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky gentoo.org>
.../octave/files/octave-6.4.0-slibtool.patch | 37 ++
sci-mathematics/octave/octave-6.4.0.ebuild | 1 +
2 files changed, 38 insertions(+)
diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
new file mode 100644
index ..1558b334d522
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User Markus Mützel
+# Date 1647451226 -3600
+# Node ID 2d394460429ff8313004ddaeea31437e90d16799
+# Parent d3123b682f63723c111a50b77716fe9349d8fb7d
+build: Parse .la files in build tree when installing .oct files (bug #61905).
+
+* Makefile.am (install-oct): Parse .la files in build tree when installing .oct
+files. That should improve compatibility with tools like `slibtool` that don't
+install .la files.
+
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
b/Makefile.am
+@@ -460,17 +460,18 @@
+ if [ -n "`cat $(OCT_FILE_PKG_ADD_FILES)`" ]; then \
+ $(INSTALL_DATA) oct-file-pkg-add $(DESTDIR)$(octfiledir)/PKG_ADD; \
+ fi
++ top_build_dir=`pwd` && \
+ cd $(DESTDIR)$(octlibdir) && \
+ for ltlib in $(OCT_FILE_LIBS); do \
+ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \
+-dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \
++dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" <
$$top_build_dir/$$ltlib`; \
+ if [ -n "$$dl" ]; then \
+ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED)
's,^lib,,; s,\.la$$,.oct,'`; \
+ else \
+ echo "error: dlname is empty in $$ltlib!"; \
+ exit 1; \
+ fi; \
+-lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" < $$f`; \
++lnames=`$(SED) -n -e "s/library_names='\([^']*\)'/\1/p" <
$$top_build_dir/$$ltlib`; \
+ if [ -n "$$lnames" ]; then \
+ rm -f $$f $$lnames $$dl; \
+ fi \
+
diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild
b/sci-mathematics/octave/octave-6.4.0.ebuild
index 4b0b6832a769..bc0547dacdd3 100644
--- a/sci-mathematics/octave/octave-6.4.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0.ebuild
@@ -97,6 +97,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+ "${FILESDIR}/${PN}-6.4.0-slibtool.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 4e5e8a1eb261f84f53cf25d1c41df734089b31db
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jun 4 13:31:58 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 4 13:32:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5e8a1e
sci-mathematics/octave: Drop 4* and 5.1.0
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
sci-mathematics/octave/Manifest| 4 -
.../octave/files/octave-4.2.0-imagemagick.patch| 139 ---
.../octave/files/octave-4.2.0-pkgbuilddir.patch| 41 -
.../octave/files/octave-4.2.0-texi.patch | 11 --
.../files/octave-4.2.0-zlib-underlinking.patch | 10 --
.../octave-4.2.2-fix-qscintilla-detection.patch| 14 --
.../files/octave-4.2.2-imagemagick-configure.patch | 16 --
.../files/octave-4.4.0-imagemagick-configure.patch | 16 --
.../octave/files/octave-4.4.0-imagemagick.patch| 22 ---
.../octave/files/octave-4.4.0-qt-5.11.patch| 10 --
sci-mathematics/octave/metadata.xml| 1 -
sci-mathematics/octave/octave-4.2.2.ebuild | 191
sci-mathematics/octave/octave-4.4.0.ebuild | 195
sci-mathematics/octave/octave-4.4.1.ebuild | 196 -
sci-mathematics/octave/octave-5.1.0.ebuild | 192
15 files changed, 1058 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 23044156fe0..62029d3b7e2 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1 @@
-DIST octave-4.2.2.tar.gz 25624087 BLAKE2B
c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a
SHA512
b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
-DIST octave-4.4.0.tar.gz 29009355 BLAKE2B
3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc
SHA512
6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
-DIST octave-4.4.1.tar.gz 28626462 BLAKE2B
0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6
SHA512
21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
-DIST octave-5.1.0.tar.gz 32034788 BLAKE2B
d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb
SHA512
a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
DIST octave-5.2.0.tar.gz 33360285 BLAKE2B
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
SHA512
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch
b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch
deleted file mode 100644
index 8fb786964c2..000
--- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch
+++ /dev/null
@@ -1,139 +0,0 @@
a/libinterp/corefcn/__magick_read__.cc
-+++ b/libinterp/corefcn/__magick_read__.cc
-@@ -39,7 +39,15 @@
-
- #if defined (HAVE_MAGICK)
-
-+#define MAGICKCORE_EXCLUDE_DEPRECATED 1
- #include
-+#if !defined(QuantumRange) && defined(MaxRGB)
-+#define QuantumRange MaxRGB
-+#endif
-+#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
-+#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
-+#endif
-+
- #include
-
- // In theory, it should be enough to check the class:
-@@ -121,6 +129,9 @@
- get_depth (Magick::Image& img)
- {
- octave_idx_type depth = img.depth ();
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#define Magick MagickCore
-+#endif
- if (depth == 8
- && img.channelDepth (Magick::RedChannel) == 1
- && img.channelDepth (Magick::GreenChannel) == 1
-@@ -132,6 +143,9 @@
- && img.channelDepth (Magick::OpacityChannel) == 1
- && img.channelDepth (Magick::GrayChannel)== 1)
- depth = 1;
-+#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
-+#undef Magick
-+#endif
-
- return depth;
- }
-@@ -355,7 +369,10 @@
- if (imvec[def_elem].depth () == 32)
- divisor = std::numeric_limits::max ();
- else
--divisor = MaxRGB / ((uint64_t (1) << imvec[def_elem].depth ()) - 1);
-+{
-+ using namespace Magick;
-+ divisor = QuantumRange / ((uint64_t (1) << imvec[def_elem].depth ()) -
1);
-+}
-
- // FIXME: this workaround should probably
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 28712fe5aac4a7328f54bfc23bab8e0a10343a19
Author: Benda Xu gentoo org>
AuthorDate: Sun Aug 25 01:10:13 2019 +
Commit: Benda XU gentoo org>
CommitDate: Sun Aug 25 01:12:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28712fe5
sci-mathematics/octave: Bump to 5.1.0.
Adopted to ${PN}-5.1.0-pkgbuilddir.patch with minor changes.
Removed --without-OSMesa as the option is no longer available.
Removed --Wl,-z defs, because upstream designed the related objects
as loadable plugins.
Reference: http://savannah.gnu.org/bugs/?53627
Suggested-By: Fabio Rossi
Bug: https://bugs.gentoo.org/593670
Closes: https://bugs.gentoo.org/661048
Closes: https://bugs.gentoo.org/679654
Signed-off-by: Benda Xu gentoo.org>
sci-mathematics/octave/Manifest| 1 +
.../octave/files/octave-5.1.0-pkgbuilddir.patch| 43 +
sci-mathematics/octave/octave-5.1.0.ebuild | 192 +
3 files changed, 236 insertions(+)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index c3fe75910f0..2292bb1be34 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
DIST octave-4.2.2.tar.gz 25624087 BLAKE2B
c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a
SHA512
b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
DIST octave-4.4.0.tar.gz 29009355 BLAKE2B
3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc
SHA512
6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
DIST octave-4.4.1.tar.gz 28626462 BLAKE2B
0ea7a9b5840c7afdf20dff36e896b37c1c69eb8799ba48722c02f9636591b849f26f56720a75293c11c1000d0088e07373aa84ef7d360436eb095fc0a2e721a6
SHA512
21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
+DIST octave-5.1.0.tar.gz 32034788 BLAKE2B
d387f41f6ae826b35735fc4208d71be84076a81544f5cd0e3d5410f41a70eebb5b0b3bbf19e4344b88901869d54f2759259dc374c44a430f681d3b0c32cb02cb
SHA512
a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
diff --git a/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch
b/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch
new file mode 100644
index 000..56a133b7f35
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-5.1.0-pkgbuilddir.patch
@@ -0,0 +1,43 @@
+Index: octave-5.1.0/scripts/pkg/private/install.m
+===
+--- octave-5.1.0.orig/scripts/pkg/private/install.m
octave-5.1.0/scripts/pkg/private/install.m
+@@ -62,7 +62,14 @@ function install (files, handle_deps, pr
+ for i = 1:length (files)
+ tgz = files{i};
+
+- if (exist (tgz, "file"))
++ ## The filename pointed to an uncompressed package to begin with.
++ if (exist (tgz, "dir"))
++if (tgz(1) == '/')
++ packdir = tgz;
++else
++ packdir = fullfile (pwd(), tgz);
++endif
++ elseif (exist (tgz, "file"))
+ ## Create a temporary directory.
+ tmpdir = tempname ();
+ tmpdirs{end+1} = tmpdir;
+@@ -89,20 +96,12 @@ function install (files, handle_deps, pr
+ if (length (dirlist) > 3)
+ error ("bundles of packages are not allowed");
+ endif
+- endif
+
+- ## The filename pointed to an uncompressed package to begin with.
+- if (isfolder (tgz))
+-dirlist = {".", "..", tgz};
++## The two first entries of dirlist are "." and "..".
++packdir = fullfile (tmpdir, dirlist{3});
+ endif
+
+ if (exist (tgz, "file") || isfolder (tgz))
+-## The two first entries of dirlist are "." and "..".
+-if (exist (tgz, "file"))
+- packdir = fullfile (tmpdir, dirlist{3});
+-else
+- packdir = fullfile (pwd (), dirlist{3});
+-endif
+ packdirs{end+1} = packdir;
+
+ ## Make sure the package contains necessary files.
diff --git a/sci-mathematics/octave/octave-5.1.0.ebuild
b/sci-mathematics/octave/octave-5.1.0.ebuild
new file mode 100644
index 000..f347d4a6cfb
--- /dev/null
+++ b/sci-mathematics/octave/octave-5.1.0.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 gnome2-utils java-pkg-opt-2 pax-utils
toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/;
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: dfc6d810f76e3d9777f622a8108b0cbf060b1c04
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Apr 7 17:56:46 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Apr 7 20:48:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfc6d810
sci-mathematics/octave: Drop 4.2.1
Package-Manager: Portage-2.3.28, Repoman-2.3.9
sci-mathematics/octave/Manifest| 1 -
.../octave-4.2.0-fix-qscintilla-detection.patch| 14 --
.../files/octave-4.2.0-imagemagick-configure.patch | 16 --
.../files/octave-4.2.0-ncurses-pkgconfig.patch | 37
sci-mathematics/octave/octave-4.2.1.ebuild | 187 -
5 files changed, 255 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 7bc14e5915b..5a47e212d7a 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1 @@
-DIST octave-4.2.1.tar.gz 25409651 BLAKE2B
c53dd025cbad023d4d343d47ff13051f6f66bc8cfeece6c56eda83a80c92d2256fd1e75d5574ae024e42d707eb22b60420269f91a4930642aec8e3391a17b035
SHA512
c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7
DIST octave-4.2.2.tar.gz 25624087 BLAKE2B
c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a
SHA512
b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
diff --git
a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
deleted file mode 100644
index ea714ecbfbb..000
--- a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-In Gentoo, QScintilla for Qt5 has the same library name
-as its Qt4 variant.
-
a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1327,7 +1327,7 @@
- ;;
- 5)
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
- ;;
- *)
- AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git
a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch
b/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch
deleted file mode 100644
index d5b2870185b..000
--- a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/configure.ac
-+++ b/configure.ac
-@@ -1560,11 +1560,11 @@
- MAGICK_LIBS=
-
- PKG_CHECK_EXISTS([$magick++], [
--## Make sure we only get -I, -L, and -l flags. Some
Graphics/ImageMagick++
-+## Make sure we only get -I, -D, -L, and -l flags. Some
Graphics/ImageMagick++
- ## packages add extra flags that are useful when building
- ## Graphics/ImageMagick++ extentions. These extra flags break the
- ## Octave build.
--MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++`
-+MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e
's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'`
- MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++`
- MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++`
-
diff --git a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch
b/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch
deleted file mode 100644
index 89f6f6e7014..000
--- a/sci-mathematics/octave/files/octave-4.2.0-ncurses-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
a/m4/acinclude.m4
-+++ b/m4/acinclude.m4
-@@ -1194,32 +1194,8 @@
- dnl Find a suitable termlib to use.
- dnl
- AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
-- TERM_LIBS=
-- ac_octave_save_LIBS="$LIBS"
-- AC_SEARCH_LIBS([tputs],
-- [ncurses curses termcap terminfo termlib],
-- [], [])
-- LIBS="$ac_octave_save_LIBS"
-- case "$ac_cv_search_tputs" in
---l*)
-- TERM_LIBS="$ac_cv_search_tputs"
--;;
--no)
-- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses,
-lcurses, or -ltermlib!"
-- AC_MSG_WARN([$warn_termlibs])
--;;
-- esac
--
--dnl Old code (9/9/2012). Delete when new code is definitely proven.
--dnl
--dnl for _termlib in ncurses curses termcap terminfo termlib; do
--dnlAC_CHECK_LIB([${_termlib}], [tputs], [
--dnl TERM_LIBS="-l${termlib}"
--dnl octave_cv_lib_found_termlib=yes
--dnl break])
--dnl done
--
-- AC_SUBST(TERM_LIBS)
-+ PKG_CHECK_MODULES([TERM], [ncurses])
-+ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}"
- ])
- dnl
- dnl Check for the Qhull version.
diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild
b/sci-mathematics/octave/octave-4.2.1.ebuild
deleted file mode 100644
index e7ecf516cc4..000
---
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 3613246e32e9e7d129f8b2bb981b816bdc6dd8c4
Author: Jouni Kosonen tukesoft com>
AuthorDate: Wed Mar 21 15:51:38 2018 +
Commit: Patrice Clement gentoo org>
CommitDate: Wed Mar 21 22:04:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3613246e
sci-mathematics/octave: version bump to 4.2.2.
Closes: https://bugs.gentoo.org/650974
Closes: https://github.com/gentoo/gentoo/pull/7534
sci-mathematics/octave/Manifest| 1 +
.../octave-4.2.2-fix-qscintilla-detection.patch| 14 ++
.../files/octave-4.2.2-imagemagick-configure.patch | 16 ++
.../files/octave-4.2.2-ncurses-pkgconfig.patch | 37
sci-mathematics/octave/octave-4.2.2.ebuild | 187 +
5 files changed, 255 insertions(+)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 071b0414714..7bc14e5915b 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
DIST octave-4.2.1.tar.gz 25409651 BLAKE2B
c53dd025cbad023d4d343d47ff13051f6f66bc8cfeece6c56eda83a80c92d2256fd1e75d5574ae024e42d707eb22b60420269f91a4930642aec8e3391a17b035
SHA512
c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7
+DIST octave-4.2.2.tar.gz 25624087 BLAKE2B
c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a
SHA512
b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
diff --git
a/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch
b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch
new file mode 100644
index 000..80fc2801323
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.2.2-fix-qscintilla-detection.patch
@@ -0,0 +1,14 @@
+In Gentoo, QScintilla for Qt5 has the same library name
+as its Qt4 variant.
+
+--- a/m4/acinclude.m4
b/m4/acinclude.m4
+@@ -1460,7 +1460,7 @@
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5
qt5scintilla2"
++ octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
+ ;;
+ *)
+ AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git
a/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch
b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch
new file mode 100644
index 000..d80c23ec422
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.2.2-imagemagick-configure.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
b/configure.ac
+@@ -1560,11 +1560,11 @@ if test $check_magick = yes; then
+ MAGICK_LIBS=
+
+ PKG_CHECK_EXISTS([$magick++], [
+-## Make sure we only get -I, -L, and -l flags. Some
Graphics/ImageMagick++
++## Make sure we only get -I, -D, -L, and -l flags. Some
Graphics/ImageMagick++
+ ## packages add extra flags that are useful when building
+ ## Graphics/ImageMagick++ extentions. These extra flags break the
+ ## Octave build.
+-MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^
*$//')"
++MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^
*$//' | $SED -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g')"
+ MAGICK_LDFLAGS="$($PKG_CONFIG --libs-only-L $magick++ | $SED -e 's/^
*$//')"
+ MAGICK_LIBS="$($PKG_CONFIG --libs-only-l $magick++ | $SED -e 's/^ *$//')"
+
diff --git a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
new file mode 100644
index 000..d20fef5c56e
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
@@ -0,0 +1,37 @@
+--- a/m4/acinclude.m4
b/m4/acinclude.m4
+@@ -1327,32 +1327,8 @@
+ dnl Find a suitable termlib to use.
+ dnl
+ AC_DEFUN([OCTAVE_CHECK_LIB_TERMLIB], [
+- TERM_LIBS=
+- ac_octave_save_LIBS="$LIBS"
+- AC_SEARCH_LIBS([tputs],
+- [ncurses curses termcap terminfo termlib],
+- [], [])
+- LIBS="$ac_octave_save_LIBS"
+- case "$ac_cv_search_tputs" in
+--l*)
+- TERM_LIBS="$ac_cv_search_tputs"
+-;;
+-no)
+- warn_termlibs="I couldn't find -ltermcap, -lterminfo, -lncurses,
-lcurses, or -ltermlib!"
+- AC_MSG_WARN([$warn_termlibs])
+-;;
+- esac
+-
+-dnl Old code (9/9/2012). Delete when new code is definitely proven.
+-dnl
+-dnl for _termlib in ncurses curses termcap terminfo termlib; do
+-dnlAC_CHECK_LIB([${_termlib}], [tputs], [
+-dnl TERM_LIBS="-l${termlib}"
+-dnl octave_cv_lib_found_termlib=yes
+-dnl break])
+-dnl done
+-
+- AC_SUBST(TERM_LIBS)
++ PKG_CHECK_MODULES([TERM], [ncurses])
++ CPPFLAGS="${CPPFLAGS} ${TERM_CFLAGS}"
+ ])
+ dnl
+ dnl Check for the Qhull
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 1842a17a0dacbcf414630b07b2e9a79bca455ddb
Author: David Seifert gentoo org>
AuthorDate: Thu Dec 22 20:58:56 2016 +
Commit: David Seifert gentoo org>
CommitDate: Thu Dec 22 22:32:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1842a17a
sci-mathematics/octave: Fix QScintilla detection for Qt5
Gentoo-bug: 600482
* Also bring back USE=gui flag
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../files/octave-4.2.0-fix-qscintilla-detection.patch | 14 ++
.../{octave-4.2.0-r1.ebuild => octave-4.2.0-r2.ebuild} | 9 +
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git
a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
new file mode 100644
index ..9d18b6a
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch
@@ -0,0 +1,14 @@
+In Gentoo, QScintilla for Qt5 has the same library name
+as its Qt4 variant.
+
+--- a/m4/acinclude.m4
b/m4/acinclude.m4
+@@ -1327,7 +1327,7 @@
+ ;;
+ 5)
+ QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
+- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
++ octave_qscintilla_libnames=qscintilla2
+ ;;
+ *)
+ AC_MSG_ERROR([Unrecognized Qt version $qt_version])
diff --git a/sci-mathematics/octave/octave-4.2.0-r1.ebuild
b/sci-mathematics/octave/octave-4.2.0-r2.ebuild
similarity index 94%
rename from sci-mathematics/octave/octave-4.2.0-r1.ebuild
rename to sci-mathematics/octave/octave-4.2.0-r2.ebuild
index 331bf04..c2a64e2 100644
--- a/sci-mathematics/octave/octave-4.2.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r2.ebuild
@@ -12,8 +12,8 @@ HOMEPAGE="http://www.octave.org/;
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick java opengl
openssl
- portaudio postscript +qhull +qrupdate qt5 readline sndfile +sparse
static-libs X zlib"
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java
opengl openssl
+ portaudio postscript +qhull +qrupdate readline sndfile +sparse
static-libs X zlib"
REQUIRED_USE="?? ( graphicsmagick imagemagick )"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
@@ -47,7 +47,7 @@ RDEPEND="
media-gfx/transfig )
qhull? ( media-libs/qhull:0= )
qrupdate? ( sci-libs/qrupdate:0= )
- qt5? (
+ gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -85,6 +85,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
"${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch
"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+ "${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch
)
src_prepare() {
@@ -143,7 +144,7 @@ src_configure() {
$(use_with portaudio) \
$(use_with qhull) \
$(use_with qrupdate) \
- $(use_with qt5 qt 5) \
+ $(use_with gui qt 5) \
$(use_with sndfile) \
$(use_with sparse arpack) \
$(use_with sparse umfpack) \
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 40582ca0015450d47be3b2ff4a7390cbbb56b7c0 Author: David Seifert gentoo org> AuthorDate: Sun Nov 20 18:23:32 2016 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 20 19:23:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40582ca0 sci-mathematics/octave: Version bump to 4.2.0 Gentoo-bug: 594794 * Add USE="openssl" * Add USE="portaudio" * Add USE="sndfile" * GUI provided with USE="qt5" * Replace EROOT in src_install Package-Manager: portage-2.3.2 sci-mathematics/octave/Manifest| 1 + ...le-getcwd-path-max-test-as-it-is-too-slow.patch | 11 ++ .../files/octave-4.2.0-imagemagick-configure.patch | 16 ++ .../octave/files/octave-4.2.0-imagemagick.patch| 139 .../files/octave-4.2.0-ncurses-pkgconfig.patch | 37 + .../octave/files/octave-4.2.0-pkgbuilddir.patch| 41 + .../octave/files/octave-4.2.0-texi.patch | 11 ++ .../files/octave-4.2.0-zlib-underlinking.patch | 10 ++ sci-mathematics/octave/metadata.xml| 9 +- sci-mathematics/octave/octave-4.2.0.ebuild | 176 + 10 files changed, 445 insertions(+), 6 deletions(-) diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index 3aa2d42..516c99f 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -4,3 +4,4 @@ DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0 DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a4de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb DIST octave-4.0.2.tar.xz 15668728 SHA256 98c11ecead8ea759eb1d010ad6319a63a1c6199d3a7e2abbafe453c753090403 SHA512 e79d43528d47a2b3f0fbc9e43eefd5fb8e199dd3818ffd745c1424c7cfca9397186dab129b6f61ee52f5c5203d613e5290d8dc5e32b318cfdd3d38f7facf63cd WHIRLPOOL bf870ef3b6affb4a157951d99132078f528b52be403f7d01bfd98fd657d4089ebbf5fb78f340ce18e59ae27d5eddb9edbbf76583810bcf2dbd5c9ce8ea3434cd DIST octave-4.0.3.tar.xz 15697064 SHA256 dc2bec8c68fa5733a5847563634b1729356a84f3a5071008ecdb793293f0aa85 SHA512 bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d WHIRLPOOL 69546306417c85b65ae371035be906d5968b1af358ba16ff3c979a925766be92b933d386b6b594c70befaf8ddd95cf27fcd94934c03713688d05141e86a92dd0 +DIST octave-4.2.0.tar.gz 25320153 SHA256 443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567 SHA512 5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678 WHIRLPOOL b5973f4e96aa4785436afa7fcc637cce021e4b5e93c3368f61712c808191bc26e3ece9d649f0b99e3df03672cb6df16c28cad931f3317b555f4f3167e4092f34 diff --git a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch b/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch new file mode 100644 index ..f6fa7be --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch @@ -0,0 +1,11 @@ +--- a/m4/getcwd.m4 b/m4/getcwd.m4 +@@ -110,7 +110,7 @@ + + gl_abort_bug=no + case "$host_os" in +-mingw*) ++*-gnu* | gnu* | mingw*) + gl_cv_func_getcwd_path_max=yes + ;; + *) diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch new file mode 100644 index ..d5b2870 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.0-imagemagick-configure.patch @@ -0,0 +1,16 @@ +--- a/configure.ac b/configure.ac +@@ -1560,11 +1560,11 @@ + MAGICK_LIBS= + + PKG_CHECK_EXISTS([$magick++], [ +-## Make sure we only get -I, -L, and -l flags. Some Graphics/ImageMagick++ ++## Make sure we only get -I, -D, -L, and -l flags. Some Graphics/ImageMagick++ + ## packages add extra flags that are useful when building + ## Graphics/ImageMagick++ extentions. These extra flags break the + ## Octave build. +-MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags-only-I $magick++` ++MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | sed -e 's/\(-@<:@DI@:>@@<:@^ \t@:>@*\)\|\(-@<:@^ \t@:>@*\)/\1/g'` + MAGICK_LDFLAGS=`$PKG_CONFIG --libs-only-L $magick++` + MAGICK_LIBS=`$PKG_CONFIG --libs-only-l $magick++` + diff --git a/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch new file mode 100644 index ..8fb7869 --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.0-imagemagick.patch @@ -0,0 +1,139 @@ +---
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: d6473d63d7750c68812a1f5f8da79e4548b752bb
Author: David Seifert gentoo org>
AuthorDate: Sat Sep 10 11:36:28 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Sep 11 08:48:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6473d63
sci-mathematics/octave: Remove USE=jit
Gentoo-Bug: 588098
* USE=jit has become a liability instead of a feature for
Gentoo. The JIT support within octave requires old versions
of LLVM, which are broken and unsupported.
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2288
Signed-off-by: David Seifert gentoo.org>
.../files/octave-4.0.0-llvm-3.5-gnulib-hg.patch| 19 ---
.../octave/files/octave-4.0.0-llvm-3.5.patch | 130 -
sci-mathematics/octave/metadata.xml| 1 -
sci-mathematics/octave/octave-4.0.0-r1.ebuild | 13 +--
sci-mathematics/octave/octave-4.0.0.ebuild | 13 +--
sci-mathematics/octave/octave-4.0.1-r1.ebuild | 13 +--
sci-mathematics/octave/octave-4.0.1.ebuild | 13 +--
sci-mathematics/octave/octave-4.0.2-r2.ebuild | 13 +--
sci-mathematics/octave/octave-4.0.3.ebuild | 13 +--
9 files changed, 12 insertions(+), 216 deletions(-)
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
deleted file mode 100644
index e74d123..
--- a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5-gnulib-hg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-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/files/octave-4.0.0-llvm-3.5.patch
b/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5.patch
deleted file mode 100644
index 31b1bed..
--- a/sci-mathematics/octave/files/octave-4.0.0-llvm-3.5.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -r 3797df921988 configure.ac
a/configure.ac Wed Apr 29 17:09:24 2015 -0700
-+++ b/configure.ac Sun May 03 22:48:56 2015 +0200
-@@ -815,8 +815,13 @@
- AC_MSG_NOTICE([using -isystem for LLVM headers])])
-
- dnl Use -isystem so we don't get warnings from llvm headers
--LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
--LLVM_CXXFLAGS=
-+AX_CHECK_COMPILE_FLAG([-std=c++11],[
-+ LLVM_CPPFLAGS="-std=c++11 $LLVM_INCLUDE_FLAG `$LLVM_CONFIG
--includedir`"
-+ LLVM_CXXFLAGS="-std=c++11"
-+],[
-+ LLVM_CPPFLAGS="$LLVM_INCLUDE_FLAG `$LLVM_CONFIG --includedir`"
-+ LLVM_CXXFLAGS=
-+])
- LLVM_LDFLAGS="-L`$LLVM_CONFIG --libdir`"
-
-
-@@ -860,6 +865,8 @@
- OCTAVE_LLVM_CALLINST_ADDATTRIBUTE_API
- OCTAVE_LLVM_RAW_FD_OSTREAM_API
- OCTAVE_LLVM_LEGACY_PASSMANAGER_API
-+OCTAVE_LLVM_DATALAYOUTPASS_API
-+
- AC_LANG_POP(C++)
- CPPFLAGS="$save_CPPFLAGS"
- CXXFLAGS="$save_CXXFLAGS"
-diff -r 3797df921988 libinterp/corefcn/jit-typeinfo.cc
a/libinterp/corefcn/jit-typeinfo.ccWed Apr 29 17:09:24 2015 -0700
-+++ b/libinterp/corefcn/jit-typeinfo.ccSun May 03 22:48:56 2015 +0200
-@@ -1208,7 +1208,7 @@
- for (int op = 0; op < octave_value::num_binary_ops; ++op)
- {
- llvm::Twine fn_name ("octave_jit_binary_any_any_");
-- fn_name = fn_name + llvm::Twine (op);
-+ fn_name.concat( llvm::Twine (op) );
-
- fn = create_internal (fn_name, any, any, any);
- fn.mark_can_error ();
-diff -r 3797df921988 libinterp/corefcn/pt-jit.cc
a/libinterp/corefcn/pt-jit.cc Wed Apr 29 17:09:24 2015 -0700
-+++ b/libinterp/corefcn/pt-jit.cc Sun May 03 22:48:56 2015 +0200
-@@ -59,6 +59,7 @@
-
- #include
- #include
-+#include
- #include
-
- #ifdef LEGACY_PASSMANAGER
-@@ -83,6 +84,7 @@
- #include
- #endif
-
-+#include
- #include
- #include
-
-@@ -2077,7 +2079,11 @@
- module_pass_manager->add (llvm::createAlwaysInlinerPass ());
-
- #ifdef HAVE_LLVM_DATALAYOUT
-+#ifdef HAVE_LLVM_DATALAYOUTPASS
-+ pass_manager->add (new llvm::DataLayoutPass (*engine->getDataLayout ()));
-+#else
- pass_manager->add (new llvm::DataLayout (*engine->getDataLayout ()));
-+#endif
- #else
- pass_manager->add (new llvm::TargetData (*engine->getTargetData ()));
- #endif
-@@ -2192,7 +2198,7 @@
- std::string error;
- #ifdef RAW_FD_OSTREAM_ARG_IS_LLVM_SYS_FS
- llvm::raw_fd_ostream fout ("test.bc", error,
-- llvm::sys::fs::F_Binary);
-+ llvm::sys::fs::F_Text);
- #else
- llvm::raw_fd_ostream fout ("test.bc", error,
-
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 209273b20054ce83a2aa71c62d256dea7e564cc6
Author: David Seifert gentoo org>
AuthorDate: Sun Aug 21 09:02:05 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sun Aug 21 09:03:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209273b2
sci-mathematics/octave: version bump
Gentoo-bug: 590676, 590792
* EAPI=6
* Make patches -p1 compliant
* Use pkg-config for finding curses flags
Package-Manager: portage-2.3.0
sci-mathematics/octave/Manifest| 1 +
.../octave/files/octave-3.4.3-texi.patch | 4 +-
.../octave/files/octave-3.8.1-pkgbuilddir.patch| 4 +-
.../octave/files/octave-4.0.3-imagemagick.patch| 139
.../files/octave-4.0.3-ncurses-pkgconfig.patch | 42 +
sci-mathematics/octave/octave-4.0.3.ebuild | 175 +
6 files changed, 361 insertions(+), 4 deletions(-)
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 30a329a..3aa2d42 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,3 +3,4 @@ DIST octave-3.8.2.tar.bz2 17834980 SHA256
83bbd701aab04e7e57d0d5b8373dd54719bebb
DIST octave-4.0.0.tar.xz 15759196 SHA256
cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512
54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89
WHIRLPOOL
0e0154dac5ac76268d99533186a88f54bc811817cdfc3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
DIST octave-4.0.1.tar.xz 15637340 SHA256
d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512
7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798
WHIRLPOOL
7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a4de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb
DIST octave-4.0.2.tar.xz 15668728 SHA256
98c11ecead8ea759eb1d010ad6319a63a1c6199d3a7e2abbafe453c753090403 SHA512
e79d43528d47a2b3f0fbc9e43eefd5fb8e199dd3818ffd745c1424c7cfca9397186dab129b6f61ee52f5c5203d613e5290d8dc5e32b318cfdd3d38f7facf63cd
WHIRLPOOL
bf870ef3b6affb4a157951d99132078f528b52be403f7d01bfd98fd657d4089ebbf5fb78f340ce18e59ae27d5eddb9edbbf76583810bcf2dbd5c9ce8ea3434cd
+DIST octave-4.0.3.tar.xz 15697064 SHA256
dc2bec8c68fa5733a5847563634b1729356a84f3a5071008ecdb793293f0aa85 SHA512
bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d
WHIRLPOOL
69546306417c85b65ae371035be906d5968b1af358ba16ff3c979a925766be92b933d386b6b594c70befaf8ddd95cf27fcd94934c03713688d05141e86a92dd0
diff --git a/sci-mathematics/octave/files/octave-3.4.3-texi.patch
b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
index 661ddae..2ce38b2 100644
--- a/sci-mathematics/octave/files/octave-3.4.3-texi.patch
+++ b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
@@ -1,5 +1,5 @@
doc/interpreter/Makefile.am.orig 2012-01-31 17:47:52.0 +
-+++ doc/interpreter/Makefile.am2012-01-31 17:49:37.0 +
+--- a/doc/interpreter/Makefile.am
b/doc/interpreter/Makefile.am
@@ -202,6 +202,8 @@
$(AWK) -f $(srcdir)/mkcontrib.awk $(srcdir)/contributors.in > $@-t
mv $@-t $@
diff --git a/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
b/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
index 98fe3d5..5cb2784 100644
--- a/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
+++ b/sci-mathematics/octave/files/octave-3.8.1-pkgbuilddir.patch
@@ -1,5 +1,5 @@
scripts/pkg/private/install.m.orig 2014-04-15 08:45:55.487258887 -0700
-+++ scripts/pkg/private/install.m 2014-04-15 12:12:40.985606248 -0700
+--- a/scripts/pkg/private/install.m
b/scripts/pkg/private/install.m
@@ -62,7 +62,14 @@
for i = 1:length (files)
tgz = files{i};
diff --git a/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch
b/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch
new file mode 100644
index 000..5ad31c2
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.0.3-imagemagick.patch
@@ -0,0 +1,139 @@
+--- octave-4.0.3/libinterp/corefcn/__magick_read__.cc
octave-4.0.3/libinterp/corefcn/__magick_read__.cc
+@@ -38,8 +38,15 @@
+ #include "gripes.h"
+
+ #ifdef HAVE_MAGICK
+-
++#define MAGICKCORE_EXCLUDE_DEPRECATED 1
+ #include
++#if !defined(QuantumRange) && defined(MaxRGB)
++#define QuantumRange MaxRGB
++#endif
++#if !defined(MAGICKCORE_QUANTUM_DEPTH) && defined(QuantumDepth)
++#define MAGICKCORE_QUANTUM_DEPTH QuantumDepth
++#endif
++
+ #include
+
+ // In theory, it should be enough to check the class:
+@@ -121,12 +128,18 @@
+ get_depth (Magick::Image& img)
+ {
+ octave_idx_type depth = img.depth ();
++#if defined(MagickLibVersion) && (MagickLibVersion <= 0x686)
++#define Magick MagickCore
[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/
commit: 595225ee11a3f1228d45e112b757e6beda119c78
Author: Mark Wright gentoo org>
AuthorDate: Mon May 2 22:59:40 2016 +
Commit: Mark Wright gentoo org>
CommitDate: Mon May 2 23:00:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=595225ee
sci-mathematics/octave: Fix bug 554226, thanks to Helmut Jarausch for reporting.
Thanks to Patric Schmitz for helping. The patch from upstream is in versions
after 4.0.
Gentoo-bug: 554226
Package-Manager: portage-2.2.28
.../octave/files/octave-4.0.0-texinfo.patch| 63 ++
sci-mathematics/octave/octave-4.0.0-r1.ebuild | 5 ++
2 files changed, 68 insertions(+)
diff --git a/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch
b/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch
new file mode 100644
index 000..d94e751
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.0.0-texinfo.patch
@@ -0,0 +1,63 @@
+diff -r 3300cb76cccd -r 2ec049e50ed8 libinterp/corefcn/utils.cc
+--- a/libinterp/corefcn/utils.ccTue Jul 07 19:09:35 2015 -0700
b/libinterp/corefcn/utils.ccThu Jul 09 21:44:09 2015 -0400
+@@ -1379,7 +1379,7 @@
+ \n\
+ Implementation Note: Strings are first converted to double values before
the\n\
+ checks for valid indices are made. Unless a string contains the NULL\n\
+-character @nospell{\"\\0\"}, it will always be a valid index.\n\
++character @nospell{\"@xbackslashchar{}0\"}, it will always be a valid
index.\n\
+ @end deftypefn")
+ {
+ octave_value retval;
+diff -r 3300cb76cccd -r 2ec049e50ed8 scripts/io/beep.m
+--- a/scripts/io/beep.m Tue Jul 07 19:09:35 2015 -0700
b/scripts/io/beep.m Thu Jul 09 21:44:09 2015 -0400
+@@ -20,9 +20,9 @@
+ ## @deftypefn {Function File} {} beep ()
+ ## Produce a beep from the speaker (or visual bell).
+ ##
+-## This function sends the alarm character @qcode{"\a"} to the terminal.
+-## Depending on the user's configuration this may produce an audible beep,
+-## a visual bell, or nothing at all.
++## This function sends the alarm character @qcode{"@xbackslashchar{}a"} to
++## the terminal. Depending on the user's configuration this may produce an
++## audible beep, a visual bell, or nothing at all.
+ ## @seealso{puts, fputs, printf, fprintf}
+ ## @end deftypefn
+
+diff -r 2ec049e50ed8 -r 45d7be391982 doc/Makefile.am
+--- a/doc/Makefile.am Thu Jul 09 21:44:09 2015 -0400
b/doc/Makefile.am Thu Jul 09 21:45:26 2015 -0400
+@@ -26,7 +26,6 @@
+
+ EXTRA_DIST = \
+ Makefile.am \
+- texinfo.tex \
+ texmf.cnf
+
+ SUBDIRS = doxyhtml interpreter liboctave refcard
+diff -r 2ec049e50ed8 -r 45d7be391982 doc/interpreter/Makefile.am
+--- a/doc/interpreter/Makefile.am Thu Jul 09 21:44:09 2015 -0400
b/doc/interpreter/Makefile.am Thu Jul 09 21:45:26 2015 -0400
+@@ -20,8 +20,6 @@
+
+ include $(top_srcdir)/build-aux/common.mk
+
+-TEXINFO_TEX = ../texinfo.tex
+-
+ ## Leading PATH_SEPARATOR required due to weak parsing by dvips (12/04/09)
+ TEXINPUTS :=
"$(PATH_SEPARATOR)$(srcdir)$(PATH_SEPARATOR)$(TEXINPUTS)$(PATH_SEPARATOR)"
+ export TEXINPUTS
+diff -r 2ec049e50ed8 -r 45d7be391982 doc/liboctave/Makefile.am
+--- a/doc/liboctave/Makefile.am Thu Jul 09 21:44:09 2015 -0400
b/doc/liboctave/Makefile.am Thu Jul 09 21:45:26 2015 -0400
+@@ -20,8 +20,6 @@
+
+ include $(top_srcdir)/build-aux/common.mk
+
+-TEXINFO_TEX = ../texinfo.tex
+-
+ info_TEXINFOS = liboctave.texi
+
+ liboctave_TEXINFOS = \
diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 88a67af..d19407f 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -100,6 +100,11 @@ src_prepare() {
-e 's@A-Za-z0-9@[:alnum:]@g' \
-e 's@A-Za-z@[:alpha:]@g' \
libinterp/mkbuiltins || die
+
+ # Fix bug 554226 - sci-mathematics/octave-4.0.0 fails because of a
LaTeX error
+ epatch "${FILESDIR}"/${PN}-4.0.0-texinfo.patch
+ rm -f "${S}"/doc/texinfo.tex || die
+
autotools-utils_src_prepare
}
