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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5CC9139085 for ; Thu, 22 Dec 2016 22:34:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F259E0C8A; Thu, 22 Dec 2016 22:34:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0977BE0C8A for ; Thu, 22 Dec 2016 22:34:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6741341117 for ; Thu, 22 Dec 2016 22:34:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2050424DF for ; Thu, 22 Dec 2016 22:34:05 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1482445971.1842a17a0dacbcf414630b07b2e9a79bca455ddb.soap@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-4.2.0-fix-qscintilla-detection.patch sci-mathematics/octave/octave-4.2.0-r1.ebuild sci-mathematics/octave/octave-4.2.0-r2.ebuild X-VCS-Directories: sci-mathematics/octave/ sci-mathematics/octave/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 1842a17a0dacbcf414630b07b2e9a79bca455ddb X-VCS-Branch: master Date: Thu, 22 Dec 2016 22:34:05 +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-Archives-Salt: a7847bc2-767b-4a3a-b22b-a92175b9da9c X-Archives-Hash: a65324b22b3c8f4ad4ae6b7559805123 commit: 1842a17a0dacbcf414630b07b2e9a79bca455ddb Author: David Seifert gentoo org> AuthorDate: Thu Dec 22 20:58:56 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Thu Dec 22 22:32:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1842a17a sci-mathematics/octave: Fix QScintilla detection for Qt5 Gentoo-bug: 600482 * Also bring back USE=gui flag Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/octave-4.2.0-fix-qscintilla-detection.patch | 14 ++++++++++++++ .../{octave-4.2.0-r1.ebuild => octave-4.2.0-r2.ebuild} | 9 +++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch new file mode 100644 index 00000000..9d18b6a --- /dev/null +++ b/sci-mathematics/octave/files/octave-4.2.0-fix-qscintilla-detection.patch @@ -0,0 +1,14 @@ +In Gentoo, QScintilla for Qt5 has the same library name +as its Qt4 variant. + +--- a/m4/acinclude.m4 ++++ b/m4/acinclude.m4 +@@ -1327,7 +1327,7 @@ + ;; + 5) + QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport" +- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2" ++ octave_qscintilla_libnames=qscintilla2 + ;; + *) + AC_MSG_ERROR([Unrecognized Qt version $qt_version]) diff --git a/sci-mathematics/octave/octave-4.2.0-r1.ebuild b/sci-mathematics/octave/octave-4.2.0-r2.ebuild similarity index 94% rename from sci-mathematics/octave/octave-4.2.0-r1.ebuild rename to sci-mathematics/octave/octave-4.2.0-r2.ebuild index 331bf04..c2a64e2 100644 --- a/sci-mathematics/octave/octave-4.2.0-r1.ebuild +++ b/sci-mathematics/octave/octave-4.2.0-r2.ebuild @@ -12,8 +12,8 @@ HOMEPAGE="http://www.octave.org/" SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" SLOT="0/${PV}" -IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick java opengl openssl - portaudio postscript +qhull +qrupdate qt5 readline sndfile +sparse static-libs X zlib" +IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl + portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib" REQUIRED_USE="?? ( graphicsmagick imagemagick )" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" @@ -47,7 +47,7 @@ RDEPEND=" media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) - qt5? ( + gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 @@ -85,6 +85,7 @@ PATCHES=( "${FILESDIR}"/${PN}-4.2.0-pkgbuilddir.patch "${FILESDIR}"/${PN}-4.2.0-ncurses-pkgconfig.patch "${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch + "${FILESDIR}"/${PN}-4.2.0-fix-qscintilla-detection.patch ) src_prepare() { @@ -143,7 +144,7 @@ src_configure() { $(use_with portaudio) \ $(use_with qhull) \ $(use_with qrupdate) \ - $(use_with qt5 qt 5) \ + $(use_with gui qt 5) \ $(use_with sndfile) \ $(use_with sparse arpack) \ $(use_with sparse umfpack) \