Blocking sci-biology/probcons to resolve bug 248333

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

5 files changed, 35 insertions, 15 deletions

diff --git a/sci-geosciences/gmt/ChangeLog b/sci-geosciences/gmt/ChangeLog
index 43932a71c974..6b9e1f204dd3 100644
--- a/sci-geosciences/gmt/ChangeLog
+++ b/sci-geosciences/gmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/gmt
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.19 2009/07/26 18:29:55 cryos Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/ChangeLog,v 1.20 2010/06/17 09:48:27 jlec Exp $
+
+  17 Jun 2010; Justin Lecher <jlec@gentoo.org> gmt-4.0.ebuild,
+  gmt-4.1.1.ebuild, gmt-4.5.0-r1.ebuild:
+  Blocking sci-biology/probcons to resolve bug 248333
 
 *gmt-4.5.0-r1 (26 Jul 2009)
 
diff --git a/sci-geosciences/gmt/Manifest b/sci-geosciences/gmt/Manifest
index 2ce7e3abf88c..58d565a92ff7 100644
--- a/sci-geosciences/gmt/Manifest
+++ b/sci-geosciences/gmt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gmt-4.5.0-no-strip.patch 886 RMD160 f167966962d9fad051afdbc2de09a68bad848f3b SHA1 3ee027b2a0ecfa9449055b2aba44cfc44bc27a11 SHA256 7e84aa704dea1e75dd57bd99953f0002500f00d2fce258f0f9c48c7f04032244
 DIST GMT4.0_man.tar.bz2 105146 RMD160 685526638dd2b6f4058dd136e043ad0c81a25545 SHA1 51812b72a4542c515305cf5d5b0bbd78f46c8029 SHA256 83d2709a5683a11fd8cae44b2fd5a9316864535d8249d89c2b83716f46c9a9fe
 DIST GMT4.0_pdf.tar.bz2 9578106 RMD160 dea1c7c294aae7c1c96475101e5fa88dd2397e79 SHA1 0e9e0b4f6d42c3e1d488627583e6b28ec2c69f95 SHA256 9b6e529973ce645f1d3d0599677562c3f05812b2895ced1a7d1af9dc7cf8ce30
@@ -23,8 +26,15 @@ DIST GSHHS2.0_coast.tar.bz2 4226168 RMD160 a099d16cbea6bb7d8c6dddce5280a0c5a3b00
 DIST GSHHS2.0_full.tar.bz2 29518019 RMD160 3bfd0ba09c78da876973336744d1606cb66a0786 SHA1 b8bb2b5c4b9ee49ff92c49717a0bc529d6846e1c SHA256 9a952e8d2916592b393c04e3fbebbbd1d51cebdc558bd2386d2b4fbffe15f0a9
 DIST GSHHS2.0_high.tar.bz2 9411460 RMD160 bc78714e38bbc55d957ce52ea1ba756bcf2dfad7 SHA1 f2e44ffcb18203d4115c422bb45b4f509b6d63f2 SHA256 ee2ef5f57970a6f12005bf4f73be11dac693c4a8af529b186060831c5ad4ae30
 DIST triangle.tar.bz2 103116 RMD160 98d55e26393530a03aba3b9c8b1dc04fa96a1a8b SHA1 6430dda9d481121b095d1aa0955519f79a88875d SHA256 798cd5b01ba84dde53cce5bf6fb45ff66a830a9ab83960fd1e050a8e3237f3e9
-EBUILD gmt-4.0.ebuild 3704 RMD160 ba524b02331a778c273675d82c347075a92e5f0d SHA1 c7d60b8960f29c1e076b86e0adc76af9e4ec53a0 SHA256 8aca6748de0938cf363f6c465d6503de758024a8ea9766c708a3743cdbc1dd20
-EBUILD gmt-4.1.1.ebuild 3566 RMD160 c3f16ba6a83a39272e1d47b9c180d90abf65ecd6 SHA1 d1d616acfa779f8b3684c6bae353224ea89a560c SHA256 257ebb1b4ad87a398e29b54124c4afb31a771bbf5ef6ab3b4266e0466930905b
-EBUILD gmt-4.5.0-r1.ebuild 3191 RMD160 c2e8321737dba73098cba6f2c45383112c5f8b62 SHA1 498f192d2b801e9d44a19a9b475f28e8aff1f02c SHA256 d68c3ef91e656f823316e07d33a082f0cb8bd2d1a9f920d4989d7a59233e7ecc
-MISC ChangeLog 4231 RMD160 d573e49a3c97bda3f2587edc7dfd8e34786e12a3 SHA1 763496bc342921b77d446b5d0246e0e6d9b66021 SHA256 f08c545d0fdca527ba55bf1c0706dd60ac8ec68dfcea6c438ffb0fd7a50bd618
+EBUILD gmt-4.0.ebuild 3728 RMD160 b018c9de5d38e2ea2a0493b69664fed633acd965 SHA1 fb88b8dda42c3c4a64213435efe74c5e1fccbbfb SHA256 3b4a37133eccc686bd54afd8654b9483466fc3b66f8c3eb8424b7b21d1f35711
+EBUILD gmt-4.1.1.ebuild 3590 RMD160 9f845f4e8188d4fe3301577fb79a179c40865819 SHA1 32d72ae7d0ed8d0ce458792ad00603689fca15d0 SHA256 8ca869202be8bf5e907845a6016c482e4930309741b2bf51190f2c892115c6f3
+EBUILD gmt-4.5.0-r1.ebuild 3215 RMD160 81a217ed19745c21312460376b6574ed975b0faf SHA1 091f3ac2134eec072ef1d3259ef46ca02cda41a6 SHA256 6e5d06381dabc647ebbbe81c582070eb9056b17b05ac9335922a5649f9eb60f3
+MISC ChangeLog 4389 RMD160 b1dd81d3ea76a873e4b9d3a9e771c560b20bd360 SHA1 4334d9bfe1980e9d9ba514dd1684114d31fa98eb SHA256 b7191a429bec7dd6a51e9741ace4824922bd7ae2569a8bf738e2469358fe15cc
 MISC metadata.xml 452 RMD160 e70c04a9d50d215cd99d37693423527d71ec6ccc SHA1 f16c5be9e455d820c5c48665f55cb7d7f304e753 SHA256 0509f73fc513ea60968d8dd1a94ec77095709475709e64d25a7d52cef2f44789
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwZ73AACgkQgAnW8HDreRZ68wCfaMAFsg1C8L/vKWvatywa2jIc
+2VYAnjeGmlAB9mOjDmsHE/ih/eGNTb3r
+=mXm5
+-----END PGP SIGNATURE-----
diff --git a/sci-geosciences/gmt/gmt-4.0.ebuild b/sci-geosciences/gmt/gmt-4.0.ebuild
index fac157c1a416..d41674f57eaf 100644
--- a/sci-geosciences/gmt/gmt-4.0.ebuild
+++ b/sci-geosciences/gmt/gmt-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild,v 1.6 2007/07/02 15:25:12 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.0.ebuild,v 1.7 2010/06/17 09:48:27 jlec Exp $
 
 inherit multilib
 
@@ -28,7 +28,9 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="gmtsuppl gmtfull gmthigh gmttria doc"
 
-RDEPEND=">=sci-libs/netcdf-3.5.0"
+RDEPEND="
+	!sci-biology/probcons
+	>=sci-libs/netcdf-3.5.0"
 DEPEND="${RDEPEND}
 	gmtsuppl? ( >=sys-devel/autoconf-2.58 )"
 
diff --git a/sci-geosciences/gmt/gmt-4.1.1.ebuild b/sci-geosciences/gmt/gmt-4.1.1.ebuild
index c89e7eb9d69a..fb2b01ee1ef2 100644
--- a/sci-geosciences/gmt/gmt-4.1.1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.1.1.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-geosciences/gmt/gmt-4.1.1.ebuild,v 1.1 2006/04/10 00:28:49 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.1.1.ebuild,v 1.2 2010/06/17 09:48:27 jlec Exp $
 
 inherit multilib
 
@@ -25,7 +25,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gmtsuppl gmtfull gmthigh gmttria doc"
 
-RDEPEND=">=sci-libs/netcdf-3.5.0"
+RDEPEND="
+	!sci-biology/probcons
+	>=sci-libs/netcdf-3.5.0"
 DEPEND="${RDEPEND}
 	gmtsuppl? ( >=sys-devel/autoconf-2.58 )"
 
diff --git a/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild b/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild
index ba10137eb509..4df2f36af5f3 100644
--- a/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild
+++ b/sci-geosciences/gmt/gmt-4.5.0-r1.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-geosciences/gmt/gmt-4.5.0-r1.ebuild,v 1.1 2009/07/26 18:29:55 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gmt/gmt-4.5.0-r1.ebuild,v 1.2 2010/06/17 09:48:27 jlec Exp $
 
 inherit multilib autotools eutils
 
@@ -22,7 +22,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gmtsuppl gmtfull gmthigh gmttria doc"
 
-RDEPEND=">=sci-libs/netcdf-3.5.0"
+RDEPEND="
+	!sci-biology/probcons
+	>=sci-libs/netcdf-3.5.0"
 DEPEND="${RDEPEND}
 	gmtsuppl? ( >=sys-devel/autoconf-2.58 )"