commit: 05af7b5e2a7d3115f0e11acb0f0235e0c5b752fe Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 17:46:39 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 18:26:27 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05af7b5e
sci-mathematics/octave: Qt4/Qt5 USEdep on x11-libs/qscintilla Gentoo-bug: 600482 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3188 .../octave/{octave-3.8.2-r1.ebuild => octave-3.8.2-r2.ebuild} | 2 +- .../octave/{octave-4.2.0.ebuild => octave-4.2.0-r1.ebuild} | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sci-mathematics/octave/octave-3.8.2-r1.ebuild b/sci-mathematics/octave/octave-3.8.2-r2.ebuild similarity index 99% rename from sci-mathematics/octave/octave-3.8.2-r1.ebuild rename to sci-mathematics/octave/octave-3.8.2-r2.ebuild index 186c802..aa4c3f0 100644 --- a/sci-mathematics/octave/octave-3.8.2-r1.ebuild +++ b/sci-mathematics/octave/octave-3.8.2-r2.ebuild @@ -29,7 +29,7 @@ RDEPEND=" fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) - gui? ( x11-libs/qscintilla:0= ) + gui? ( x11-libs/qscintilla:=[qt4(-)] ) hdf5? ( sci-libs/hdf5:0= ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) imagemagick? ( media-gfx/imagemagick:=[cxx] ) diff --git a/sci-mathematics/octave/octave-4.2.0.ebuild b/sci-mathematics/octave/octave-4.2.0-r1.ebuild similarity index 97% rename from sci-mathematics/octave/octave-4.2.0.ebuild rename to sci-mathematics/octave/octave-4.2.0-r1.ebuild index ed9861c..331bf04 100644 --- a/sci-mathematics/octave/octave-4.2.0.ebuild +++ b/sci-mathematics/octave/octave-4.2.0-r1.ebuild @@ -15,7 +15,7 @@ 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" REQUIRED_USE="?? ( graphicsmagick imagemagick )" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" app-arch/bzip2 @@ -50,7 +50,9 @@ RDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 - dev-qt/qtnetwork:5 ) + dev-qt/qtnetwork:5 + >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] + ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? (
