[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/

["Sam James" <sam@gentoo.org>]

commit:     cefa83cc9eafe62faf7785efaafe4d0b2640c7cf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu May  5 00:38:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu May  5 00:39:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cefa83cc

sci-mathematics/octave: patch 6.4.0 for Qt as well

... given 7 doesn't seem to build with SSL?

Bug: https://bugs.gentoo.org/839285
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-qtchooser-qtver.patch => octave-6.4.0-omit-qtchooser-qtver.patch} | 0
 .../octave/{octave-6.4.0-r1.ebuild => octave-6.4.0-r2.ebuild}         | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
similarity index 100%
rename from sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch
rename to sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch

diff --git a/sci-mathematics/octave/octave-6.4.0-r1.ebuild b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
similarity index 99%
rename from sci-mathematics/octave/octave-6.4.0-r1.ebuild
rename to sci-mathematics/octave/octave-6.4.0-r2.ebuild
index 3ef75b4b879f..23efecfc1a2a 100644
--- a/sci-mathematics/octave/octave-6.4.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-6.4.0-r2.ebuild
@@ -99,9 +99,12 @@ 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}-7.1.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"
@@ -110,7 +113,6 @@ src_prepare() {
 	# occasional fail on install, force regeneration (bug #401189)
 	rm doc/interpreter/contributors.texi || die
 
-	default
 	eautoreconf
 }