diff options
Diffstat (limited to 'sci-mathematics/octave/octave-4.0.0.ebuild')
| -rw-r--r-- | sci-mathematics/octave/octave-4.0.0.ebuild | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild index 459bec9efa3f..a90d8000ce2a 100644 --- a/sci-mathematics/octave/octave-4.0.0.ebuild +++ b/sci-mathematics/octave/octave-4.0.0.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit opengl postscript +qhull +qrupdate readline +sparse static-libs X zlib" +REQUIRED_USE="?? ( graphicsmagick imagemagick )" KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" RDEPEND=" @@ -31,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -140,12 +139,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi |