sci-mathematics/octave: Add subslot operator for media-gfx/imagemagick

Gentoo-bug: 584104
* Also add USE="graphicsmagick" and add subslot
  operator for media-gfx/graphicsmagick

Package-Manager: portage-2.3.0

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 8bafaba697408bd86b9dc3b875e41fdac042cd30..a3ecac6b94b75e2a63cc069565cf292cf2b971a1 100644 (file)
--- a/sci-mathematics/octave/metadata.xml
+++ b/sci-mathematics/octave/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>sci-mathematics@gentoo.org</email>
-  <name>Gentoo Mathematics Project</name>
-</maintainer>
-<longdescription lang="en">
+       <maintainer type="project">
+               <email>sci-mathematics@gentoo.org</email>
+               <name>Gentoo Mathematics Project</name>
+       </maintainer>
+       <longdescription lang="en">
   Octave is a high-level language, primarily intended for numerical
   computations.  It provides a convenient command line interface for
   solving linear and nonlinear problems numerically, and for performing
   other numerical experiments.  It may also be used as a batch-oriented
   language.
 </longdescription>
-<use>
-  <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
-  <flag name="gui">Enable the graphical user interface</flag>
-  <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
-  <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
-  <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
-  <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
-</use>
+       <use>
+               <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag>
+               <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
+               <flag name="gui">Enable the graphical user interface</flag>
+               <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag>
+               <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag>
+               <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag>
+               <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag>
+       </use>
 </pkgmetadata>

diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
index 65094e6acf68197b02283df07ef33e183a379b3d..401cd70c44541f196ab77d17c7a3527b3f39af74 100644 (file)
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
        +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -29,9 +29,10 @@ RDEPEND="
        glpk? ( sci-mathematics/glpk )
        gnuplot? ( sci-visualization/gnuplot )
        hdf5? ( sci-libs/hdf5 )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        opengl? (
                media-libs/freetype:2
                media-libs/fontconfig

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild
index 67ab623ccd1a71ff6d77667107794229676dbebf..01f83354047257c6e0f78595003f714b92bc5313 100644 (file)
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript
        +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -29,9 +29,10 @@ RDEPEND="
        glpk? ( sci-mathematics/glpk )
        gnuplot? ( sci-visualization/gnuplot )
        hdf5? ( sci-libs/hdf5 )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        opengl? (
                media-libs/freetype:2
                media-libs/fontconfig

diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild
index 7d12d6f3bb3391e1a3dca8825d5aa7a019d5b610..f61595cfbfae5214ebdd2c9b0039b30052211b0a 100644 (file)
--- a/sci-mathematics/octave/octave-3.8.2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -30,9 +30,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        opengl? (
                media-libs/freetype:2=

diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
index 1e40ef2f6dcdb2de0dbe1a3a9869b00fd86f2ace..07eee35902bfbdce2bb7157073aa70b65900b524 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        jit? (
                >=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild
index 6702068a95bfaa8384d0b5b1103a0aa27089c9d1..4da0aa4b91edc5fa0054983d53e5a41e21e1766b 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.0.ebuild
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        jit? (
                >=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
index 1b0a27f7b8e176255f5aaf28b831ae8a37ce37c5..13da145cd8696b9f281636732a6116c8c60626b0 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        jit? (
                >=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild
index 2355b918ccdc83d5ca4f7eaa725f8293af368b1d..4da0aa4b91edc5fa0054983d53e5a41e21e1766b 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        jit? (
                >=sys-devel/autoconf-archive-2015.02.04

diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
index 1b0a27f7b8e176255f5aaf28b831ae8a37ce37c5..13da145cd8696b9f281636732a6116c8c60626b0 100644 (file)
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild
+++ b/sci-mathematics/octave/octave-4.0.2-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 SLOT="0/${PV}"
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl
        postscript +qhull +qrupdate readline +sparse static-libs X zlib"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
@@ -31,9 +31,10 @@ RDEPEND="
        gnuplot? ( sci-visualization/gnuplot )
        gui? ( x11-libs/qscintilla:0= )
        hdf5? ( sci-libs/hdf5:0= )
-       imagemagick? ( || (
-                       media-gfx/graphicsmagick[cxx]
-                       media-gfx/imagemagick[cxx] ) )
+       imagemagick? (
+               graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+               !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+       )
        java? ( >=virtual/jre-1.6.0:* )
        jit? (
                >=sys-devel/autoconf-archive-2015.02.04