From 97bacba3ead078e5db8b87ab651a3ffa7d82f60f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 17 Apr 2024 12:04:28 +0100 Subject: gentoo auto-resync : 17:04:2024 - 12:04:27 --- sci-mathematics/Manifest.gz | Bin 19315 -> 19315 bytes sci-mathematics/octave/Manifest | 2 +- sci-mathematics/octave/octave-8.3.0-r1.ebuild | 241 -------------------------- sci-mathematics/octave/octave-8.3.0-r2.ebuild | 241 ++++++++++++++++++++++++++ 4 files changed, 242 insertions(+), 242 deletions(-) delete mode 100644 sci-mathematics/octave/octave-8.3.0-r1.ebuild create mode 100644 sci-mathematics/octave/octave-8.3.0-r2.ebuild (limited to 'sci-mathematics') diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz index c9dbe1970d4f..e0d715051931 100644 Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest index d92a123930e3..5e63c88061d4 100644 --- a/sci-mathematics/octave/Manifest +++ b/sci-mathematics/octave/Manifest @@ -1,5 +1,5 @@ AUX octave-5.1.0-pkgbuilddir.patch 1565 BLAKE2B 7b2968139e080aaa20b5372b400ac84c1754296767834011bcdda5258e7859c48ffaedcade17e8b23e2d23635a546c6a726061e8b4679913ff5b204a26cd0ef4 SHA512 28dcebc3a904cf048cb0568591c6c55616d40f6ca80982a232489a51ec92505dca186043ee3750d8a3f3782149ef1861332a8486466fba2898f0084adf0acb90 AUX octave-6.4.0-omit-qtchooser-qtver.patch 765 BLAKE2B 2f889e8278e48489f2eab1c399b0bf7af26be7f79e35c29fc2963124852067429f7ee25325402ad6983c047398a5c43c2d9f44d3a96e5c3db49282f826ecab82 SHA512 a1edd69d06aadd5c9772b12f32468bcd25b181883d3c303cd5ff58175e95021ed661d363137002a50073ec9c90564442c8b968ea1a3ad6fe56a80cf27e2efc3a DIST octave-8.3.0.tar.xz 26970776 BLAKE2B 8c7241ff6bd5b23244edb47e74753ddf867139280b899b16ae2cab91c30a73ebdcf471d032ee47bddb67f8c7f5c772a23f4a832cadcca7ada01468b84e451ad4 SHA512 b7c8724ca8376783e8563c2050c2d9219309e559116e5cba0fdc9f50780782ff4cc98d382bdbe26055aebffb6be99b110033c682f661a3966ea1b1ddb12d4ac3 -EBUILD octave-8.3.0-r1.ebuild 6655 BLAKE2B 55874aaf37c7d57426fab51c9ed94ac1678924240aec7ad15340e315d3b1a0c90e6e35d78324198e5f29ee20a5a554052993115a79e6d711c478b620b394c126 SHA512 bcf1dfd6c623767ca7a434148cffe5c325402d7b31307658819fc9cc5a8625a69eaabd50a85bf1c0ed412c1fd8dbe9be735d726d4708124d06e8c2d44e7841fd +EBUILD octave-8.3.0-r2.ebuild 6663 BLAKE2B 5f6f2910ba98c2c42d7c34000e847ff91724f4ee80b9114d0943a2bb4b9cbd9a6dd10a42a3c62e337da3e4ab46db9a406477df696dcf9ad0916d383e604637ac SHA512 41743cce406d7b1721265daf7741ca93160e6ddf349f6bf1c3fdca19f5f97eb20b9419ffca00149f5b1907a95ea4432449d6dd8df1dd56cd448d1d4edf052d36 MISC metadata.xml 1703 BLAKE2B 0471bc1eeaa2ce86b8eeca5c3e831eb0d9207b5fd1d3c03aba017a257b7b98b313c42a1054471c79dab1b5d2d84df8a8d3b0ee68e772cbe6970ac92f07dc3269 SHA512 3c051ff80c958af4315faa1670cc5e1d6a53397b4182304b760cf4f2e14f716e187dd76879d094e35713ac115c47ea623530c2f4b114f7bf2eae1cdf28bc46b8 diff --git a/sci-mathematics/octave/octave-8.3.0-r1.ebuild b/sci-mathematics/octave/octave-8.3.0-r1.ebuild deleted file mode 100644 index 70720e5931cd..000000000000 --- a/sci-mathematics/octave/octave-8.3.0-r1.ebuild +++ /dev/null @@ -1,241 +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 - -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 -} diff --git a/sci-mathematics/octave/octave-8.3.0-r2.ebuild b/sci-mathematics/octave/octave-8.3.0-r2.ebuild new file mode 100644 index 000000000000..d13104f9342f --- /dev/null +++ b/sci-mathematics/octave/octave-8.3.0-r2.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:=[qt5(+)] + ) + 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 +} -- cgit v1.2.3