diff options
author | Justin Lecher <jlec@gentoo.org> | 2010-06-17 09:46:52 +0000 |
---|---|---|
committer | Justin Lecher <jlec@gentoo.org> | 2010-06-17 09:46:52 +0000 |
commit | d3916fb17389bac95cd421f724bbdbd4471418f1 (patch) | |
tree | b54bd882c3a557aeb79dbc5e2ff5f2c3de15fa0f /sci-biology | |
parent | Version bump (diff) | |
download | gentoo-2-d3916fb17389bac95cd421f724bbdbd4471418f1.tar.gz gentoo-2-d3916fb17389bac95cd421f724bbdbd4471418f1.tar.bz2 gentoo-2-d3916fb17389bac95cd421f724bbdbd4471418f1.zip |
Blocking sci-geosciences/gmt to resolve bug 248333
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sci-biology')
-rw-r--r-- | sci-biology/probcons/ChangeLog | 6 | ||||
-rw-r--r-- | sci-biology/probcons/probcons-1.10.ebuild | 8 | ||||
-rw-r--r-- | sci-biology/probcons/probcons-1.12-r1.ebuild | 6 | ||||
-rw-r--r-- | sci-biology/probcons/probcons-1.12.ebuild | 8 |
4 files changed, 19 insertions, 9 deletions
diff --git a/sci-biology/probcons/ChangeLog b/sci-biology/probcons/ChangeLog index 212d6096034a..d9b329e2c165 100644 --- a/sci-biology/probcons/ChangeLog +++ b/sci-biology/probcons/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-biology/probcons # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.10 2010/06/15 13:27:50 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/ChangeLog,v 1.11 2010/06/17 09:46:52 jlec Exp $ + + 17 Jun 2010; Justin Lecher <jlec@gentoo.org> probcons-1.10.ebuild, + probcons-1.12.ebuild, probcons-1.12-r1.ebuild: + Blocking sci-geosciences/gmt to resolve bug 248333 *probcons-1.12-r1 (15 Jun 2010) diff --git a/sci-biology/probcons/probcons-1.10.ebuild b/sci-biology/probcons/probcons-1.10.ebuild index e76a9e11f2cb..e648de636d28 100644 --- a/sci-biology/probcons/probcons-1.10.ebuild +++ b/sci-biology/probcons/probcons-1.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.10.ebuild,v 1.2 2006/07/09 07:18:06 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.10.ebuild,v 1.3 2010/06/17 09:46:52 jlec Exp $ inherit eutils toolchain-funcs @@ -13,7 +13,9 @@ SLOT="0" KEYWORDS="x86" IUSE="" # Gnuplot is explicitly runtime-only, it's run using system() -RDEPEND="sci-visualization/gnuplot" +RDEPEND=" + !sci-geosciences/gmt + sci-visualization/gnuplot" DEPEND="" S="${WORKDIR}/${PN}" diff --git a/sci-biology/probcons/probcons-1.12-r1.ebuild b/sci-biology/probcons/probcons-1.12-r1.ebuild index 4dbeda112c8e..3dd4c9f108c3 100644 --- a/sci-biology/probcons/probcons-1.12-r1.ebuild +++ b/sci-biology/probcons/probcons-1.12-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12-r1.ebuild,v 1.1 2010/06/15 13:27:50 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12-r1.ebuild,v 1.2 2010/06/17 09:46:52 jlec Exp $ EAPI="3" @@ -18,7 +18,9 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="" # Gnuplot is explicitly runtime-only, it's run using system() -RDEPEND="sci-visualization/gnuplot" +RDEPEND=" + !sci-geosciences/gmt + sci-visualization/gnuplot" DEPEND="" S="${WORKDIR}/${PN}" diff --git a/sci-biology/probcons/probcons-1.12.ebuild b/sci-biology/probcons/probcons-1.12.ebuild index c8c7d77c6720..a636ebf5e0cb 100644 --- a/sci-biology/probcons/probcons-1.12.ebuild +++ b/sci-biology/probcons/probcons-1.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12.ebuild,v 1.4 2009/08/16 18:18:18 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-biology/probcons/probcons-1.12.ebuild,v 1.5 2010/06/17 09:46:52 jlec Exp $ inherit eutils toolchain-funcs @@ -13,7 +13,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" # Gnuplot is explicitly runtime-only, it's run using system() -RDEPEND="sci-visualization/gnuplot" +RDEPEND=" + !sci-geosciences/gmt + sci-visualization/gnuplot" DEPEND="" S="${WORKDIR}/${PN}" |