From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
Date: Sat, 16 Apr 2022 17:34:56 +0000 (UTC) [thread overview]
Message-ID: <1650130489.d2975ebf793475fb14124efed12030fdb6eae48c.andrewammerlaan@gentoo> (raw)
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
}
next reply other threads:[~2022-04-16 17:35 UTC|newest]
Thread overview: 110+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-16 17:34 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-10-18 13:26 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ Sam James
2025-05-28 7:54 Sam James
2025-05-26 19:43 Andreas Sturmlechner
2025-01-24 2:23 Sam James
2025-01-23 22:19 Sam James
2025-01-23 22:19 Sam James
2024-12-26 17:50 Ionen Wolkens
2024-08-29 21:56 Andreas Sturmlechner
2024-08-29 21:56 Andreas Sturmlechner
2024-07-02 11:48 Andrew Ammerlaan
2024-04-16 16:30 Jimi Huotari
2023-12-17 17:40 Arthur Zamarin
2023-12-17 17:40 Arthur Zamarin
2023-12-16 9:28 Joonas Niilola
2023-11-12 12:28 Pacho Ramos
2023-08-23 11:40 Michael Orlitzky
2023-06-09 17:05 Arthur Zamarin
2023-06-09 15:27 Arthur Zamarin
2023-05-26 9:35 Sam James
2023-03-16 23:13 Sam James
2023-02-07 17:25 Andreas Sturmlechner
2023-01-13 13:37 Arthur Zamarin
2023-01-09 15:10 Sam James
2023-01-08 5:17 Sam James
2023-01-08 5:17 Sam James
2022-12-20 14:14 Michael Orlitzky
2022-12-18 20:47 Arthur Zamarin
2022-12-18 20:16 Arthur Zamarin
2022-12-18 20:11 Arthur Zamarin
2022-12-18 19:59 Arthur Zamarin
2022-12-18 11:29 Sam James
2022-11-09 18:20 Michael Orlitzky
2022-11-05 7:55 Sam James
2022-11-05 5:35 Sam James
2022-10-18 2:47 Sam James
2022-10-18 2:18 Sam James
2022-09-11 22:31 Michael Orlitzky
2022-09-11 12:44 Michael Orlitzky
2022-08-13 2:26 Michael Orlitzky
2022-08-03 2:54 Sam James
2022-08-03 2:54 Sam James
2022-07-26 22:02 Maciej Barć
2022-07-08 6:45 Agostino Sarubbo
2022-07-07 6:34 Agostino Sarubbo
2022-07-06 13:07 Arthur Zamarin
2022-05-26 0:28 Sam James
2022-05-17 22:20 Sam James
2022-05-07 16:17 Michael Orlitzky
2022-05-05 1:07 Sam James
2022-05-05 1:07 Sam James
2022-05-05 1:07 Sam James
2022-05-05 0:40 Sam James
2022-05-05 0:39 Sam James
2022-01-17 17:28 Michael Orlitzky
2022-01-17 17:28 Michael Orlitzky
2021-10-11 22:22 Yixun Lan
2021-09-30 22:30 Michael Orlitzky
2021-05-03 9:50 Mikle Kolyada
2021-03-10 12:26 Michael Orlitzky
2020-12-12 23:31 Sam James
2020-12-12 22:20 Sam James
2020-12-07 15:27 Sam James
2020-12-07 15:27 Sam James
2020-12-01 16:14 Michael Orlitzky
2020-12-01 4:49 Michael Orlitzky
2020-11-06 15:23 Sam James
2020-10-06 21:11 Sam James
2020-06-04 6:35 Agostino Sarubbo
2020-05-25 12:28 Mikle Kolyada
2020-04-11 15:57 Sergei Trofimovich
2020-03-27 18:46 Michael Orlitzky
2020-01-12 11:14 David Seifert
2019-06-24 7:01 Pacho Ramos
2019-01-25 20:56 Robin H. Johnson
2018-09-23 20:45 Jeroen Roovers
2018-09-12 6:07 Andreas Sturmlechner
2018-07-21 12:25 Alexis Ballier
2018-07-05 0:52 Mark Wright
2018-04-26 3:01 Matt Turner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2017-06-11 11:22 Alexis Ballier
2017-05-26 14:59 Agostino Sarubbo
2017-05-26 14:05 Agostino Sarubbo
2017-05-24 13:42 Agostino Sarubbo
2017-05-23 23:25 Michael Weber
2017-05-10 20:02 Jeroen Roovers
2017-05-10 12:47 Jeroen Roovers
2017-02-28 20:41 David Seifert
2017-02-26 9:29 David Seifert
2017-02-02 11:01 David Seifert
2017-01-10 16:47 David Seifert
2017-01-06 15:17 David Seifert
2016-12-22 18:26 David Seifert
2016-08-09 7:08 David Seifert
2016-08-05 7:19 David Seifert
2016-07-31 13:24 David Seifert
2016-06-05 11:47 Michał Górny
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-02 22:39 Mark Wright
2016-05-02 22:39 Mark Wright
2016-04-30 11:24 Manuel Rüger
2016-04-19 20:14 Ian Stakenvicius
2016-04-19 20:12 Ian Stakenvicius
2016-03-27 22:03 Manuel Rüger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1650130489.d2975ebf793475fb14124efed12030fdb6eae48c.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox