Add blocker against <sci-libs/ccp4-libs-6.1.3-r10, #376131

Package-Manager: portage-2.2.0_alpha46/cvs/Linux x86_64

diff --git a/sci-libs/ssm/ChangeLog b/sci-libs/ssm/ChangeLog
index cfb17a7cb1c00da217a6ce8c8a81ffddea2a664d..af6dccfddbcd6236e0251845c7696d4d6fd791c7 100644 (file)
--- a/sci-libs/ssm/ChangeLog
+++ b/sci-libs/ssm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/ssm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ssm/ChangeLog,v 1.3 2011/07/19 16:05:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ssm/ChangeLog,v 1.4 2011/07/23 19:37:06 jlec Exp $
+
+  23 Jul 2011; Justin Lecher <jlec@gentoo.org> ssm-1.1.ebuild:
+  Add blocker against <sci-libs/ccp4-libs-6.1.3-r10, #376131
 
   19 Jul 2011; Justin Lecher <jlec@gentoo.org> ssm-1.1.ebuild:
   Keyworded for *-linux prefix

diff --git a/sci-libs/ssm/Manifest b/sci-libs/ssm/Manifest
index 3a33d2f46044235a475a749cc00a929f664fdee9..e1f7da66086f14acde104537a19df2f3fa0723bb 100644 (file)
--- a/sci-libs/ssm/Manifest
+++ b/sci-libs/ssm/Manifest
@@ -4,13 +4,13 @@ Hash: SHA512
 AUX ssm-1.1-mmdb.patch 792 RMD160 55f51cee18198b6de8fae3905f643335d76d1bb9 SHA1 0012be8875a13eeffe42d763bd711ef618abce35 SHA256 e108aac6e2ec0cbadbafc9214189e9e42a7b3840e6b4d11a29d016bb4c7cf899
 AUX ssm-1.1-pc.patch 450 RMD160 6131c3eeee16322f89a3c81b06dc400fdb003372 SHA1 90d3dde9cc38d631d143a0137ec59cb7045f92a6 SHA256 44f52741c597808518d1ac10d5c56cbe950b01d86e40a6e69628d3a2e3884982
 DIST ssm-1.1.tar.gz 376302 RMD160 6ab0f63cd6cd36e75959e943dc6740ae19089402 SHA1 df201c5279408539fd1ab04f7038461f832d482d SHA256 975e4e67838d2b44d1c66edff2f7b7802696e80e68bd5238ad0d23834a4583e9
-EBUILD ssm-1.1.ebuild 727 RMD160 eaadf97c5485a5e7970187c940790d9fc989288c SHA1 9cc96d3d3daf1391a3230cbd0d6bb80ca422b2c7 SHA256 a4462686a5786b5c90cf4e389764ab5b84452bd45d060fbdc5de3a0ada4ee0fe
-MISC ChangeLog 606 RMD160 6c9466713c9e8dbaf2c26a2bc14906f34a4d04eb SHA1 6c4f5cac82856a4925bb134e0213f7c890add34d SHA256 d22a8559362c9d5b5a09abd854d93fae88cc1ccefddf6041b649acccdbb3da6b
+EBUILD ssm-1.1.ebuild 759 RMD160 f5d3e2b0897682e0fa914888b7fad29ebf8cc882 SHA1 8ab9d8aaaca9cc8aa047d6becfc27e28f70b5e2e SHA256 c13909419486c5cadccc40ae84779e68f9028a7c9172cea18c50188fd79f7b14
+MISC ChangeLog 731 RMD160 6f97aae13dc5e34f15c2ed5ed54ecc91396ed1ac SHA1 58e97119c02e203a86dcf103590e96cfa5e25507 SHA256 bc4a770dd38827bc3c75967258a058d3dcc5400c4bc01316edc4a71c56096ae9
 MISC metadata.xml 218 RMD160 5dcdfc9ffbff78c3625f6ee6cd8242c0130bba48 SHA1 e7d6721263f31430e0dd04b17f16c27ebac78a89 SHA256 45420c665fb7a061ce85d5300ea7ed5a034a812dc286e2c87540b90d1388d79d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk4lq00ACgkQgAnW8HDreRYR3QCfWOyd3uCbmotD37bSMSQmMYLN
-rOwAnA/D96yhj1UWs8KbeEHJBTMeUZWj
-=3sic
+iEYEAREKAAYFAk4rIu4ACgkQgAnW8HDreRYR+ACcCCb0McxxGAamfKnQsQNhWF3e
+CwUAn1er5NTkODPH1VRXmiEJBlrcj8Lc
+=UfyM
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/ssm/ssm-1.1.ebuild b/sci-libs/ssm/ssm-1.1.ebuild
index 758cf8b143196124be416949b73d109f95dd34d0..30a22df6ea8460a36d282a8b1ebe5cf2dd0af1dd 100644 (file)
--- a/sci-libs/ssm/ssm-1.1.ebuild
+++ b/sci-libs/ssm/ssm-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ssm/ssm-1.1.ebuild,v 1.2 2011/07/19 16:05:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ssm/ssm-1.1.ebuild,v 1.3 2011/07/23 19:37:06 jlec Exp $
 
 EAPI=4
 
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=">=sci-libs/mmdb-1.23"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+       !<sci-libs/ccp4-libs-6.1.3-r10"
 
 src_prepare() {
        epatch \