From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B19FE15808B for ; Sat, 16 Apr 2022 17:35:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9553E0895; Sat, 16 Apr 2022 17:34:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94B96E0895 for ; Sat, 16 Apr 2022 17:34:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 903B73418F8 for ; Sat, 16 Apr 2022 17:34:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EC82E3A7 for ; Sat, 16 Apr 2022 17:34:56 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1650130489.d2975ebf793475fb14124efed12030fdb6eae48c.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/octave-6.4.0-r1.ebuild sci-mathematics/octave/octave-6.4.0.ebuild X-VCS-Directories: sci-mathematics/octave/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: d2975ebf793475fb14124efed12030fdb6eae48c X-VCS-Branch: master Date: Sat, 16 Apr 2022 17:34:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 35e8528d-f303-472f-8d23-1037af0cdb70 X-Archives-Hash: e5cb42763fe780b2d357091fdcfe105c commit: d2975ebf793475fb14124efed12030fdb6eae48c Author: chn chn moe> AuthorDate: Mon Apr 11 06:45:20 2022 +0000 Commit: Andrew Ammerlaan gentoo 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.moe> Closes: https://github.com/gentoo/gentoo/pull/24985 Signed-off-by: Andrew Ammerlaan 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 }