Diff octave-5.2.0 with a octave-6.2.0

/usr/portage/sci-mathematics/octave/octave-6.2.0.ebuild 2021-05-03 13:09:00.000000000 +0300
13 13
SLOT="0/${PV}"
14 14
IUSE="curl doc fftw +glpk gnuplot gui hdf5 java opengl
15 15
	portaudio postscript +qhull +qrupdate readline sndfile +sparse
16
	ssl static-libs X zlib"
17
KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
16
	ssl static-libs sundials X zlib"
17
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
18 18

  
19
# Although it is listed in INSTALL.OCTAVE as a build tool, Octave runs
20
# "makeinfo" from sys-apps/texinfo at runtime to convert its texinfo
21
# documentation to text (see scripts/help/help.m).
19 22
RDEPEND="
20 23
	app-arch/bzip2
21 24
	app-text/ghostscript-gpl
25
	sys-apps/texinfo
22 26
	dev-libs/libpcre:3=
23 27
	sys-libs/ncurses:0=
24 28
	sys-libs/zlib
......
47 51
		>=x11-libs/fltk-1.3:1=[opengl,xft]
48 52
		x11-libs/gl2ps:0=
49 53
	)
50
	ssl? (
51
		 dev-libs/openssl:0=
52
	)
53 54
	portaudio? ( media-libs/portaudio )
54 55
	postscript? (
55 56
		app-text/epstool
......
69 70
		sci-libs/cxsparse:0=
70 71
		sci-libs/umfpack:0=
71 72
	)
73
	ssl? (
74
		 dev-libs/openssl:0=
75
	)
76
	sundials? ( >=sci-libs/sundials-4:0= )
72 77
	X? ( x11-libs/libX11:0= )"
73 78
DEPEND="${RDEPEND}
74 79
	dev-util/gperf
75
	sys-apps/texinfo
76 80
	virtual/pkgconfig
77 81
	doc? (
78 82
		dev-texlive/texlive-fontsrecommended
......
85 89
	qrupdate? ( app-misc/pax-utils )
86 90
	sparse? ( app-misc/pax-utils )"
87 91

  
88
# Removed "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
89
# because I think Z_LIBS are added to LIBOCTINTERP_LINK_DEPS
90
# in the top-level configure.ac now.
91
#
92
# Both "${FILESDIR}"/${PN}-4.4.0-imagemagick-configure.patch
93
# and "${FILESDIR}"/${PN}-4.4.0-imagemagick.patch were removed
94
# because this support has been broken upstream for a long time,
95
# and a fix that involves "using namespace Magick;" was rejected
96
# as far as I can tell. Moreover, the configure.ac patch no longer
97
# applies. In the meantime, I've remove support for USE=imagemagick
98
# and USE=graphicsmagick.
99
#
100
# Removed "${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch because it was fixed
101
# in https://hg.savannah.gnu.org/hgweb/octave/rev/cdaa884568b1
102
#
103
# The texi patch is upstream as https://savannah.gnu.org/bugs/?58057
104
# and should be in a future release.
92
# I'm not sure what the getcwd patch is intended to fix. That macro is
93
# part of gnulib, though, so if it's a serious problem then we should
94
# consult upstream about it.
105 95
PATCHES=(
106
	"${FILESDIR}"/${PN}-4.4.0-texi.patch
107 96
	"${FILESDIR}"/${PN}-4.2.0-disable-getcwd-path-max-test-as-it-is-too-slow.patch
108 97
	"${FILESDIR}"/${PN}-5.1.0-pkgbuilddir.patch
109 98
	"${FILESDIR}"/${PN}-4.2.2-ncurses-pkgconfig.patch
......
127 116
	use hdf5 && has_version sci-libs/hdf5[mpi] && \
128 117
		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
129 118

  
119
	# Some of these use_with flags are a bit mismatched. The configure
120
	# script offers only --without-foo, and detects "foo" automatically
121
	# unless --without-foo is specified. Passing --with-foo is not an
122
	# error, however, so it kind of works. We wind up with, for example,
123
	#
124
	# --with-sundials_ida (no-op) with USE="sundials"
125
	# --without-sundials_ida (disables it) with USE="-sundials"
126
	#
130 127
	econf \
131 128
		--localstatedir="${EPREFIX}/var/state/octave" \
132 129
		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
......
160 157
		$(use_with sparse ccolamd) \
161 158
		$(use_with sparse cholmod) \
162 159
		$(use_with sparse cxsparse) \
160
		$(use_with sundials sundials_ida) \
163 161
		$(use_with X x)
164 162
}
165 163

  
Thank you!