public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
Date: Sun, 31 Jul 2016 13:24:50 +0000 (UTC)	[thread overview]
Message-ID: <1469971406.4df89de481ecf67d98d81ebdb61ac2252000387c.soap@gentoo> (raw)

commit:     4df89de481ecf67d98d81ebdb61ac2252000387c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 31 13:20:05 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 13:23:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4df89de4

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

 sci-mathematics/octave/metadata.xml           | 27 ++++++++++++++-------------
 sci-mathematics/octave/octave-3.6.4-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-3.6.4.ebuild    |  9 +++++----
 sci-mathematics/octave/octave-3.8.2.ebuild    | 11 ++++++-----
 sci-mathematics/octave/octave-4.0.0-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-4.0.0.ebuild    | 11 ++++++-----
 sci-mathematics/octave/octave-4.0.1-r1.ebuild |  9 +++++----
 sci-mathematics/octave/octave-4.0.1.ebuild    |  9 +++++----
 sci-mathematics/octave/octave-4.0.2-r1.ebuild |  9 +++++----
 9 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/sci-mathematics/octave/metadata.xml b/sci-mathematics/octave/metadata.xml
index 8bafaba..a3ecac6 100644
--- 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 65094e6..401cd70 100644
--- 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 67ab623..01f8335 100644
--- 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 7d12d6f..f61595c 100644
--- 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 1e40ef2..07eee35 100644
--- 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 6702068..4da0aa4 100644
--- 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 1b0a27f..13da145 100644
--- 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 2355b91..4da0aa4 100644
--- 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 1b0a27f..13da145 100644
--- 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


             reply	other threads:[~2016-07-31 13:24 UTC|newest]

Thread overview: 103+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-31 13:24 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29 21:56 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ Andreas Sturmlechner
2024-08-29 21:56 Andreas Sturmlechner
2024-07-02 11:48 Andrew Ammerlaan
2024-04-16 16:30 Jimi Huotari
2023-12-17 17:40 Arthur Zamarin
2023-12-17 17:40 Arthur Zamarin
2023-12-16  9:28 Joonas Niilola
2023-11-12 12:28 Pacho Ramos
2023-08-23 11:40 Michael Orlitzky
2023-06-09 17:05 Arthur Zamarin
2023-06-09 15:27 Arthur Zamarin
2023-05-26  9:35 Sam James
2023-03-16 23:13 Sam James
2023-02-07 17:25 Andreas Sturmlechner
2023-01-13 13:37 Arthur Zamarin
2023-01-09 15:10 Sam James
2023-01-08  5:17 Sam James
2023-01-08  5:17 Sam James
2022-12-20 14:14 Michael Orlitzky
2022-12-18 20:47 Arthur Zamarin
2022-12-18 20:16 Arthur Zamarin
2022-12-18 20:11 Arthur Zamarin
2022-12-18 19:59 Arthur Zamarin
2022-12-18 11:29 Sam James
2022-11-09 18:20 Michael Orlitzky
2022-11-05  7:55 Sam James
2022-11-05  5:35 Sam James
2022-10-18  2:47 Sam James
2022-10-18  2:18 Sam James
2022-09-11 22:31 Michael Orlitzky
2022-09-11 12:44 Michael Orlitzky
2022-08-13  2:26 Michael Orlitzky
2022-08-03  2:54 Sam James
2022-08-03  2:54 Sam James
2022-07-26 22:02 Maciej Barć
2022-07-08  6:45 Agostino Sarubbo
2022-07-07  6:34 Agostino Sarubbo
2022-07-06 13:07 Arthur Zamarin
2022-05-26  0:28 Sam James
2022-05-17 22:20 Sam James
2022-05-07 16:17 Michael Orlitzky
2022-05-05  1:07 Sam James
2022-05-05  1:07 Sam James
2022-05-05  1:07 Sam James
2022-05-05  0:40 Sam James
2022-05-05  0:39 Sam James
2022-04-16 17:34 Andrew Ammerlaan
2022-01-17 17:28 Michael Orlitzky
2022-01-17 17:28 Michael Orlitzky
2021-10-11 22:22 Yixun Lan
2021-09-30 22:30 Michael Orlitzky
2021-05-03  9:50 Mikle Kolyada
2021-03-10 12:26 Michael Orlitzky
2020-12-12 23:31 Sam James
2020-12-12 22:20 Sam James
2020-12-07 15:27 Sam James
2020-12-07 15:27 Sam James
2020-12-01 16:14 Michael Orlitzky
2020-12-01  4:49 Michael Orlitzky
2020-11-06 15:23 Sam James
2020-10-06 21:11 Sam James
2020-06-04  6:35 Agostino Sarubbo
2020-05-25 12:28 Mikle Kolyada
2020-04-11 15:57 Sergei Trofimovich
2020-03-27 18:46 Michael Orlitzky
2020-01-12 11:14 David Seifert
2019-06-24  7:01 Pacho Ramos
2019-01-25 20:56 Robin H. Johnson
2018-09-23 20:45 Jeroen Roovers
2018-09-12  6:07 Andreas Sturmlechner
2018-07-21 12:25 Alexis Ballier
2018-07-05  0:52 Mark Wright
2018-04-26  3:01 Matt Turner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2018-04-07 20:49 Andreas Sturmlechner
2017-06-11 11:22 Alexis Ballier
2017-05-26 14:59 Agostino Sarubbo
2017-05-26 14:05 Agostino Sarubbo
2017-05-24 13:42 Agostino Sarubbo
2017-05-23 23:25 Michael Weber
2017-05-10 20:02 Jeroen Roovers
2017-05-10 12:47 Jeroen Roovers
2017-02-28 20:41 David Seifert
2017-02-26  9:29 David Seifert
2017-02-02 11:01 David Seifert
2017-01-10 16:47 David Seifert
2017-01-06 15:17 David Seifert
2016-12-22 18:26 David Seifert
2016-08-09  7:08 David Seifert
2016-08-05  7:19 David Seifert
2016-06-05 11:47 Michał Górny
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-14 23:32 David Seifert
2016-05-02 22:39 Mark Wright
2016-05-02 22:39 Mark Wright
2016-04-30 11:24 Manuel Rüger
2016-04-19 20:14 Ian Stakenvicius
2016-04-19 20:12 Ian Stakenvicius
2016-03-27 22:03 Manuel Rüger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1469971406.4df89de481ecf67d98d81ebdb61ac2252000387c.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox