[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2024-04-16 Thread Jimi Huotari
commit: 3ae3a72b858be8b826ca96b34cb0f124659133e0
Author: José P. R. N. Assis  gmail  com>
AuthorDate: Thu Feb  1 12:00:54 2024 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Tue Apr 16 16:29:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ae3a72b

sci-mathematics/octave: fix qscintilla dep #916232

Adding [qt5(+)] to the qscintilla in preparation to supporting Qt5/Qt6
QScintilla multibuild. All revision numbers have been bumped (except for
8.3.0). Keywords kept as-is.

Bug: https://bugs.gentoo.org/916232
Signed-off-by: José P. R. N. Assis  gmail.com>
Signed-off-by: Jimi Huotari  gentoo.org>

 .../octave/{octave-8.3.0-r1.ebuild => octave-8.3.0-r2.ebuild}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-8.3.0-r2.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-8.3.0-r1.ebuild
rename to sci-mathematics/octave/octave-8.3.0-r2.ebuild
index 70720e5931cd..d13104f9342f 100644
--- a/sci-mathematics/octave/octave-8.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-8.3.0-r2.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
dev-qt/qtopengl:5
dev-qt/qtprintsupport:5
dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
+   x11-libs/qscintilla:=[qt5(+)]
)
hdf5? ( sci-libs/hdf5:= )
imagemagick? ( media-gfx/graphicsmagick:=[cxx] )



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2024-03-15 Thread Andreas Sturmlechner
commit: 07de6b1ce6757e614a991d530359e02f14d3c190
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Mar 15 10:02:37 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Mar 15 10:07:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07de6b1c

sci-mathematics/octave: drop 7.3.0-r2, 8.1.0, 8.2.0, 8.3.0

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-mathematics/octave/Manifest|   3 -
 .../files/octave-4.2.2-ncurses-pkgconfig.patch |  37 
 .../octave/files/octave-6.4.0-slibtool.patch   |  37 
 .../files/octave-7.3.0-docs-texinfo-7.0.patch  |  45 
 sci-mathematics/octave/octave-7.3.0-r2.ebuild  | 236 
 sci-mathematics/octave/octave-8.1.0.ebuild | 233 
 sci-mathematics/octave/octave-8.2.0.ebuild | 241 -
 sci-mathematics/octave/octave-8.3.0.ebuild | 241 -
 8 files changed, 1073 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 07e12a3bd229..033d2df417bb 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1 @@
-DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
-DIST octave-8.1.0.tar.xz 26957620 BLAKE2B 
d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf
 SHA512 
7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d
-DIST octave-8.2.0.tar.xz 26970452 BLAKE2B 
c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f
 SHA512 
9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514
 DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 
8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4
 SHA512 
b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3

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
deleted file mode 100644
index d20fef5c56e9..
--- a/sci-mathematics/octave/files/octave-4.2.2-ncurses-pkgconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
 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 version.

diff --git a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch 
b/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
deleted file mode 100644
index 1558b334d522..
--- a/sci-mathematics/octave/files/octave-6.4.0-slibtool.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# 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,.*/,,'`; \
--  

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-12-17 Thread Arthur Zamarin
commit: 4ae09aea2cb1b1ae8f62660407a22096ac00b702
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 17:39:41 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 17:39:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ae09aea

sci-mathematics/octave: Stabilize 8.3.0-r1 arm, #917280

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-8.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
index 73abb207cb80..5b284e1a503d 100644
--- a/sci-mathematics/octave/octave-8.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-12-17 Thread Arthur Zamarin
commit: a90edf18c36b77c1fa1589c7e52f8f4679a56c3e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 17:39:46 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 17:39:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a90edf18

sci-mathematics/octave: Stabilize 8.3.0-r1 arm64, #917280

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-8.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
index 5b284e1a503d..70720e5931cd 100644
--- a/sci-mathematics/octave/octave-8.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-12-16 Thread Joonas Niilola
commit: 91495171b3b46ebc4a32bbef18a95443f2235ca4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Dec 16 09:28:06 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Dec 16 09:28:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91495171

sci-mathematics/octave: Stabilize 8.3.0-r1 amd64, #917280

Signed-off-by: Joonas Niilola  gentoo.org>

 sci-mathematics/octave/octave-8.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
index 35f4d8535b46..73abb207cb80 100644
--- a/sci-mathematics/octave/octave-8.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-11-12 Thread Pacho Ramos
commit: 91129865043f559c0c2e02bc16ef6436ce489dde
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 12 12:16:41 2023 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 12 12:28:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91129865

sci-mathematics/octave: Use transfig from fig2dev

Signed-off-by: Pacho Ramos  gentoo.org>

 sci-mathematics/octave/octave-8.3.0-r1.ebuild | 241 ++
 1 file changed, 241 insertions(+)

diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
new file mode 100644
index ..35f4d8535b46
--- /dev/null
+++ b/sci-mathematics/octave/octave-8.3.0-r1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre2
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   >=media-gfx/fig2dev-3.2.9-r1
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:=
+   sci-libs/camd:=
+   sci-libs/ccolamd:=
+   sci-libs/cholmod:=
+   sci-libs/colamd:=
+   sci-libs/cxsparse:=
+   sci-libs/umfpack:=
+   )
+   ssl? (
+   dev-libs/openssl:=
+   )
+   sundials? ( >=sci-libs/sundials-4:= )
+   X? ( x11-libs/libX11:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/gperf
+   virtual/pkgconfig
+   doc? (
+   dev-texlive/texlive-fontsrecommended
+   dev-texlive/texlive-plaingeneric
+   dev-texlive/texlive-metapost
+   virtual/latex-base
+   )
+   java? ( >=virtual/jdk-1.8:* )
+   gui? ( dev-qt/linguist-tools:5 )
+   qrupdate? ( app-misc/pax-utils )
+   sparse? ( app-misc/pax-utils )
+"
+
+# There are three ways to plot in Octave:
+#
+#   1. The old gnuplot renderer
+#   2. The OpenGL renderer using the FLTK backend
+#   3. The OpenGL renderer using the Qt backend
+#
+# It's possible to use the Qt GUI without OpenGL, but OpenGL rendering
+# is all that FLTK is used for, so it doesn't make sense to enable
+# USE=fltk without USE=opengl.
+#
+# Building without either USE=gnuplot or USE=opengl is technically legal,
+# but will leave you unable to plot anything.
+#
+# Octave's FLTK support is unofficially deprecated, in the sense that
+# you'll often get "why are you using FLTK?" in response to
+# bugs. (Upstream bug 59321 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-08-23 Thread Michael Orlitzky
commit: d753594eaa95214de0567966f7d59d235c74db5c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Aug 23 03:03:02 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Aug 23 11:38:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d753594e

sci-mathematics/octave: add 8.3.0

Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-8.3.0.ebuild | 241 +
 2 files changed, 242 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 0cdd26e02f7c..07e12a3bd229 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 DIST octave-8.1.0.tar.xz 26957620 BLAKE2B 
d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf
 SHA512 
7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d
 DIST octave-8.2.0.tar.xz 26970452 BLAKE2B 
c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f
 SHA512 
9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514
+DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 
8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4
 SHA512 
b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3

diff --git a/sci-mathematics/octave/octave-8.3.0.ebuild 
b/sci-mathematics/octave/octave-8.3.0.ebuild
new file mode 100644
index ..d0d284820f9f
--- /dev/null
+++ b/sci-mathematics/octave/octave-8.3.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre2
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-06-09 Thread Arthur Zamarin
commit: 8cf2d1887e51a8c7a7111d2bc88dde532bf6a224
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 17:05:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 17:05:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cf2d188

sci-mathematics/octave: Stabilize 8.1.0 amd64, #908186

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-8.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.1.0.ebuild 
b/sci-mathematics/octave/octave-8.1.0.ebuild
index dafdb597cda2..5bb414745372 100644
--- a/sci-mathematics/octave/octave-8.1.0.ebuild
+++ b/sci-mathematics/octave/octave-8.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-06-09 Thread Arthur Zamarin
commit: 3e5827c7f1fec153664f979a58c0f73846ae141e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 15:27:15 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 15:27:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e5827c7

sci-mathematics/octave: Stabilize 8.1.0 arm64, #908186

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-8.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-8.1.0.ebuild 
b/sci-mathematics/octave/octave-8.1.0.ebuild
index 212af2b3d89a..dafdb597cda2 100644
--- a/sci-mathematics/octave/octave-8.1.0.ebuild
+++ b/sci-mathematics/octave/octave-8.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-05-26 Thread Sam James
commit: 7b562e163273acc15b4490f029e08a637a57c764
Author: Sam James  gentoo  org>
AuthorDate: Fri May 26 09:35:07 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 26 09:35:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b562e16

sci-mathematics/octave: add 8.2.0

Closes: https://bugs.gentoo.org/907183
Closes: https://bugs.gentoo.org/901965
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-8.2.0.ebuild | 241 +
 2 files changed, 242 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ad1f6c9bfd39..0cdd26e02f7c 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,3 @@
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
 DIST octave-8.1.0.tar.xz 26957620 BLAKE2B 
d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf
 SHA512 
7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d
+DIST octave-8.2.0.tar.xz 26970452 BLAKE2B 
c5bd03861681a7e194a0fb195433d085fc7d98eb3c6f65929ad53c93afef199062902293082e5aeab7c5e15e0045093efbebcc860052e6081708947483425f2f
 SHA512 
9f56428e990c6aa71a5cfe7698602ba681535c36b140fa9248536c260afebd19f6125c92a0fd6d14fab5a794de49e03ccc98e89ac879108f635b3ffc4ec40514

diff --git a/sci-mathematics/octave/octave-8.2.0.ebuild 
b/sci-mathematics/octave/octave-8.2.0.ebuild
new file mode 100644
index ..d0d284820f9f
--- /dev/null
+++ b/sci-mathematics/octave/octave-8.2.0.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre2
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:=
+   sci-libs/camd:=
+   sci-libs/ccolamd:=
+   sci-libs/cholmod:=
+   sci-libs/colamd:=
+   sci-libs/cxsparse:=
+   sci-libs/umfpack:=
+   )
+   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-03-16 Thread Sam James
commit: 7618b11bc8c66b75d218a5025c467f5b0d4a96b4
Author: Sam James  gentoo  org>
AuthorDate: Thu Mar 16 23:12:57 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Mar 16 23:12:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7618b11b

sci-mathematics/octave: add 8.1.0

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-8.1.0.ebuild | 233 +
 2 files changed, 234 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 083f66c96461..ad1f6c9bfd39 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e
+DIST octave-8.1.0.tar.xz 26957620 BLAKE2B 
d1d90a242b1517dd0284af454b9de83238c5f515690c1ffd8bd5d8c43ff6c690ccab590a877e74631394295b97292d71b2dc1c62ea50f0c4ff3e9ac728f67dbf
 SHA512 
7e43e1a272cb51e981d4f534bbed2c2915bb714be3f151f98862ed8ecec1ee3a90600dd22778077b6cdecee4c802a2e4d13a49c339cef683e1356941b9e1cd1d

diff --git a/sci-mathematics/octave/octave-8.1.0.ebuild 
b/sci-mathematics/octave/octave-8.1.0.ebuild
new file mode 100644
index ..212af2b3d89a
--- /dev/null
+++ b/sci-mathematics/octave/octave-8.1.0.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre2
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:=
+   sci-libs/camd:=
+   sci-libs/ccolamd:=
+   sci-libs/cholmod:=
+   sci-libs/colamd:=
+   sci-libs/cxsparse:=
+   sci-libs/umfpack:=
+   )
+   ssl? (
+   dev-libs/openssl:=
+   )
+   sundials? ( >=sci-libs/sundials-4:= )
+   X? ( x11-libs/libX11:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/gperf
+   virtual/pkgconfig
+   doc? (
+   dev-texlive/texlive-fontsrecommended
+   dev-texlive/texlive-plaingeneric
+   dev-texlive/texlive-metapost
+ 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-02-07 Thread Andreas Sturmlechner
commit: cde5556c2c612c33ae728a16d7041df124b86419
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Feb  7 17:02:21 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb  7 17:25:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cde5556c

sci-mathematics/octave: drop 6.4.0-r5

Closes: https://bugs.gentoo.org/886641
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-mathematics/octave/Manifest   |   1 -
 sci-mathematics/octave/octave-6.4.0-r5.ebuild | 218 --
 2 files changed, 219 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 527eddbd2f74..083f66c96461 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1 @@
-DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e

diff --git a/sci-mathematics/octave/octave-6.4.0-r5.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
deleted file mode 100644
index 9c173fa095d8..
--- a/sci-mathematics/octave/octave-6.4.0-r5.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/;
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-   portaudio postscript +qhull +qrupdate readline sndfile +sparse
-   ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
-#
-RDEPEND="
-   app-arch/bzip2
-   app-arch/unzip
-   app-arch/zip
-   app-text/ghostscript-gpl
-   sys-apps/texinfo
-   dev-libs/libpcre:3=
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:0= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
-   )
-   hdf5? ( sci-libs/hdf5:0= )
-   java? ( >=virtual/jre-1.6.0:* )
-   opengl? (
-   media-libs/freetype:2=
-   media-libs/fontconfig:1.0=
-   virtual/glu
-   >=x11-libs/fltk-1.3:1=[opengl,xft]
-   x11-libs/gl2ps:0=
-   )
-   portaudio? ( media-libs/portaudio )
-   postscript? (
-   app-text/epstool
-   media-gfx/pstoedit
-   media-gfx/transfig
-   )
-   qhull? ( media-libs/qhull:0= )
-   qrupdate? ( sci-libs/qrupdate:0= )
-   readline? ( sys-libs/readline:0= )
-   sndfile? ( media-libs/libsndfile )
-   sparse? (
-   sci-libs/arpack:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=
-   sci-libs/colamd:0=
-   sci-libs/cxsparse:0=
-   sci-libs/umfpack:0=
-   )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   sundials? (  99octave || die
-   doenvd 99octave
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-01-13 Thread Arthur Zamarin
commit: 92f9cc2c7d3f2e28ed80d53512473e5a0ff786ed
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 13 13:36:59 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 13 13:36:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f9cc2c

sci-mathematics/octave: Stabilize 6.4.0-r5 arm64, #886641

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r5.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
index b3eb587fad29..9c173fa095d8 100644
--- a/sci-mathematics/octave/octave-6.4.0-r5.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-01-09 Thread Sam James
commit: a333ac46309b0034cfcf8761e470c42e9ae5644c
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan  9 15:09:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan  9 15:09:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a333ac46

sci-mathematics/octave: keyword 7.3.0-r2 for ~hppa

I didn't keyword this when I did the previous version - I assume
because 7.x was unkeyworded in Gentoo for a while for all arches.

Oops.

Bug: https://bugs.gentoo.org/757822
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-7.3.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.3.0-r2.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
index 2d09264e6440..eea6ea2ec301 100644
--- a/sci-mathematics/octave/octave-7.3.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-01-07 Thread Sam James
commit: d9df02159b614febc610a52e606872bb79b31bef
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  8 05:13:48 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  8 05:17:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9df0215

sci-mathematics/octave: drop 6.4.0-r3

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 215 --
 1 file changed, 215 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
deleted file mode 100644
index e99fbea2fc93..
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="https://www.gnu.org/software/octave/;
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-   portaudio postscript +qhull +qrupdate readline sndfile +sparse
-   ssl static-libs sundials X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
-#
-RDEPEND="
-   app-arch/bzip2
-   app-arch/unzip
-   app-arch/zip
-   app-text/ghostscript-gpl
-   sys-apps/texinfo
-   dev-libs/libpcre:3=
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:0= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
-   )
-   hdf5? ( sci-libs/hdf5:0= )
-   java? ( >=virtual/jre-1.6.0:* )
-   opengl? (
-   media-libs/freetype:2=
-   media-libs/fontconfig:1.0=
-   virtual/glu
-   >=x11-libs/fltk-1.3:1=[opengl,xft]
-   x11-libs/gl2ps:0=
-   )
-   portaudio? ( media-libs/portaudio )
-   postscript? (
-   app-text/epstool
-   media-gfx/pstoedit
-   media-gfx/transfig
-   )
-   qhull? ( media-libs/qhull:0= )
-   qrupdate? ( sci-libs/qrupdate:0= )
-   readline? ( sys-libs/readline:0= )
-   sndfile? ( media-libs/libsndfile )
-   sparse? (
-   sci-libs/arpack:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=
-   sci-libs/colamd:0=
-   sci-libs/cxsparse:0=
-   sci-libs/umfpack:0=
-   )
-   ssl? (
-   dev-libs/openssl:0=
-   )
-   sundials? (  99octave || die
-   doenvd 99octave
-}
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2023-01-07 Thread Sam James
commit: b33a038cbac1a238d184e8c387b2b6fc7a7d6150
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  8 05:12:58 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  8 05:17:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b33a038c

sci-mathematics/octave: disable GLIBCXX_ASSERTIONS (libstdc++ bug)

It's not a test-only issue so could cause SIGABRT at runtime, so
revbump.

The libstdc++ issue is reported upstream at
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=107538.

Closes: https://bugs.gentoo.org/887815
Signed-off-by: Sam James  gentoo.org>

 .../octave/{octave-6.4.0-r4.ebuild => octave-6.4.0-r5.ebuild}  | 5 -
 .../octave/{octave-7.3.0-r1.ebuild => octave-7.3.0-r2.ebuild}  | 7 +--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r4.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
similarity index 98%
rename from sci-mathematics/octave/octave-6.4.0-r4.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r5.ebuild
index 4bc8ceb0934f..b3eb587fad29 100644
--- a/sci-mathematics/octave/octave-6.4.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -119,6 +119,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # libstdc++ bug, bug #887815
+   append-cxxflags -U_GLIBCXX_ASSERTIONS
+
# unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
similarity index 96%
rename from sci-mathematics/octave/octave-7.3.0-r1.ebuild
rename to sci-mathematics/octave/octave-7.3.0-r2.ebuild
index 50d77f9706b7..2d09264e6440 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit autotools fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
 
 DESCRIPTION="High-level interactive language for numerical computations"
 HOMEPAGE="https://www.gnu.org/software/octave/;
@@ -144,6 +144,9 @@ src_prepare() {
 }
 
 src_configure() {
+   # libstdc++ bug, bug #887815
+   append-cxxflags -U_GLIBCXX_ASSERTIONS
+
# Unfortunate dependency on mpi from hdf5 (bug #302621)
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-20 Thread Michael Orlitzky
commit: 27b54a050068d3023ce502cf59671710ca493a98
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Dec 20 14:09:34 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Dec 20 14:09:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b54a05

sci-mathematics/octave: drop 7.2.0-r1

Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest   |   1 -
 sci-mathematics/octave/octave-7.2.0-r1.ebuild | 208 --
 2 files changed, 209 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1c82c201102b..527eddbd2f74 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,2 @@
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
-DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 
311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23
 SHA512 
b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e

diff --git a/sci-mathematics/octave/octave-7.2.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.2.0-r1.ebuild
deleted file mode 100644
index 74f1205d583c..
--- a/sci-mathematics/octave/octave-7.2.0-r1.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
-
-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"
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio 
postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X 
zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
-#
-RDEPEND="
-   app-arch/bzip2
-   app-arch/unzip
-   app-arch/zip
-   app-text/ghostscript-gpl
-   sys-apps/texinfo
-   dev-libs/libpcre:=
-   sys-libs/ncurses:=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
-   )
-   hdf5? ( sci-libs/hdf5:= )
-   java? ( >=virtual/jre-1.8:* )
-   json? ( dev-libs/rapidjson )
-   opengl? (
-   media-libs/freetype:=
-   media-libs/fontconfig:=
-   virtual/glu
-   >=x11-libs/fltk-1.3:1=[opengl,xft]
-   x11-libs/gl2ps:=
-   )
-   portaudio? ( media-libs/portaudio )
-   postscript? (
-   app-text/epstool
-   media-gfx/pstoedit
-   media-gfx/transfig
-   )
-   qhull? ( media-libs/qhull:= )
-   qrupdate? ( sci-libs/qrupdate:= )
-   readline? ( sys-libs/readline:= )
-   sndfile? ( media-libs/libsndfile )
-   sparse? (
-   sci-libs/arpack:=
-   sci-libs/camd:=
-   sci-libs/ccolamd:=
-   sci-libs/cholmod:=
-   sci-libs/colamd:=
-   sci-libs/cxsparse:=
-   sci-libs/umfpack:=
-   )
-   ssl? (
-   dev-libs/openssl:=
-   )
-   sundials? ( >=sci-libs/sundials-4:= )
-   X? ( x11-libs/libX11:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-util/gperf
-   virtual/imagemagick-tools
-   virtual/pkgconfig
-   doc? (
-   dev-texlive/texlive-fontsrecommended
-   dev-texlive/texlive-plaingeneric
-   dev-texlive/texlive-metapost
-   virtual/latex-base
- 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-18 Thread Arthur Zamarin
commit: f66dfb32c021aa0c816a3cf8a231f26bc1037b66
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 20:47:15 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 20:47:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66dfb32

sci-mathematics/octave: Stabilize 7.3.0-r1 amd64, #887013

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-7.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 2a27ff4cd798..50d77f9706b7 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-18 Thread Arthur Zamarin
commit: 275f32cc4f8855696db08ba1a33b18f3a538b167
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 20:16:24 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 20:16:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=275f32cc

sci-mathematics/octave: Stabilize 7.3.0-r1 x86, #887013

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-7.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 99a82fab229e..2a27ff4cd798 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-18 Thread Arthur Zamarin
commit: 484ba8ef67f71953c9a6009f037f1de2f92a1f47
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 20:11:08 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 20:11:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=484ba8ef

sci-mathematics/octave: Stabilize 7.3.0-r1 arm, #887013

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-7.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 4fc5c885d7c7..99a82fab229e 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-18 Thread Arthur Zamarin
commit: b106dade1ece282766a9475e94f4631296fa1409
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 18 19:59:19 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 18 19:59:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b106dade

sci-mathematics/octave: Stabilize 7.3.0-r1 arm64, #887013

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-7.3.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 0901c51c9f76..4fc5c885d7c7 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0/${PV}"
 IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-12-18 Thread Sam James
commit: 61e6c6b552f71b10f96b0cad7d9173d407ec3c0c
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 18 11:28:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 18 11:28:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e6c6b5

sci-mathematics/octave: Stabilize 6.4.0-r4 x86, #886641

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r4.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r4.ebuild
index 354b3b02baf9..85dc18d6efd9 100644
--- a/sci-mathematics/octave/octave-6.4.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r4.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2022-11-23 Thread Andreas Sturmlechner
commit: a85f69392e0384f5b34f1d00e08482d69f4868e1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 23 20:57:54 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 23 20:57:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a85f6939

sci-mathematics/octave: drop 5.2.0

Closes: https://bugs.gentoo.org/854489
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 sci-mathematics/octave/Manifest|   1 -
 ...le-getcwd-path-max-test-as-it-is-too-slow.patch |  11 --
 .../octave/files/octave-4.4.0-texi.patch   |  11 --
 sci-mathematics/octave/octave-5.2.0.ebuild | 200 -
 4 files changed, 223 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 01f81cd55afc..1c82c201102b 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1,3 @@
-DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 
311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23
 SHA512 
b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e

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
deleted file mode 100644
index f6fa7be3b28f..
--- 
a/sci-mathematics/octave/files/octave-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 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.4.0-texi.patch 
b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
deleted file mode 100644
index 90ffa5361bf7..
--- a/sci-mathematics/octave/files/octave-4.4.0-texi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/doc/interpreter/module.mk2018-04-30 19:03:56.0 +0200
-+++ a/doc/interpreter/module.mk.new2018-05-22 12:17:03.587175816 +0200
-@@ -368,6 +368,8 @@
-   $(AWK) -f $(srcdir)/%reldir%/mkcontrib.awk 
$(srcdir)/%reldir%/contributors.in > $@-t && \
-   mv $@-t $@
- 
-+%reldir%/preface.texi: %reldir%/contributors.texi
-+
- AUTHORS: %reldir%/preface.texi %reldir%/contributors.texi | 
%reldir%/$(octave_dirstamp)
-   $(AM_V_MAKEINFO)rm -f $@-t $@ && \
-   if [ "x$(srcdir)" != "x." ] && [ -f 
$(srcdir)/%reldir%/contributors.texi ] && [ ! -f %reldir%/contributors.texi ]; 
then \

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
deleted file mode 100644
index 0427a86b5e74..
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2021 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/;
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-   portaudio postscript +qhull +qrupdate readline sndfile +sparse
-   ssl static-libs X zlib"
-KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-   app-arch/bzip2
-   app-text/ghostscript-gpl
-   dev-libs/libpcre:3=
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:0= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2022-11-14 Thread Sam James
commit: c8016a40d4749950f493e0831547351a1f8a2982
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov 15 04:58:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 15 04:58:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8016a40

sci-mathematics/octave: fix build loop with USE=doc & texinfo-7.0

Closes: https://bugs.gentoo.org/880623
Signed-off-by: Sam James  gentoo.org>

 .../files/octave-7.3.0-docs-texinfo-7.0.patch  | 45 ++
 sci-mathematics/octave/octave-7.3.0-r1.ebuild  |  1 +
 2 files changed, 46 insertions(+)

diff --git a/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch 
b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
new file mode 100644
index ..7a6249ae80d4
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-7.3.0-docs-texinfo-7.0.patch
@@ -0,0 +1,45 @@
+https://savannah.gnu.org/bugs/?62648#comment22
+https://bugs.gentoo.org/880623
+
+# HG changeset patch
+# User Rik 
+# Date 1668451079 28800
+#  Mon Nov 14 10:37:59 2022 -0800
+# Node ID 67d5b2d119e254efc3d9f2658de47b293ac1f6eb
+# Parent  9f4a9dd4a6ee34ddc6e8d0a87d0c703782af7358
+doc: Enable building of Qt documentation with Texinfo >= 7.0 (bug #62648)
+
+* mk-qthelp.pl: Update regular expressions that find the start of data in
+index.html and Function-index.html to include additional pattern generated by
+Texinfo 7.0.
+
+--- a/doc/interpreter/mk-qthelp.pl
 b/doc/interpreter/mk-qthelp.pl
+@@ -26,8 +26,11 @@ if ($#ARGV != 1)
+ open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+ 
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^/ ) {;}
+-while (($_ = <$HTML>) !~ /^/ ) {;}
++while (defined ($_ = <$HTML>) and ! /^/ ) {;}
++while (defined ($_ = <$HTML>)
++ and ! /^/ ) {;}
++
++die "index.html: reached EOF without finding data start pattern" if eof 
($HTML);
+ 
+ $level = 0;
+ while (<$HTML>)
+@@ -68,7 +71,11 @@ die "Failed to parse index.html" if ($le
+ open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
+ 
+ # Skip through preamble of file to find start of list
+-while (($_ = <$HTML>) !~ /^)
+ {
+

diff --git a/sci-mathematics/octave/octave-7.3.0-r1.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
index 05285cf1f3e5..0901c51c9f76 100644
--- a/sci-mathematics/octave/octave-7.3.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -131,6 +131,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+   "${FILESDIR}"/${P}-docs-texinfo-7.0.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-11-09 Thread Michael Orlitzky
commit: ff61ef7d2434eebfec1e13e04f5d7e92b2c1772d
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Nov  9 17:58:19 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Nov  9 18:19:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff61ef7d

sci-mathematics/octave: new revision fixing some dependency issues.

This revision adds a new flag, USE=imagemagick, to pull in
media-gfx/graphicsmagick. That's not a typo -- the global USE flag
descriptions for "imagemagick" and "graphicsmagick" make this awkward.
In any case, Octave upstream doesn't really support imagemagick, only
graphicsmagick. Thanks to Fabio Rossi for reporting the issue and
suggesting the fix.

Furthermore,

  1. media-gfx/graphicsmagick was moved to DEPEND because Octave
 links with it.

  2. The "static-libs" USE flag was dropped.

  3. A new flag, USE=fltk, was factored out of USE=opengl. The Qt
 GUI can make use of OpenGL on its own.

  4. An old hack for linking with fltk was dropped.

  5. A new REQUIRED_USE prevents some nonsense combinations of the
 X, gui, fltk, and opengl USE flags.

  6. Local descriptions for the fltk, gnuplot, and imagemagick flags
 were added to metadata.xml to explain more accurately what they
 actually do.

Closes: https://bugs.gentoo.org/864785
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/metadata.xml|  3 ++
 ...{octave-7.3.0.ebuild => octave-7.3.0-r1.ebuild} | 46 --
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index 9058f2f3596f..72d5085bcfb1 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -9,7 +9,10 @@
   Octave is a high-level language, primarily intended for numerical 
computations. It provides a convenient command line interface for solving 
linear and nonlinear problems numerically, and for performing other numerical 
experiments. It may also be used as a batch-oriented language.
   
   
+Use x11-libs/fltk as the backend for the 
OpenGL renderer in the absence of the Qt GUI
 Add support for sci-mathematics/glpk for 
linear programming
+Use sci-visualization/gnuplot to render 
plots if OpenGL is unavailable
+Use media-gfx/graphicsmagick to read 
and write images
 Allow using jsonencode and jsondecode commands via 
dev-libs/rapidjson
 Add support for media-libs/qhull, to allow 
`delaunay', `convhull', and related functions
 Add support for sci-libs/qrupdatefor QR 
and Cholesky update functions

diff --git a/sci-mathematics/octave/octave-7.3.0.ebuild 
b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
similarity index 75%
rename from sci-mathematics/octave/octave-7.3.0.ebuild
rename to sci-mathematics/octave/octave-7.3.0-r1.ebuild
index ab0821420539..05285cf1f3e5 100644
--- a/sci-mathematics/octave/octave-7.3.0.ebuild
+++ b/sci-mathematics/octave/octave-7.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+inherit autotools fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
 
 DESCRIPTION="High-level interactive language for numerical computations"
 HOMEPAGE="https://www.gnu.org/software/octave/;
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio 
postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X 
zlib"
+IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json opengl 
portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl sundials X 
zlib"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
@@ -20,6 +20,11 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 
~amd64-linux ~x86-linux"
 #
 # (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
 #
+# The use of USE=imagemagick to pull in media-gfx/graphicsmagick is not
+# ideal, but both "graphicsmagick" and "imagemagick" are global USE
+# flags whose existing descriptions conflict with the obvious way we
+# would want to use them in octave. In any case, upstream doesn't really
+# support imagemagick, only graphicsmagick (bug 864785).
 RDEPEND="
app-arch/bzip2
app-arch/unzip
@@ -33,6 +38,7 @@ RDEPEND="
virtual/lapack
curl? ( net-misc/curl:= )
fftw? ( sci-libs/fftw:3.0= )
+   fltk? ( >=x11-libs/fltk-1.3:1=[opengl,xft] )
glpk? ( sci-mathematics/glpk:= )
gnuplot? ( sci-visualization/gnuplot )
gui? (
@@ -46,13 +52,13 @@ RDEPEND="
x11-libs/qscintilla:=
)
hdf5? ( sci-libs/hdf5:= )
+   imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
java? ( >=virtual/jre-1.8:* )
  

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-11-05 Thread Sam James
commit: 86ca5e1ab6a48efd0c09238d94e9fca52d60403e
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  5 07:55:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 07:55:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ca5e1a

sci-mathematics/octave: Stabilize 6.4.0-r3 arm, #854489

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 8919fcaa9b6e..e99fbea2fc93 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-11-04 Thread Sam James
commit: 3af5c40a901d2cdf343e90c88f7e93cb5a3f37ba
Author: Sam James  gentoo  org>
AuthorDate: Sat Nov  5 05:34:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 05:34:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af5c40a

sci-mathematics/octave: add 7.3.0

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-7.3.0.ebuild | 208 +
 2 files changed, 209 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 5ce57ee4f2a9..01f81cd55afc 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 
311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23
 SHA512 
b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
+DIST octave-7.3.0.tar.xz 26215288 BLAKE2B 
53fff89e798f8b8795f83e46f66793f2cf37f98933fa62a47d5ec389f89a3447eb96128c1d6b68a4184630d071ecf1a4323299c251b43c3211a8f781486b32e5
 SHA512 
1399d7010cbd4e83d6dc60ab8cc2abb20e64a762e905a00066e6331c5350df93b4ff8f2670fd52fc183918cea21bc176cb263ca71080de6e4041f5e0ea21558e

diff --git a/sci-mathematics/octave/octave-7.3.0.ebuild 
b/sci-mathematics/octave/octave-7.3.0.ebuild
new file mode 100644
index ..ab0821420539
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.3.0.ebuild
@@ -0,0 +1,208 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+DESCRIPTION="High-level interactive language for numerical computations"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio 
postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre:=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:=
+   sci-libs/camd:=
+   sci-libs/ccolamd:=
+   sci-libs/cholmod:=
+   sci-libs/colamd:=
+   sci-libs/cxsparse:=
+   sci-libs/umfpack:=
+   )
+   ssl? (
+   dev-libs/openssl:=
+   )
+   sundials? ( >=sci-libs/sundials-4:= )
+   X? ( x11-libs/libX11:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-10-17 Thread Sam James
commit: 735dd7dedcbb4dfb5a5260204ea8053ddb3d50f3
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 02:45:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 02:45:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735dd7de

sci-mathematics/octave: fix PkgMetadataXmlIndentation

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index 19ea2766ed71..9058f2f3596f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -6,8 +6,8 @@
 Gentoo Mathematics Project
   
   
-   Octave is a high-level language, primarily intended for numerical 
computations. It provides a convenient command line interface for solving 
linear and nonlinear problems numerically, and for performing other numerical 
experiments. It may also be used as a batch-oriented language.
-   
+  Octave is a high-level language, primarily intended for numerical 
computations. It provides a convenient command line interface for solving 
linear and nonlinear problems numerically, and for performing other numerical 
experiments. It may also be used as a batch-oriented language.
+  
   
 Add support for sci-mathematics/glpk for 
linear programming
 Allow using jsonencode and jsondecode commands via 
dev-libs/rapidjson



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-10-17 Thread Sam James
commit: a670ce482325d7c5d83470258aa0211c704923c9
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct 18 01:47:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 18 02:17:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a670ce48

sci-mathematics/octave: add savannah upstream metadata

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/metadata.xml | 29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index 759ec5c83e0f..19ea2766ed71 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,19 +1,22 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sci-mathemat...@gentoo.org
-   Gentoo Mathematics Project
-   
-   
+  
+sci-mathemat...@gentoo.org
+Gentoo Mathematics Project
+  
+  
Octave is a high-level language, primarily intended for numerical 
computations. It provides a convenient command line interface for solving 
linear and nonlinear problems numerically, and for performing other numerical 
experiments. It may also be used as a batch-oriented language.

-   
-   Add support for 
sci-mathematics/glpk for linear programming
-   Allow using jsonencode and jsondecode 
commands via dev-libs/rapidjson
-   Add support for media-libs/qhull, 
to allow `delaunay', `convhull', and related functions
-   Add support for 
sci-libs/qrupdatefor QR and Cholesky update functions
-   Add enhanced support for sparse matrix 
algebra with SuiteSparse
-   Enable the ode15i and ode15s ODE solvers 
using sci-libs/sundials
-   
+  
+Add support for sci-mathematics/glpk for 
linear programming
+Allow using jsonencode and jsondecode commands via 
dev-libs/rapidjson
+Add support for media-libs/qhull, to allow 
`delaunay', `convhull', and related functions
+Add support for sci-libs/qrupdatefor QR 
and Cholesky update functions
+Add enhanced support for sparse matrix algebra with 
SuiteSparse
+Enable the ode15i and ode15s ODE solvers using 
sci-libs/sundials
+  
+  
+octave
+  
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-09-11 Thread Michael Orlitzky
commit: ee828164174dac808cc0b37b9306871b45857246
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Sep 11 22:26:15 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Sep 11 22:29:56 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee828164

sci-mathematics/octave: better slibtool fix in v6.4.0.

The --enable-link-all-dependencies flag was added to octave-6.4.0 to fix
the build with slibtool, but that had some unintended consequences (bug
858554). The whole thing is moot in v7.2.0, but there's a better fix for
v6.4.0: using --disable-no-undefined, which, double-negatively, allows
for undefined symbols wherever they were causing problems. It still
builds OK with rlibtool, ship it!

Closes: https://bugs.gentoo.org/858554
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r4.ebuild | 215 ++
 1 file changed, 215 insertions(+)

diff --git a/sci-mathematics/octave/octave-6.4.0-r4.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r4.ebuild
new file mode 100644
index ..354b3b02baf9
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.4.0-r4.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="https://www.gnu.org/software/octave/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
+#
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   qrupdate? ( sci-libs/qrupdate:0= )
+   readline? ( sys-libs/readline:0= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/cxsparse:0=
+   sci-libs/umfpack:0=
+   )
+   ssl? (
+   dev-libs/openssl:0=
+   )
+   sundials? (  99octave || die
+   doenvd 99octave
+}
+
+pkg_postinst() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_icon_cache_update
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-09-11 Thread Michael Orlitzky
commit: 0ff312a62959b56777f3557cd7c6b9b1b36d7cff
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Sep 11 12:33:36 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Sep 11 12:42:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff312a6

sci-mathematics/octave: remove slibtool workaround from v7.2.0.

The --enable-link-all-dependencies flag is apparently no longer needed
with octave-7.2.0. Removing it from the ./configure invocation prevents
mkoctfile from using the -loctave and -loctinterp flags by default. With
octave-7.2.0 they should be harmless anyway, but it's nice to clean
things up a bit when we can get away with it.

Bug: https://bugs.gentoo.org/776583
Bug: https://bugs.gentoo.org/858554
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../octave/{octave-7.2.0.ebuild => octave-7.2.0-r1.ebuild}   | 5 -
 1 file changed, 5 deletions(-)

diff --git a/sci-mathematics/octave/octave-7.2.0.ebuild 
b/sci-mathematics/octave/octave-7.2.0-r1.ebuild
similarity index 95%
rename from sci-mathematics/octave/octave-7.2.0.ebuild
rename to sci-mathematics/octave/octave-7.2.0-r1.ebuild
index f6b2f628e13d..74f1205d583c 100644
--- a/sci-mathematics/octave/octave-7.2.0.ebuild
+++ b/sci-mathematics/octave/octave-7.2.0-r1.ebuild
@@ -139,16 +139,11 @@ src_configure() {
# --with-sundials_ida (no-op) with USE="sundials"
# --without-sundials_ida (disables it) with USE="-sundials"
#
-   # The --enable-link-all-dependencies flag is needed because
-   # otherwise, the build system appends --no-undefined to LDFLAGS and
-   # then proceeds to undefine things. GNU libtool ignores this, but
-   # slibtool (for example) does not (bug #776583).
econf \
--localstatedir="${EPREFIX}/var/state/octave" \
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
--disable-64 \
-   --enable-link-all-dependencies \
--enable-shared \
--with-z \
--with-bz2 \



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-08-12 Thread Michael Orlitzky
commit: 839c277c9505c8be372a614c7db96f5ce64743d3
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Aug 12 23:41:48 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Aug 13 02:22:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839c277c

sci-mathematics/octave: don't install test logs with FEATURES=test.

This was apparently intentional, but I guess I agree that these logs are
not really end-user documentation and are therefore mis-dodoc'd.

Closes: https://bugs.gentoo.org/861410
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/octave-7.2.0.ebuild | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-7.2.0.ebuild 
b/sci-mathematics/octave/octave-7.2.0.ebuild
index 5ae855cdd7e0..f6b2f628e13d 100644
--- a/sci-mathematics/octave/octave-7.2.0.ebuild
+++ b/sci-mathematics/octave/octave-7.2.0.ebuild
@@ -203,8 +203,6 @@ src_install() {
doins doc/interpreter/macros.texi
fi
 
-   [[ -e test/fntests.log ]] && dodoc test/fntests.log
-
use java && \
java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-08-02 Thread Sam James
commit: 4e74e7f7b997167e77f0f6debc844f0f3a42a89a
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  3 02:53:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  3 02:53:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e74e7f7

sci-mathematics/octave: add 7.2.0

Closes: https://bugs.gentoo.org/842645
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-7.2.0.ebuild | 215 +
 2 files changed, 216 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index acebc906380c..1bc20321a5e6 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
 DIST octave-7.1.0.tar.gz 34187598 BLAKE2B 
da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58
 SHA512 
042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
+DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 
311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23
 SHA512 
b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024

diff --git a/sci-mathematics/octave/octave-7.2.0.ebuild 
b/sci-mathematics/octave/octave-7.2.0.ebuild
new file mode 100644
index ..5ae855cdd7e0
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.2.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
+
+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"
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl portaudio 
postscript +qhull +qrupdate readline sndfile +sparse ssl static-libs sundials X 
zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug #775254).
+#
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre:=
+   sys-libs/ncurses:=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:= )
+   java? ( >=virtual/jre-1.8:* )
+   json? ( dev-libs/rapidjson )
+   opengl? (
+   media-libs/freetype:=
+   media-libs/fontconfig:=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:= )
+   qrupdate? ( sci-libs/qrupdate:= )
+   readline? ( sys-libs/readline:= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:=
+   sci-libs/camd:=
+   sci-libs/ccolamd:=
+   sci-libs/cholmod:=
+   sci-libs/colamd:=
+   sci-libs/cxsparse:=
+   sci-libs/umfpack:=
+   )
+   ssl? (
+   dev-libs/openssl:=
+   )
+   sundials? ( >=sci-libs/sundials-4:= )
+   X? ( x11-libs/libX11:= )
+"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-08-02 Thread Sam James
commit: 5f7f22be582175d2fdf731123da9805c69a131ec
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  3 02:53:55 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  3 02:53:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7f22be

sci-mathematics/octave: drop 7.1.0

Bug: https://bugs.gentoo.org/842645
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 -
 sci-mathematics/octave/octave-7.1.0.ebuild | 212 -
 2 files changed, 213 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1bc20321a5e6..5ce57ee4f2a9 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1,3 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
-DIST octave-7.1.0.tar.gz 34187598 BLAKE2B 
da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58
 SHA512 
042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 
311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23
 SHA512 
b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
deleted file mode 100644
index 91df3f2a06d3..
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
-
-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"
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl
-   portaudio postscript +qhull +qrupdate readline sndfile +sparse
-   ssl static-libs sundials X zlib"
-# Issue when building w/ SSL needs investigation
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-#
-# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
-#
-RDEPEND="
-   app-arch/bzip2
-   app-arch/unzip
-   app-arch/zip
-   app-text/ghostscript-gpl
-   sys-apps/texinfo
-   dev-libs/libpcre:3=
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:0= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
-   )
-   hdf5? ( sci-libs/hdf5:0= )
-   java? ( >=virtual/jre-1.8:* )
-   json? ( dev-libs/rapidjson )
-   opengl? (
-   media-libs/freetype:2=
-   media-libs/fontconfig:1.0=
-   virtual/glu
-   >=x11-libs/fltk-1.3:1=[opengl,xft]
-   x11-libs/gl2ps:0=
-   )
-   portaudio? ( media-libs/portaudio )
-   postscript? (
-   app-text/epstool
-   media-gfx/pstoedit
-   media-gfx/transfig
-   )
-   qhull? ( media-libs/qhull:0= )
-   qrupdate? ( sci-libs/qrupdate:0= )
-   readline? ( sys-libs/readline:0= )
-   sndfile? ( media-libs/libsndfile )
-   sparse? (
-   sci-libs/arpack:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=
-   sci-libs/colamd:0=
-   sci-libs/cxsparse:0=
-   sci-libs/umfpack:0=
-   )
-   ssl? (
-   dev-libs/openssl:0=
-   )

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-07-26 Thread Maciej Barć
commit: d2211047a4e28db93b5cc955f533b53d7afe666f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul 25 18:34:17 2022 +
Commit: Maciej Barć  gentoo  org>
CommitDate: Tue Jul 26 22:02:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2211047

sci-mathematics/octave: Move dev-qt/linguist-tools:5 to BDEPEND

Bug: https://bugs.gentoo.org/544938
Bug: https://github.com/gentoo/gentoo/pull/26595
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Maciej Barć  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 5 +++--
 sci-mathematics/octave/octave-7.1.0.ebuild| 9 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 5329c54bee7d..8919fcaa9b6e 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -83,18 +83,19 @@ RDEPEND="
 # bug #846968 for sundials < dep
 DEPEND="${RDEPEND}
dev-util/gperf
-   virtual/pkgconfig
doc? (
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-plaingeneric
dev-texlive/texlive-metapost
virtual/latex-base
)
-   gui? ( dev-qt/linguist-tools:5 )
java? ( >=virtual/jdk-1.6.0 )
qrupdate? ( app-misc/pax-utils )
sparse? ( app-misc/pax-utils )
|| ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/linguist-tools:5 )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index b04de9f52552..91df3f2a06d3 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -82,9 +82,8 @@ RDEPEND="
)
sundials? ( >=sci-libs/sundials-4:0= )
X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/gperf
-   virtual/pkgconfig
+DEPEND="${RDEPEND}
+   dev-util/gperf
virtual/imagemagick-tools
doc? (
dev-texlive/texlive-fontsrecommended
@@ -92,10 +91,12 @@ BDEPEND="dev-util/gperf
dev-texlive/texlive-metapost
virtual/latex-base
)
-   gui? ( dev-qt/linguist-tools:5 )
java? ( >=virtual/jdk-1.8:* )
qrupdate? ( app-misc/pax-utils )
sparse? ( app-misc/pax-utils )"
+BDEPEND="
+   virtual/pkgconfig
+   gui? ( dev-qt/linguist-tools:5 )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-07-08 Thread Agostino Sarubbo
commit: 4d78b40c21c400b103b3574f8c47781836fb2976
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Jul  8 06:44:41 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Jul  8 06:44:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d78b40c

sci-mathematics/octave: x86 stable wrt bug #854489

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 849f53698922..5329c54bee7d 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-07-07 Thread Agostino Sarubbo
commit: b0150443db00f07d687f78e4ca75768c9df5848f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jul  7 06:34:01 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jul  7 06:34:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0150443

sci-mathematics/octave: amd64 stable wrt bug #854489

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index d87f09f4aaf1..849f53698922 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-07-06 Thread Arthur Zamarin
commit: 9e55f71f57415a38feebb91d37f418abe48f3d94
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jul  6 13:07:42 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jul  6 13:07:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e55f71f

sci-mathematics/octave: Stabilize 6.4.0-r3 arm64, #854489

Signed-off-by: Arthur Zamarin  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r3.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
index 0b54c76a4ce2..d87f09f4aaf1 100644
--- a/sci-mathematics/octave/octave-6.4.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-25 Thread Sam James
commit: abda90159d0be46a93172c2a6298946306347d17
Author: Sam James  gentoo  org>
AuthorDate: Thu May 26 00:10:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 26 00:10:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abda9015

sci-mathematics/octave: add sundials upper bound

Closes: https://bugs.gentoo.org/846968
Signed-off-by: Sam James  gentoo.org>

 .../octave/{octave-6.4.0-r2.ebuild => octave-6.4.0-r3.ebuild}  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r2.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
similarity index 98%
rename from sci-mathematics/octave/octave-6.4.0-r2.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r3.ebuild
index beacfa32b21a..0b54c76a4ce2 100644
--- a/sci-mathematics/octave/octave-6.4.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r3.ebuild
@@ -78,8 +78,9 @@ RDEPEND="
ssl? (
dev-libs/openssl:0=
)
-   sundials? ( >=sci-libs/sundials-4:0= )
+   sundials? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-17 Thread Sam James
commit: 64dd2f667b6feb15854cbb5a4932346ca00f6919
Author: Sam James  gentoo  org>
AuthorDate: Tue May 17 22:20:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 22:20:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64dd2f66

sci-mathematics/octave: Keyword 6.4.0-r2 hppa, #757822

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r2.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
index fc956ca314bf..beacfa32b21a 100644
--- a/sci-mathematics/octave/octave-6.4.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux 
~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-07 Thread Michael Orlitzky
commit: 07a6c967141ad1390f6668c7ce947630be207523
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat May  7 13:59:52 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat May  7 16:17:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07a6c967

sci-mathematics/octave: don't install *.la files.

I've fixed this only in the currently-unkeyworded v7.1.0 since it is
harmless and octave takes a long time to build.

Closes: https://bugs.gentoo.org/842663
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/octave-7.1.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 1158afd167bd..b04de9f52552 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -206,4 +206,6 @@ src_install() {
 
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
+
+   find "${ED}" -type f -name '*.la' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: aac091c1ac349d27bd53fdf9fdbde4149d2b2098
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 00:55:37 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 01:07:17 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac091c1

sci-mathematics/octave: tidy up 7.1.0

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-7.1.0.ebuild | 35 --
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 37a6248277be..9d333e018ff1 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg
 
 DESCRIPTION="High-level interactive language for numerical computations"
 HOMEPAGE="https://www.gnu.org/software/octave/;
@@ -81,9 +81,10 @@ RDEPEND="
)
sundials? ( >=sci-libs/sundials-4:0= )
X? ( x11-libs/libX11:0= )"
-BDEPEND="${RDEPEND}
-   dev-util/gperf
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/gperf
virtual/pkgconfig
+   virtual/imagemagick-tools
doc? (
dev-texlive/texlive-fontsrecommended
dev-texlive/texlive-plaingeneric
@@ -93,8 +94,7 @@ BDEPEND="${RDEPEND}
gui? ( dev-qt/linguist-tools:5 )
java? ( >=virtual/jdk-1.6.0 )
qrupdate? ( app-misc/pax-utils )
-   sparse? ( app-misc/pax-utils )
-   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
+   sparse? ( app-misc/pax-utils )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
@@ -138,13 +138,12 @@ src_configure() {
# The --enable-link-all-dependencies flag is needed because
# otherwise, the build system appends --no-undefined to LDFLAGS and
# then proceeds to undefine things. GNU libtool ignores this, but
-   # slibtool (for example) does not (bug 776583).
+   # slibtool (for example) does not (bug #776583).
econf \
--localstatedir="${EPREFIX}/var/state/octave" \
--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
--disable-64 \
-   --disable-jit \
--enable-link-all-dependencies \
--enable-shared \
--with-z \
@@ -163,7 +162,7 @@ src_configure() {
$(use_with opengl fltk) \
$(use_with ssl openssl) \
$(use_with portaudio) \
-   $(use_with qhull) \
+   $(use_with qhull_r) \
$(use_with qrupdate) \
$(use_with gui qt 5) \
$(use_with sndfile) \
@@ -179,7 +178,9 @@ src_configure() {
 
 src_compile() {
export VARTEXFONTS="${T}/fonts" # otherwise it will write to 
/var/cache/fonts/ and trip sandbox
+
default
+
if use java; then
pax-mark m "${S}/src/.libs/octave-cli"
fi
@@ -187,28 +188,20 @@ src_compile() {
 
 src_install() {
default
+
if use doc; then
dodoc $(find doc -name '*.pdf')
else
-   # bug 566134, macros.texi is installed by make install if use 
doc
+   # bug #566134, macros.texi is installed by make install if use 
doc
insinto /usr/share/${PN}/${PV}/etc
doins doc/interpreter/macros.texi
fi
+
[[ -e test/fntests.log ]] && dodoc test/fntests.log
+
use java && \
java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
 }
-
-pkg_postinst() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}
-
-pkg_postrm() {
-   xdg_icon_cache_update
-   xdg_mimeinfo_database_update
-   xdg_desktop_database_update
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: 510489d817fdc246fd73b7000886692ee27ff699
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 01:07:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 01:07:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510489d8

sci-mathematics/octave: fix Java dependency

Thanks vaukai.

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-7.1.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 0f6f332a685b..1158afd167bd 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -49,7 +49,7 @@ RDEPEND="
x11-libs/qscintilla:=
)
hdf5? ( sci-libs/hdf5:0= )
-   java? ( >=virtual/jre-1.6.0:* )
+   java? ( >=virtual/jre-1.8:* )
json? ( dev-libs/rapidjson )
opengl? (
media-libs/freetype:2=
@@ -93,7 +93,7 @@ BDEPEND="dev-util/gperf
virtual/latex-base
)
gui? ( dev-qt/linguist-tools:5 )
-   java? ( >=virtual/jdk-1.6.0 )
+   java? ( >=virtual/jdk-1.8:* )
qrupdate? ( app-misc/pax-utils )
sparse? ( app-misc/pax-utils )"
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: e6cc2ca6f0e30f587cd5df3ce4e63d4ec2d09e46
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 01:00:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 01:07:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cc2ca6

sci-mathematics/octave: add rapidjson USE flag

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/metadata.xml| 1 +
 sci-mathematics/octave/octave-7.1.0.ebuild | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index cfb2c2525f7c..759ec5c83e0f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -10,6 +10,7 @@


Add support for 
sci-mathematics/glpk for linear programming
+   Allow using jsonencode and jsondecode 
commands via dev-libs/rapidjson
Add support for media-libs/qhull, 
to allow `delaunay', `convhull', and related functions
Add support for 
sci-libs/qrupdatefor QR and Cholesky update functions
Add enhanced support for sparse matrix 
algebra with SuiteSparse

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 9d333e018ff1..0f6f332a685b 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java json opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
 # Issue when building w/ SSL needs investigation
@@ -50,6 +50,7 @@ RDEPEND="
)
hdf5? ( sci-libs/hdf5:0= )
java? ( >=virtual/jre-1.6.0:* )
+   json? ( dev-libs/rapidjson )
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
@@ -151,6 +152,7 @@ src_configure() {
$(use_enable static-libs static) \
$(use_enable doc docs) \
$(use_enable java) \
+   $(use_enable json rapidjson) \
$(use_enable readline) \
$(use_with curl) \
$(use_with fftw fftw3) \
@@ -162,7 +164,7 @@ src_configure() {
$(use_with opengl fltk) \
$(use_with ssl openssl) \
$(use_with portaudio) \
-   $(use_with qhull_r) \
+   $(use_with qhull qhull_r) \
$(use_with qrupdate) \
$(use_with gui qt 5) \
$(use_with sndfile) \



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: 2e7f3d962f84ad3363e3602563d22de5dd19b46d
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 00:40:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 00:40:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7f3d96

sci-mathematics/octave: fix patch filename

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.4.0-r2.ebuild | 2 +-
 sci-mathematics/octave/octave-7.1.0.ebuild| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0-r2.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
index 23efecfc1a2a..fc956ca314bf 100644
--- a/sci-mathematics/octave/octave-6.4.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
@@ -99,7 +99,7 @@ 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
+   "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
 )
 
 src_prepare() {

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 614ff3b2db5a..37a6248277be 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -100,7 +100,7 @@ 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
+   "${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: 7e9174d66023f9bcff9eb80758243ae781860689
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 00:39:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 00:39:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e9174d6

sci-mathematics/octave: unkeyword 7.1.0

Doesn't build with SSL.

Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-7.1.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
index 29b80b554192..614ff3b2db5a 100644
--- a/sci-mathematics/octave/octave-7.1.0.ebuild
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -14,7 +14,8 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+# Issue when building w/ SSL needs investigation
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2022-05-04 Thread Sam James
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/files/

2022-05-04 Thread Sam James
commit: c9f89fde98fbb42678f1e168be438f99fe651473
Author: Sam James  gentoo  org>
AuthorDate: Thu May  5 00:10:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 00:11:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f89fde

sci-mathematics/octave: use configure.ac patch

More resilient and doesn't get blown away by subsequent autoreconf.

Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James  gentoo.org>

 .../files/octave-7.1.0-omit-qtchooser-qtver.patch  | 77 +-
 1 file changed, 18 insertions(+), 59 deletions(-)

diff --git 
a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch 
b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
index 3dc9c3e1d191..2b16fbf411e1 100644
--- a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
+++ b/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
@@ -1,63 +1,22 @@
-diff -urNp octave-6.4.0-orig/configure octave-6.4.0-dwok/configure
 octave-6.4.0-orig/configure2022-04-19 20:45:23.112463584 +0200
-+++ octave-6.4.0-dwok/configure2022-04-19 20:44:19.024774083 +0200
-@@ -77543,9 +77543,6 @@ esac
- fi
- 
- if test -n "$MOC"; then
--  if test -n "$QTCHOOSER"; then
--MOCFLAGS="-qt=$qt_version"
--  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
- else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
-@@ -8,9 +5,6 @@ esac
- fi
- 
- if test -n "$UIC"; then
--  if test -n "$QTCHOOSER"; then
--UICFLAGS="-qt=$qt_version"
--  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
- else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
-@@ -78013,9 +78007,6 @@ esac
- fi
- 
- if test -n "$RCC"; then
--  if test -n "$QTCHOOSER"; then
--RCCFLAGS="-qt=$qt_version"
--  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
- else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
-@@ -78248,9 +78239,6 @@ esac
- fi
- 
- if test -n "$LRELEASE"; then
--  if test -n "$QTCHOOSER"; then
--LRELEASEFLAGS="-qt=$qt_version"
--  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
- else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
-@@ -78483,9 +78471,6 @@ esac
- fi
- 
- if test -n "$QCOLLECTIONGENERATOR"; then
+https://bugs.gentoo.org/839285
+--- a/m4/acinclude.m4
 b/m4/acinclude.m4
+@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
+   if test -z "$m4_toupper([$1])_QTVER"; then
+ AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
+ if test -n "$m4_toupper([$1])"; then
 -  if test -n "$QTCHOOSER"; then
--QCOLLECTIONGENERATORFLAGS="-qt=$qt_version"
+-m4_toupper([$1])FLAGS="-qt=$qt_version"
 -  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
  else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
-@@ -78718,9 +78703,6 @@ esac
- fi
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
+@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt 
version $1])
+   QT_TOOLS_MISSING=
  
- if test -n "$QHELPGENERATOR"; then
--  if test -n "$QTCHOOSER"; then
--QHELPGENERATORFLAGS="-qt=$qt_version"
--  fi
-   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator"
- else
-   QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator"
+   if test $build_qt_gui = yes; then
+-AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
+-
+ OCTAVE_CHECK_QT_TOOL([moc])
+ OCTAVE_CHECK_QT_TOOL([uic])
+ OCTAVE_CHECK_QT_TOOL([rcc])



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2022-05-04 Thread Sam James
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/files/, sci-mathematics/octave/

2022-05-04 Thread Sam James
commit: 92866628bc2358685c29fc8bef7bc1121929b103
Author: Thamognya Kodi  thamognya  com>
AuthorDate: Thu Apr 21 12:28:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May  5 00:11:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92866628

sci-mathematics/octave: version bump to 7.1.0

Bug: https://bugs.gentoo.org/839285
Closes: https://github.com/gentoo/gentoo/pull/25143
Signed-off-by: Thamognya Kodi  thamognya.com>
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 .../files/octave-6.4.0-omit-qtchooser-qtver.patch  |  63 ++
 sci-mathematics/octave/octave-7.1.0.ebuild | 213 +
 3 files changed, 277 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 1b45de02c2e9..acebc906380c 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,3 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435
+DIST octave-7.1.0.tar.gz 34187598 BLAKE2B 
da4c1b47e0d71f05edc47036b9b10fb83aa6edb8aa911ff22f77a013935ea37295f776f5c478e198c38102b8d1ad68edada818c9b46ad1061a466b5c77eeed58
 SHA512 
042a68bd2c5c873ccc846c6de13743c6fddd166e8b062948daf184133eb774a05e29ab6132829886411a5ba330126d20a3d0700a606819a424c3db6e57471888

diff --git 
a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch 
b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
new file mode 100644
index ..3dc9c3e1d191
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
@@ -0,0 +1,63 @@
+diff -urNp octave-6.4.0-orig/configure octave-6.4.0-dwok/configure
+--- octave-6.4.0-orig/configure2022-04-19 20:45:23.112463584 +0200
 octave-6.4.0-dwok/configure2022-04-19 20:44:19.024774083 +0200
+@@ -77543,9 +77543,6 @@ esac
+ fi
+ 
+ if test -n "$MOC"; then
+-  if test -n "$QTCHOOSER"; then
+-MOCFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE moc"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING moc"
+@@ -8,9 +5,6 @@ esac
+ fi
+ 
+ if test -n "$UIC"; then
+-  if test -n "$QTCHOOSER"; then
+-UICFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE uic"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING uic"
+@@ -78013,9 +78007,6 @@ esac
+ fi
+ 
+ if test -n "$RCC"; then
+-  if test -n "$QTCHOOSER"; then
+-RCCFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE rcc"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING rcc"
+@@ -78248,9 +78239,6 @@ esac
+ fi
+ 
+ if test -n "$LRELEASE"; then
+-  if test -n "$QTCHOOSER"; then
+-LRELEASEFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE lrelease"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING lrelease"
+@@ -78483,9 +78471,6 @@ esac
+ fi
+ 
+ if test -n "$QCOLLECTIONGENERATOR"; then
+-  if test -n "$QTCHOOSER"; then
+-QCOLLECTIONGENERATORFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
+@@ -78718,9 +78703,6 @@ esac
+ fi
+ 
+ if test -n "$QHELPGENERATOR"; then
+-  if test -n "$QTCHOOSER"; then
+-QHELPGENERATORFLAGS="-qt=$qt_version"
+-  fi
+   QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qhelpgenerator"
+ else
+   QT_TOOLS_MISSING="$QT_TOOLS_MISSING qhelpgenerator"

diff --git a/sci-mathematics/octave/octave-7.1.0.ebuild 
b/sci-mathematics/octave/octave-7.1.0.ebuild
new file mode 100644
index ..fe852460a5bb
--- /dev/null
+++ b/sci-mathematics/octave/octave-7.1.0.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
+
+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"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs sundials X 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-04-16 Thread Andrew Ammerlaan
commit: d2975ebf793475fb14124efed12030fdb6eae48c
Author: chn  chn  moe>
AuthorDate: Mon Apr 11 06:45:20 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Sat Apr 16 17:34:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2975ebf

sci-mathematics/octave-6.4.0: add missing dependencies

Closes: https://bugs.gentoo.org/837752
Signed-off-by: Haonan Chen  chn.moe>
Closes: https://github.com/gentoo/gentoo/pull/24985
Signed-off-by: Andrew Ammerlaan  gentoo.org>

 .../{octave-6.4.0.ebuild => octave-6.4.0-r1.ebuild}  | 16 +++-
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild 
b/sci-mathematics/octave/octave-6.4.0-r1.ebuild
similarity index 90%
rename from sci-mathematics/octave/octave-6.4.0.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r1.ebuild
index bc0547dacdd3..3ef75b4b879f 100644
--- a/sci-mathematics/octave/octave-6.4.0.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils 
toolchain-funcs xdg-utils
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils qmake-utils 
toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -76,7 +76,7 @@ RDEPEND="
sci-libs/umfpack:0=
)
ssl? (
-dev-libs/openssl:0=
+   dev-libs/openssl:0=
)
sundials? ( >=sci-libs/sundials-4:0= )
X? ( x11-libs/libX11:0= )"
@@ -92,7 +92,8 @@ DEPEND="${RDEPEND}
gui? ( dev-qt/linguist-tools:5 )
java? ( >=virtual/jdk-1.6.0 )
qrupdate? ( app-misc/pax-utils )
-   sparse? ( app-misc/pax-utils )"
+   sparse? ( app-misc/pax-utils )
+   || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
@@ -118,6 +119,11 @@ src_configure() {
use hdf5 && has_version sci-libs/hdf5[mpi] && \
export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
 
+   # tell autoconf where to find qt binaries, fix bug #837752
+   export MOC="$(qt5_get_bindir)/moc" UIC="$(qt5_get_bindir)/uic" 
RCC="$(qt5_get_bindir)/rcc" \
+   LRELEASE="$(qt5_get_bindir)/lrelease" 
QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \
+   QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator"
+
# Some of these use_with flags are a bit mismatched. The configure
# script offers only --without-foo, and detects "foo" automatically
# unless --without-foo is specified. Passing --with-foo is not an
@@ -187,7 +193,7 @@ src_install() {
fi
[[ -e test/fntests.log ]] && dodoc test/fntests.log
use java && \
-   java-pkg_regjar 
"${ED%/}/usr/share/${PN}/${PV}/m/java/octave.jar"
+   java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
 }



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2022-03-17 Thread Michael Orlitzky
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/

2022-01-17 Thread Michael Orlitzky
commit: c3b07b88c4c2034c849824210c3227bb0ab28bfa
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jan 17 17:19:22 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jan 17 17:24:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b07b88

sci-mathematics/octave: new upstream version 6.4.0.

Bug: https://bugs.gentoo.org/776583
Closes: https://bugs.gentoo.org/775254
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-6.4.0.ebuild | 204 +
 2 files changed, 205 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 19093503ee65..f38fe7346ca7 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 
55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0
 SHA512 
4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
 DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 
032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9
 SHA512 
9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b740519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
+DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435

diff --git a/sci-mathematics/octave/octave-6.4.0.ebuild 
b/sci-mathematics/octave/octave-6.4.0.ebuild
new file mode 100644
index ..4b0b6832a769
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.4.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 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/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+#
+# (un)zip isn't mentioned, but there's a test that uses it (bug 775254).
+#
+RDEPEND="
+   app-arch/bzip2
+   app-arch/unzip
+   app-arch/zip
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   qrupdate? ( sci-libs/qrupdate:0= )
+   readline? ( sys-libs/readline:0= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/cxsparse:0=
+   sci-libs/umfpack:0=
+   )
+   ssl? (
+

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2022-01-17 Thread Michael Orlitzky
commit: 207456b03f58406323fe450ddb780ae898b93173
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Jan 17 17:21:27 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Jan 17 17:24:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=207456b0

sci-mathematics/octave: remove old "unused" ebuilds.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   2 -
 sci-mathematics/octave/octave-6.2.0.ebuild | 198 -
 sci-mathematics/octave/octave-6.3.0.ebuild | 194 
 3 files changed, 394 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index f38fe7346ca7..1b45de02c2e9 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1,2 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
-DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 
55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0
 SHA512 
4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
-DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 
032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9
 SHA512 
9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b740519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 DIST octave-6.4.0.tar.gz 32873157 BLAKE2B 
afa729c3c9917f724e7d97fe3af42986f323d3ff849e0a33ac9f183237e68d989d4f3dacd644405b648ec050ad07d8973abddbd8657b810de6f65d5b5ae37c02
 SHA512 
91ff031f6dfff8506fa738fd4f1f07276501fdfe003f8ed992cccf91da14d9d33da6d08923322b0dae5f5b696b49856b0f5c5065e26b0701b0d1630173807435

diff --git a/sci-mathematics/octave/octave-6.2.0.ebuild 
b/sci-mathematics/octave/octave-6.2.0.ebuild
deleted file mode 100644
index f38aa0631f6a..
--- a/sci-mathematics/octave/octave-6.2.0.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 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/;
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
-   portaudio postscript +qhull +qrupdate readline sndfile +sparse
-   ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
-# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
-# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
-# documentation to text (see scripts/help/help.m).
-RDEPEND="
-   app-arch/bzip2
-   app-text/ghostscript-gpl
-   sys-apps/texinfo
-   dev-libs/libpcre:3=
-   sys-libs/ncurses:0=
-   sys-libs/zlib
-   virtual/blas
-   virtual/lapack
-   curl? ( net-misc/curl:0= )
-   fftw? ( sci-libs/fftw:3.0= )
-   glpk? ( sci-mathematics/glpk:0= )
-   gnuplot? ( sci-visualization/gnuplot )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qthelp:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   dev-qt/qtprintsupport:5
-   dev-qt/qtwidgets:5
-   x11-libs/qscintilla:=
-   )
-   hdf5? ( sci-libs/hdf5:0= )
-   java? ( >=virtual/jre-1.6.0:* )
-   opengl? (
-   media-libs/freetype:2=
-   media-libs/fontconfig:1.0=
-   virtual/glu
-   >=x11-libs/fltk-1.3:1=[opengl,xft]
-   x11-libs/gl2ps:0=
-   )
-   portaudio? ( media-libs/portaudio )
-   postscript? (
-   app-text/epstool
-   media-gfx/pstoedit
-   media-gfx/transfig
-   )
-   qhull? ( media-libs/qhull:0= )
-   qrupdate? ( sci-libs/qrupdate:0= )
-   readline? ( sys-libs/readline:0= )
-   sndfile? ( media-libs/libsndfile )
-   sparse? (
-   sci-libs/arpack:0=
-   sci-libs/camd:0=
-   sci-libs/ccolamd:0=
-   sci-libs/cholmod:0=
-   sci-libs/colamd:0=
-   sci-libs/cxsparse:0=
-   sci-libs/umfpack:0=
-   )
-   ssl? (
-dev-libs/openssl:0=
-   )
-   sundials? ( >=sci-libs/sundials-4:0= )
-   X? ( x11-libs/libX11:0= )"

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave-epstk/

2021-11-21 Thread Yixun Lan
commit: f8c711613d9a893f03be61e76f310fecc05b10e2
Author: Alex Fan  gmail  com>
AuthorDate: Thu Nov 18 07:18:51 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Nov 22 03:01:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8c71161

sci-mathematics/octave-epstk: keyword 2.4 for ~riscv

Signed-off-by: Alex Fan  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild 
b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
index beaa8dc5478f..04ae2479ca9c 100644
--- a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
+++ b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2
 S="${WORKDIR}"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 SLOT="0"
 IUSE="doc"
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2021-10-11 Thread Yixun Lan
commit: e96c9a00c3a0aa8c8845f70c70f347d182d3bcfa
Author: Alex Fan  yahoo  com>
AuthorDate: Mon Oct 11 05:27:29 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Oct 11 22:20:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e96c9a00

sci-mathematics/octave: keyword 6.3.0 for ~riscv

Closes: https://github.com/gentoo/gentoo/pull/22554
Signed-off-by: Alex Fan  yahoo.com>
Signed-off-by: Yixun Lan  gentoo.org>

 sci-mathematics/octave/octave-6.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild 
b/sci-mathematics/octave/octave-6.3.0.ebuild
index 0b137094276..5c1ff358633 100644
--- a/sci-mathematics/octave/octave-6.3.0.ebuild
+++ b/sci-mathematics/octave/octave-6.3.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2021-09-30 Thread Michael Orlitzky
commit: e74fea220f6c31c548cb8fecd033d479224fef0f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Sep 30 22:28:23 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Sep 30 22:28:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e74fea22

sci-mathematics/octave: new upstream version 6.3.0.

A standard copy/paste update, and I've dropped an old patch to one of
the autotools macros. A comment stated that the macro took too long,
but on my (ancient) machine it took about ten seconds. That is
relatively long, but not compared to the rest of the Octave build, and
not when considered against the burden of an eternal patch.

Closes: https://bugs.gentoo.org/815463
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-6.3.0.ebuild | 194 +
 2 files changed, 195 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 80143154f5f..19093503ee6 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,3 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
 DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 
55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0
 SHA512 
4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2
+DIST octave-6.3.0.tar.gz 32859335 BLAKE2B 
032f0e74b2fcd41358db1adc7f7274f6c8e327f5f86a32739864078bf236af26544f5988e774ebdd2ed28a6906e86556ce44ecd4bc5d3e710d839ecf5dcad9d9
 SHA512 
9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b740519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788

diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild 
b/sci-mathematics/octave/octave-6.3.0.ebuild
new file mode 100644
index 000..0b137094276
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.3.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 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/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
+RDEPEND="
+   app-arch/bzip2
+   app-text/ghostscript-gpl
+   sys-apps/texinfo
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   qrupdate? ( sci-libs/qrupdate:0= )
+   readline? ( sys-libs/readline:0= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/cxsparse:0=
+   sci-libs/umfpack:0=
+   )
+   ssl? (
+dev-libs/openssl:0=
+   )
+   sundials? ( >=sci-libs/sundials-4:0= )
+   X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2021-05-03 Thread Mikle Kolyada
commit: f39d632b12f70d6c6c9110fa858b49a39d9e06e7
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May  3 09:50:00 2021 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May  3 09:50:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f39d632b

sci-mathematics/octave: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada  gentoo.org>

 sci-mathematics/octave/octave-5.2.0.ebuild | 7 +++
 sci-mathematics/octave/octave-6.2.0.ebuild | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
index 873ea617a81..0427a86b5e7 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/octave/;
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs X zlib"
 KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
@@ -48,8 +48,7 @@ RDEPEND="
x11-libs/gl2ps:0=
)
ssl? (
-!libressl? ( dev-libs/openssl:0= )
-libressl? ( dev-libs/libressl:0= )
+dev-libs/openssl:0=
)
portaudio? ( media-libs/portaudio )
postscript? (

diff --git a/sci-mathematics/octave/octave-6.2.0.ebuild 
b/sci-mathematics/octave/octave-6.2.0.ebuild
index 0485737c240..f38aa0631f6 100644
--- a/sci-mathematics/octave/octave-6.2.0.ebuild
+++ b/sci-mathematics/octave/octave-6.2.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gnu.org/software/octave/;
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
@@ -71,8 +71,7 @@ RDEPEND="
sci-libs/umfpack:0=
)
ssl? (
-!libressl? ( dev-libs/openssl:0= )
-libressl? ( dev-libs/libressl:0= )
+dev-libs/openssl:0=
)
sundials? ( >=sci-libs/sundials-4:0= )
X? ( x11-libs/libX11:0= )"



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2021-03-10 Thread Michael Orlitzky
commit: c2da2325f592ff752fc8ccbbad5f869e90672026
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Mar 10 12:20:44 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Mar 10 12:21:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2da2325

sci-mathematics/octave: new upstream version 6.2.0.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest| 2 +-
 sci-mathematics/octave/{octave-6.1.0-r1.ebuild => octave-6.2.0.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ca1b95d3145..80143154f5f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,2 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
-DIST octave-6.1.0.tar.gz 32592405 BLAKE2B 
e39d7e8726b1aad8e378c8578e3d019b735ee82aa00230c9c35b36238848aa4c557da11707203c1ff845c26a117852c40ad9a42138812dcb5eba9b77a583a117
 SHA512 
34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7
+DIST octave-6.2.0.tar.gz 32620419 BLAKE2B 
55fd06336263b43f921ef30cac4fb82951a6be19aa60b6c24f24bcf3884923d824b6e4e6a8ad2983c394f541e556f7830922b34f8565bff3d07a7830c5df3cb0
 SHA512 
4039b68ffa77e599c63aa5748411603e86943be63ce96b6810547ba9776fe400939957fd8c40b2f212dfe244c76e58fdbbc4025179c9785b773da9bbb9fedaf2

diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild 
b/sci-mathematics/octave/octave-6.2.0.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-6.1.0-r1.ebuild
rename to sci-mathematics/octave/octave-6.2.0.ebuild
index 291afd25676..0485737c240 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-12-12 Thread Sam James
commit: 3d3724fb08ea318a4559e0c2634ab6b985e69f84
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 12 23:31:15 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 12 23:31:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3724fb

sci-mathematics/octave: ppc keyworded (bug #757822)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild 
b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
index cc994767a8f..291afd25676 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-12-12 Thread Sam James
commit: 19a5e47e0403fcb6c9e32072f582e4c4df3884dd
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 12 22:20:01 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 12 22:20:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a5e47e

sci-mathematics/octave: ppc64 keyworded (bug #757822)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild 
b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
index a1b62fde1d3..cc994767a8f 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-12-07 Thread Sam James
commit: 8b7ca49ca22343d9f6b019261dc08e8933d6bfb9
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 15:24:29 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 15:24:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7ca49c

sci-mathematics/octave: Keyword 6.1.0-r1 arm, #757822

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild 
b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
index cbd2dd72530..e5467f37741 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-12-07 Thread Sam James
commit: 4cfa8aeae7b25ba43374f5193ff69735560abbbd
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec  7 15:26:53 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec  7 15:26:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cfa8aea

sci-mathematics/octave: arm64 keyworded (bug #757822)

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-6.1.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.1.0-r1.ebuild 
b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
index e5467f37741..a1b62fde1d3 100644
--- a/sci-mathematics/octave/octave-6.1.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs sundials X zlib"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 # Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
 # "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-12-01 Thread Michael Orlitzky
commit: 944d865582a419b31183f4408a8895f45b7e6607
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Dec  1 16:10:55 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Dec  1 16:14:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944d8655

sci-mathematics/octave: new revision with sys-apps/texinfo in RDEPEND.

Closes: https://bugs.gentoo.org/743019
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../octave/{octave-6.1.0.ebuild => octave-6.1.0-r1.ebuild}   | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-6.1.0.ebuild 
b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
similarity index 96%
rename from sci-mathematics/octave/octave-6.1.0.ebuild
rename to sci-mathematics/octave/octave-6.1.0-r1.ebuild
index ff79efc69a4..cbd2dd72530 100644
--- a/sci-mathematics/octave/octave-6.1.0.ebuild
+++ b/sci-mathematics/octave/octave-6.1.0-r1.ebuild
@@ -16,9 +16,13 @@ IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl 
opengl
ssl static-libs sundials X zlib"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
+# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
+# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
+# documentation to text (see scripts/help/help.m).
 RDEPEND="
app-arch/bzip2
app-text/ghostscript-gpl
+   sys-apps/texinfo
dev-libs/libpcre:3=
sys-libs/ncurses:0=
sys-libs/zlib
@@ -74,7 +78,6 @@ RDEPEND="
X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
dev-util/gperf
-   sys-apps/texinfo
virtual/pkgconfig
doc? (
dev-texlive/texlive-fontsrecommended



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-11-30 Thread Michael Orlitzky
commit: 789bf5a4cfe45faa2c3a8f31ef6b13516f2e1f41
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Dec  1 01:41:58 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Dec  1 04:47:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789bf5a4

sci-mathematics/octave: new version 6.1.0.

Dropped keywords arm, arm64, hppa, ppc, and ppc64 due to a new
USE-conditional dependency on sci-libs/sundials.

Closes: https://bugs.gentoo.org/660310
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/metadata.xml|   1 +
 sci-mathematics/octave/octave-6.1.0.ebuild | 196 +
 3 files changed, 198 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 62029d3b7e2..ca1b95d3145 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
 DIST octave-5.2.0.tar.gz 33360285 BLAKE2B 
6d53a48a7fbe929e372fd51d084c0269befd3140341f3f3a1f2cae02f9f085ed434c3336c770c9a856081197c93ee306f481dd116b958685175bc294e4db62ae
 SHA512 
fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498
+DIST octave-6.1.0.tar.gz 32592405 BLAKE2B 
e39d7e8726b1aad8e378c8578e3d019b735ee82aa00230c9c35b36238848aa4c557da11707203c1ff845c26a117852c40ad9a42138812dcb5eba9b77a583a117
 SHA512 
34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index 619b5f255ad..7c8e7d9ad55 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -13,5 +13,6 @@
Add support for media-libs/qhull, 
to allow `delaunay', `convhull', and related functions
Add support for 
sci-libs/qrupdatefor QR and Cholesky update functions
Add enhanced support for sparse matrix 
algebra with SuiteSparse
+   Enable the ode15i and ode15s ODE solvers 
using sci-libs/sundials

 

diff --git a/sci-mathematics/octave/octave-6.1.0.ebuild 
b/sci-mathematics/octave/octave-6.1.0.ebuild
new file mode 100644
index 000..ff79efc69a4
--- /dev/null
+++ b/sci-mathematics/octave/octave-6.1.0.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2020 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/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs sundials X zlib"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   app-arch/bzip2
+   app-text/ghostscript-gpl
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   qrupdate? ( sci-libs/qrupdate:0= )
+   readline? ( sys-libs/readline:0= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/cxsparse:0=
+   sci-libs/umfpack:0=
+   )
+   ssl? (
+!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
+   )
+   sundials? ( >=sci-libs/sundials-4:0= )
+   X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+   dev-util/gperf
+   sys-apps/texinfo
+   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-11-06 Thread Sam James
commit: 164f6b7b2baef530fcfdba7df2bf02d2106c2ea6
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov  6 15:19:46 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov  6 15:19:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=164f6b7b

sci-mathematics/octave: Stabilize 5.2.0 arm64, #709830

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
index 321f94206cc..1c82411ce54 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs X zlib"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-10-06 Thread Sam James
commit: 1899d0dd394397f77575bf17ed93f9e8d724b00f
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  6 21:09:30 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  6 21:09:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1899d0dd

sci-mathematics/octave: Keyword 5.2.0 arm64, #746944

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/octave/octave-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
index 1fe5608b0c3..321f94206cc 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs X zlib"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave-epstk/

2020-09-19 Thread Sam James
commit: 6587669ebc55bd9b9865677c5c16ba50cc31a0bf
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 19 18:50:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 19 18:50:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6587669e

sci-mathematics/octave-epstk: port to EAPI 7

Closes: https://bugs.gentoo.org/740970
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../octave-epstk/octave-epstk-2.4.ebuild| 21 ++---
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild 
b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
index 9031c1f761f..84af6b0bbb0 100644
--- a/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
+++ b/sci-mathematics/octave-epstk/octave-epstk-2.4.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
 inherit eutils
 
 DEB_PR=1
@@ -9,6 +10,7 @@ DESCRIPTION="Graphical output functions for Matlab and Octave"
 HOMEPAGE="http://www.epstk.de/;
 SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2

mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
+S="${WORKDIR}"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
@@ -17,22 +19,27 @@ IUSE="doc"
 
 RDEPEND="sci-mathematics/octave
app-text/ghostscript-gpl"
-DEPEND=""
-
-S="${WORKDIR}"
 
 src_prepare() {
+   cd eps* || die
+
local p
-   cd eps*
for p in $(cat "${WORKDIR}"/debian/patches/series); do
-   epatch "${WORKDIR}"/debian/patches/${p}
+   eapply "${WORKDIR}"/debian/patches/${p}
done
+
+   default
 }
 
 src_install() {
insinto /usr/share/octave/site/m/${PN}
doins eps*/m/*
-   use doc && dohtml -r eps*/doc/*
+
+   if use doc ; then
+   docinto html
+   dodoc -r eps*/doc/*
+   fi
+
insinto /etc
doins debian/epstk.conf
dodoc debian/README.Debian debian/changelog



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2020-06-04 Thread Andreas Sturmlechner
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/

2020-06-04 Thread Agostino Sarubbo
commit: 21887a304bea6e4aab6ab1990bf1d6f0c02dc9ec
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Jun  4 06:35:16 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Jun  4 06:35:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21887a30

sci-mathematics/octave: x86 stable wrt bug #709830

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
index 08552a338be..1fe5608b0c3 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs X zlib"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-05-25 Thread Mikle Kolyada
commit: e8cec9daeddf8b84af3ccdec8a224db4eb6947ff
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon May 25 12:28:21 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon May 25 12:28:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cec9da

sci-mathematics/octave: amd64 stable wrt bug #709830

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada  gentoo.org>

 sci-mathematics/octave/octave-5.2.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
index 5d9b11ef5c5..08552a338be 100644
--- a/sci-mathematics/octave/octave-5.2.0.ebuild
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
portaudio postscript +qhull +qrupdate readline sndfile +sparse
ssl static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-04-11 Thread Sergei Trofimovich
commit: c97d85259637fa96ac5613f19c29c56aea489af5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Apr 11 14:55:28 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 11 15:57:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97d8525

sci-mathematics/octave: drop to ~hppa

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/octave/octave-4.2.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index ec97d6fd740..8600b40098f 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-03-27 Thread Michael Orlitzky
commit: 9bf0c5ed22569b38b971412c57fb17c08c2abc64
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Mar 27 18:41:36 2020 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Mar 27 18:42:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0c5ed

sci-mathematics/octave: new version 5.2.0 sans imagemagick support.

This new version drops two patches (zlib underlinking and qt-5.11
support) that have been fixed upstream in other ways. Unfortunately,
it also temporarily disables USE=imagemagick, because the upstream
support for imagemagick is broken. In the past, we have carried custom
patches to fix that, but they no longer apply, and upstream has hinted
that the approach they take will not be accepted. So to get this out
the door, the simplest thing to do is to follow upstream and throw
imagemagick under a bus.

Bug: https://bugs.gentoo.org/401189
Bug: https://bugs.gentoo.org/660298
Closes: https://bugs.gentoo.org/709388
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Michael Orlitzky  gentoo.org>

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-5.2.0.ebuild | 201 +
 2 files changed, 202 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 2292bb1be34..23044156fe0 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,3 +2,4 @@ DIST octave-4.2.2.tar.gz 25624087 BLAKE2B 
c46de90d9a985c2b6b4f87b94b56f2ba4fb648
 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/octave-5.2.0.ebuild 
b/sci-mathematics/octave/octave-5.2.0.ebuild
new file mode 100644
index 000..5d9b11ef5c5
--- /dev/null
+++ b/sci-mathematics/octave/octave-5.2.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2020 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/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 java libressl opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse
+   ssl static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   app-arch/bzip2
+   app-text/ghostscript-gpl
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   ssl? (
+!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2020-01-12 Thread David Seifert
commit: bd0071ebb25c3665bb0cb7430821e06542ae7ca3
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jan 12 11:13:38 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 12 11:13:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd0071eb

sci-mathematics/octave: Remove local USE="gui"

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/octave/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-mathematics/octave/metadata.xml 
b/sci-mathematics/octave/metadata.xml
index c11ec7171e0..54f7c4586ad 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -10,7 +10,6 @@


Add support for 
sci-mathematics/glpk for linear programming
-   Enable the graphical user interface
Use dev-libs/openssl for low 
level hash functions
Add support for media-libs/qhull, 
to allow `delaunay', `convhull', and related functions
Add support for 
sci-libs/qrupdatefor QR and Cholesky update functions



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2019-08-24 Thread Benda XU
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/

2019-06-24 Thread Pacho Ramos
commit: ac0126c0d65ef0785c688b0027c4f3cbbc7c7a45
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Jun 24 07:01:37 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Jun 24 07:01:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac0126c0

sci-mathematics/octave: imagemagick-7 is needed

Closes: https://bugs.gentoo.org/660298
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Pacho Ramos  gentoo.org>

 sci-mathematics/octave/octave-4.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild 
b/sci-mathematics/octave/octave-4.4.1.ebuild
index ac34dd412bb..56a8b3b9eb3 100644
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -39,7 +39,7 @@ RDEPEND="
)
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
-   !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+   !graphicsmagick? ( >=media-gfx/imagemagick-7:=[cxx] )
graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
)
java? ( >=virtual/jre-1.6.0:* )



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2019-01-25 Thread Robin H. Johnson
commit: 2d82b58e6274ebf2d481a7c7aeb325fa7e847f9a
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jan 25 18:38:12 2019 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jan 25 20:56:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d82b58e

sci-mathematics/octave: fix USE=doc sandbox trip due to tex fonts

Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Robin H. Johnson  gentoo.org>

 sci-mathematics/octave/octave-4.2.2.ebuild | 3 ++-
 sci-mathematics/octave/octave-4.4.1.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index cf855684553..f326d2dd104 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -155,6 +155,7 @@ src_configure() {
 }
 
 src_compile() {
+   export VARTEXFONTS="${T}/fonts" # otherwise it will write to 
/var/cache/fonts/ and trip sandbox
default
if use java; then
pax-mark m "${S}/src/.libs/octave-cli"

diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild 
b/sci-mathematics/octave/octave-4.4.1.ebuild
index 3e298f6bd61..ac34dd412bb 100644
--- a/sci-mathematics/octave/octave-4.4.1.ebuild
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -160,6 +160,7 @@ src_configure() {
 }
 
 src_compile() {
+   export VARTEXFONTS="${T}/fonts" # otherwise it will write to 
/var/cache/fonts/ and trip sandbox
default
if use java; then
pax-mark m "${S}/src/.libs/octave-cli"



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-09-23 Thread Jeroen Roovers
commit: 0c23e329c379c5394a4514d5ba537f1159caa1d1
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Sep 23 20:44:30 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Sep 23 20:45:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c23e329

sci-mathematics/octave: Version 4.4.1.

Package-Manager: Portage-2.3.49, Repoman-2.3.11
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=665762

 sci-mathematics/octave/Manifest|   1 +
 sci-mathematics/octave/octave-4.4.1.ebuild | 195 +
 2 files changed, 196 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 3280adb74dd..c3fe75910f0 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/sci-mathematics/octave/octave-4.4.1.ebuild 
b/sci-mathematics/octave/octave-4.4.1.ebuild
new file mode 100644
index 000..3e298f6bd61
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.4.1.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2018 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/;
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
libressl opengl
+   portaudio postscript +qhull +qrupdate readline sndfile +sparse ssl 
static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+   app-arch/bzip2
+   app-text/ghostscript-gpl
+   dev-libs/libpcre:3=
+   sys-libs/ncurses:0=
+   sys-libs/zlib
+   virtual/blas
+   virtual/lapack
+   curl? ( net-misc/curl:0= )
+   fftw? ( sci-libs/fftw:3.0= )
+   glpk? ( sci-mathematics/glpk:0= )
+   gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qthelp:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
+   x11-libs/qscintilla:=
+   )
+   hdf5? ( sci-libs/hdf5:0= )
+   imagemagick? (
+   !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+   graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+   )
+   java? ( >=virtual/jre-1.6.0:* )
+   opengl? (
+   media-libs/freetype:2=
+   media-libs/fontconfig:1.0=
+   virtual/glu
+   >=x11-libs/fltk-1.3:1=[opengl,xft]
+   x11-libs/gl2ps:0=
+   )
+   ssl? (
+!libressl? ( dev-libs/openssl:0= )
+libressl? ( dev-libs/libressl:0= )
+   )
+   portaudio? ( media-libs/portaudio )
+   postscript? (
+   app-text/epstool
+   media-gfx/pstoedit
+   media-gfx/transfig
+   )
+   qhull? ( media-libs/qhull:0= )
+   qrupdate? ( sci-libs/qrupdate:0= )
+   readline? ( sys-libs/readline:0= )
+   sndfile? ( media-libs/libsndfile )
+   sparse? (
+   sci-libs/arpack:0=
+   sci-libs/camd:0=
+   sci-libs/ccolamd:0=
+   sci-libs/cholmod:0=
+   sci-libs/colamd:0=
+   sci-libs/cxsparse:0=
+   sci-libs/umfpack:0=
+   )
+   X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+   dev-util/gperf
+   sys-apps/texinfo
+   virtual/pkgconfig
+   doc? (
+   dev-texlive/texlive-fontsrecommended
+   dev-texlive/texlive-plaingeneric
+   dev-texlive/texlive-metapost
+   virtual/latex-base
+   )
+   gui? ( dev-qt/linguist-tools:5 )
+   java? ( >=virtual/jdk-1.6.0 )
+   qrupdate? ( 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-09-12 Thread Andreas Sturmlechner
commit: 6a7d52d678573425a521319c8bdf4278baf8a9b6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 12 06:06:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 06:06:54 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7d52d6

sci-mathematics/octave: Add qt-5.11 fix to 4.2.2

Octave shall not block Qt 5.11 stabilisation.

Bug: https://bugs.gentoo.org/663390
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sci-mathematics/octave/octave-4.2.2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index da55163918a..cf855684553 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${FILESDIR}"/${P}-ncurses-pkgconfig.patch
"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
"${FILESDIR}"/${P}-fix-qscintilla-detection.patch
+   "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/

2018-09-11 Thread Andreas Sturmlechner
commit: f0c36728afd0e9720c8efea527faa62670794755
Author: Dennis Schridde  gmx  net>
AuthorDate: Fri Jul 13 06:19:44 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 12 05:28:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0c36728

sci-mathematics/octave: Fix w/ media-gfx/graphicsmagick-1.3.30[imagemagick]

Closes: https://bugs.gentoo.org/661046

 sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch 
b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
index 2f651e0995e..2aa6e5b9d8c 100644
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
@@ -1,16 +1,22 @@
 --- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 
+0200
 +++ a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 
+0200
-@@ -817,10 +817,11 @@
+@@ -817,10 +817,19 @@
// depth is 8, there's a good chance that we will be limited.  It
// is also the GraphicsMagick recommended setting and the default
// for ImageMagick.
--  if (QuantumDepth < 16)
++#ifdef QuantumDepth
+   if (QuantumDepth < 16)
++#else
 +  using namespace Magick;
 +  if (MAGICKCORE_QUANTUM_DEPTH < 16)
++#endif
  warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
   "your version of %s limits images to %d bits per 
pixel\n",
-- MagickPackageName, QuantumDepth);
++#ifdef QuantumDepth
+  MagickPackageName, QuantumDepth);
++#else
 + MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
++#endif
  
initialized = true;
  }



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-07-21 Thread Alexis Ballier
commit: 0782a6fbed8e4c78c94c7f7cdfb4d4c1ec1e1c3d
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jul 21 12:12:41 2018 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jul 21 12:23:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0782a6fb

sci-mathematics/octave: simplify tl deps now that 2017 is stable

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 sci-mathematics/octave/octave-4.2.2.ebuild | 2 +-
 sci-mathematics/octave/octave-4.4.0.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index cc87a36b369..da55163918a 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -74,7 +74,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
dev-texlive/texlive-fontsrecommended
-   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
+   dev-texlive/texlive-plaingeneric
dev-texlive/texlive-metapost
virtual/latex-base
)

diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild 
b/sci-mathematics/octave/octave-4.4.0.ebuild
index 45ac0d9b327..d5d7b00aaf2 100644
--- a/sci-mathematics/octave/octave-4.4.0.ebuild
+++ b/sci-mathematics/octave/octave-4.4.0.ebuild
@@ -80,7 +80,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? (
dev-texlive/texlive-fontsrecommended
-   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
+   dev-texlive/texlive-plaingeneric
dev-texlive/texlive-metapost
virtual/latex-base
)



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-07-04 Thread Mark Wright
commit: bceea257a9486c16aeb98bf04872a73604acccdc
Author: Mark Wright  gentoo  org>
AuthorDate: Thu Jul  5 00:51:47 2018 +
Commit: Mark Wright  gentoo  org>
CommitDate: Thu Jul  5 00:51:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bceea257

sci-mathematics/octave: Add missing qt deps

Thanks to Jens Saak for reporting.

Closes: https://bugs.gentoo.org/660336
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sci-mathematics/octave/octave-4.4.0.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sci-mathematics/octave/octave-4.4.0.ebuild 
b/sci-mathematics/octave/octave-4.4.0.ebuild
index 54e929a545b..45ac0d9b327 100644
--- a/sci-mathematics/octave/octave-4.4.0.ebuild
+++ b/sci-mathematics/octave/octave-4.4.0.ebuild
@@ -30,8 +30,11 @@ RDEPEND="
gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
+   dev-qt/qthelp:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
+   dev-qt/qtprintsupport:5
+   dev-qt/qtwidgets:5
x11-libs/qscintilla:=
)
hdf5? ( sci-libs/hdf5:0= )



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2018-07-03 Thread Mark Wright
commit: 9bec43136e0fea48bb5e352b0ac9f14b78444690
Author: Mark Wright  gentoo  org>
AuthorDate: Tue Jul  3 12:46:41 2018 +
Commit: Mark Wright  gentoo  org>
CommitDate: Tue Jul  3 12:46:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bec4313

sci-mathematics/octave: Bump to 4.4.0, thanks Fabio Rossi

for providing a 4.4.0 ebuild and patches, thanks to Anton Kochkov for
reporting 655308.

Rename openssl USE flag to ssl, add support for USE libressl (not tested
with libressl), thanks to Alessandro Barbieri for reporting 620864.

Closes: https://bugs.gentoo.org/655308
Closes: https://bugs.gentoo.org/620864
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 sci-mathematics/octave/Manifest|   1 +
 .../files/octave-4.4.0-imagemagick-configure.patch |  16 ++
 .../octave/files/octave-4.4.0-imagemagick.patch|  16 ++
 .../octave/files/octave-4.4.0-qt-5.11.patch|  10 ++
 .../octave/files/octave-4.4.0-texi.patch   |  11 ++
 sci-mathematics/octave/octave-4.4.0.ebuild | 192 +
 6 files changed, 246 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 5a47e212d7a..3280adb74dd 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B 
c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a
 SHA512 
b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
+DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 
3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc
 SHA512 
6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2

diff --git 
a/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch 
b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
new file mode 100644
index 000..ce81b801d99
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick-configure.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac 2018-04-30 19:03:56.0 +0200
 a/configure.ac.new 2018-05-22 12:23:30.371174341 +0200
+@@ -1946,11 +1946,11 @@
+   MAGICK_LIBS=
+ 
+   PKG_CHECK_EXISTS([$magick++], [
+-dnl Make sure we only get -I, -L, and -l flags.
++dnl Make sure we only get -I, -D, -L, and -l flags.
+ dnl Some Graphics/ImageMagick++ dnl packages add extra flags that are
+ dnl useful when building Graphics/ImageMagick++ extentions.  These extra
+ dnl flags break the Octave build.
+-MAGICK_CPPFLAGS="$($PKG_CONFIG --cflags-only-I $magick++ | $SED -e 's/^ 
*$//')"
++MAGICK_CPPFLAGS=`$PKG_CONFIG --cflags $magick++ | 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.4.0-imagemagick.patch 
b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
new file mode 100644
index 000..2f651e0995e
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
@@ -0,0 +1,16 @@
+--- a/libinterp/corefcn/__magick_read__.cc 2018-05-22 12:25:37.688173855 
+0200
 a/libinterp/corefcn/__magick_read__.cc.new 2018-05-22 12:32:51.475172200 
+0200
+@@ -817,10 +817,11 @@
+   // depth is 8, there's a good chance that we will be limited.  It
+   // is also the GraphicsMagick recommended setting and the default
+   // for ImageMagick.
+-  if (QuantumDepth < 16)
++  using namespace Magick;
++  if (MAGICKCORE_QUANTUM_DEPTH < 16)
+ warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
+  "your version of %s limits images to %d bits per 
pixel\n",
+- MagickPackageName, QuantumDepth);
++ MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
+ 
+   initialized = true;
+ }

diff --git a/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch 
b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch
new file mode 100644
index 000..70ffbb47199
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-4.4.0-qt-5.11.patch
@@ -0,0 +1,10 @@
+--- octave-4.4.0-orig/libgui/src/settings-dialog.cc2018-05-01 
03:03:56.0 +1000
 octave-4.4.0/libgui/src/settings-dialog.cc 2018-07-03 19:35:41.865149269 
+1000
+@@ -41,6 +41,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #if defined (HAVE_QSCINTILLA)
+ #  include "octave-qscintilla.h"

diff --git a/sci-mathematics/octave/files/octave-4.4.0-texi.patch 
b/sci-mathematics/octave/files/octave-4.4.0-texi.patch
new file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-04-25 Thread Matt Turner
commit: c22a3cebd215831e6cd29185e05f30909c503b60
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Apr 26 02:58:44 2018 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 26 02:58:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22a3ceb

sci-mathematics/octave: Drop to ~ppc/~ppc64

 sci-mathematics/octave/octave-4.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index 66323d5a8b5..cc87a36b369 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-04-07 Thread Andreas Sturmlechner
commit: 8838fcf498568b7ddac0c8baa4f38547b65059fe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  7 18:20:06 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  7 20:48:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8838fcf4

sci-mathematics/octave: Fix HOMEPAGE

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-mathematics/octave/octave-4.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index 3992dc9da4e..66323d5a8b5 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -7,7 +7,7 @@ inherit autotools flag-o-matic fortran-2 gnome2-utils 
java-pkg-opt-2 pax-utils t
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/;
+HOMEPAGE="https://www.gnu.org/software/octave/;
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/${PV}"



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-04-07 Thread Andreas Sturmlechner
commit: b50914de0aeb0dd48dbf59d30499cf2af1458f27
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  7 17:58:34 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  7 20:48:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50914de

sci-mathematics/octave: Drop obsolete qt4 comment

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-mathematics/octave/octave-4.2.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index f120643f017..308659f6f62 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -95,7 +95,7 @@ PATCHES=(
 )
 
 src_prepare() {
-   # nasty prefix hacks for fltk:1 and qt4 linking
+   # nasty prefix hacks for fltk:1 linking
if use prefix; then
use opengl && append-ldflags 
-Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
fi



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2018-04-07 Thread Andreas Sturmlechner
commit: bb6e872865d032decf26a8174b49e1c136d1bb51
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  7 18:12:16 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  7 20:48:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6e8728

sci-mathematics/octave: Update GTK+ icon cache

Closes: https://bugs.gentoo.org/646470
Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-mathematics/octave/octave-4.2.2.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index 70a76ad3ef6..3992dc9da4e 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils 
toolchain-funcs xdg-utils
+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"
@@ -177,11 +177,13 @@ src_install() {
 }
 
 pkg_postinst() {
+   gnome2_icon_cache_update
xdg_mimeinfo_database_update
xdg_desktop_database_update
 }
 
 pkg_postrm() {
+   gnome2_icon_cache_update
xdg_mimeinfo_database_update
xdg_desktop_database_update
 }



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2018-04-07 Thread Andreas Sturmlechner
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/

2018-04-07 Thread Andreas Sturmlechner
commit: da7b6cc34b74d180ce2a5543b32978d90070d395
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  7 18:08:10 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  7 20:48:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da7b6cc3

sci-mathematics/octave: Sort DEPENDs

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sci-mathematics/octave/octave-4.2.2.ebuild | 32 +++---
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild 
b/sci-mathematics/octave/octave-4.2.2.ebuild
index 308659f6f62..70a76ad3ef6 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -27,6 +27,13 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0= )
glpk? ( sci-mathematics/glpk:0= )
gnuplot? ( sci-visualization/gnuplot )
+   gui? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
+   )
hdf5? ( sci-libs/hdf5:0= )
imagemagick? (
!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
@@ -36,9 +43,9 @@ RDEPEND="
opengl? (
media-libs/freetype:2=
media-libs/fontconfig:1.0=
+   virtual/glu
>=x11-libs/fltk-1.3:1=[opengl,xft]
x11-libs/gl2ps:0=
-   virtual/glu
)
openssl? ( dev-libs/openssl:0= )
portaudio? ( media-libs/portaudio )
@@ -49,13 +56,6 @@ RDEPEND="
)
qhull? ( media-libs/qhull:0= )
qrupdate? ( sci-libs/qrupdate:0= )
-   gui? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtopengl:5
-   >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
-   )
readline? ( sys-libs/readline:0= )
sndfile? ( media-libs/libsndfile )
sparse? (
@@ -69,19 +69,19 @@ RDEPEND="
)
X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
-   gui? ( dev-qt/linguist-tools:5 )
-   qrupdate? ( app-misc/pax-utils )
-   sparse? ( app-misc/pax-utils )
-   java? ( >=virtual/jdk-1.6.0 )
+   dev-util/gperf
+   sys-apps/texinfo
+   virtual/pkgconfig
doc? (
-   virtual/latex-base
dev-texlive/texlive-fontsrecommended
|| ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
+   virtual/latex-base
)
-   sys-apps/texinfo
-   dev-util/gperf
-   virtual/pkgconfig"
+   gui? ( dev-qt/linguist-tools:5 )
+   java? ( >=virtual/jdk-1.6.0 )
+   qrupdate? ( app-misc/pax-utils )
+   sparse? ( app-misc/pax-utils )"
 
 PATCHES=(
"${FILESDIR}"/${PN}-4.2.0-texi.patch



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

2018-03-21 Thread Patrice Clement
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-epstk/

2018-03-05 Thread Pacho Ramos
commit: 018ab87bbc1bfab8196afa25313babceb388f3df
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Mar  5 15:28:35 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Mar  5 15:30:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=018ab87b

sci-mathematics/octave-epstk: Drop old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sci-mathematics/octave-epstk/Manifest  |  2 --
 .../octave-epstk/octave-epstk-2.3.ebuild   | 39 --
 2 files changed, 41 deletions(-)

diff --git a/sci-mathematics/octave-epstk/Manifest 
b/sci-mathematics/octave-epstk/Manifest
index 2bd92a51b83..bcc7069208b 100644
--- a/sci-mathematics/octave-epstk/Manifest
+++ b/sci-mathematics/octave-epstk/Manifest
@@ -1,4 +1,2 @@
-DIST octave-epstk_2.3-2.debian.tar.gz 10079 BLAKE2B 
dac7f138373a14bb51190dadeb4481c73b204756a1760242141459c011e59e14d705e2cc1b3f4de9a5a49ee034dffa898e1d217a90ea564556ecc71346d84d4f
 SHA512 
076c374581df44d5b6ac9e0a7fd0a412adfda325fd28fbbf036a739d444332a75dea30a3e313f4df8ec54ceab60fea8206cf70837ae83407b17c5ff42e35563f
-DIST octave-epstk_2.3.orig.tar.bz2 1401307 BLAKE2B 
d2537046e2436e595ad7d86c783b095af51d3598faa9b97d22724e75fc8e009afe096bcf736145e90757088c9148c1d2dad1689bc06343d7789d0f1137bb5a48
 SHA512 
3b672e78636a1d339355d5f8340a0f35c3af443061e76de875a0f22fae5fa394b3373fb12770705a301dbccdd1ad577aec2934daa04e8f3d16f8133b77e9bbd7
 DIST octave-epstk_2.4-1.debian.tar.gz 10905 BLAKE2B 
79290d650a3a9e485c2b45fabcf5aa6c68585656f5f1c81ac3412ea123986bb51ed18b7f093bcec954964e260907594d5fda0f28915ef951fe59c6d238092278
 SHA512 
93ce2bdb04b2be36bc73d2c13a1bdd909b30597a76bc80db0abb1b4f53467742086559ed1f5ce265cea70f84c9b33d07a514b4fc1c8afc46640d0031907e6dea
 DIST octave-epstk_2.4.orig.tar.bz2 1072111 BLAKE2B 
25694cb80fe66efb15508f6654218a2fcfd66997258e590626caf4daeafdc68b92dba5c9b0066c25777af609606d9b6e15ebea45c8fabcca17c962a1d664172c
 SHA512 
64de7c23e2a79f03a6aeaa9e8a73c6d95e59cf616fc601bd8c6ad18d3870b1c60752f95cdc174cc31b3095e8b6e3858111c7d72b3b6df8effee4393791282112

diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild 
b/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
deleted file mode 100644
index f4c6f9a75dc..000
--- a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DEB_PR=2
-DESCRIPTION="Graphical output functions for Matlab and Octave"
-HOMEPAGE="http://www.epstk.de/;
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2
-   
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="sci-mathematics/octave
-   app-text/ghostscript-gpl"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-   local p
-   cd eps*
-   for p in $(cat "${WORKDIR}"/debian/patches/series); do
-   epatch "${WORKDIR}"/debian/patches/${p}
-   done
-}
-
-src_install () {
-   insinto /usr/share/octave/site/m/${PN}
-   doins eps*/m/* || die
-   use doc && dohtml -r eps*/doc/*
-   insinto /etc
-   doins debian/epstk.conf || die
-   dodoc debian/README.Debian debian/changelog
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave-epstk/

2017-11-25 Thread David Seifert
commit: c6e1c15691d1fc4239c82ea830d0485e46fac05f
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 25 16:52:21 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 25 17:39:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6e1c156

sci-mathematics/octave-epstk: [QA] Consistent whitespace in metadata.xml

 sci-mathematics/octave-epstk/metadata.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sci-mathematics/octave-epstk/metadata.xml 
b/sci-mathematics/octave-epstk/metadata.xml
index f42812a0961..b86b9785df2 100644
--- a/sci-mathematics/octave-epstk/metadata.xml
+++ b/sci-mathematics/octave-epstk/metadata.xml
@@ -1,14 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   sci-mathemat...@gentoo.org
-   Gentoo Mathematics Project
-
-
-  The epsTk package provides, via a set of functions for octave, a
-  toolkit to create powerful encapsulated postscript (.eps) graphs. Most 2D
-  scientific graphics functions are written. The generated .eps-files are very
-  small and can be imported into other documents without loss of quality.
-
+   
+   sci-mathemat...@gentoo.org
+   Gentoo Mathematics Project
+   
+   
+   The epsTk package provides, via a set of functions for octave, a
+   toolkit to create powerful encapsulated postscript (.eps) 
graphs. Most 2D
+   scientific graphics functions are written. The generated 
.eps-files are very
+   small and can be imported into other documents without loss of 
quality.
+   
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2017-10-08 Thread Andreas Sturmlechner
commit: b028a2c63ff7fe94201305761d6d9daf3745af5f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct  8 14:46:45 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct  8 16:42:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b028a2c6

sci-mathematics/octave: Fix >=qscintilla-2.10 detection

Gentoo-bug: 617024
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 .../octave/files/octave-4.2.0-fix-qscintilla-detection.patch |  2 +-
 sci-mathematics/octave/octave-4.2.1.ebuild   | 12 +++-
 2 files changed, 12 insertions(+), 2 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
index 9d18b6a6d7c..ea714ecbfbb 100644
--- 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
@@ -8,7 +8,7 @@ as its Qt4 variant.
  5)
QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
 -  octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+  octave_qscintilla_libnames=qscintilla2
++  octave_qscintilla_libnames="qscintilla2_qt5 qscintilla2"
  ;;
  *)
AC_MSG_ERROR([Unrecognized Qt version $qt_version])

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index 00a2d44ce48..e7ecf516cc4 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils 
toolchain-funcs
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils 
toolchain-funcs xdg-utils
 
 DESCRIPTION="High-level interactive language for numerical computations"
 LICENSE="GPL-3"
@@ -175,3 +175,13 @@ src_install() {
echo "LDPATH=${EPREFIX}/usr/$(get_libdir)/${PN}/${PV}" > 99octave || die
doenvd 99octave
 }
+
+pkg_postinst() {
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}
+
+pkg_postrm() {
+   xdg_mimeinfo_database_update
+   xdg_desktop_database_update
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/files/, sci-mathematics/octave/

2017-06-11 Thread David Seifert
commit: 8fc2192f2c98e1de3f9667d4d968141c6df8d55c
Author: David Seifert  gentoo  org>
AuthorDate: Sun Jun 11 21:02:50 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jun 11 21:43:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc2192f

sci-mathematics/octave: Remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4771

 sci-mathematics/octave/Manifest|   3 -
 .../octave/files/octave-3.4.3-pkgbuilddir.patch|  44 ---
 .../octave/files/octave-3.4.3-texi.patch   |  11 -
 .../octave/files/octave-3.6.3-legendtext.patch |  13 -
 .../octave/files/octave-3.6.4-texinfo.patch| 378 -
 ...le-getcwd-path-max-test-as-it-is-too-slow.patch |  11 -
 .../files/octave-3.8.0-imagemagick-configure.patch |  16 -
 .../octave/files/octave-3.8.1-imagemagick.patch| 138 
 .../octave/files/octave-3.8.1-pkgbuilddir.patch|  41 ---
 sci-mathematics/octave/octave-3.6.4-r1.ebuild  | 124 ---
 sci-mathematics/octave/octave-3.8.2-r3.ebuild  | 151 
 sci-mathematics/octave/octave-4.2.0-r4.ebuild  | 177 --
 12 files changed, 1107 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index b0da42bbc13..31d611c011f 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,4 +1 @@
-DIST octave-3.6.4.tar.bz2 15627315 SHA256 
fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 
a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81
 WHIRLPOOL 
f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
-DIST octave-3.8.2.tar.bz2 17834980 SHA256 
83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 
c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc
 WHIRLPOOL 
c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
-DIST octave-4.2.0.tar.gz 25320153 SHA256 
443ba73782f3531c94bcf016f2f0362a58e186ddb8269af7dcce973562795567 SHA512 
5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678
 WHIRLPOOL 
b5973f4e96aa4785436afa7fcc637cce021e4b5e93c3368f61712c808191bc26e3ece9d649f0b99e3df03672cb6df16c28cad931f3317b555f4f3167e4092f34
 DIST octave-4.2.1.tar.gz 25409651 SHA256 
80c28f6398576b50faca0e602defb9598d6f7308b0903724442c2a35a605333b SHA512 
c437c57eb145ddea7b97124dc6406d130fd91c9141198b93bc756bb05cb3f7645a7c591443faeb65e69edf6abc2b8d5612e515f7703a04eed27213a2133009b7
 WHIRLPOOL 
4488287a9223ed99fe4ff3423f8ea5157cb538eb54918a53024082083a2f22d2af751f7dde0e489266a518d6ea5265e9c68536b5d5d9a186919d9979e9575333

diff --git a/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch 
b/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch
deleted file mode 100644
index 5340c9a19b9..000
--- a/sci-mathematics/octave/files/octave-3.4.3-pkgbuilddir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Allow installation of already extracted packages with pkg.m
-Forwarded: not-needed
-Author: Thomas Weber 
 scripts/pkg/pkg.m.orig 2011-02-08 03:00:51.0 -0700
-+++ scripts/pkg/pkg.m  2011-03-18 09:31:24.670165643 -0600
-@@ -644,7 +644,14 @@
- 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 = tmpnam ();
- tmpdirs{end+1} = tmpdir;
-@@ -671,20 +678,12 @@
- if (length (dirlist) > 3)
-   error ("bundles of packages are not allowed");
- endif
--  endif
- 
--  ## The filename pointed to an uncompressed package to begin with.
--  if (exist (tgz, "dir"))
--dirlist = {".", "..", tgz};
-+## The two first entries of dirlist are "." and "..".
-+packdir = fullfile (tmpdir, dirlist{3});
-   endif
- 
-   if (exist (tgz, "file") || exist (tgz, "dir"))
--## 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/files/octave-3.4.3-texi.patch 
b/sci-mathematics/octave/files/octave-3.4.3-texi.patch
deleted file 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-06-11 Thread Alexis Ballier
commit: 80ad06020a3f76ef0e6b76cb6507351674632a52
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Jun 11 11:22:01 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Jun 11 11:22:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ad0602

sci-mathematics/octave: Adapt deps for texlive 2017, bug #621240

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-mathematics/octave/octave-3.6.4-r1.ebuild | 2 +-
 sci-mathematics/octave/octave-3.8.2-r3.ebuild | 2 +-
 sci-mathematics/octave/octave-4.2.0-r4.ebuild | 2 +-
 sci-mathematics/octave/octave-4.2.1.ebuild| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild 
b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 0a66c65436c..191446ebdfc 100644
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
doc? (
virtual/latex-base
-   dev-texlive/texlive-genericrecommended
+   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
sys-apps/texinfo )
dev-util/gperf
virtual/pkgconfig"

diff --git a/sci-mathematics/octave/octave-3.8.2-r3.ebuild 
b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
index 2269f831a09..9ae07cee479 100644
--- a/sci-mathematics/octave/octave-3.8.2-r3.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
@@ -64,7 +64,7 @@ DEPEND="${RDEPEND}
java? ( >=virtual/jdk-1.6.0 )
doc? (
virtual/latex-base
-   dev-texlive/texlive-genericrecommended
+   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
sys-apps/texinfo )
dev-util/gperf

diff --git a/sci-mathematics/octave/octave-4.2.0-r4.ebuild 
b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
index a52aea882a3..2bbb86439b6 100644
--- a/sci-mathematics/octave/octave-4.2.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
doc? (
virtual/latex-base
dev-texlive/texlive-fontsrecommended
-   dev-texlive/texlive-genericrecommended
+   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
)
sys-apps/texinfo

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index 66548146eba..00a2d44ce48 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -76,7 +76,7 @@ DEPEND="${RDEPEND}
doc? (
virtual/latex-base
dev-texlive/texlive-fontsrecommended
-   dev-texlive/texlive-genericrecommended
+   || ( dev-texlive/texlive-plaingeneric 
dev-texlive/texlive-genericrecommended )
dev-texlive/texlive-metapost
)
sys-apps/texinfo



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-05-26 Thread Agostino Sarubbo
commit: c252c52bbc905b9fc174e4edeff89cf0e0dcdb42
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 26 14:59:25 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 26 14:59:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c252c52b

sci-mathematics/octave: ppc64 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index b4f01ff00ad..66548146eba 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-05-26 Thread Agostino Sarubbo
commit: 4d47f976b48b128487a9246e505ca4a8807d8f50
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri May 26 14:05:25 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri May 26 14:05:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d47f976

sci-mathematics/octave: x86 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index 9e65f53aa17..b4f01ff00ad 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-05-24 Thread Agostino Sarubbo
commit: d8685043138d8f2b4b353385d79b4c610f0d1ef5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed May 24 13:42:09 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed May 24 13:42:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8685043

sci-mathematics/octave: amd64 stable wrt bug #617694

Package-Manager: Portage-2.3.5, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 sci-mathematics/octave/octave-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index 25496a9dace..9e65f53aa17 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="~amd64 ~arm hppa ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-05-23 Thread Michael Weber
commit: 82d27fa97ca7f555a139695210a2e7826e6bf70a
Author: Michael Weber  gentoo  org>
AuthorDate: Tue May 23 23:25:32 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue May 23 23:25:44 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d27fa9

sci-mathematics/octave: ppc stable (bug 617694).

Package-Manager: Portage-2.3.6, Repoman-2.3.2
RepoMan-Options: --include-arches="ppc"

 sci-mathematics/octave/octave-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index 9b3658d7822..25496a9dace 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm hppa ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/

2017-05-10 Thread Jeroen Roovers
commit: aa7e4411ab80728d323f674ca76178fe073fba0c
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Wed May 10 20:01:59 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Wed May 10 20:01:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa7e4411

sci-mathematics/octave: Stable for HPPA (bug #617694).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 sci-mathematics/octave/octave-4.2.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild 
b/sci-mathematics/octave/octave-4.2.1.ebuild
index a52aea882a3..9b3658d7822 100644
--- a/sci-mathematics/octave/octave-4.2.1.ebuild
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 
opengl openssl
portaudio postscript +qhull +qrupdate readline sndfile +sparse 
static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
app-arch/bzip2



  1   2   >