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, 26 Feb 2017 09:29:56 +0000 (UTC)	[thread overview]
Message-ID: <1488101379.3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b.soap@gentoo> (raw)

commit:     3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 09:28:22 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 09:29:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5dd6e8

sci-mathematics/octave: Update USE=im/gm semantics to match #314431

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../{octave-3.6.4.ebuild => octave-3.6.4-r1.ebuild}   | 17 ++++++-----------
 ...{octave-3.8.2-r2.ebuild => octave-3.8.2-r3.ebuild} | 17 ++++++-----------
 ...{octave-4.2.0-r3.ebuild => octave-4.2.0-r4.ebuild} | 19 ++++++-------------
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
similarity index 88%
rename from sci-mathematics/octave/octave-3.6.4.ebuild
rename to sci-mathematics/octave/octave-3.6.4-r1.ebuild
index f25a0fdee2..d3a25179a6 100644
--- a/sci-mathematics/octave/octave-3.6.4.ebuild
+++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,6 @@ 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="
@@ -30,8 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5 )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	opengl? (
 		media-libs/freetype:2
 		media-libs/fontconfig
@@ -99,6 +100,7 @@ src_configure() {
 		$(use_with fftw fftw3f)
 		$(use_with glpk)
 		$(use_with hdf5)
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
 		$(use_with opengl)
 		$(use_with qhull)
 		$(use_with qrupdate)
@@ -111,13 +113,6 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use graphicsmagick; then
-		myeconfargs+=( "--with-magick=GraphicsMagick" )
-	elif use imagemagick; then
-		myeconfargs+=( "--with-magick=ImageMagick" )
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
 	autotools-utils_src_configure
 }
 

diff --git a/sci-mathematics/octave/octave-3.8.2-r2.ebuild b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
similarity index 90%
rename from sci-mathematics/octave/octave-3.8.2-r2.ebuild
rename to sci-mathematics/octave/octave-3.8.2-r3.ebuild
index aa4c3f0c49..1db0b9dc4d 100644
--- a/sci-mathematics/octave/octave-3.8.2-r2.ebuild
+++ b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -17,7 +17,6 @@ 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="
@@ -31,8 +30,10 @@ RDEPEND="
 	gnuplot? ( sci-visualization/gnuplot )
 	gui? ( x11-libs/qscintilla:=[qt4(-)] )
 	hdf5? ( sci-libs/hdf5:0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=
@@ -117,6 +118,7 @@ src_configure() {
 		$(use_enable fftw fftw-threads)
 		$(use_with glpk)
 		$(use_with hdf5)
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
 		$(use_with opengl)
 		$(use_with qhull)
 		$(use_with qrupdate)
@@ -129,13 +131,6 @@ src_configure() {
 		$(use_with X x)
 		$(use_with zlib z)
 	)
-	if use graphicsmagick; then
-		myeconfargs+=( "--with-magick=GraphicsMagick" )
-	elif use imagemagick; then
-		myeconfargs+=( "--with-magick=ImageMagick" )
-	else
-		myeconfargs+=( "--without-magick" )
-	fi
 	autotools-utils_src_configure
 }
 

diff --git a/sci-mathematics/octave/octave-4.2.0-r3.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
similarity index 92%
rename from sci-mathematics/octave/octave-4.2.0-r3.ebuild
rename to sci-mathematics/octave/octave-4.2.0-r4.ebuild
index 32bcf4c713..4570c991f5 100644
--- a/sci-mathematics/octave/octave-4.2.0-r3.ebuild
+++ b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
@@ -14,7 +14,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 SLOT="0/${PV}"
 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
 	portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
-REQUIRED_USE="?? ( graphicsmagick imagemagick )"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="
@@ -30,8 +29,10 @@ RDEPEND="
 	glpk? ( sci-mathematics/glpk:0= )
 	gnuplot? ( sci-visualization/gnuplot )
 	hdf5? ( sci-libs/hdf5:0= )
-	graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
-	imagemagick? ( media-gfx/imagemagick:=[cxx] )
+	imagemagick? (
+		!graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
+		graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
+	)
 	java? ( >=virtual/jre-1.6.0:* )
 	opengl? (
 		media-libs/freetype:2=
@@ -115,16 +116,7 @@ src_configure() {
 	use hdf5 && has_version sci-libs/hdf5[mpi] && \
 		export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
 
-	local myconf=()
-	if use graphicsmagick; then
-		myconf+=( --with-magick=GraphicsMagick )
-	elif use imagemagick; then
-		myconf+=( --with-magick=ImageMagick )
-	else
-		myconf+=( --without-magick )
-	fi
-
-	econf "${myconf[@]}" \
+	econf \
 		--localstatedir="${EPREFIX}/var/state/octave" \
 		--with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
 		--with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
@@ -144,6 +136,7 @@ src_configure() {
 		$(use_enable fftw fftw-threads) \
 		$(use_with glpk) \
 		$(use_with hdf5) \
+		$(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
 		$(use_with opengl) \
 		$(use_with opengl fltk) \
 		$(use_with openssl) \


             reply	other threads:[~2017-02-26  9:30 UTC|newest]

Thread overview: 107+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-26  9:29 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-24  2:23 [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ Sam James
2025-01-23 22:19 Sam James
2025-01-23 22:19 Sam James
2024-12-26 17:50 Ionen Wolkens
2024-08-29 21:56 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-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-07-31 13:24 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=1488101379.3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b.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