sci-mathematics/octave: Remove automagic dep on media-gfx/graphicsmagick

Gentoo-Bug: 590280
* Explicitly select dependency on the basis of USE="graphicsmagick"
  vs USE="imagemagick" only.

Package-Manager: portage-2.3.0

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index e698a8ca08ad0b50a0c68df614dbe15fa142880a..3aeefddb4a7cd562753fd72d8e8fdd04118fa65d 100644 (file)
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick 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="
@@ -29,10 +30,8 @@ RDEPEND="
        glpk? ( sci-mathematics/glpk )
        gnuplot? ( sci-visualization/gnuplot )
        hdf5? ( sci-libs/hdf5 )
-       imagemagick? (
-               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-       )
+       graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+       imagemagick? ( media-gfx/imagemagick:=[cxx] )
        opengl? (
                media-libs/freetype:2
                media-libs/fontconfig
@@ -114,12 +113,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

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index db636ad50e324b1e6c83230ab9f46f948ca02a55..f25a0fdee2c20c5d9698d5042782e81907ebded9 100644 (file)
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick 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="
@@ -29,10 +30,8 @@ RDEPEND="
        glpk? ( sci-mathematics/glpk )
        gnuplot? ( sci-visualization/gnuplot )
        hdf5? ( sci-libs/hdf5 )
-       imagemagick? (
-               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
-       )
+       graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+       imagemagick? ( media-gfx/imagemagick:=[cxx] )
        opengl? (
                media-libs/freetype:2
                media-libs/fontconfig
@@ -112,12 +111,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

diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2-r1.ebuild
similarity index 92%
rename from sci-mathematics/octave/octave-3.8.2.ebuild
rename to sci-mathematics/octave/octave-3.8.2-r1.ebuild
index 35bfd1114b452d827f8c9529cf198d6cfc3f02f2..186c802c54f318df9be35b40593f30db9819acb1 100644 (file)
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r1.ebuild
@@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java 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="
@@ -30,10 +31,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:* )
        opengl? (
                media-libs/freetype:2=
@@ -130,12 +129,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

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 2a99d8be9dfea9daa5d49eddc9901e7a4edf2654..4aa4db278af2f9edf0305c3e0e2d9a0388be2fd5 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.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
@@ -145,12 +144,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

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 459bec9efa3f64a16087e44967fd73bdea0bf26b..a90d8000ce2a793faa43d66311fa91a7539d18f8 100644 (file)
--- 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

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 17c05636c2d8ee2464ea453fa417b4e86a0312d9..279abf2fb37db389e1b33ff08904993b2815352e 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.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

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index 459bec9efa3f64a16087e44967fd73bdea0bf26b..a90d8000ce2a793faa43d66311fa91a7539d18f8 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.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

diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild
similarity index 93%
rename from sci-mathematics/octave/octave-4.0.2-r1.ebuild
rename to sci-mathematics/octave/octave-4.0.2-r2.ebuild
index 17c05636c2d8ee2464ea453fa417b4e86a0312d9..279abf2fb37db389e1b33ff08904993b2815352e 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r2.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