| 1 |
commit: 4df89de481ecf67d98d81ebdb61ac2252000387c |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 31 13:20:05 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 31 13:23:26 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df89de4 |
| 7 |
|
| 8 |
sci-mathematics/octave: Add subslot operator for media-gfx/imagemagick |
| 9 |
|
| 10 |
Gentoo-bug: 584104 |
| 11 |
* Also add USE="graphicsmagick" and add subslot |
| 12 |
operator for media-gfx/graphicsmagick |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0 |
| 15 |
|
| 16 |
sci-mathematics/octave/metadata.xml | 27 ++++++++++++++------------- |
| 17 |
sci-mathematics/octave/octave-3.6.4-r1.ebuild | 9 +++++---- |
| 18 |
sci-mathematics/octave/octave-3.6.4.ebuild | 9 +++++---- |
| 19 |
sci-mathematics/octave/octave-3.8.2.ebuild | 11 ++++++----- |
| 20 |
sci-mathematics/octave/octave-4.0.0-r1.ebuild | 9 +++++---- |
| 21 |
sci-mathematics/octave/octave-4.0.0.ebuild | 11 ++++++----- |
| 22 |
sci-mathematics/octave/octave-4.0.1-r1.ebuild | 9 +++++---- |
| 23 |
sci-mathematics/octave/octave-4.0.1.ebuild | 9 +++++---- |
| 24 |
sci-mathematics/octave/octave-4.0.2-r1.ebuild | 9 +++++---- |
| 25 |
9 files changed, 56 insertions(+), 47 deletions(-) |
| 26 |
|
| 27 |
diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml |
| 28 |
index 8bafaba..a3ecac6 100644 |
| 29 |
--- a/sci-mathematics/octave/metadata.xml |
| 30 |
+++ b/sci-mathematics/octave/metadata.xml |
| 31 |
@@ -1,23 +1,24 @@ |
| 32 |
<?xml version="1.0" encoding="UTF-8"?> |
| 33 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 34 |
<pkgmetadata> |
| 35 |
-<maintainer type="project"> |
| 36 |
- <email>sci-mathematics@g.o</email> |
| 37 |
- <name>Gentoo Mathematics Project</name> |
| 38 |
-</maintainer> |
| 39 |
-<longdescription lang="en"> |
| 40 |
+ <maintainer type="project"> |
| 41 |
+ <email>sci-mathematics@g.o</email> |
| 42 |
+ <name>Gentoo Mathematics Project</name> |
| 43 |
+ </maintainer> |
| 44 |
+ <longdescription lang="en"> |
| 45 |
Octave is a high-level language, primarily intended for numerical |
| 46 |
computations. It provides a convenient command line interface for |
| 47 |
solving linear and nonlinear problems numerically, and for performing |
| 48 |
other numerical experiments. It may also be used as a batch-oriented |
| 49 |
language. |
| 50 |
</longdescription> |
| 51 |
-<use> |
| 52 |
- <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag> |
| 53 |
- <flag name="gui">Enable the graphical user interface</flag> |
| 54 |
- <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag> |
| 55 |
- <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag> |
| 56 |
- <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag> |
| 57 |
- <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag> |
| 58 |
-</use> |
| 59 |
+ <use> |
| 60 |
+ <flag name="glpk">Add support for <pkg>sci-mathematics/glpk</pkg> for linear programming</flag> |
| 61 |
+ <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag> |
| 62 |
+ <flag name="gui">Enable the graphical user interface</flag> |
| 63 |
+ <flag name="jit">(EXPERIMENTAL) enable JIT compiler</flag> |
| 64 |
+ <flag name="qhull">Add support for <pkg>media-libs/qhull</pkg>, to allow `delaunay', `convhull', and related functions</flag> |
| 65 |
+ <flag name="qrupdate">Add support for <pkg>sci-libs/qrupdate</pkg>for QR and Cholesky update functions</flag> |
| 66 |
+ <flag name="sparse">Add enhanced support for sparse matrix algebra with SuiteSparse</flag> |
| 67 |
+ </use> |
| 68 |
</pkgmetadata> |
| 69 |
|
| 70 |
diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild |
| 71 |
index 65094e6..401cd70 100644 |
| 72 |
--- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild |
| 73 |
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild |
| 74 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 75 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" |
| 76 |
|
| 77 |
SLOT="0/${PV}" |
| 78 |
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript |
| 79 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript |
| 80 |
+qhull +qrupdate readline +sparse static-libs X zlib" |
| 81 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 82 |
|
| 83 |
@@ -29,9 +29,10 @@ RDEPEND=" |
| 84 |
glpk? ( sci-mathematics/glpk ) |
| 85 |
gnuplot? ( sci-visualization/gnuplot ) |
| 86 |
hdf5? ( sci-libs/hdf5 ) |
| 87 |
- imagemagick? ( || ( |
| 88 |
- media-gfx/graphicsmagick[cxx] |
| 89 |
- media-gfx/imagemagick[cxx] ) ) |
| 90 |
+ imagemagick? ( |
| 91 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 92 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 93 |
+ ) |
| 94 |
opengl? ( |
| 95 |
media-libs/freetype:2 |
| 96 |
media-libs/fontconfig |
| 97 |
|
| 98 |
diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild |
| 99 |
index 67ab623..01f8335 100644 |
| 100 |
--- a/sci-mathematics/octave/octave-3.6.4.ebuild |
| 101 |
+++ b/sci-mathematics/octave/octave-3.6.4.ebuild |
| 102 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 103 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" |
| 104 |
|
| 105 |
SLOT="0/${PV}" |
| 106 |
-IUSE="curl doc fftw +glpk gnuplot hdf5 +imagemagick opengl postscript |
| 107 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick hdf5 +imagemagick opengl postscript |
| 108 |
+qhull +qrupdate readline +sparse static-libs X zlib" |
| 109 |
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 110 |
|
| 111 |
@@ -29,9 +29,10 @@ RDEPEND=" |
| 112 |
glpk? ( sci-mathematics/glpk ) |
| 113 |
gnuplot? ( sci-visualization/gnuplot ) |
| 114 |
hdf5? ( sci-libs/hdf5 ) |
| 115 |
- imagemagick? ( || ( |
| 116 |
- media-gfx/graphicsmagick[cxx] |
| 117 |
- media-gfx/imagemagick[cxx] ) ) |
| 118 |
+ imagemagick? ( |
| 119 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 120 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 121 |
+ ) |
| 122 |
opengl? ( |
| 123 |
media-libs/freetype:2 |
| 124 |
media-libs/fontconfig |
| 125 |
|
| 126 |
diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2.ebuild |
| 127 |
index 7d12d6f..f61595c 100644 |
| 128 |
--- a/sci-mathematics/octave/octave-3.8.2.ebuild |
| 129 |
+++ b/sci-mathematics/octave/octave-3.8.2.ebuild |
| 130 |
@@ -1,4 +1,4 @@ |
| 131 |
-# Copyright 1999-2015 Gentoo Foundation |
| 132 |
+# Copyright 1999-2016 Gentoo Foundation |
| 133 |
# Distributed under the terms of the GNU General Public License v2 |
| 134 |
# $Id$ |
| 135 |
|
| 136 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 137 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" |
| 138 |
|
| 139 |
SLOT="0/${PV}" |
| 140 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java opengl |
| 141 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java opengl |
| 142 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 143 |
KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 144 |
|
| 145 |
@@ -30,9 +30,10 @@ RDEPEND=" |
| 146 |
gnuplot? ( sci-visualization/gnuplot ) |
| 147 |
gui? ( x11-libs/qscintilla:0= ) |
| 148 |
hdf5? ( sci-libs/hdf5:0= ) |
| 149 |
- imagemagick? ( || ( |
| 150 |
- media-gfx/graphicsmagick[cxx] |
| 151 |
- media-gfx/imagemagick[cxx] ) ) |
| 152 |
+ imagemagick? ( |
| 153 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 154 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 155 |
+ ) |
| 156 |
java? ( >=virtual/jre-1.6.0:* ) |
| 157 |
opengl? ( |
| 158 |
media-libs/freetype:2= |
| 159 |
|
| 160 |
diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild |
| 161 |
index 1e40ef2..07eee35 100644 |
| 162 |
--- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild |
| 163 |
+++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild |
| 164 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 165 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 166 |
|
| 167 |
SLOT="0/${PV}" |
| 168 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl |
| 169 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl |
| 170 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 171 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 172 |
|
| 173 |
@@ -31,9 +31,10 @@ RDEPEND=" |
| 174 |
gnuplot? ( sci-visualization/gnuplot ) |
| 175 |
gui? ( x11-libs/qscintilla:0= ) |
| 176 |
hdf5? ( sci-libs/hdf5:0= ) |
| 177 |
- imagemagick? ( || ( |
| 178 |
- media-gfx/graphicsmagick[cxx] |
| 179 |
- media-gfx/imagemagick[cxx] ) ) |
| 180 |
+ imagemagick? ( |
| 181 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 182 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 183 |
+ ) |
| 184 |
java? ( >=virtual/jre-1.6.0:* ) |
| 185 |
jit? ( |
| 186 |
>=sys-devel/autoconf-archive-2015.02.04 |
| 187 |
|
| 188 |
diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild |
| 189 |
index 6702068..4da0aa4 100644 |
| 190 |
--- a/sci-mathematics/octave/octave-4.0.0.ebuild |
| 191 |
+++ b/sci-mathematics/octave/octave-4.0.0.ebuild |
| 192 |
@@ -1,4 +1,4 @@ |
| 193 |
-# Copyright 1999-2015 Gentoo Foundation |
| 194 |
+# Copyright 1999-2016 Gentoo Foundation |
| 195 |
# Distributed under the terms of the GNU General Public License v2 |
| 196 |
# $Id$ |
| 197 |
|
| 198 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 199 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 200 |
|
| 201 |
SLOT="0/${PV}" |
| 202 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl |
| 203 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl |
| 204 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 205 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 206 |
|
| 207 |
@@ -31,9 +31,10 @@ RDEPEND=" |
| 208 |
gnuplot? ( sci-visualization/gnuplot ) |
| 209 |
gui? ( x11-libs/qscintilla:0= ) |
| 210 |
hdf5? ( sci-libs/hdf5:0= ) |
| 211 |
- imagemagick? ( || ( |
| 212 |
- media-gfx/graphicsmagick[cxx] |
| 213 |
- media-gfx/imagemagick[cxx] ) ) |
| 214 |
+ imagemagick? ( |
| 215 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 216 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 217 |
+ ) |
| 218 |
java? ( >=virtual/jre-1.6.0:* ) |
| 219 |
jit? ( |
| 220 |
>=sys-devel/autoconf-archive-2015.02.04 |
| 221 |
|
| 222 |
diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild |
| 223 |
index 1b0a27f..13da145 100644 |
| 224 |
--- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild |
| 225 |
+++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild |
| 226 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 227 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 228 |
|
| 229 |
SLOT="0/${PV}" |
| 230 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl |
| 231 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl |
| 232 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 233 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 234 |
|
| 235 |
@@ -31,9 +31,10 @@ RDEPEND=" |
| 236 |
gnuplot? ( sci-visualization/gnuplot ) |
| 237 |
gui? ( x11-libs/qscintilla:0= ) |
| 238 |
hdf5? ( sci-libs/hdf5:0= ) |
| 239 |
- imagemagick? ( || ( |
| 240 |
- media-gfx/graphicsmagick[cxx] |
| 241 |
- media-gfx/imagemagick[cxx] ) ) |
| 242 |
+ imagemagick? ( |
| 243 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 244 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 245 |
+ ) |
| 246 |
java? ( >=virtual/jre-1.6.0:* ) |
| 247 |
jit? ( |
| 248 |
>=sys-devel/autoconf-archive-2015.02.04 |
| 249 |
|
| 250 |
diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild |
| 251 |
index 2355b91..4da0aa4 100644 |
| 252 |
--- a/sci-mathematics/octave/octave-4.0.1.ebuild |
| 253 |
+++ b/sci-mathematics/octave/octave-4.0.1.ebuild |
| 254 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 255 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 256 |
|
| 257 |
SLOT="0/${PV}" |
| 258 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl |
| 259 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl |
| 260 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 261 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 262 |
|
| 263 |
@@ -31,9 +31,10 @@ RDEPEND=" |
| 264 |
gnuplot? ( sci-visualization/gnuplot ) |
| 265 |
gui? ( x11-libs/qscintilla:0= ) |
| 266 |
hdf5? ( sci-libs/hdf5:0= ) |
| 267 |
- imagemagick? ( || ( |
| 268 |
- media-gfx/graphicsmagick[cxx] |
| 269 |
- media-gfx/imagemagick[cxx] ) ) |
| 270 |
+ imagemagick? ( |
| 271 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 272 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 273 |
+ ) |
| 274 |
java? ( >=virtual/jre-1.6.0:* ) |
| 275 |
jit? ( |
| 276 |
>=sys-devel/autoconf-archive-2015.02.04 |
| 277 |
|
| 278 |
diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r1.ebuild |
| 279 |
index 1b0a27f..13da145 100644 |
| 280 |
--- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild |
| 281 |
+++ b/sci-mathematics/octave/octave-4.0.2-r1.ebuild |
| 282 |
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.octave.org/" |
| 283 |
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" |
| 284 |
|
| 285 |
SLOT="0/${PV}" |
| 286 |
-IUSE="curl doc fftw +glpk gnuplot gui hdf5 +imagemagick java jit opengl |
| 287 |
+IUSE="curl doc fftw +glpk gnuplot +graphicsmagick gui hdf5 +imagemagick java jit opengl |
| 288 |
postscript +qhull +qrupdate readline +sparse static-libs X zlib" |
| 289 |
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 290 |
|
| 291 |
@@ -31,9 +31,10 @@ RDEPEND=" |
| 292 |
gnuplot? ( sci-visualization/gnuplot ) |
| 293 |
gui? ( x11-libs/qscintilla:0= ) |
| 294 |
hdf5? ( sci-libs/hdf5:0= ) |
| 295 |
- imagemagick? ( || ( |
| 296 |
- media-gfx/graphicsmagick[cxx] |
| 297 |
- media-gfx/imagemagick[cxx] ) ) |
| 298 |
+ imagemagick? ( |
| 299 |
+ graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) |
| 300 |
+ !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) |
| 301 |
+ ) |
| 302 |
java? ( >=virtual/jre-1.6.0:* ) |
| 303 |
jit? ( |
| 304 |
>=sys-devel/autoconf-archive-2015.02.04 |
Archives