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 }
