public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-03-27 22:03 Manuel Rüger
  0 siblings, 0 replies; 103+ messages in thread
From: Manuel Rüger @ 2016-03-27 22:03 UTC (permalink / raw
  To: gentoo-commits

commit:     41aaade924d5583c8f5866797758011b533b7784
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 22:03:33 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 22:03:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41aaade9

sci-mathematics/octave: Version bump

Package-Manager: portage-2.2.28

 sci-mathematics/octave/Manifest            |   1 +
 sci-mathematics/octave/octave-4.0.1.ebuild | 169 +++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index ec9e36b..c1e4dfe 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -2,3 +2,4 @@ DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd
 DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
 DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 WHIRLPOOL 0e0154dac5ac76268d99533186a88f54bc811817cdf2222c3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
+DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a40000de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
new file mode 100644
index 0000000..a527708
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	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? ( x11-libs/qscintilla:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
+	java? ( >=virtual/jre-1.6.0:* )
+	jit? (
+		>=sys-devel/autoconf-archive-2015.02.04
+		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+		virtual/glu )
+	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= )
+	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= )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+	java? ( >=virtual/jdk-1.6.0 )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-metapost
+		sys-apps/texinfo )
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 and qt4 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
+	fi
+
+	# Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061
+	use jit && \
+		has_version ">=sys-devel/llvm-3.5" && \
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
+
+	# Fix bug 501756
+	sed -i \
+		-e 's@A-Za-z0-9@[:alnum:]@g' \
+		-e 's@A-Za-z@[:alpha:]@g' \
+		libinterp/mkbuiltins || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	# 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
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable gui)
+		$(use_enable jit)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myeconfargs+=( "--with-magick=GraphicsMagick" )
+		else
+			myeconfargs+=( "--with-magick=ImageMagick" )
+		fi
+	else
+		myeconfargs+=( "--without-magick" )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	emake
+	if use java || use jit ; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
+	doenvd 99octave
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-04-19 20:12 Ian Stakenvicius
  0 siblings, 0 replies; 103+ messages in thread
From: Ian Stakenvicius @ 2016-04-19 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     259a7c38d153e2ab802dc3aa7a233f413b37dd1d
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 20:12:32 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 20:12:32 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=259a7c38

fix <pkg/> reference in metadata.xml

Package-Manager: portage-2.2.26

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

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index ceea696..1696a2f 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -16,7 +16,7 @@
   <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
   <flag name="gui">Enable the graphical user interface</flag>
   <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
-  <flag name="qhull">Add support for <pkg>sci-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+  <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
   <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
   <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
 </use>


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-04-19 20:14 Ian Stakenvicius
  0 siblings, 0 replies; 103+ messages in thread
From: Ian Stakenvicius @ 2016-04-19 20:14 UTC (permalink / raw
  To: gentoo-commits

commit:     135260dbd38eace72c9c02c8e5e0d8f13debef68
Author:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 20:14:24 2016 +0000
Commit:     Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Tue Apr 19 20:14:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=135260db

fix another <pkg/> reference in metadata.xml

Package-Manager: portage-2.2.26

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

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 1696a2f..8bafaba 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -13,7 +13,7 @@
   language.
 </longdescription>
 <use>
-  <flag name="glpk">Add support for <pkg>sci-libs/glpk</pkg> for linear programming</flag>
+  <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
   <flag name="gui">Enable the graphical user interface</flag>
   <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
   <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-04-30 11:24 Manuel Rüger
  0 siblings, 0 replies; 103+ messages in thread
From: Manuel Rüger @ 2016-04-30 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     f235f5084dabbf3c5b5f3eff3b7f080935314611
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 11:24:02 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 11:24:02 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f235f508

sci-mathematics/octave: Version bump to 4.0.2

Package-Manager: portage-2.2.28

 sci-mathematics/octave/Manifest            |   1 +
 sci-mathematics/octave/octave-4.0.2.ebuild | 169 +++++++++++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index c1e4dfe..650d367 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -3,3 +3,4 @@ DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c63
 DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 WHIRLPOOL 0e0154dac5ac76268d99533186a88f54bc811817cdf2222c3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
 DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a40000de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb
+DIST octave-4.0.2.tar.xz 15668728 SHA256 98c11ecead8ea759eb1d010ad6319a63a1c6199d3a7e2abbafe453c753090403 SHA512 e79d43528d47a2b3f0fbc9e43eefd5fb8e199dd3818ffd745c1424c7cfca9397186dab129b6f61ee52f5c5203d613e5290d8dc5e32b318cfdd3d38f7facf63cd WHIRLPOOL bf870ef3b6affb4a157951d99132078f528b52be403f7d01bfd98fd657d4089ebbf5fb78f340ce18e59ae27d5eddb9edbbf76583810bcf2dbd5c9ce8ea3434cd

diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.2.ebuild
new file mode 100644
index 0000000..a527708
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.0.2.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+SLOT="0/${PV}"
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	dev-libs/libpcre:3=
+	sys-libs/ncurses:0=
+	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? ( x11-libs/qscintilla:0= )
+	hdf5? ( sci-libs/hdf5:0= )
+	imagemagick? ( || (
+			media-gfx/graphicsmagick[cxx]
+			media-gfx/imagemagick[cxx] ) )
+	java? ( >=virtual/jre-1.6.0:* )
+	jit? (
+		>=sys-devel/autoconf-archive-2015.02.04
+		>=sys-devel/llvm-3.3:0= <sys-devel/llvm-3.6:0= )
+	opengl? (
+		media-libs/freetype:2=
+		media-libs/fontconfig:1.0=
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+		virtual/glu )
+	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= )
+	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= )
+	zlib? ( sys-libs/zlib:0= )"
+
+DEPEND="${RDEPEND}
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+	java? ( >=virtual/jdk-1.6.0 )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-metapost
+		sys-apps/texinfo )
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.3-texi.patch
+	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.0.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.0.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 and qt4 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
+	fi
+
+	# Octave fails to build with LLVM 3.5 http://savannah.gnu.org/bugs/?41061
+	use jit && \
+		has_version ">=sys-devel/llvm-3.5" && \
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5.patch && \
+		epatch "${FILESDIR}"/${PN}-4.0.0-llvm-3.5-gnulib-hg.patch
+
+	# Fix bug 501756
+	sed -i \
+		-e 's@A-Za-z0-9@[:alnum:]@g' \
+		-e 's@A-Za-z@[:alpha:]@g' \
+		libinterp/mkbuiltins || die
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	# 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
+
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable gui)
+		$(use_enable jit)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with opengl)
+		$(use_with qhull)
+		$(use_with qrupdate)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with X x)
+		$(use_with zlib z)
+	)
+	if use imagemagick; then
+		if has_version media-gfx/graphicsmagick[cxx]; then
+			myeconfargs+=( "--with-magick=GraphicsMagick" )
+		else
+			myeconfargs+=( "--with-magick=ImageMagick" )
+		fi
+	else
+		myeconfargs+=( "--without-magick" )
+	fi
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	emake
+	if use java || use jit ; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+src_install() {
+	autotools-utils_src_install
+	use doc && dodoc $(find doc -name \*.pdf)
+	[[ -e test/fntests.log ]] && dodoc test/fntests.log
+	use java && \
+		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
+	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
+	doenvd 99octave
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-05-02 22:39 Mark Wright
  0 siblings, 0 replies; 103+ messages in thread
From: Mark Wright @ 2016-05-02 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     8a47ee1317a53e70dbced981850b377d02725dff
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 22:38:11 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon May  2 22:39:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a47ee13

sci-mathematics/octave: revbump 4.0.2 for bug 566134 fix.

Gentoo-bug: 566134

Package-Manager: portage-2.2.28

 sci-mathematics/octave/{octave-4.0.2.ebuild => octave-4.0.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
similarity index 100%
rename from sci-mathematics/octave/octave-4.0.2.ebuild
rename to sci-mathematics/octave/octave-4.0.2-r1.ebuild


^ permalink raw reply	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-05-02 22:39 Mark Wright
  0 siblings, 0 replies; 103+ messages in thread
From: Mark Wright @ 2016-05-02 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     3869c30043d3a0eb4c9bb11709346ee012fcc0c4
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Mon May  2 14:43:40 2016 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Mon May  2 22:38:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3869c300

sci-mathematics/octave: Fix bug 566134, thanks to Francisco Vazquez for reporting.

Gentoo-bug: 566134

Package-Manager: portage-2.2.28

 .../octave/{octave-4.0.2.ebuild => octave-4.0.0-r1.ebuild}   | 12 +++++++++---
 .../octave/{octave-4.0.2.ebuild => octave-4.0.1-r1.ebuild}   | 12 +++++++++---
 sci-mathematics/octave/octave-4.0.2.ebuild                   | 12 +++++++++---
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
similarity index 94%
copy from sci-mathematics/octave/octave-4.0.2.ebuild
copy to sci-mathematics/octave/octave-4.0.0-r1.ebuild
index a527708..88a67af 100644
--- a/sci-mathematics/octave/octave-4.0.2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -69,8 +69,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
+		dev-texlive/texlive-metapost )
+	sys-apps/texinfo
 	dev-util/gperf
 	virtual/pkgconfig"
 
@@ -160,7 +160,13 @@ src_compile() {
 
 src_install() {
 	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
+	if use doc; then
+		dodoc $(find doc -name \*.pdf)
+	else
+		# 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"

diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
similarity index 94%
copy from sci-mathematics/octave/octave-4.0.2.ebuild
copy to sci-mathematics/octave/octave-4.0.1-r1.ebuild
index a527708..88a67af 100644
--- a/sci-mathematics/octave/octave-4.0.2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -69,8 +69,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
+		dev-texlive/texlive-metapost )
+	sys-apps/texinfo
 	dev-util/gperf
 	virtual/pkgconfig"
 
@@ -160,7 +160,13 @@ src_compile() {
 
 src_install() {
 	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
+	if use doc; then
+		dodoc $(find doc -name \*.pdf)
+	else
+		# 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"

diff --git a/sci-mathematics/octave/octave-4.0.2.ebuild b/sci-mathematics/octave/octave-4.0.2.ebuild
index a527708..88a67af 100644
--- a/sci-mathematics/octave/octave-4.0.2.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2.ebuild
@@ -69,8 +69,8 @@ DEPEND="${RDEPEND}
 	doc? (
 		virtual/latex-base
 		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
+		dev-texlive/texlive-metapost )
+	sys-apps/texinfo
 	dev-util/gperf
 	virtual/pkgconfig"
 
@@ -160,7 +160,13 @@ src_compile() {
 
 src_install() {
 	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
+	if use doc; then
+		dodoc $(find doc -name \*.pdf)
+	else
+		# 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"


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-05-14 23:32 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-05-14 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ba2ed7ab86def230fd31d1ebd37bc9e179b38900
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 23:06:24 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 23:16:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2ed7ab

sci-mathematics/octave: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

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

diff --git a/sci-mathematics/octave/octave-3.8.1.ebuild b/sci-mathematics/octave/octave-3.8.1.ebuild
index 7dbd710..667ad0c 100644
--- a/sci-mathematics/octave/octave-3.8.1.ebuild
+++ b/sci-mathematics/octave/octave-3.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 RDEPEND="
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	jit? ( <sys-devel/llvm-3.5 )
 	virtual/lapack
 	curl? ( net-misc/curl )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-05-14 23:32 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-05-14 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     375c4d9d9d68193f115116812d1ccaa94c9d1d88
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 23:04:20 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 23:16:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375c4d9d

sci-mathematics/octave: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

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

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index 378b116..67ab623 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 RDEPEND="
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	virtual/lapack
 	curl? ( net-misc/curl )
 	fftw? ( sci-libs/fftw:3.0 )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-05-14 23:32 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-05-14 23:32 UTC (permalink / raw
  To: gentoo-commits

commit:     ab1612ffccfe4893d14ca379503914993380beb4
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 23:05:23 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 14 23:16:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab1612ff

sci-mathematics/octave: Fix QA MissingSlotDep

Package-Manager: portage-2.2.28

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

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 9e8f5ab..65094e6 100644
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 RDEPEND="
 	app-text/ghostscript-gpl
 	dev-libs/libpcre
-	sys-libs/ncurses
+	sys-libs/ncurses:0=
 	virtual/lapack
 	curl? ( net-misc/curl )
 	fftw? ( sci-libs/fftw:3.0 )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-06-05 11:47 Michał Górny
  0 siblings, 0 replies; 103+ messages in thread
From: Michał Górny @ 2016-06-05 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     8672d31fc9e433cb154239c22a0672e7cae80788
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  5 08:15:35 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun  5 11:47:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8672d31f

sci-mathematics/octave: Nuke 3.8.1

 sci-mathematics/octave/Manifest               |   1 -
 sci-mathematics/octave/octave-3.8.1-r1.ebuild | 163 ---------------------
 sci-mathematics/octave/octave-3.8.1.ebuild    | 202 --------------------------
 3 files changed, 366 deletions(-)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 650d367..30a329a 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,5 +1,4 @@
 DIST octave-3.6.4.tar.bz2 15627315 SHA256 fa185df9591f5d740f4d37ff6eaf06db576fdd3e0ddd9d0737365799e5d1c962 SHA512 a49ef50161272618c9543057be5903e1e50b7f4ecb929777f6715d4b3a07a92c36a5b13958c52d8b942b6c7e7e3f7844409d0062eb02bdb3972d7194312b7a81 WHIRLPOOL f51c764ce1ed911661bb3dd1d31a2321f09c0d887ead7bbe8c1f4ad1ebe05137223afb5ff18fc57b83d631936975964a85e4fed9a087760935acb5a35050cda0
-DIST octave-3.8.1.tar.bz2 17664241 SHA256 d6762ed2ad4a042243a095fb44c7a1d3a91c635b6dca37fcef15a5efdffa9bbd SHA512 673ff37692d2ef1116a10afb36448494e69cb01de609017af1a72c3258a1fe71012e9986aafc29127509f7e6664127b4e9b7f269322820b3464eb30ab4b4ef7f WHIRLPOOL 85729283a65051159245f31ab53951c756ea55d1cc93518dbb55b740329a89cffbdf3679ae8d2b957e1a4b47dbf5f2dd9d60f51acf32e159d821979661a5fa54
 DIST octave-3.8.2.tar.bz2 17834980 SHA256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae SHA512 c2bf4cc844a5b8dbabf2b54d2458ee7573f87dc92ca8cd7829e8c057591387b3a0995b5b48c6e50ff2944411f2b28521de26e438ed431f68ab5b49b8ce1d94cc WHIRLPOOL c117b935a060572577b3506a508d558a2af85b2785af02647e9edc47c5df97e357d954449edc90cc40a6af3230f99faccf6c7cf1b9b2bc6044f35749d3ae1af0
 DIST octave-4.0.0.tar.xz 15759196 SHA256 cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474 SHA512 54559686d017b7fe731a89a24e74d08781365028d2799a86f25ebf4c433013eab03e5b4381a992b79e40bce1827a6eee2aefd0798b739128dd8dd7b41d936b89 WHIRLPOOL 0e0154dac5ac76268d99533186a88f54bc811817cdf2222c3c0bc22ff456fd23829f7015eebcb9d441665c1d2782ed57c06ab00880f64d63b22ef4aad43f132a
 DIST octave-4.0.1.tar.xz 15637340 SHA256 d58f4861f93dbf4c98f3574d6066cfa25001349bd58ce063cf443efba4e1c287 SHA512 7fa22b50c9116c917b2a2bd63d81a8106eba95842a5de736fbf89ee6ea3dbd5542c183ab6229b62f548ad07abbf67514152a8e553e8fbdf86036d44ced669798 WHIRLPOOL 7bcc16a1e01543dc0baab92993a305c6fea7fc9eb9d806004a1b3e11479c34d8a40000de60e2291a27c846d54abc35883a16583bc324681d7897624fa40d98bb

diff --git a/sci-mathematics/octave/octave-3.8.1-r1.ebuild b/sci-mathematics/octave/octave-3.8.1-r1.ebuild
deleted file mode 100644
index e5f5569..0000000
--- a/sci-mathematics/octave/octave-3.8.1-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
-	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-libs/libpcre:3=
-	sys-libs/ncurses:0=
-	virtual/lapack
-	curl? ( net-misc/curl:0= )
-	fftw? ( sci-libs/fftw:3.0= )
-	glpk? ( sci-mathematics/glpk:0= )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( x11-libs/qscintilla:0= )
-	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
-	java? ( >=virtual/jre-1.6.0:* )
-	jit? ( <sys-devel/llvm-3.5 )
-	opengl? (
-		media-libs/freetype:2=
-		media-libs/fontconfig:1.0=
-		>=x11-libs/fltk-1.3:1=[opengl]
-		x11-libs/gl2ps:0=
-		virtual/glu )
-	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= )
-	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= )
-	zlib? ( sys-libs/zlib:0= )"
-
-DEPEND="${RDEPEND}
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	java? ( >=virtual/jdk-1.6.0 )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.3-texi.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.1-pkgbuilddir.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 and qt4 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-		use gui && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/qt4"
-	fi
-
-	has_version ">=sys-devel/llvm-3.4" && \
-		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-
-	# Fix bug 501756
-	sed -i \
-		-e 's@A-Za-z0-9@[:alnum:]@g' \
-		-e 's@A-Za-z@[:alpha:]@g' \
-		libinterp/mkbuiltins || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	# 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
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable gui)
-		$(use_enable jit)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with hdf5)
-		$(use_with opengl)
-		$(use_with qhull)
-		$(use_with qrupdate)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with X x)
-		$(use_with zlib z)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	emake
-	if use java || use jit ; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && \
-		java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
-	doenvd 99octave
-}

diff --git a/sci-mathematics/octave/octave-3.8.1.ebuild b/sci-mathematics/octave/octave-3.8.1.ebuild
deleted file mode 100644
index 667ad0c..0000000
--- a/sci-mathematics/octave/octave-3.8.1.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-inherit autotools-utils multilib toolchain-funcs fortran-2 flag-o-matic java-pkg-opt-2 pax-utils
-
-DESCRIPTION="High-level interactive language for numerical computations"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.octave.org/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl postscript
-	+qhull +qrupdate readline +sparse static-libs X zlib"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	app-text/ghostscript-gpl
-	dev-libs/libpcre
-	sys-libs/ncurses:0=
-	jit? ( <sys-devel/llvm-3.5 )
-	virtual/lapack
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0 )
-	glpk? ( sci-mathematics/glpk )
-	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( x11-libs/qscintilla )
-	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
-	opengl? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-		>=x11-libs/fltk-1.3:1[opengl]
-		x11-libs/gl2ps
-		virtual/glu )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		media-gfx/transfig )
-	qhull? ( media-libs/qhull )
-	qrupdate? ( sci-libs/qrupdate )
-	readline? ( sys-libs/readline:0 )
-	sparse? (
-		sci-libs/arpack
-		sci-libs/camd
-		sci-libs/ccolamd
-		sci-libs/cholmod
-		sci-libs/colamd
-		sci-libs/cxsparse
-		sci-libs/umfpack )
-	X? ( x11-libs/libX11 )
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost
-		sys-apps/texinfo )
-	dev-util/gperf
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.8.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-3.4.3-texi.patch
-	"${FILESDIR}"/${PN}-3.8.0-imagemagick-configure.patch
-	"${FILESDIR}"/${PN}-3.8.1-imagemagick.patch
-	"${FILESDIR}"/${PN}-3.8.0-llvm-configure.patch
-	"${FILESDIR}"/${PN}-3.8.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-)
-
-pkg_pretend() {
-	if use qrupdate || use sparse; then
-		local blaslib=$($(tc-getPKG_CONFIG) --libs-only-l blas | sed -e 's@-l\([^ \t]*\)@lib\1@' | cut -d' ' -f 1)
-		einfo "Checking dependencies are built with the same blas lib = ${blaslib}"
-		local usr_lib="${ROOT}usr/$(get_libdir)"
-		local libs=( )
-		use qrupdate && libs+=( "${usr_lib}"/libqrupdate.so )
-		use sparse && libs+=(
-			"${usr_lib}"/libarpack.so
-			"${usr_lib}"/libcholmod.so
-			"${usr_lib}"/libspqr.so
-			"${usr_lib}"/libumfpack.so
-		)
-		for i in ${libs[*]}
-		do
-			# Is it not linked with the current blas?  This check is not enough though, as
-			# earlier versions of sci-libs/cholmod were not linked with blas, while as later
-			# versions are if built with the lapack use flag.
-			scanelf -n ${i} | grep -q "${blaslib}"
-			if [[ $? -ne 0 ]]; then
-				# Does it appear to be linked with some blas or lapack library?
-				scanelf -n ${i} | egrep -q "blas|lapack"
-				if [[ $? -eq 0 ]]; then
-					eerror "*******************************************************************************"
-					eerror "${i} must be rebuilt with ${blaslib}"
-					eerror ""
-					eerror "To check the libaries ${i} is currently built with:"
-					eerror ""
-					eerror "scanelf -n ${i}"
-					eerror ""
-					eerror "To find the package that needs to be rebuilt:"
-					eerror ""
-					eerror "equery belongs ${i}"
-					eerror "*******************************************************************************"
-					die
-				fi
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	# nasty prefix hack for fltk:1 linking
-	if use prefix && use opengl; then
-		sed -i \
-			-e "s:ldflags\`:ldflags\` -Wl,-rpath,${EPREFIX}/usr/$(get_libdir)/fltk-1:" \
-			configure.ac
-	fi
-	if has_version ">=sys-devel/llvm-3.4"; then
-		epatch "${FILESDIR}"/${PN}-3.8.0-llvm-3.4.patch
-	fi
-	# Fix bug 501756 - sci-mathematics/octave-3.8.0 LC_ALL=et_EE - octave.cc:485:56:
-	# error: 'Fallow_noninteger_range_as_index' was not declared in this scope
-	sed -e 's@A-Za-z0-9@[:alnum:]@g' \
-		-e 's@A-Za-z@[:alpha:]@g' \
-		-i "${S}/libinterp/mkbuiltins" \
-		|| die "Could not patch ${S}/libinterp/mkbuiltins for some non-English locales"
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	# 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
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable gui gui)
-		$(use_enable jit)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with hdf5)
-		$(use_with opengl)
-		$(use_with qhull)
-		$(use_with qrupdate)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with X x)
-		$(use_with zlib z)
-	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	emake
-	if use java || use jit ; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && dodoc $(find doc -name \*.pdf)
-	[[ -e test/fntests.log ]] && dodoc test/fntests.log
-	use java && java-pkg_regjar "${ED}/usr/share/${PN}/${PV}/m/java/octave.jar"
-	echo "LDPATH=${EROOT}usr/$(get_libdir)/${PN}/${PV}" > 99octave
-	doenvd 99octave
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-07-31 13:24 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-07-31 13:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4df89de481ecf67d98d81ebdb61ac2252000387c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:20:05 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:23:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df89de4

sci-mathematics/octave: Add subslot operator for media-gfx/imagemagick

Gentoo-bug: 584104
* Also add USE="graphicsmagick" and add subslot
  operator for media-gfx/graphicsmagick

Package-Manager: portage-2.3.0

 sci-mathematics/octave/metadata.xml           | 27 ++++++++++++++-------------
 sci-mathematics/octave/octave-3.6.4-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-3.6.4.ebuild    |  9 +++++----
 sci-mathematics/octave/octave-3.8.2.ebuild    | 11 ++++++-----
 sci-mathematics/octave/octave-4.0.0-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-4.0.0.ebuild    | 11 ++++++-----
 sci-mathematics/octave/octave-4.0.1-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-4.0.1.ebuild    |  9 +++++----
 sci-mathematics/octave/octave-4.0.2-r1.ebuild |  9 +++++----
 9 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 8bafaba..a3ecac6 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci-mathematics@gentoo.org</email>
-  <name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="project">
+		<email>sci-mathematics@gentoo.org</email>
+		<name>Gentoo Mathematics Project</name>
+	</maintainer>
+	<longdescription lang="en">
   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.
 </longdescription>
-<use>
-  <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-  <flag name="gui">Enable the graphical user interface</flag>
-  <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
-  <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-  <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-  <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-</use>
+	<use>
+		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+		<flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
+		<flag name="gui">Enable the graphical user interface</flag>
+		<flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
+		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+	</use>
 </pkgmetadata>

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 65094e6..401cd70 100644
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -29,9 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index 67ab623..01f8335 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -29,9 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig

diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index 7d12d6f..f61595c 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -30,9 +30,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 1e40ef2..07eee35 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 6702068..4da0aa4 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 1b0a27f..13da145 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index 2355b91..4da0aa4 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
index 1b0a27f..13da145 100644
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? ( || (
-			media-gfx/graphicsmagick[cxx]
-			media-gfx/imagemagick[cxx] ) )
+	imagemagick? (
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-08-05  7:19 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-08-05  7:19 UTC (permalink / raw
  To: gentoo-commits

commit:     05f70b616f6df7f4d777c6f03e18c809c3f38b25
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 07:19:03 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 07:19:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05f70b61

sci-mathematics/octave: Switch to media-gfx/imagemagick by default

Gentoo-bug: 590280

Package-Manager: portage-2.3.0

 sci-mathematics/octave/octave-3.6.4-r1.ebuild | 2 +-
 sci-mathematics/octave/octave-3.6.4.ebuild    | 2 +-
 sci-mathematics/octave/octave-3.8.2.ebuild    | 2 +-
 sci-mathematics/octave/octave-4.0.0-r1.ebuild | 2 +-
 sci-mathematics/octave/octave-4.0.0.ebuild    | 2 +-
 sci-mathematics/octave/octave-4.0.1-r1.ebuild | 2 +-
 sci-mathematics/octave/octave-4.0.1.ebuild    | 2 +-
 sci-mathematics/octave/octave-4.0.2-r1.ebuild | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 401cd70..e698a8c 100644
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index 01f8335..db636ad 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index f61595c..35bfd11 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 07eee35..2a99d8b 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 4da0aa4..459bec9 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 13da145..17c0563 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index 4da0aa4..459bec9 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 

diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
index 13da145..17c0563 100644
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-08-09  7:08 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-08-09  7:08 UTC (permalink / raw
  To: gentoo-commits

commit:     8020ccb2e7e25d0ae3fbd2f3ab039538b055e31c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  9 07:06:37 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Aug  9 07:08:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8020ccb2

sci-mathematics/octave: Remove automagic dep on media-gfx/graphicsmagick

Gentoo-Bug: 590280
* Explicitly select dependency on the basis of USE="graphicsmagick"
  vs USE="imagemagick" only.

Package-Manager: portage-2.3.0

 sci-mathematics/octave/octave-3.6.4-r1.ebuild           | 17 +++++++----------
 sci-mathematics/octave/octave-3.6.4.ebuild              | 17 +++++++----------
 .../{octave-3.8.2.ebuild => octave-3.8.2-r1.ebuild}     | 17 +++++++----------
 sci-mathematics/octave/octave-4.0.0-r1.ebuild           | 17 +++++++----------
 sci-mathematics/octave/octave-4.0.0.ebuild              | 17 +++++++----------
 sci-mathematics/octave/octave-4.0.1-r1.ebuild           | 17 +++++++----------
 sci-mathematics/octave/octave-4.0.1.ebuild              | 17 +++++++----------
 .../{octave-4.0.2-r1.ebuild => octave-4.0.2-r2.ebuild}  | 17 +++++++----------
 8 files changed, 56 insertions(+), 80 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index e698a8c..3aeefdd 100644
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -29,10 +30,8 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig
@@ -114,12 +113,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index db636ad..f25a0fd 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -29,10 +30,8 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig
@@ -112,12 +111,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2-r1.ebuild
similarity index 92%
rename from sci-mathematics/octave/octave-3.8.2.ebuild
rename to sci-mathematics/octave/octave-3.8.2-r1.ebuild
index 35bfd11..186c802 100644
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -30,10 +31,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=
@@ -130,12 +129,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 2a99d8b..4aa4db2 100644
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,10 +32,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04
@@ -145,12 +144,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 459bec9..a90d800 100644
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,10 +32,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04
@@ -140,12 +139,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 17c0563..279abf2 100644
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,10 +32,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04
@@ -140,12 +139,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index 459bec9..a90d800 100644
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,10 +32,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04
@@ -140,12 +139,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi

diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
similarity index 93%
rename from sci-mathematics/octave/octave-4.0.2-r1.ebuild
rename to sci-mathematics/octave/octave-4.0.2-r2.ebuild
index 17c0563..279abf2 100644
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
+REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,10 +32,8 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:0= )
 	hdf5? ( sci-libs/hdf5:0= )
-	imagemagick? (
-		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-	)
+	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	imagemagick? ( media-gfx/imagemagick:=[cxx] )
 	java? ( >=virtual/jre-1.6.0:* )
 	jit? (
 		>=sys-devel/autoconf-archive-2015.02.04
@@ -140,12 +139,10 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use imagemagick; then
-		if has_version media-gfx/graphicsmagick[cxx]; then
-			myeconfargs+=( "--with-magick=GraphicsMagick" )
-		else
-			myeconfargs+=( "--with-magick=ImageMagick" )
-		fi
+	if use graphicsmagick; then
+		myeconfargs+=( "--with-magick=GraphicsMagick" )
+	elif use imagemagick; then
+		myeconfargs+=( "--with-magick=ImageMagick" )
 	else
 		myeconfargs+=( "--without-magick" )
 	fi


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2016-12-22 18:26 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2016-12-22 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     05af7b5e2a7d3115f0e11acb0f0235e0c5b752fe
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 22 17:46:39 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 18:26:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05af7b5e

sci-mathematics/octave: Qt4/Qt5 USEdep on x11-libs/qscintilla

Gentoo-bug: 600482

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3188

 .../octave/{octave-3.8.2-r1.ebuild => octave-3.8.2-r2.ebuild}       | 2 +-
 .../octave/{octave-4.2.0.ebuild => octave-4.2.0-r1.ebuild}          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.8.2-r1.ebuild b/sci-mathematics/octave/octave-3.8.2-r2.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-3.8.2-r1.ebuild
rename to sci-mathematics/octave/octave-3.8.2-r2.ebuild
index 186c802..aa4c3f0 100644
--- a/sci-mathematics/octave/octave-3.8.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 	fftw? ( sci-libs/fftw:3.0= )
 	glpk? ( sci-mathematics/glpk:0= )
 	gnuplot? ( sci-visualization/gnuplot )
-	gui? ( x11-libs/qscintilla:0= )
+	gui? ( x11-libs/qscintilla:=[qt4(-)] )
 	hdf5? ( sci-libs/hdf5:0= )
 	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
 	imagemagick? ( media-gfx/imagemagick:=[cxx] )

diff --git a/sci-mathematics/octave/octave-4.2.0.ebuild b/sci-mathematics/octave/octave-4.2.0-r1.ebuild
similarity index 97%
rename from sci-mathematics/octave/octave-4.2.0.ebuild
rename to sci-mathematics/octave/octave-4.2.0-r1.ebuild
index ed9861c..331bf04 100644
--- a/sci-mathematics/octave/octave-4.2.0.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick java opengl openssl
 	portaudio postscript +qhull +qrupdate qt5 readline sndfile +sparse static-libs X zlib"
 REQUIRED_USE="?? ( graphicsmagick imagemagick )"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/bzip2
@@ -50,7 +50,9 @@ RDEPEND="
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
-		dev-qt/qtnetwork:5 )
+		dev-qt/qtnetwork:5
+		>=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)]
+	)
 	readline? ( sys-libs/readline:0= )
 	sndfile? ( media-libs/libsndfile )
 	sparse? (


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-01-06 15:17 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2017-01-06 15:17 UTC (permalink / raw
  To: gentoo-commits

commit:     24a4b747e224dfdb3ece48f0e8f44aee7768a095
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 15:16:44 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 15:17:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a4b747

sci-mathematics/octave: Add missing DEPEND on dev-qt/linguist-tools:5

Gentoo-bug: 604418

Package-Manager: Portage-2.3.3, Repoman-2.3.1

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

diff --git a/sci-mathematics/octave/octave-4.2.0-r2.ebuild b/sci-mathematics/octave/octave-4.2.0-r2.ebuild
index c2a64e2..bf16ec0 100644
--- a/sci-mathematics/octave/octave-4.2.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,8 +64,8 @@ RDEPEND="
 		sci-libs/cxsparse:0=
 		sci-libs/umfpack:0= )
 	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 )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-01-10 16:47 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2017-01-10 16:47 UTC (permalink / raw
  To: gentoo-commits

commit:     74e01111d0665dbb30030a57d553e692583404d2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 10 16:46:31 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 16:46:52 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e01111

sci-mathematics/octave: RDEPEND on dev-qt/qtopengl:5

Gentoo-bug: 604418

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../octave/{octave-4.2.0-r2.ebuild => octave-4.2.0-r3.ebuild}            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sci-mathematics/octave/octave-4.2.0-r2.ebuild b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-4.2.0-r2.ebuild
rename to sci-mathematics/octave/octave-4.2.0-r3.ebuild
index bf16ec0..5deb837 100644
--- a/sci-mathematics/octave/octave-4.2.0-r2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
@@ -51,6 +51,7 @@ RDEPEND="
 		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= )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-02-02 11:01 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2017-02-02 11:01 UTC (permalink / raw
  To: gentoo-commits

commit:     8057d1196a8133dddff1304589fbfb85a2cf06c5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  2 11:01:02 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb  2 11:01:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8057d119

sci-mathematics/octave: Add missing DEPEND on dev-texlive/texlive-fontsrecommended

Gentoo-bug: 591818

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-mathematics/octave/octave-4.2.0-r3.ebuild | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/sci-mathematics/octave/octave-4.2.0-r3.ebuild b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
index 5deb837..32bcf4c 100644
--- a/sci-mathematics/octave/octave-4.2.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r3.ebuild
@@ -38,13 +38,15 @@ RDEPEND="
 		media-libs/fontconfig:1.0=
 		>=x11-libs/fltk-1.3:1=[opengl,xft]
 		x11-libs/gl2ps:0=
-		virtual/glu )
+		virtual/glu
+	)
 	openssl? ( dev-libs/openssl:0= )
 	portaudio? ( media-libs/portaudio )
 	postscript? (
 		app-text/epstool
 		media-gfx/pstoedit
-		media-gfx/transfig )
+		media-gfx/transfig
+	)
 	qhull? ( media-libs/qhull:0= )
 	qrupdate? ( sci-libs/qrupdate:0= )
 	gui? (
@@ -63,7 +65,8 @@ RDEPEND="
 		sci-libs/cholmod:0=
 		sci-libs/colamd:0=
 		sci-libs/cxsparse:0=
-		sci-libs/umfpack:0= )
+		sci-libs/umfpack:0=
+	)
 	X? ( x11-libs/libX11:0= )"
 DEPEND="${RDEPEND}
 	gui? ( dev-qt/linguist-tools:5 )
@@ -72,8 +75,10 @@ DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.6.0 )
 	doc? (
 		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
 		dev-texlive/texlive-genericrecommended
-		dev-texlive/texlive-metapost )
+		dev-texlive/texlive-metapost
+	)
 	sys-apps/texinfo
 	dev-util/gperf
 	virtual/pkgconfig"


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-02-26  9:29 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2017-02-26  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 09:28:22 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 09:29:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5dd6e8

sci-mathematics/octave: Update USE=im/gm semantics to match #314431

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{octave-3.6.4.ebuild => octave-3.6.4-r1.ebuild}   | 17 ++++++-----------
 ...{octave-3.8.2-r2.ebuild => octave-3.8.2-r3.ebuild} | 17 ++++++-----------
 ...{octave-4.2.0-r3.ebuild => octave-4.2.0-r4.ebuild} | 19 ++++++-------------
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
similarity index 88%
rename from sci-mathematics/octave/octave-3.6.4.ebuild
rename to sci-mathematics/octave/octave-3.6.4-r1.ebuild
index f25a0fdee2..d3a25179a6 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
 	+qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -30,8 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig
@@ -99,6 +100,7 @@ src_configure() {
 		$(use_with fftw fftw3f)
 		$(use_with glpk)
 		$(use_with hdf5)
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
 		$(use_with opengl)
 		$(use_with qhull)
 		$(use_with qrupdate)
@@ -111,13 +113,6 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use graphicsmagick; then
-		myeconfargs+=( "--with-magick=GraphicsMagick" )
-	elif use imagemagick; then
-		myeconfargs+=( "--with-magick=ImageMagick" )
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
 	autotools-utils_src_configure
 }
 

diff --git a/sci-mathematics/octave/octave-3.8.2-r2.ebuild b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
similarity index 90%
rename from sci-mathematics/octave/octave-3.8.2-r2.ebuild
rename to sci-mathematics/octave/octave-3.8.2-r3.ebuild
index aa4c3f0c49..1db0b9dc4d 100644
--- a/sci-mathematics/octave/octave-3.8.2-r2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
 	postscript +qhull +qrupdate readline +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -31,8 +30,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:=[qt4(-)] )
 	hdf5? ( sci-libs/hdf5:0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=
@@ -117,6 +118,7 @@ src_configure() {
 		$(use_enable fftw fftw-threads)
 		$(use_with glpk)
 		$(use_with hdf5)
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
 		$(use_with opengl)
 		$(use_with qhull)
 		$(use_with qrupdate)
@@ -129,13 +131,6 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use graphicsmagick; then
-		myeconfargs+=( "--with-magick=GraphicsMagick" )
-	elif use imagemagick; then
-		myeconfargs+=( "--with-magick=ImageMagick" )
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
 	autotools-utils_src_configure
 }
 

diff --git a/sci-mathematics/octave/octave-4.2.0-r3.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
similarity index 92%
rename from sci-mathematics/octave/octave-4.2.0-r3.ebuild
rename to sci-mathematics/octave/octave-4.2.0-r4.ebuild
index 32bcf4c713..4570c991f5 100644
--- a/sci-mathematics/octave/octave-4.2.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
@@ -14,7 +14,6 @@ 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"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -30,8 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk:0= )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5:0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=
@@ -115,16 +116,7 @@ src_configure() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && \
 		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
 
-	local myconf=()
-	if use graphicsmagick; then
-		myconf+=( --with-magick=GraphicsMagick )
-	elif use imagemagick; then
-		myconf+=( --with-magick=ImageMagick )
-	else
-		myconf+=( --without-magick )
-	fi
-
-	econf "${myconf[@]}" \
+	econf \
 		--localstatedir="${EPREFIX}/var/state/octave" \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
@@ -144,6 +136,7 @@ src_configure() {
 		$(use_enable fftw fftw-threads) \
 		$(use_with glpk) \
 		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
 		$(use_with opengl) \
 		$(use_with opengl fltk) \
 		$(use_with openssl) \


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-02-28 20:41 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2017-02-28 20:41 UTC (permalink / raw
  To: gentoo-commits

commit:     2d77607d1de9cc286035ca5e99a2eaa5bb05e01c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 20:39:19 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 20:41:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d77607d

sci-mathematics/octave: Version bump to 4.2.1

Bug: https://bugs.gentoo.org/show_bug.cgi?id=610994

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-mathematics/octave/Manifest            |   1 +
 sci-mathematics/octave/octave-4.2.1.ebuild | 178 +++++++++++++++++++++++++++++
 2 files changed, 179 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index c2b7f89c33b..b0da42bbc13 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1,3 +1,4 @@
 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/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
new file mode 100644
index 00000000000..4570c991f58
--- /dev/null
+++ b/sci-mathematics/octave/octave-4.2.1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic fortran-2 java-pkg-opt-2 pax-utils toolchain-funcs
+
+DESCRIPTION="High-level interactive language for numerical computations"
+LICENSE="GPL-3"
+HOMEPAGE="http://www.octave.org/"
+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 ~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 )
+	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=
+		>=x11-libs/fltk-1.3:1=[opengl,xft]
+		x11-libs/gl2ps:0=
+		virtual/glu
+	)
+	openssl? ( dev-libs/openssl: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= )
+	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? (
+		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}
+	gui? ( dev-qt/linguist-tools:5 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+	java? ( >=virtual/jdk-1.6.0 )
+	doc? (
+		virtual/latex-base
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-genericrecommended
+		dev-texlive/texlive-metapost
+	)
+	sys-apps/texinfo
+	dev-util/gperf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.2.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.2.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch
+	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+	"${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 and qt4 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# [QA] detect underlinking #593670
+	append-ldflags $(test-flags-CXX -Wl,-z,defs)
+
+	# 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
+
+	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-shared \
+		--with-z \
+		--with-bz2 \
+		--without-OSMesa \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-10 12:47 Jeroen Roovers
  0 siblings, 0 replies; 103+ messages in thread
From: Jeroen Roovers @ 2017-05-10 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     686085963334ff70500a70f34516ff49036fffb4
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 12:47:13 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May 10 12:47:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68608596

sci-mathematics/octave: Mark ~hppa (bug #600482).

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

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

diff --git a/sci-mathematics/octave/octave-4.2.0-r4.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
index cd7ad9a9587..a52aea882a3 100644
--- a/sci-mathematics/octave/octave-4.2.0-r4.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r4.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 ~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

diff --git a/sci-mathematics/octave/octave-4.2.1.ebuild b/sci-mathematics/octave/octave-4.2.1.ebuild
index cd7ad9a9587..a52aea882a3 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 ~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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-10 20:02 Jeroen Roovers
  0 siblings, 0 replies; 103+ messages in thread
From: Jeroen Roovers @ 2017-05-10 20:02 UTC (permalink / raw
  To: gentoo-commits

commit:     aa7e4411ab80728d323f674ca76178fe073fba0c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed May 10 20:01:59 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed May 10 20:01:59 2017 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-23 23:25 Michael Weber
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Weber @ 2017-05-23 23:25 UTC (permalink / raw
  To: gentoo-commits

commit:     82d27fa97ca7f555a139695210a2e7826e6bf70a
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue May 23 23:25:32 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue May 23 23:25:44 2017 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-24 13:42 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2017-05-24 13:42 UTC (permalink / raw
  To: gentoo-commits

commit:     d8685043138d8f2b4b353385d79b4c610f0d1ef5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed May 24 13:42:09 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed May 24 13:42:09 2017 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-26 14:05 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2017-05-26 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     4d47f976b48b128487a9246e505ca4a8807d8f50
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:05:25 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:05:25 2017 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-05-26 14:59 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2017-05-26 14:59 UTC (permalink / raw
  To: gentoo-commits

commit:     c252c52bbc905b9fc174e4edeff89cf0e0dcdb42
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 14:59:25 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 26 14:59:25 2017 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2017-06-11 11:22 Alexis Ballier
  0 siblings, 0 replies; 103+ messages in thread
From: Alexis Ballier @ 2017-06-11 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     80ad06020a3f76ef0e6b76cb6507351674632a52
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 11:22:01 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 11 11:22:01 2017 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-04-07 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2018-04-07 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     da7b6cc34b74d180ce2a5543b32978d90070d395
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 18:08:10 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 20:48:44 2018 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-04-07 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2018-04-07 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     8838fcf498568b7ddac0c8baa4f38547b65059fe
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 18:20:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 20:48:45 2018 +0000
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}"


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-04-07 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2018-04-07 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     bb6e872865d032decf26a8174b49e1c136d1bb51
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 18:12:16 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 20:48:45 2018 +0000
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
 }


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-04-07 20:49 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2018-04-07 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     b50914de0aeb0dd48dbf59d30499cf2af1458f27
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  7 17:58:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr  7 20:48:44 2018 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-04-26  3:01 Matt Turner
  0 siblings, 0 replies; 103+ messages in thread
From: Matt Turner @ 2018-04-26  3:01 UTC (permalink / raw
  To: gentoo-commits

commit:     c22a3cebd215831e6cd29185e05f30909c503b60
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 26 02:58:44 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 26 02:58:44 2018 +0000
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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-07-05  0:52 Mark Wright
  0 siblings, 0 replies; 103+ messages in thread
From: Mark Wright @ 2018-07-05  0:52 UTC (permalink / raw
  To: gentoo-commits

commit:     bceea257a9486c16aeb98bf04872a73604acccdc
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  5 00:51:47 2018 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Thu Jul  5 00:51:47 2018 +0000
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= )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-07-21 12:25 Alexis Ballier
  0 siblings, 0 replies; 103+ messages in thread
From: Alexis Ballier @ 2018-07-21 12:25 UTC (permalink / raw
  To: gentoo-commits

commit:     0782a6fbed8e4c78c94c7f7cdfb4d4c1ec1e1c3d
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 21 12:12:41 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Jul 21 12:23:53 2018 +0000
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
 	)


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-09-12  6:07 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2018-09-12  6:07 UTC (permalink / raw
  To: gentoo-commits

commit:     6a7d52d678573425a521319c8bdf4278baf8a9b6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 12 06:06:04 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 12 06:06:54 2018 +0000
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() {


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2018-09-23 20:45 Jeroen Roovers
  0 siblings, 0 replies; 103+ messages in thread
From: Jeroen Roovers @ 2018-09-23 20:45 UTC (permalink / raw
  To: gentoo-commits

commit:     0c23e329c379c5394a4514d5ba537f1159caa1d1
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 20:44:30 2018 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 20:45:15 2018 +0000
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 00000000000..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? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+	"${FILESDIR}"/${PN}-4.4.0-imagemagick.patch
+	"${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+	"${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# [QA] detect underlinking #593670
+	append-ldflags $(test-flags-CXX -Wl,-z,defs)
+
+	# 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
+
+	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-shared \
+		--with-z \
+		--with-bz2 \
+		--without-OSMesa \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+src_compile() {
+	default
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2019-01-25 20:56 Robin H. Johnson
  0 siblings, 0 replies; 103+ messages in thread
From: Robin H. Johnson @ 2019-01-25 20:56 UTC (permalink / raw
  To: gentoo-commits

commit:     2d82b58e6274ebf2d481a7c7aeb325fa7e847f9a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 25 18:38:12 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 25 20:56:29 2019 +0000
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 <robbat2 <AT> 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"


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2019-06-24  7:01 Pacho Ramos
  0 siblings, 0 replies; 103+ messages in thread
From: Pacho Ramos @ 2019-06-24  7:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ac0126c0d65ef0785c688b0027c4f3cbbc7c7a45
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 07:01:37 2019 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 07:01:37 2019 +0000
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 <pacho <AT> 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:* )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-01-12 11:14 David Seifert
  0 siblings, 0 replies; 103+ messages in thread
From: David Seifert @ 2020-01-12 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     bd0071ebb25c3665bb0cb7430821e06542ae7ca3
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:13:38 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:13:38 2020 +0000
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 <soap <AT> 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 @@
 	</longdescription>
 	<use>
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-		<flag name="gui">Enable the graphical user interface</flag>
 		<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for low level hash functions</flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-03-27 18:46 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2020-03-27 18:46 UTC (permalink / raw
  To: gentoo-commits

commit:     9bf0c5ed22569b38b971412c57fb17c08c2abc64
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 18:41:36 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 18:42:04 2020 +0000
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 <mjo <AT> 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 00000000000..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= )
+	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? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )"
+
+# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
+# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
+# in the top-level configure.ac now.
+#
+# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
+# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
+# because this support has been broken upstream for a long time,
+# and a fix that involves "using namespace Magick;" was rejected
+# as far as I can tell. Moreover, the configure.ac patch no longer
+# applies. In the meantime, I've remove support for USE=imagemagick
+# and USE=graphicsmagick.
+#
+# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
+# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
+#
+# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
+# and should be in a future release.
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4.0-texi.patch
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	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-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with X x)
+}
+
+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
+}
+
+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
+		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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-04-11 15:57 Sergei Trofimovich
  0 siblings, 0 replies; 103+ messages in thread
From: Sergei Trofimovich @ 2020-04-11 15:57 UTC (permalink / raw
  To: gentoo-commits

commit:     c97d85259637fa96ac5613f19c29c56aea489af5
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Apr 11 14:55:28 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 15:57:49 2020 +0000
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 <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-05-25 12:28 Mikle Kolyada
  0 siblings, 0 replies; 103+ messages in thread
From: Mikle Kolyada @ 2020-05-25 12:28 UTC (permalink / raw
  To: gentoo-commits

commit:     e8cec9daeddf8b84af3ccdec8a224db4eb6947ff
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 12:28:21 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 25 12:28:21 2020 +0000
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 <zlogene <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-06-04  6:35 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2020-06-04  6:35 UTC (permalink / raw
  To: gentoo-commits

commit:     21887a304bea6e4aab6ab1990bf1d6f0c02dc9ec
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  4 06:35:16 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jun  4 06:35:48 2020 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-10-06 21:11 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-10-06 21:11 UTC (permalink / raw
  To: gentoo-commits

commit:     1899d0dd394397f77575bf17ed93f9e8d724b00f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  6 21:09:30 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct  6 21:09:30 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-11-06 15:23 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-11-06 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     164f6b7b2baef530fcfdba7df2bf02d2106c2ea6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  6 15:19:46 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov  6 15:19:46 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-01  4:49 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2020-12-01  4:49 UTC (permalink / raw
  To: gentoo-commits

commit:     789bf5a4cfe45faa2c3a8f31ef6b13516f2e1f41
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 01:41:58 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 04:47:44 2020 +0000
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 <mjo <AT> 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 @@
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+		<flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
 	</use>
 </pkgmetadata>

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 00000000000..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
+	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 )"
+
+# I'm not sure what the getcwd patch is intended to fix. That macro is
+# part of gnulib, though, so if it's a serious problem then we should
+# consult upstream about it.
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	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-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+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
+}
+
+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
+		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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-01 16:14 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2020-12-01 16:14 UTC (permalink / raw
  To: gentoo-commits

commit:     944d865582a419b31183f4408a8895f45b7e6607
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  1 16:10:55 2020 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Tue Dec  1 16:14:36 2020 +0000
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 <mjo <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-07 15:27 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-12-07 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     4cfa8aeae7b25ba43374f5193ff69735560abbbd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 15:26:53 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 15:26:53 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-07 15:27 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-12-07 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     8b7ca49ca22343d9f6b019261dc08e8933d6bfb9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 15:24:29 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 15:24:29 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-12 22:20 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-12-12 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     19a5e47e0403fcb6c9e32072f582e4c4df3884dd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 22:20:01 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 22:20:01 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2020-12-12 23:31 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2020-12-12 23:31 UTC (permalink / raw
  To: gentoo-commits

commit:     3d3724fb08ea318a4559e0c2634ab6b985e69f84
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 12 23:31:15 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 12 23:31:15 2020 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2021-03-10 12:26 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2021-03-10 12:26 UTC (permalink / raw
  To: gentoo-commits

commit:     c2da2325f592ff752fc8ccbbad5f869e90672026
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 10 12:20:44 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Mar 10 12:21:10 2021 +0000
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 <mjo <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2021-05-03  9:50 Mikle Kolyada
  0 siblings, 0 replies; 103+ messages in thread
From: Mikle Kolyada @ 2021-05-03  9:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f39d632b12f70d6c6c9110fa858b49a39d9e06e7
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 09:50:00 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May  3 09:50:00 2021 +0000
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 <zlogene <AT> 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= )"


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2021-09-30 22:30 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2021-09-30 22:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e74fea220f6c31c548cb8fecd033d479224fef0f
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 30 22:28:23 2021 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Sep 30 22:28:54 2021 +0000
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 <mjo <AT> 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 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788

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 00000000000..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}
+	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 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	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-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+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
+}
+
+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
+		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() {
+	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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2021-10-11 22:22 Yixun Lan
  0 siblings, 0 replies; 103+ messages in thread
From: Yixun Lan @ 2021-10-11 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     e96c9a00c3a0aa8c8845f70c70f347d182d3bcfa
Author:     Alex Fan <alexfanqi <AT> yahoo <DOT> com>
AuthorDate: Mon Oct 11 05:27:29 2021 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 11 22:20:52 2021 +0000
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 <alexfanqi <AT> yahoo.com>
Signed-off-by: Yixun Lan <dlan <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-01-17 17:28 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-01-17 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     207456b03f58406323fe450ddb780ae898b93173
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 17 17:21:27 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 17:24:32 2022 +0000
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 <mjo <AT> 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 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
 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..000000000000
--- 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= )"
-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 )"
-
-# I'm not sure what the getcwd patch is intended to fix. That macro is
-# part of gnulib, though, so if it's a serious problem then we should
-# consult upstream about it.
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	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-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-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
-}
-
-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
-		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() {
-	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
-}

diff --git a/sci-mathematics/octave/octave-6.3.0.ebuild b/sci-mathematics/octave/octave-6.3.0.ebuild
deleted file mode 100644
index 5c1ff358633d..000000000000
--- a/sci-mathematics/octave/octave-6.3.0.ebuild
+++ /dev/null
@@ -1,194 +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 ~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).
-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}
-	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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-)
-
-src_prepare() {
-	# nasty prefix hacks for fltk:1 linking
-	if use prefix; then
-		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	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-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-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
-}
-
-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
-		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() {
-	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
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-01-17 17:28 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-01-17 17:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c3b07b88c4c2034c849824210c3227bb0ab28bfa
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 17 17:19:22 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Jan 17 17:24:31 2022 +0000
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 <mjo <AT> 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 9582d7a7d84beef2a22d3dfaf45aee4778fc0dfc0ec1831c5bcb863dd0062e996e5b7aaaa40519c23d2c730c3408e26745b9dbf73db5127ebae22da0b2532788
+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 000000000000..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? (
+		 dev-libs/openssl:0=
+	)
+	sundials? ( >=sci-libs/sundials-4:0= )
+	X? ( x11-libs/libX11:0= )"
+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 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+)
+
+src_prepare() {
+	# nasty prefix hacks for fltk:1 linking
+	if use prefix; then
+		use opengl && append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/fltk-1"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --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 \
+		--disable-jit \
+		--enable-link-all-dependencies \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+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
+}
+
+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
+		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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-04-16 17:34 Andrew Ammerlaan
  0 siblings, 0 replies; 103+ messages in thread
From: Andrew Ammerlaan @ 2022-04-16 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d2975ebf793475fb14124efed12030fdb6eae48c
Author:     chn <chn <AT> chn <DOT> moe>
AuthorDate: Mon Apr 11 06:45:20 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 17:34:49 2022 +0000
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 <AT> chn.moe>
Closes: https://github.com/gentoo/gentoo/pull/24985
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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
 }


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-05  0:39 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-05  0:39 UTC (permalink / raw
  To: gentoo-commits

commit:     7e9174d66023f9bcff9eb80758243ae781860689
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 00:39:23 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 00:39:28 2022 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-05  0:40 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-05  0:40 UTC (permalink / raw
  To: gentoo-commits

commit:     2e7f3d962f84ad3363e3602563d22de5dd19b46d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 00:40:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 00:40:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e7f3d96

sci-mathematics/octave: fix patch filename

Signed-off-by: Sam James <sam <AT> 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() {


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-05  1:07 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-05  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e6cc2ca6f0e30f587cd5df3ce4e63d4ec2d09e46
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 01:00:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 01:07:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6cc2ca6

sci-mathematics/octave: add rapidjson USE flag

Signed-off-by: Sam James <sam <AT> 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 @@
 	</longdescription>
 	<use>
 		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+		<flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
 		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
 		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
 		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>

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) \


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-05  1:07 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-05  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     aac091c1ac349d27bd53fdf9fdbde4149d2b2098
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 00:55:37 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 01:07:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac091c1

sci-mathematics/octave: tidy up 7.1.0

Signed-off-by: Sam James <sam <AT> 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
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-05  1:07 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-05  1:07 UTC (permalink / raw
  To: gentoo-commits

commit:     510489d817fdc246fd73b7000886692ee27ff699
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 01:07:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 01:07:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=510489d8

sci-mathematics/octave: fix Java dependency

Thanks vaukai.

Signed-off-by: Sam James <sam <AT> 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 )"
 


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-07 16:17 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-05-07 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     07a6c967141ad1390f6668c7ce947630be207523
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 13:59:52 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat May  7 16:17:48 2022 +0000
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 <mjo <AT> 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
 }


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-17 22:20 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-17 22:20 UTC (permalink / raw
  To: gentoo-commits

commit:     64dd2f667b6feb15854cbb5a4932346ca00f6919
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 22:20:06 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue May 17 22:20:06 2022 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-05-26  0:28 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-05-26  0:28 UTC (permalink / raw
  To: gentoo-commits

commit:     abda90159d0be46a93172c2a6298946306347d17
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 00:10:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May 26 00:10:28 2022 +0000
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 <sam <AT> 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? ( <sci-libs/sundials-6.2.0:= )
 	X? ( x11-libs/libX11:0= )"
+# bug #846968 for sundials < dep
 DEPEND="${RDEPEND}
 	dev-util/gperf
 	virtual/pkgconfig


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-07-06 13:07 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2022-07-06 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9e55f71f57415a38feebb91d37f418abe48f3d94
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  6 13:07:42 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  6 13:07:42 2022 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-07-07  6:34 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2022-07-07  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     b0150443db00f07d687f78e4ca75768c9df5848f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  7 06:34:01 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul  7 06:34:01 2022 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-07-08  6:45 Agostino Sarubbo
  0 siblings, 0 replies; 103+ messages in thread
From: Agostino Sarubbo @ 2022-07-08  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     4d78b40c21c400b103b3574f8c47781836fb2976
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  8 06:44:41 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul  8 06:44:41 2022 +0000
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 <ago <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-07-26 22:02 Maciej Barć
  0 siblings, 0 replies; 103+ messages in thread
From: Maciej Barć @ 2022-07-26 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d2211047a4e28db93b5cc955f533b53d7afe666f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 25 18:34:17 2022 +0000
Commit:     Maciej Barć <xgqt <AT> gentoo <DOT> org>
CommitDate: Tue Jul 26 22:02:49 2022 +0000
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 <asturm <AT> gentoo.org>
Signed-off-by: Maciej Barć <xgqt <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-08-03  2:54 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-08-03  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     5f7f22be582175d2fdf731123da9805c69a131ec
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 02:53:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 02:53:55 2022 +0000
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 <sam <AT> 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..000000000000
--- 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=
-	)
-	sundials? ( >=sci-libs/sundials-4:0= )
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	virtual/imagemagick-tools
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	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
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-	"${FILESDIR}"/${PN}-6.4.0-slibtool.patch
-	"${FILESDIR}"/${PN}-6.4.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"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --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 \
-		$(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) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull qhull_r) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-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
-}
-
-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
-		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
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-08-03  2:54 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-08-03  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     4e74e7f7b997167e77f0f6debc844f0f3a42a89a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 02:53:28 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  3 02:53:28 2022 +0000
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 <sam <AT> 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 000000000000..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:= )
+"
+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
+	)
+	java? ( >=virtual/jdk-1.8:* )
+	gui? ( dev-qt/linguist-tools:5 )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+"
+
+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-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"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --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 \
+		$(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) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull qhull_r) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-08-13  2:26 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-08-13  2:26 UTC (permalink / raw
  To: gentoo-commits

commit:     839c277c9505c8be372a614c7db96f5ce64743d3
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 23:41:48 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 02:22:33 2022 +0000
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 <mjo <AT> 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"
 


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-09-11 12:44 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-09-11 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     0ff312a62959b56777f3557cd7c6b9b1b36d7cff
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 12:33:36 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 12:42:04 2022 +0000
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 <mjo <AT> 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 \


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-09-11 22:31 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-09-11 22:31 UTC (permalink / raw
  To: gentoo-commits

commit:     ee828164174dac808cc0b37b9306871b45857246
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 11 22:26:15 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sun Sep 11 22:29:56 2022 +0000
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 <mjo <AT> 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 000000000000..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? ( <sci-libs/sundials-6.2.0:= )
+	X? ( x11-libs/libX11:0= )"
+# bug #846968 for sundials < dep
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	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
+	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
+	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
+	"${FILESDIR}"/${PN}-6.4.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"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	# The --disable-no-undefined 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 \
+		--disable-jit \
+		--disable-no-undefined \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable static-libs static) \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+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
+}
+
+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
+		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
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-10-18  2:18 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-10-18  2:18 UTC (permalink / raw
  To: gentoo-commits

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

sci-mathematics/octave: add savannah upstream metadata

Signed-off-by: Sam James <sam <AT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci-mathematics@gentoo.org</email>
-		<name>Gentoo Mathematics Project</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="project">
+    <email>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
 	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.
 	</longdescription>
-	<use>
-		<flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-		<flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
-		<flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-		<flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-		<flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-		<flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
-	</use>
+  <use>
+    <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+    <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
+    <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+    <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+    <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+    <flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">octave</remote-id>
+  </upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-10-18  2:47 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-10-18  2:47 UTC (permalink / raw
  To: gentoo-commits

commit:     735dd7dedcbb4dfb5a5260204ea8053ddb3d50f3
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 18 02:45:19 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 18 02:45:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735dd7de

sci-mathematics/octave: fix PkgMetadataXmlIndentation

Signed-off-by: Sam James <sam <AT> 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 @@
     <name>Gentoo Mathematics Project</name>
   </maintainer>
   <longdescription lang="en">
-	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.
-	</longdescription>
+  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.
+  </longdescription>
   <use>
     <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
     <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-11-05  5:35 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-11-05  5:35 UTC (permalink / raw
  To: gentoo-commits

commit:     3af5c40a901d2cdf343e90c88f7e93cb5a3f37ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 05:34:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 05:34:37 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af5c40a

sci-mathematics/octave: add 7.3.0

Signed-off-by: Sam James <sam <AT> 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 000000000000..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="
+	dev-util/gperf
+	virtual/imagemagick-tools
+	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 )
+"
+
+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-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"
+	fi
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# 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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(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) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with opengl) \
+		$(use_with opengl fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull qhull_r) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-11-05  7:55 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-11-05  7:55 UTC (permalink / raw
  To: gentoo-commits

commit:     86ca5e1ab6a48efd0c09238d94e9fca52d60403e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov  5 07:55:24 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 07:55:24 2022 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-11-09 18:20 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-11-09 18:20 UTC (permalink / raw
  To: gentoo-commits

commit:     ff61ef7d2434eebfec1e13e04f5d7e92b2c1772d
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  9 17:58:19 2022 +0000
Commit:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Wed Nov  9 18:19:36 2022 +0000
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 <mjo <AT> 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.
   </longdescription>
   <use>
+    <flag name="fltk">Use <pkg>x11-libs/fltk</pkg> as the backend for the OpenGL renderer in the absence of the Qt GUI</flag>
     <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+    <flag name="gnuplot">Use <pkg>sci-visualization/gnuplot</pkg> to render plots if OpenGL is unavailable</flag>
+    <flag name="imagemagick">Use <pkg>media-gfx/graphicsmagick</pkg> to read and write images</flag>
     <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
     <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
     <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>

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:* )
 	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 )
@@ -83,7 +89,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gperf
-	virtual/imagemagick-tools
 	virtual/pkgconfig
 	doc? (
 		dev-texlive/texlive-fontsrecommended
@@ -97,6 +102,30 @@ BDEPEND="
 	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 for a random example.) In the future, it
+# will probably make sense to merge USE=opengl and USE=X into USE=gui,
+# dropping USE=fltk entirely.
+REQUIRED_USE="
+	fltk? ( opengl X )
+	gui? ( X )
+	opengl? ( || ( fltk gui ) )
+"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
 	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
@@ -107,11 +136,6 @@ PATCHES=(
 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"
-	fi
-
 	# occasional fail on install, force regeneration (bug #401189)
 	rm doc/interpreter/contributors.texi || die
 
@@ -147,7 +171,6 @@ src_configure() {
 		--enable-shared \
 		--with-z \
 		--with-bz2 \
-		$(use_enable static-libs static) \
 		$(use_enable doc docs) \
 		$(use_enable java) \
 		$(use_enable json rapidjson) \
@@ -158,8 +181,9 @@ src_configure() {
 		$(use_enable fftw fftw-threads) \
 		$(use_with glpk) \
 		$(use_with hdf5) \
+		$(use_with imagemagick magick GraphicsMagick++) \
 		$(use_with opengl) \
-		$(use_with opengl fltk) \
+		$(use_with fltk) \
 		$(use_with ssl openssl) \
 		$(use_with portaudio) \
 		$(use_with qhull qhull_r) \


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-18 11:29 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2022-12-18 11:29 UTC (permalink / raw
  To: gentoo-commits

commit:     61e6c6b552f71b10f96b0cad7d9173d407ec3c0c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 11:28:48 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 11:28:48 2022 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-18 19:59 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2022-12-18 19:59 UTC (permalink / raw
  To: gentoo-commits

commit:     b106dade1ece282766a9475e94f4631296fa1409
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 19:59:19 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 19:59:19 2022 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-18 20:11 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2022-12-18 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     484ba8ef67f71953c9a6009f037f1de2f92a1f47
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 20:11:08 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 20:11:08 2022 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-18 20:16 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2022-12-18 20:16 UTC (permalink / raw
  To: gentoo-commits

commit:     275f32cc4f8855696db08ba1a33b18f3a538b167
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 20:16:24 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 20:16:24 2022 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-18 20:47 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2022-12-18 20:47 UTC (permalink / raw
  To: gentoo-commits

commit:     f66dfb32c021aa0c816a3cf8a231f26bc1037b66
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 20:47:15 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 20:47:15 2022 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2022-12-20 14:14 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2022-12-20 14:14 UTC (permalink / raw
  To: gentoo-commits

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

sci-mathematics/octave: drop 7.2.0-r1

Signed-off-by: Michael Orlitzky <mjo <AT> 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..000000000000
--- 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
-	)
-	java? ( >=virtual/jdk-1.8:* )
-	gui? ( dev-qt/linguist-tools:5 )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-"
-
-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-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"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	econf \
-		--localstatedir="${EPREFIX}/var/state/octave" \
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
-		--disable-64 \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(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) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull qhull_r) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-src_compile() {
-	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
-	export VARTEXFONTS="${T}/fonts"
-
-	default
-
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-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
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-
-	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
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-01-08  5:17 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2023-01-08  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     b33a038cbac1a238d184e8c387b2b6fc7a7d6150
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 05:12:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 05:17:26 2023 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-01-08  5:17 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2023-01-08  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     d9df02159b614febc610a52e606872bb79b31bef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  8 05:13:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan  8 05:17:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9df0215

sci-mathematics/octave: drop 6.4.0-r3

Signed-off-by: Sam James <sam <AT> 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..000000000000
--- 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? ( <sci-libs/sundials-6.2.0:= )
-	X? ( x11-libs/libX11:0= )"
-# bug #846968 for sundials < dep
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	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
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
-	"${FILESDIR}"/${PN}-6.4.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"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# 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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --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 \
-		--disable-jit \
-		--enable-link-all-dependencies \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-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
-}
-
-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
-		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
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-01-09 15:10 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2023-01-09 15:10 UTC (permalink / raw
  To: gentoo-commits

commit:     a333ac46309b0034cfcf8761e470c42e9ae5644c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  9 15:09:19 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jan  9 15:09:23 2023 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-01-13 13:37 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2023-01-13 13:37 UTC (permalink / raw
  To: gentoo-commits

commit:     92f9cc2c7d3f2e28ed80d53512473e5a0ff786ed
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 13:36:59 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 13:36:59 2023 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-02-07 17:25 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2023-02-07 17:25 UTC (permalink / raw
  To: gentoo-commits

commit:     cde5556c2c612c33ae728a16d7041df124b86419
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 17:02:21 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 17:25:09 2023 +0000
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 <asturm <AT> 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..000000000000
--- 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? ( <sci-libs/sundials-6.2.0:= )
-	X? ( x11-libs/libX11:0= )"
-# bug #846968 for sundials < dep
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	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
-	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
-	"${FILESDIR}/${PN}-6.4.0-slibtool.patch"
-	"${FILESDIR}"/${PN}-6.4.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"
-	fi
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	# The --disable-no-undefined 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 \
-		--disable-jit \
-		--disable-no-undefined \
-		--enable-shared \
-		--with-z \
-		--with-bz2 \
-		$(use_enable static-libs static) \
-		$(use_enable doc docs) \
-		$(use_enable java) \
-		$(use_enable readline) \
-		$(use_with curl) \
-		$(use_with fftw fftw3) \
-		$(use_with fftw fftw3f) \
-		$(use_enable fftw fftw-threads) \
-		$(use_with glpk) \
-		$(use_with hdf5) \
-		$(use_with opengl) \
-		$(use_with opengl fltk) \
-		$(use_with ssl openssl) \
-		$(use_with portaudio) \
-		$(use_with qhull) \
-		$(use_with qrupdate) \
-		$(use_with gui qt 5) \
-		$(use_with sndfile) \
-		$(use_with sparse arpack) \
-		$(use_with sparse umfpack) \
-		$(use_with sparse colamd) \
-		$(use_with sparse ccolamd) \
-		$(use_with sparse cholmod) \
-		$(use_with sparse cxsparse) \
-		$(use_with sundials sundials_ida) \
-		$(use_with X x)
-}
-
-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
-}
-
-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
-		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
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-03-16 23:13 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2023-03-16 23:13 UTC (permalink / raw
  To: gentoo-commits

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

sci-mathematics/octave: add 8.1.0

Signed-off-by: Sam James <sam <AT> 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 000000000000..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
+		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 for a random example.) In the future, it
+# will probably make sense to merge USE=opengl and USE=X into USE=gui,
+# dropping USE=fltk entirely.
+REQUIRED_USE="
+	fltk? ( opengl X )
+	gui? ( X )
+	opengl? ( || ( fltk gui ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	econf \
+		--localstatedir="${EPREFIX}/var/state/octave" \
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
+		--disable-64 \
+		--enable-shared \
+		--with-z \
+		--with-bz2 \
+		$(use_enable doc docs) \
+		$(use_enable java) \
+		$(use_enable json rapidjson) \
+		$(use_enable readline) \
+		$(use_with curl) \
+		$(use_with fftw fftw3) \
+		$(use_with fftw fftw3f) \
+		$(use_enable fftw fftw-threads) \
+		$(use_with glpk) \
+		$(use_with hdf5) \
+		$(use_with imagemagick magick GraphicsMagick++) \
+		$(use_with opengl) \
+		$(use_with fltk) \
+		$(use_with ssl openssl) \
+		$(use_with portaudio) \
+		$(use_with qhull qhull_r) \
+		$(use_with qrupdate) \
+		$(use_with gui qt 5) \
+		$(use_with sndfile) \
+		$(use_with sparse arpack) \
+		$(use_with sparse umfpack) \
+		$(use_with sparse colamd) \
+		$(use_with sparse ccolamd) \
+		$(use_with sparse cholmod) \
+		$(use_with sparse cxsparse) \
+		$(use_with sundials sundials_ida) \
+		$(use_with X x)
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-05-26  9:35 Sam James
  0 siblings, 0 replies; 103+ messages in thread
From: Sam James @ 2023-05-26  9:35 UTC (permalink / raw
  To: gentoo-commits

commit:     7b562e163273acc15b4490f029e08a637a57c764
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 09:35:07 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 26 09:35:17 2023 +0000
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 <sam <AT> 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 000000000000..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:=
+	)
+	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 for a random example.) In the future, it
+# will probably make sense to merge USE=opengl and USE=X into USE=gui,
+# dropping USE=fltk entirely.
+REQUIRED_USE="
+	fltk? ( opengl X )
+	gui? ( X )
+	opengl? ( || ( fltk gui ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with opengl)
+		$(use_with fltk)
+		$(use_with ssl openssl)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with gui qt 5)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with sundials sundials_ida)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-06-09 15:27 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2023-06-09 15:27 UTC (permalink / raw
  To: gentoo-commits

commit:     3e5827c7f1fec153664f979a58c0f73846ae141e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 15:27:15 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 15:27:15 2023 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-06-09 17:05 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2023-06-09 17:05 UTC (permalink / raw
  To: gentoo-commits

commit:     8cf2d1887e51a8c7a7111d2bc88dde532bf6a224
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  9 17:05:50 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jun  9 17:05:50 2023 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-08-23 11:40 Michael Orlitzky
  0 siblings, 0 replies; 103+ messages in thread
From: Michael Orlitzky @ 2023-08-23 11:40 UTC (permalink / raw
  To: gentoo-commits

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

sci-mathematics/octave: add 8.3.0

Signed-off-by: Michael Orlitzky <mjo <AT> 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 000000000000..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? (
+		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 for a random example.) In the future, it
+# will probably make sense to merge USE=opengl and USE=X into USE=gui,
+# dropping USE=fltk entirely.
+REQUIRED_USE="
+	fltk? ( opengl X )
+	gui? ( X )
+	opengl? ( || ( fltk gui ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with opengl)
+		$(use_with fltk)
+		$(use_with ssl openssl)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with gui qt 5)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with sundials sundials_ida)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-11-12 12:28 Pacho Ramos
  0 siblings, 0 replies; 103+ messages in thread
From: Pacho Ramos @ 2023-11-12 12:28 UTC (permalink / raw
  To: gentoo-commits

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

sci-mathematics/octave: Use transfig from fig2dev

Signed-off-by: Pacho Ramos <pacho <AT> 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 000000000000..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 for a random example.) In the future, it
+# will probably make sense to merge USE=opengl and USE=X into USE=gui,
+# dropping USE=fltk entirely.
+REQUIRED_USE="
+	fltk? ( opengl X )
+	gui? ( X )
+	opengl? ( || ( fltk gui ) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+	"${FILESDIR}"/${PN}-6.4.0-omit-qtchooser-qtver.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with opengl)
+		$(use_with fltk)
+		$(use_with ssl openssl)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with gui qt 5)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with sundials sundials_ida)
+		$(use_with X x)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-12-16  9:28 Joonas Niilola
  0 siblings, 0 replies; 103+ messages in thread
From: Joonas Niilola @ 2023-12-16  9:28 UTC (permalink / raw
  To: gentoo-commits

commit:     91495171b3b46ebc4a32bbef18a95443f2235ca4
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 09:28:06 2023 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 09:28:32 2023 +0000
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 <juippis <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-12-17 17:40 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2023-12-17 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4ae09aea2cb1b1ae8f62660407a22096ac00b702
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 17:39:41 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 17:39:41 2023 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2023-12-17 17:40 Arthur Zamarin
  0 siblings, 0 replies; 103+ messages in thread
From: Arthur Zamarin @ 2023-12-17 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     a90edf18c36b77c1fa1589c7e52f8f4679a56c3e
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 17:39:46 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 17:39:46 2023 +0000
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 <arthurzam <AT> 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


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2024-04-16 16:30 Jimi Huotari
  0 siblings, 0 replies; 103+ messages in thread
From: Jimi Huotari @ 2024-04-16 16:30 UTC (permalink / raw
  To: gentoo-commits

commit:     3ae3a72b858be8b826ca96b34cb0f124659133e0
Author:     José P. R. N. Assis <espinafre <AT> gmail <DOT> com>
AuthorDate: Thu Feb  1 12:00:54 2024 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 16:29:06 2024 +0000
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 <espinafre <AT> gmail.com>
Signed-off-by: Jimi Huotari <chiitoo <AT> 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] )


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2024-07-02 11:48 Andrew Ammerlaan
  0 siblings, 0 replies; 103+ messages in thread
From: Andrew Ammerlaan @ 2024-07-02 11:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f41f655d60bca2e2d3d878a03836d409ab5f8d9c
Author:     Fabio Rossi <rossi.f <AT> inwind <DOT> it>
AuthorDate: Tue May 21 16:52:22 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 11:47:38 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f41f655d

sci-mathematics/octave: bump to version 9.2.0

- Added support for Qt6
- Added support for sci-libs/klu
- Added support for sci-libs/spqr

Closes: https://bugs.gentoo.org/918123
Signed-off-by: Fabio Rossi <rossi.f <AT> inwind.it>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-mathematics/octave/Manifest            |   1 +
 sci-mathematics/octave/metadata.xml        |   2 +
 sci-mathematics/octave/octave-9.2.0.ebuild | 218 +++++++++++++++++++++++++++++
 3 files changed, 221 insertions(+)

diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 033d2df417bb..63a8b3a5d0dd 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -1 +1,2 @@
 DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4 SHA512 b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3
+DIST octave-9.2.0.tar.xz 27425184 BLAKE2B 55480201037871d878090972bf89d5ff43508276f41e77accdd16b752758775e883fe3875d19ea4fc2b33cf8a9a9f39684f05c85e027ca53ee2cdfda6c6bae72 SHA512 cb1667cd6557d48ecd7ae191bc44c9b9fd4f79e7cf4bf6c917093d120c4312e9594e6dddc5287661627ac053e9f23faaec40a1286d792d859f1fefbfdb3eeb8c

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 72d5085bcfb1..af1bd5973c10 100644
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -14,9 +14,11 @@
     <flag name="gnuplot">Use <pkg>sci-visualization/gnuplot</pkg> to render plots if OpenGL is unavailable</flag>
     <flag name="imagemagick">Use <pkg>media-gfx/graphicsmagick</pkg> to read and write images</flag>
     <flag name="json">Allow using jsonencode and jsondecode commands via <pkg>dev-libs/rapidjson</pkg></flag>
+    <flag name="klu">Add support for KLU (<pkg>sci-libs/klu</pkg>)</flag>
     <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
     <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
     <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+    <flag name="spqr">Add support for SPQR (<pkg>sci-libs/spqr</pkg>)</flag>
     <flag name="sundials">Enable the ode15i and ode15s ODE solvers using <pkg>sci-libs/sundials</pkg></flag>
   </use>
   <upstream>

diff --git a/sci-mathematics/octave/octave-9.2.0.ebuild b/sci-mathematics/octave/octave-9.2.0.ebuild
new file mode 100644
index 000000000000..24c4f2d9dc7b
--- /dev/null
+++ b/sci-mathematics/octave/octave-9.2.0.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 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}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
+
+# 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).
+COMMON_DEPS="
+	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= )
+	glpk? ( sci-mathematics/glpk:= )
+	gnuplot? ( sci-visualization/gnuplot )
+	hdf5? ( sci-libs/hdf5:= )
+	imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+	json? ( dev-libs/rapidjson )
+	klu? ( sci-libs/klu:= )
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		>=media-gfx/fig2dev-3.2.9-r1
+	)
+	gui? (
+		dev-qt/qtbase:6[gui,opengl,network,widgets]
+		media-libs/fontconfig:=
+		media-libs/freetype:=
+		virtual/glu
+		x11-libs/gl2ps:=
+		x11-libs/libX11:=
+		x11-libs/qscintilla:=[qt6]
+	)
+	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:=
+	)
+	spqr? ( sci-libs/spqr:= )
+	ssl? (
+		dev-libs/openssl:=
+	)
+	sundials? (
+		klu? ( >=sci-libs/sundials-4:=[sparse] )
+		!klu? ( >=sci-libs/sundials-4:= )
+	)
+"
+RDEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jre-1.8:* )"
+DEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? ( dev-qt/qttools:6[linguist] )
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+		--without-fltk
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with gui opengl)
+		$(use_with gui qt 6)
+		$(use_with gui x)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with klu)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with spqr)
+		$(use_with ssl openssl)
+		$(use_with sundials sundials_ida)
+		$(use_with sundials sundials_nvecserial)
+	)
+
+	# Tell autoconf where to find qt binaries, fix bug #837752
+	if use gui ; then
+		export MOC="$(qt6_get_bindir)/../libexec/moc" \
+			UIC="$(qt6_get_bindir)/../libexec/uic" \
+			RCC="$(qt6_get_bindir)/../libexec/rcc" \
+			LRELEASE="$(qt6_get_bindir)/lrelease" \
+			QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator"
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2024-08-29 21:56 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2024-08-29 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     4926abf83c91c351d28e9670ca916a73d657a089
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 21:55:22 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 21:55:22 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4926abf8

sci-mathematics/octave: Add missing dependencies w/ USE=gui

Closes: https://bugs.gentoo.org/938706
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

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

diff --git a/sci-mathematics/octave/octave-9.2.0-r1.ebuild b/sci-mathematics/octave/octave-9.2.0-r1.ebuild
new file mode 100644
index 000000000000..c0305336a4ae
--- /dev/null
+++ b/sci-mathematics/octave/octave-9.2.0-r1.ebuild
@@ -0,0 +1,220 @@
+# Copyright 1999-2024 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}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
+
+# 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).
+COMMON_DEPS="
+	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= )
+	glpk? ( sci-mathematics/glpk:= )
+	gnuplot? ( sci-visualization/gnuplot )
+	hdf5? ( sci-libs/hdf5:= )
+	imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
+	json? ( dev-libs/rapidjson )
+	klu? ( sci-libs/klu:= )
+	portaudio? ( media-libs/portaudio )
+	postscript? (
+		app-text/epstool
+		media-gfx/pstoedit
+		>=media-gfx/fig2dev-3.2.9-r1
+	)
+	gui? (
+		dev-qt/qt5compat:6
+		dev-qt/qtbase:6[gui,opengl,network,widgets]
+		media-libs/fontconfig:=
+		media-libs/freetype:=
+		virtual/glu
+		x11-libs/gl2ps:=
+		x11-libs/libX11:=
+		x11-libs/qscintilla:=[qt6]
+	)
+	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:=
+	)
+	spqr? ( sci-libs/spqr:= )
+	ssl? ( dev-libs/openssl:= )
+	sundials? (
+		klu? ( >=sci-libs/sundials-4:=[sparse] )
+		!klu? ( >=sci-libs/sundials-4:= )
+	)
+"
+RDEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jre-1.8:* )"
+DEPEND="${COMMON_DEPS}
+	java? ( >=virtual/jdk-1.8:* )"
+BDEPEND="
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		dev-texlive/texlive-plaingeneric
+		dev-texlive/texlive-metapost
+		virtual/latex-base
+	)
+	gui? (
+		dev-qt/qttools:6[linguist]
+		doc? ( dev-qt/qttools:6[assistant] )
+	)
+	qrupdate? ( app-misc/pax-utils )
+	sparse? ( app-misc/pax-utils )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
+)
+
+src_prepare() {
+	default
+
+	# occasional fail on install, force regeneration (bug #401189)
+	rm doc/interpreter/contributors.texi || die
+
+	eautoreconf
+}
+
+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
+
+	# 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
+	# error, however, so it kind of works. We wind up with, for example,
+	#
+	# --with-sundials_ida (no-op) with USE="sundials"
+	# --without-sundials_ida (disables it) with USE="-sundials"
+	#
+	local myeconfargs=(
+		--localstatedir="${EPREFIX}/var/state/octave"
+		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+		--disable-64
+		--enable-shared
+		--with-z
+		--with-bz2
+		--without-fltk
+
+		# bug #901965
+		--without-libiconv-prefix
+		--without-libreadline-prefix
+
+		$(use_enable doc docs)
+		$(use_enable java)
+		$(use_enable json rapidjson)
+		$(use_enable readline)
+		$(use_with curl)
+		$(use_with fftw fftw3)
+		$(use_with fftw fftw3f)
+		$(use_enable fftw fftw-threads)
+		$(use_with glpk)
+		$(use_with gui opengl)
+		$(use_with gui qt 6)
+		$(use_with gui x)
+		$(use_with hdf5)
+		$(use_with imagemagick magick GraphicsMagick++)
+		$(use_with klu)
+		$(use_with portaudio)
+		$(use_with qhull qhull_r)
+		$(use_with qrupdate)
+		$(use_with sndfile)
+		$(use_with sparse arpack)
+		$(use_with sparse umfpack)
+		$(use_with sparse colamd)
+		$(use_with sparse ccolamd)
+		$(use_with sparse cholmod)
+		$(use_with sparse cxsparse)
+		$(use_with spqr)
+		$(use_with ssl openssl)
+		$(use_with sundials sundials_ida)
+		$(use_with sundials sundials_nvecserial)
+	)
+
+	# Tell autoconf where to find qt binaries, fix bug #837752
+	if use gui ; then
+		export MOC="$(qt6_get_bindir)/../libexec/moc" \
+			UIC="$(qt6_get_bindir)/../libexec/uic" \
+			RCC="$(qt6_get_bindir)/../libexec/rcc" \
+			LRELEASE="$(qt6_get_bindir)/lrelease" \
+			QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator"
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
+	export VARTEXFONTS="${T}/fonts"
+
+	default
+
+	if use java; then
+		pax-mark m "${S}/src/.libs/octave-cli"
+	fi
+}
+
+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
+		insinto /usr/share/${PN}/${PV}/etc
+		doins doc/interpreter/macros.texi
+	fi
+
+	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
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
@ 2024-08-29 21:56 Andreas Sturmlechner
  0 siblings, 0 replies; 103+ messages in thread
From: Andreas Sturmlechner @ 2024-08-29 21:56 UTC (permalink / raw
  To: gentoo-commits

commit:     2377ae626193b897c59af404f044a23ff529d20f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 21:55:45 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 21:55:45 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2377ae62

sci-mathematics/octave: drop 9.2.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 sci-mathematics/octave/octave-9.2.0.ebuild | 218 -----------------------------
 1 file changed, 218 deletions(-)

diff --git a/sci-mathematics/octave/octave-9.2.0.ebuild b/sci-mathematics/octave/octave-9.2.0.ebuild
deleted file mode 100644
index 24c4f2d9dc7b..000000000000
--- a/sci-mathematics/octave/octave-9.2.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2024 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}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 imagemagick java json klu portaudio postscript +qhull +qrupdate readline sndfile +sparse spqr ssl sundials zlib"
-
-# 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).
-COMMON_DEPS="
-	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= )
-	glpk? ( sci-mathematics/glpk:= )
-	gnuplot? ( sci-visualization/gnuplot )
-	hdf5? ( sci-libs/hdf5:= )
-	imagemagick? ( media-gfx/graphicsmagick:=[cxx] )
-	json? ( dev-libs/rapidjson )
-	klu? ( sci-libs/klu:= )
-	portaudio? ( media-libs/portaudio )
-	postscript? (
-		app-text/epstool
-		media-gfx/pstoedit
-		>=media-gfx/fig2dev-3.2.9-r1
-	)
-	gui? (
-		dev-qt/qtbase:6[gui,opengl,network,widgets]
-		media-libs/fontconfig:=
-		media-libs/freetype:=
-		virtual/glu
-		x11-libs/gl2ps:=
-		x11-libs/libX11:=
-		x11-libs/qscintilla:=[qt6]
-	)
-	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:=
-	)
-	spqr? ( sci-libs/spqr:= )
-	ssl? (
-		dev-libs/openssl:=
-	)
-	sundials? (
-		klu? ( >=sci-libs/sundials-4:=[sparse] )
-		!klu? ( >=sci-libs/sundials-4:= )
-	)
-"
-RDEPEND="${COMMON_DEPS}
-	java? ( >=virtual/jre-1.8:* )"
-DEPEND="${COMMON_DEPS}
-	java? ( >=virtual/jdk-1.8:* )"
-BDEPEND="
-	dev-util/gperf
-	virtual/pkgconfig
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		dev-texlive/texlive-plaingeneric
-		dev-texlive/texlive-metapost
-		virtual/latex-base
-	)
-	gui? ( dev-qt/qttools:6[linguist] )
-	qrupdate? ( app-misc/pax-utils )
-	sparse? ( app-misc/pax-utils )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
-)
-
-src_prepare() {
-	default
-
-	# occasional fail on install, force regeneration (bug #401189)
-	rm doc/interpreter/contributors.texi || die
-
-	eautoreconf
-}
-
-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
-
-	# 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
-	# error, however, so it kind of works. We wind up with, for example,
-	#
-	# --with-sundials_ida (no-op) with USE="sundials"
-	# --without-sundials_ida (disables it) with USE="-sundials"
-	#
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}/var/state/octave"
-		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
-		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
-		--disable-64
-		--enable-shared
-		--with-z
-		--with-bz2
-		--without-fltk
-
-		# bug #901965
-		--without-libiconv-prefix
-		--without-libreadline-prefix
-
-		$(use_enable doc docs)
-		$(use_enable java)
-		$(use_enable json rapidjson)
-		$(use_enable readline)
-		$(use_with curl)
-		$(use_with fftw fftw3)
-		$(use_with fftw fftw3f)
-		$(use_enable fftw fftw-threads)
-		$(use_with glpk)
-		$(use_with gui opengl)
-		$(use_with gui qt 6)
-		$(use_with gui x)
-		$(use_with hdf5)
-		$(use_with imagemagick magick GraphicsMagick++)
-		$(use_with klu)
-		$(use_with portaudio)
-		$(use_with qhull qhull_r)
-		$(use_with qrupdate)
-		$(use_with sndfile)
-		$(use_with sparse arpack)
-		$(use_with sparse umfpack)
-		$(use_with sparse colamd)
-		$(use_with sparse ccolamd)
-		$(use_with sparse cholmod)
-		$(use_with sparse cxsparse)
-		$(use_with spqr)
-		$(use_with ssl openssl)
-		$(use_with sundials sundials_ida)
-		$(use_with sundials sundials_nvecserial)
-	)
-
-	# Tell autoconf where to find qt binaries, fix bug #837752
-	if use gui ; then
-		export MOC="$(qt6_get_bindir)/../libexec/moc" \
-			UIC="$(qt6_get_bindir)/../libexec/uic" \
-			RCC="$(qt6_get_bindir)/../libexec/rcc" \
-			LRELEASE="$(qt6_get_bindir)/lrelease" \
-			QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator"
-	fi
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Otherwise it will write to /var/cache/fonts/ and trip sandbox
-	export VARTEXFONTS="${T}/fonts"
-
-	default
-
-	if use java; then
-		pax-mark m "${S}/src/.libs/octave-cli"
-	fi
-}
-
-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
-		insinto /usr/share/${PN}/${PV}/etc
-		doins doc/interpreter/macros.texi
-	fi
-
-	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
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}


^ permalink raw reply related	[flat|nested] 103+ messages in thread

end of thread, other threads:[~2024-08-29 21:56 UTC | newest]

Thread overview: 103+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-01  4:49 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ Michael Orlitzky
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 21:56 Andreas Sturmlechner
2024-08-29 21:56 Andreas Sturmlechner
2024-07-02 11:48 Andrew Ammerlaan
2024-04-16 16:30 Jimi Huotari
2023-12-17 17:40 Arthur Zamarin
2023-12-17 17:40 Arthur Zamarin
2023-12-16  9:28 Joonas Niilola
2023-11-12 12:28 Pacho Ramos
2023-08-23 11:40 Michael Orlitzky
2023-06-09 17:05 Arthur Zamarin
2023-06-09 15:27 Arthur Zamarin
2023-05-26  9:35 Sam James
2023-03-16 23:13 Sam James
2023-02-07 17:25 Andreas Sturmlechner
2023-01-13 13:37 Arthur Zamarin
2023-01-09 15:10 Sam James
2023-01-08  5:17 Sam James
2023-01-08  5:17 Sam James
2022-12-20 14:14 Michael Orlitzky
2022-12-18 20:47 Arthur Zamarin
2022-12-18 20:16 Arthur Zamarin
2022-12-18 20:11 Arthur Zamarin
2022-12-18 19:59 Arthur Zamarin
2022-12-18 11:29 Sam James
2022-11-09 18:20 Michael Orlitzky
2022-11-05  7:55 Sam James
2022-11-05  5:35 Sam James
2022-10-18  2:47 Sam James
2022-10-18  2:18 Sam James
2022-09-11 22:31 Michael Orlitzky
2022-09-11 12:44 Michael Orlitzky
2022-08-13  2:26 Michael Orlitzky
2022-08-03  2:54 Sam James
2022-08-03  2:54 Sam James
2022-07-26 22:02 Maciej Barć
2022-07-08  6:45 Agostino Sarubbo
2022-07-07  6:34 Agostino Sarubbo
2022-07-06 13:07 Arthur Zamarin
2022-05-26  0:28 Sam James
2022-05-17 22:20 Sam James
2022-05-07 16:17 Michael Orlitzky
2022-05-05  1:07 Sam James
2022-05-05  1:07 Sam James
2022-05-05  1:07 Sam James
2022-05-05  0:40 Sam James
2022-05-05  0:39 Sam James
2022-04-16 17:34 Andrew Ammerlaan
2022-01-17 17:28 Michael Orlitzky
2022-01-17 17:28 Michael Orlitzky
2021-10-11 22:22 Yixun Lan
2021-09-30 22:30 Michael Orlitzky
2021-05-03  9:50 Mikle Kolyada
2021-03-10 12:26 Michael Orlitzky
2020-12-12 23:31 Sam James
2020-12-12 22:20 Sam James
2020-12-07 15:27 Sam James
2020-12-07 15:27 Sam James
2020-12-01 16:14 Michael Orlitzky
2020-11-06 15:23 Sam James
2020-10-06 21:11 Sam James
2020-06-04  6:35 Agostino Sarubbo
2020-05-25 12:28 Mikle Kolyada
2020-04-11 15:57 Sergei Trofimovich
2020-03-27 18:46 Michael Orlitzky
2020-01-12 11:14 David Seifert
2019-06-24  7:01 Pacho Ramos
2019-01-25 20:56 Robin H. Johnson
2018-09-23 20:45 Jeroen Roovers
2018-09-12  6:07 Andreas Sturmlechner
2018-07-21 12:25 Alexis Ballier
2018-07-05  0:52 Mark Wright
2018-04-26  3:01 Matt Turner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2017-06-11 11:22 Alexis Ballier
2017-05-26 14:59 Agostino Sarubbo
2017-05-26 14:05 Agostino Sarubbo
2017-05-24 13:42 Agostino Sarubbo
2017-05-23 23:25 Michael Weber
2017-05-10 20:02 Jeroen Roovers
2017-05-10 12:47 Jeroen Roovers
2017-02-28 20:41 David Seifert
2017-02-26  9:29 David Seifert
2017-02-02 11:01 David Seifert
2017-01-10 16:47 David Seifert
2017-01-06 15:17 David Seifert
2016-12-22 18:26 David Seifert
2016-08-09  7:08 David Seifert
2016-08-05  7:19 David Seifert
2016-07-31 13:24 David Seifert
2016-06-05 11:47 Michał Górny
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-02 22:39 Mark Wright
2016-05-02 22:39 Mark Wright
2016-04-30 11:24 Manuel Rüger
2016-04-19 20:14 Ian Stakenvicius
2016-04-19 20:12 Ian Stakenvicius
2016-03-27 22:03 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox