Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/
Date: Sun, 26 Feb 2017 09:30:00
Message-Id: 1488101379.3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b.soap@gentoo
1 commit: 3a5dd6e856ca85aecc1edce3d87b9cf86ed2a56b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 26 09:28:22 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 26 09:29:39 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a5dd6e8
7
8 sci-mathematics/octave: Update USE=im/gm semantics to match #314431
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 .../{octave-3.6.4.ebuild => octave-3.6.4-r1.ebuild} | 17 ++++++-----------
13 ...{octave-3.8.2-r2.ebuild => octave-3.8.2-r3.ebuild} | 17 ++++++-----------
14 ...{octave-4.2.0-r3.ebuild => octave-4.2.0-r4.ebuild} | 19 ++++++-------------
15 3 files changed, 18 insertions(+), 35 deletions(-)
16
17 diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
18 similarity index 88%
19 rename from sci-mathematics/octave/octave-3.6.4.ebuild
20 rename to sci-mathematics/octave/octave-3.6.4-r1.ebuild
21 index f25a0fdee2..d3a25179a6 100644
22 --- a/sci-mathematics/octave/octave-3.6.4.ebuild
23 +++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild
24 @@ -1,4 +1,4 @@
25 -# Copyright 1999-2016 Gentoo Foundation
26 +# Copyright 1999-2017 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 # $Id$
29
30 @@ -17,7 +17,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
31 SLOT="0/${PV}"
32 IUSE="curl doc fftw +glpk gnuplot graphicsmagick hdf5 +imagemagick opengl postscript
33 +qhull +qrupdate readline +sparse static-libs X zlib"
34 -REQUIRED_USE="?? ( graphicsmagick imagemagick )"
35 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
36
37 RDEPEND="
38 @@ -30,8 +29,10 @@ RDEPEND="
39 glpk? ( sci-mathematics/glpk )
40 gnuplot? ( sci-visualization/gnuplot )
41 hdf5? ( sci-libs/hdf5 )
42 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
43 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
44 + imagemagick? (
45 + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
46 + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
47 + )
48 opengl? (
49 media-libs/freetype:2
50 media-libs/fontconfig
51 @@ -99,6 +100,7 @@ src_configure() {
52 $(use_with fftw fftw3f)
53 $(use_with glpk)
54 $(use_with hdf5)
55 + $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
56 $(use_with opengl)
57 $(use_with qhull)
58 $(use_with qrupdate)
59 @@ -111,13 +113,6 @@ src_configure() {
60 $(use_with X x)
61 $(use_with zlib z)
62 )
63 - if use graphicsmagick; then
64 - myeconfargs+=( "--with-magick=GraphicsMagick" )
65 - elif use imagemagick; then
66 - myeconfargs+=( "--with-magick=ImageMagick" )
67 - else
68 - myeconfargs+=( "--without-magick" )
69 - fi
70 autotools-utils_src_configure
71 }
72
73
74 diff --git a/sci-mathematics/octave/octave-3.8.2-r2.ebuild b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
75 similarity index 90%
76 rename from sci-mathematics/octave/octave-3.8.2-r2.ebuild
77 rename to sci-mathematics/octave/octave-3.8.2-r3.ebuild
78 index aa4c3f0c49..1db0b9dc4d 100644
79 --- a/sci-mathematics/octave/octave-3.8.2-r2.ebuild
80 +++ b/sci-mathematics/octave/octave-3.8.2-r3.ebuild
81 @@ -1,4 +1,4 @@
82 -# Copyright 1999-2016 Gentoo Foundation
83 +# Copyright 1999-2017 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $Id$
86
87 @@ -17,7 +17,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
88 SLOT="0/${PV}"
89 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl
90 postscript +qhull +qrupdate readline +sparse static-libs X zlib"
91 -REQUIRED_USE="?? ( graphicsmagick imagemagick )"
92 KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
93
94 RDEPEND="
95 @@ -31,8 +30,10 @@ RDEPEND="
96 gnuplot? ( sci-visualization/gnuplot )
97 gui? ( x11-libs/qscintilla:=[qt4(-)] )
98 hdf5? ( sci-libs/hdf5:0= )
99 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
100 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
101 + imagemagick? (
102 + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
103 + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
104 + )
105 java? ( >=virtual/jre-1.6.0:* )
106 opengl? (
107 media-libs/freetype:2=
108 @@ -117,6 +118,7 @@ src_configure() {
109 $(use_enable fftw fftw-threads)
110 $(use_with glpk)
111 $(use_with hdf5)
112 + $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick))
113 $(use_with opengl)
114 $(use_with qhull)
115 $(use_with qrupdate)
116 @@ -129,13 +131,6 @@ src_configure() {
117 $(use_with X x)
118 $(use_with zlib z)
119 )
120 - if use graphicsmagick; then
121 - myeconfargs+=( "--with-magick=GraphicsMagick" )
122 - elif use imagemagick; then
123 - myeconfargs+=( "--with-magick=ImageMagick" )
124 - else
125 - myeconfargs+=( "--without-magick" )
126 - fi
127 autotools-utils_src_configure
128 }
129
130
131 diff --git a/sci-mathematics/octave/octave-4.2.0-r3.ebuild b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
132 similarity index 92%
133 rename from sci-mathematics/octave/octave-4.2.0-r3.ebuild
134 rename to sci-mathematics/octave/octave-4.2.0-r4.ebuild
135 index 32bcf4c713..4570c991f5 100644
136 --- a/sci-mathematics/octave/octave-4.2.0-r3.ebuild
137 +++ b/sci-mathematics/octave/octave-4.2.0-r4.ebuild
138 @@ -14,7 +14,6 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
139 SLOT="0/${PV}"
140 IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl
141 portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib"
142 -REQUIRED_USE="?? ( graphicsmagick imagemagick )"
143 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
144
145 RDEPEND="
146 @@ -30,8 +29,10 @@ RDEPEND="
147 glpk? ( sci-mathematics/glpk:0= )
148 gnuplot? ( sci-visualization/gnuplot )
149 hdf5? ( sci-libs/hdf5:0= )
150 - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
151 - imagemagick? ( media-gfx/imagemagick:=[cxx] )
152 + imagemagick? (
153 + !graphicsmagick? ( media-gfx/imagemagick:=[cxx] )
154 + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] )
155 + )
156 java? ( >=virtual/jre-1.6.0:* )
157 opengl? (
158 media-libs/freetype:2=
159 @@ -115,16 +116,7 @@ src_configure() {
160 use hdf5 && has_version sci-libs/hdf5[mpi] && \
161 export CXX=mpicxx CC=mpicc FC=mpif77 F77=mpif77
162
163 - local myconf=()
164 - if use graphicsmagick; then
165 - myconf+=( --with-magick=GraphicsMagick )
166 - elif use imagemagick; then
167 - myconf+=( --with-magick=ImageMagick )
168 - else
169 - myconf+=( --without-magick )
170 - fi
171 -
172 - econf "${myconf[@]}" \
173 + econf \
174 --localstatedir="${EPREFIX}/var/state/octave" \
175 --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \
176 --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)" \
177 @@ -144,6 +136,7 @@ src_configure() {
178 $(use_enable fftw fftw-threads) \
179 $(use_with glpk) \
180 $(use_with hdf5) \
181 + $(use_with imagemagick magick $(usex graphicsmagick GraphicsMagick ImageMagick)) \
182 $(use_with opengl) \
183 $(use_with opengl fltk) \
184 $(use_with openssl) \
Report Message
Find on MARC Find on Google Groups