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 1BD3A158090 for ; Thu, 5 May 2022 00:39:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DB42E07A9; Thu, 5 May 2022 00:39:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 2324BE07A9 for ; Thu, 5 May 2022 00:39:47 +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 EF1F8341706 for ; Thu, 5 May 2022 00:39:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 795BB430 for ; Thu, 5 May 2022 00:39:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1651711146.cefa83cc9eafe62faf7785efaafe4d0b2640c7cf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/, sci-mathematics/octave/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch sci-mathematics/octave/files/octave-7.1.0-omit-qtchooser-qtver.patch sci-mathematics/octave/octave-6.4.0-r1.ebuild sci-mathematics/octave/octave-6.4.0-r2.ebuild X-VCS-Directories: sci-mathematics/octave/ sci-mathematics/octave/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: cefa83cc9eafe62faf7785efaafe4d0b2640c7cf X-VCS-Branch: master Date: Thu, 5 May 2022 00:39:44 +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: f344a3d6-0546-413e-b971-4950956b7aea X-Archives-Hash: 3a225c476b3c4698fac1065b4a290b7f commit: cefa83cc9eafe62faf7785efaafe4d0b2640c7cf Author: Sam James gentoo org> AuthorDate: Thu May 5 00:38:40 2022 +0000 Commit: Sam James gentoo 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 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 }