From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53DC113832E for ; Tue, 9 Aug 2016 07:08:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8107121C06A; Tue, 9 Aug 2016 07:08:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1E37821C06A for ; Tue, 9 Aug 2016 07:08:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6491E340756 for ; Tue, 9 Aug 2016 07:08:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8140D2450 for ; Tue, 9 Aug 2016 07:08:16 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1470726485.8020ccb2e7e25d0ae3fbd2f3ab039538b055e31c.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/octave/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/octave/octave-3.6.4-r1.ebuild sci-mathematics/octave/octave-3.6.4.ebuild sci-mathematics/octave/octave-3.8.2-r1.ebuild sci-mathematics/octave/octave-3.8.2.ebuild sci-mathematics/octave/octave-4.0.0-r1.ebuild sci-mathematics/octave/octave-4.0.0.ebuild sci-mathematics/octave/octave-4.0.1-r1.ebuild sci-mathematics/octave/octave-4.0.1.ebuild sci-mathematics/octave/octave-4.0.2-r1.ebuild sci-mathematics/octave/octave-4.0.2-r2.ebuild X-VCS-Directories: sci-mathematics/octave/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8020ccb2e7e25d0ae3fbd2f3ab039538b055e31c X-VCS-Branch: master Date: Tue, 9 Aug 2016 07:08:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9e55a58c-7bf2-4efe-aaaa-2324f83c649e X-Archives-Hash: 55ef106b28671e6d8ff116a1872c14b2 commit: 8020ccb2e7e25d0ae3fbd2f3ab039538b055e31c Author: David Seifert gentoo org> AuthorDate: Tue Aug 9 07:06:37 2016 +0000 Commit: David Seifert gentoo org> CommitDate: Tue Aug 9 07:08:05 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8020ccb2 sci-mathematics/octave: Remove automagic dep on media-gfx/graphicsmagick Gentoo-Bug: 590280 * Explicitly select dependency on the basis of USE="graphicsmagick" vs USE="imagemagick" only. Package-Manager: portage-2.3.0 sci-mathematics/octave/octave-3.6.4-r1.ebuild | 17 +++++++---------- sci-mathematics/octave/octave-3.6.4.ebuild | 17 +++++++---------- .../{octave-3.8.2.ebuild => octave-3.8.2-r1.ebuild} | 17 +++++++---------- sci-mathematics/octave/octave-4.0.0-r1.ebuild | 17 +++++++---------- sci-mathematics/octave/octave-4.0.0.ebuild | 17 +++++++---------- sci-mathematics/octave/octave-4.0.1-r1.ebuild | 17 +++++++---------- sci-mathematics/octave/octave-4.0.1.ebuild | 17 +++++++---------- .../{octave-4.0.2-r1.ebuild => octave-4.0.2-r2.ebuild} | 17 +++++++---------- 8 files changed, 56 insertions(+), 80 deletions(-) diff --git a/sci-mathematics/octave/octave-3.6.4-r1.ebuild b/sci-mathematics/octave/octave-3.6.4-r1.ebuild index e698a8c..3aeefdd 100644 --- a/sci-mathematics/octave/octave-3.6.4-r1.ebuild +++ b/sci-mathematics/octave/octave-3.6.4-r1.ebuild @@ -17,6 +17,7 @@ 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=" @@ -29,10 +30,8 @@ RDEPEND=" glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) opengl? ( media-libs/freetype:2 media-libs/fontconfig @@ -114,12 +113,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-3.6.4.ebuild b/sci-mathematics/octave/octave-3.6.4.ebuild index db636ad..f25a0fd 100644 --- a/sci-mathematics/octave/octave-3.6.4.ebuild +++ b/sci-mathematics/octave/octave-3.6.4.ebuild @@ -17,6 +17,7 @@ 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=" @@ -29,10 +30,8 @@ RDEPEND=" glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5 ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) opengl? ( media-libs/freetype:2 media-libs/fontconfig @@ -112,12 +111,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-3.8.2.ebuild b/sci-mathematics/octave/octave-3.8.2-r1.ebuild similarity index 92% rename from sci-mathematics/octave/octave-3.8.2.ebuild rename to sci-mathematics/octave/octave-3.8.2-r1.ebuild index 35bfd11..186c802 100644 --- a/sci-mathematics/octave/octave-3.8.2.ebuild +++ b/sci-mathematics/octave/octave-3.8.2-r1.ebuild @@ -17,6 +17,7 @@ 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=" @@ -30,10 +31,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= @@ -130,12 +129,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-4.0.0-r1.ebuild b/sci-mathematics/octave/octave-4.0.0-r1.ebuild index 2a99d8b..4aa4db2 100644 --- a/sci-mathematics/octave/octave-4.0.0-r1.ebuild +++ b/sci-mathematics/octave/octave-4.0.0-r1.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit 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,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -145,12 +144,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-4.0.0.ebuild b/sci-mathematics/octave/octave-4.0.0.ebuild index 459bec9..a90d800 100644 --- a/sci-mathematics/octave/octave-4.0.0.ebuild +++ b/sci-mathematics/octave/octave-4.0.0.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit 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,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -140,12 +139,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-4.0.1-r1.ebuild b/sci-mathematics/octave/octave-4.0.1-r1.ebuild index 17c0563..279abf2 100644 --- a/sci-mathematics/octave/octave-4.0.1-r1.ebuild +++ b/sci-mathematics/octave/octave-4.0.1-r1.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit 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,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -140,12 +139,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-4.0.1.ebuild b/sci-mathematics/octave/octave-4.0.1.ebuild index 459bec9..a90d800 100644 --- a/sci-mathematics/octave/octave-4.0.1.ebuild +++ b/sci-mathematics/octave/octave-4.0.1.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit 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,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -140,12 +139,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi diff --git a/sci-mathematics/octave/octave-4.0.2-r1.ebuild b/sci-mathematics/octave/octave-4.0.2-r2.ebuild similarity index 93% rename from sci-mathematics/octave/octave-4.0.2-r1.ebuild rename to sci-mathematics/octave/octave-4.0.2-r2.ebuild index 17c0563..279abf2 100644 --- a/sci-mathematics/octave/octave-4.0.2-r1.ebuild +++ b/sci-mathematics/octave/octave-4.0.2-r2.ebuild @@ -17,6 +17,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz" SLOT="0/${PV}" IUSE="curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java jit 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,10 +32,8 @@ RDEPEND=" gnuplot? ( sci-visualization/gnuplot ) gui? ( x11-libs/qscintilla:0= ) hdf5? ( sci-libs/hdf5:0= ) - imagemagick? ( - graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) - !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) - ) + graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) + imagemagick? ( media-gfx/imagemagick:=[cxx] ) java? ( >=virtual/jre-1.6.0:* ) jit? ( >=sys-devel/autoconf-archive-2015.02.04 @@ -140,12 +139,10 @@ src_configure() { $(use_with X x) $(use_with zlib z) ) - if use imagemagick; then - if has_version media-gfx/graphicsmagick[cxx]; then - myeconfargs+=( "--with-magick=GraphicsMagick" ) - else - myeconfargs+=( "--with-magick=ImageMagick" ) - fi + if use graphicsmagick; then + myeconfargs+=( "--with-magick=GraphicsMagick" ) + elif use imagemagick; then + myeconfargs+=( "--with-magick=ImageMagick" ) else myeconfargs+=( "--without-magick" ) fi