Blocking sci-geosciences/gmt to resolve bug 248333

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 26 insertions, 16 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/Manifest b/sci-biology/probcons/Manifest
index 222cdd2e6a1a..c21ea43bf2fe 100644
--- a/sci-biology/probcons/Manifest
+++ b/sci-biology/probcons/Manifest
@@ -6,15 +6,15 @@ AUX gcc-4.3.patch 1300 RMD160 c0865d3158f7517154d0084edea3e9d50f11f79b SHA1 9091
 AUX probcons-1.12-cxxflags.patch 1957 RMD160 5f9e849c7bdf97077325af9c9713d1de0f08376e SHA1 87e9143f948602e466526a2425c92887eb1ead21 SHA256 5342d2f86fc2d440db1649e0e1f4cf094d8e5a5861c145fb410d014bc9cd8a27
 DIST probcons_v1_10.tar.gz 43004 RMD160 ba7caa3cadd702c3dc00c20f01bfb22416435784 SHA1 773d82f6883202ec41e5dee39713b5db649ef5b0 SHA256 f7a775ac4ba3b3261c0bbe5d2c203c96fc2551e67448aefbac83b461c931b518
 DIST probcons_v1_12.tar.gz 43200 RMD160 4d7d9a89c2c95f22056719c8349216ca1ba635c9 SHA1 ee6ce81777c9ce366f575ab4096ff07f39af9829 SHA256 ecf3f9ab9ad47e14787c76d1c64aeea5533d4038c4be0236c00cdd79104cf383
-EBUILD probcons-1.10.ebuild 1236 RMD160 b24658a6866f556bab2d9ee041540ed65fba961b SHA1 2302f7a9c2a1ba349b3949546187e34e2c7aeafe SHA256 86a6355ad1d5a3bc7914579262047bde097c3228d5ef88ae6a988beb3577c964
-EBUILD probcons-1.12-r1.ebuild 1338 RMD160 b715074c1abdbfa3198b610c2b084f107327fc40 SHA1 f428a3728420421d0bd1c30687c3be14f82d254b SHA256 fa2cf717c20cccd428b7216b9fa478e4357dcf0f00f2e85023b6a7bbf7eb8732
-EBUILD probcons-1.12.ebuild 1307 RMD160 d964b0cd0787854506dcb065fcfd4b611e86ba53 SHA1 0959b01cc1b82d4f179c7ff3bb40f6e419b07411 SHA256 f715ed901b184bbeeea6969bc76101eecd2c2d9bd94f56479d7b87c83ab024a3
-MISC ChangeLog 1717 RMD160 5b5ee80867ed0f58df93922100456d375e8e7425 SHA1 7096fe510aff2c632bd6edf635d1c6049b49744e SHA256 91c18dd88fc135e44fb1a559092938ad3d170b986c01ef3e913cb868cc91dbeb
+EBUILD probcons-1.10.ebuild 1255 RMD160 49e26aae7838e14072b99e658e0497fdf48e3305 SHA1 97ee5cb12c869ff4c5c0669bdb1f7a9c8e8b7c0c SHA256 4f0d18095845561c68d69a40de2a5b4433b2d0d61ad110b2c1d1b1c599bb53e1
+EBUILD probcons-1.12-r1.ebuild 1362 RMD160 cbaeda202b8c9908552325617acc4bb3fe623c78 SHA1 7093a9001abf93ef8b26065957c412e0f601b28c SHA256 ed59a470ba5402c6c3751cc68a7b91a4089f635776043946aea9519e1c31d5c2
+EBUILD probcons-1.12.ebuild 1326 RMD160 5925f8df5fff2dc25f8112f2dda4f8877743267c SHA1 ac50b96c0203bcf0ad8c5a38a733fe59eaa73317 SHA256 c9cddf715df24fee17bf77d9ca7da71b1490664d651baf0f114d68626e1bc14b
+MISC ChangeLog 1889 RMD160 6f25bb6f1bc1fd0a3a7f3e1a2e681ea502e3c539 SHA1 7baf95c18e9c311c2ebef2cc1381b3e89fde816e SHA256 a62f6bddc7ec3dca53e676c2a84b4825e00c5a98ed68a04e013e6114fc44d714
 MISC metadata.xml 164 RMD160 2f441200f2672ab5f1efae7cbdb08b284603903c SHA1 61a50baedfd041e663d6c2a41a28b57e22dbb6de SHA256 f0897b09e661dc603041dab249d73253034659189becf1a34cca37a7d51ef72f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwXf9wACgkQgAnW8HDreRYqjwCg0o9jhCbPAqT2lUAcmD2pb4Z0
-QqQAnA9j/U4QjTVQ/KFoHFWYK63mncKf
-=ZMq2
+iEYEARECAAYFAkwZ7xIACgkQgAnW8HDreRYpdACfXuAxT/dEw6LfQr4dPx9op1p4
+73cAnRVjn7OFie9pTRJbdCFxOI8TGhxz
+=bRVu
 -----END PGP SIGNATURE-----
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}"