gentoo auto-resync : 14:09:2022 - 11:10:10

7 files changed, 276 insertions, 6 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index df7f6b34c9ad..7c1013c09137 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cadical/Manifest b/sci-mathematics/cadical/Manifest
index eef40ed8536c..1fbc26daa231 100644
--- a/sci-mathematics/cadical/Manifest
+++ b/sci-mathematics/cadical/Manifest
@@ -1,4 +1,7 @@
+AUX cadical-configure.patch 380 BLAKE2B e9fd63e663811a2a067b9bb8bb05604dc5b0fb02068a04ed1f80ad7b40e3aa8981c47ad7b80475e758e6c2e44b17b175c3a793e256185d28e0029a78473837b9 SHA512 9b82cd65257253ea423df6fb711bef0d5a8fbca48dd86fde5433b0dd377bfa9778ba3141b36560d13ceb61a4df305b818f11f3a72a483a02b3b3859299d6d830
 AUX cadical-makefile.in-ar.patch 323 BLAKE2B 226618745824824d8d7ccea53a3435abed9f829ca8462994fcdf805b7e5ba18a571214a16fbb2fcaeb0c91683424402e0a3c8dd05cd8f8dbdec19ed30aa023eb SHA512 30427fb87ef6aef56b9aebc3b2e0981e79c680c73dba20d371364d1b3668b51f1cbba4b6c7467ffb979245488b8ca1f2251a6321db4991221051f0c4b8e6a4d7
 DIST cadical-1.5.2.tar.gz 596334 BLAKE2B 2e6c0f0602b807cf9ee5993aa627e074291b0128d19474d5431e01992d66b111773e593c14712338e9702f64e23eae6fdd937b5b86b2b9b3e08022dbbb199fd7 SHA512 1aab87bdaec938eb219f75f13bf2fcb031f47ac1f49b586f769aeececd1c33b166341bef3bc8713e62b4612a91c405db33e6d1b48e1074a3433d80e9ecb33fe2
+DIST cadical-1.5.3.tar.gz 596378 BLAKE2B 1ac27412745b0f24668ccf2ea1ff89e02c1e68137110bf9522a63ad82b14621d898d0bf873a651a24ccef9f502982f5e2d5b9c558ed0b1c5b7432c1a1459cb58 SHA512 bec811ab6a4c392506bdc391227d108476b5b5fae280b2d7d484429fe6d84e86206a054a1044cf68046ce183ecd7af3ec58f8be3ac27224fe37930cf43f08f3b
 EBUILD cadical-1.5.2-r1.ebuild 732 BLAKE2B f97142135bf5be3f3912d572235aa0de953ac4137e715b0b3732014c19527cb2a6a4fca456bdd5e48b9384038b1028fcaef8b47695ead65bff5ebdd17fc1d3ce SHA512 aed6e5bd0cda217c6b2a1c9a32dc27f0b0c5f051dcbf43a3e06e806e5a6099340a8d224027b77e6949b3ca3f053f1cd1676cf968d95c9a63636bbe18703e7f79
+EBUILD cadical-1.5.3.ebuild 787 BLAKE2B b4303e9b1636eabd5697e1dcf2111182ca297c7b7d76a64eddf03acef1dd9e3ce569cf1907282cb8511d74a54d4372f5fd67d1d8f1f2f9430fbb9ecb13d9cb70 SHA512 bb7d45d98a46b0a61ce0174a9d287c2fdd425dad7da90fd0f8c963aaf53cdd0aa8b617a9a7ae1ff817a44b39ea2e4ff951d17539dcc5958ad20cd5e24f60d929
 MISC metadata.xml 613 BLAKE2B 6d7e0c1b5eae3803aa0981b195457cdcc6d2ffa2af655837e615da6ed6914ac5bec7a831ced6703ff67476561cf67139ea5519d98cdc2bd8d5781108496046e2 SHA512 b04ad6ae6e2626cea18049e3e20eb227b5580853b8ad77179ea693ed61f12d042b7ea505eb8cfafaa0121564ab0a4b6c7dcdf84f78fa2f47c465e6f61fb1a3f0
diff --git a/sci-mathematics/cadical/cadical-1.5.3.ebuild b/sci-mathematics/cadical/cadical-1.5.3.ebuild
new file mode 100644
index 000000000000..dac39982db2e
--- /dev/null
+++ b/sci-mathematics/cadical/cadical-1.5.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Simplified Satisfiability Solver"
+HOMEPAGE="http://fmv.jku.at/cadical/"
+SRC_URI="https://github.com/arminbiere/${PN}/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${PN}-rel-${PV}
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-makefile.in-ar.patch
+)
+
+DOCS=( BUILD.md CONTRIBUTING NEWS.md README.md VERSION )
+
+src_configure() {
+	tc-export AR
+	CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}" ./configure || die
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe build/{cadical,mobical}
+	dolib.a build/libcadical.a
+	doheader src/cadical.hpp
+	einstalldocs
+}
diff --git a/sci-mathematics/cadical/files/cadical-configure.patch b/sci-mathematics/cadical/files/cadical-configure.patch
new file mode 100644
index 000000000000..c6135cb08664
--- /dev/null
+++ b/sci-mathematics/cadical/files/cadical-configure.patch
@@ -0,0 +1,21 @@
+Remove forced debugging or optimization flags.
+
+--- a/configure
++++ b/configure
+@@ -261,16 +261,6 @@ case x"$CXX" in
+   *) CXXFLAGS="${CXXFLAGS}-W";;
+ esac
+ 
+-if [ $debug = yes ]
+-then
+-  CXXFLAGS="$CXXFLAGS -g"
+-else
+-  case x"$CXX" in
+-    x*g++*|x*clang++*) CXXFLAGS="$CXXFLAGS -O3";;
+-    *) CXXFLAGS="$CXXFLAGS -O";;
+-  esac
+-fi
+-
+ if [ $m32 = yes ]
+ then
+   case x"$CXX" in
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 771b3b540cc7..cf5930af005a 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -9,5 +9,6 @@ DIST octave-6.4.0.tar.gz 32873157 BLAKE2B afa729c3c9917f724e7d97fe3af42986f323d3
 DIST octave-7.2.0.tar.gz 34180572 BLAKE2B 311021c339b92b3a94b0272f0fb7c788b78ae18fa7a4bddf8302c181401854f35ea7b8e6738d1a294c9baa343c7e8ec365d33f5af2d984ac6ea6853f5d53cf23 SHA512 b1f484fb97ca9270c3090f73b01f1ec0dcd6d3f838ecf7f46c50eb6245a1fa454fbc15dcf87b462a71532ba324cccd4d547b8a5b6a8e7a0914ea14981386b024
 EBUILD octave-5.2.0.ebuild 5403 BLAKE2B c84884673c5ae98b97e18f93763932b28c01945957a56b6b5b79ac2e194ebaf01194dc96d53d0cff2ec79da04aa888f0999dd9df448cda0a6bfe1de61bbfb340 SHA512 eca18c92da4e6a76639ba1d421e648f8ed6b2fb903be02bb466038746ced17ad2c1e0cd3cea6a6ce467ba23728b5df1eb5e6bd6c9bd37d112cc63183cbc0aeda
 EBUILD octave-6.4.0-r3.ebuild 6044 BLAKE2B a5e0e0acda2c545beb02b59ba6b11356de65bf9384c736db3b1d44d4961a2272184e451fbb37b8530a0b7bce73d07db821b5519b776a43f600cde3564ae2887d SHA512 bd08da458ea2a6a3eb5aa745b25b3c47b3eb5ff34332fd0387863e480805ff984f9872b970b0e0770edbd8adb233b8a4ac2b541218cd87eb9dbba4e8c8fedc0e
-EBUILD octave-7.2.0.ebuild 5809 BLAKE2B 50dc96ae6f873f74e8cc00eb5e432c300b81e8e78ee89a9b54b6e0d8b7a68a1ca0591e1697aca7bc2f1d55687f419a86c3839f25f29e302058ca839cfab8bd6a SHA512 e8487115235d4a31ae44c342b52ef0e1be75771fb69e8811ee4531c3f4201f9a040b4f095beca6dec1813e6f091fb907c2fedd575268e7dabfe631940274b899
+EBUILD octave-6.4.0-r4.ebuild 6031 BLAKE2B 30bbe11d7ac6fea759463681cfc49a5779cec4eb99aaf5917bf9d8955bc03d63ec6e7c45b8589a54e7ca79dfe302ee60f6f20ab8a667c3a2ebb2d5d9e5e6bc56 SHA512 dcf58e44d24a894d18b2478727f970ac39f81ccd38947147dabc3f88ba8e637b6d783b136073bc2a5d4155b065d387e3f183131bc838a98c1a52bb6274c6bad1
+EBUILD octave-7.2.0-r1.ebuild 5527 BLAKE2B 799a3175791ed82cc0f46bca34f6280a5b51b0e42381e627b748f195fa965a84fda6f562d8c6e6a20b3074a225d87a9b5ab1f8ba41b8978d3187d14df569ba0e SHA512 cfa3e263ce589e39b47b5c9240c63fe006a8751b81bf03850dc91848965fb46bc67db069550e86db5a4f3bc653ae7ab7744930753bbfbcfbcbde3efa91b4e5a0
 MISC metadata.xml 1262 BLAKE2B 39736c6913fb3241bed38c5dd9218190d570a3e914a01d1d06fff2cdd68c3c07296a19e2a35305a67aa776a12636445e523b3e349daeffbf67ab60b074a25fed SHA512 177539fd369e2eee0db21ef46d64f8e9f30b39eb4648c5224ff221465c55cd554ac142940f32171ec36b9561b68243761f4e3cbcfb6b06896d45986cbb568c82
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
+}
diff --git a/sci-mathematics/octave/octave-7.2.0.ebuild b/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 \