Corrected blocker

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

diff --git a/sci-libs/ccp4-libs/ChangeLog b/sci-libs/ccp4-libs/ChangeLog
index cc06b8332777b8e5c04910fad80ab9376fcc7718..668b50251baa90cab6d2e6af57d18b646a883f0e 100644 (file)
--- a/sci-libs/ccp4-libs/ChangeLog
+++ b/sci-libs/ccp4-libs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-libs/ccp4-libs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.44 2011/12/14 12:20:17 jlec Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ChangeLog,v 1.45 2012/01/07 15:58:44 jlec Exp $
+
+  07 Jan 2012; Justin Lecher <jlec@gentoo.org> ccp4-libs-6.1.3-r11.ebuild:
+  Corrected blocker
 
 *ccp4-libs-6.1.3-r11 (14 Dec 2011)
 

diff --git a/sci-libs/ccp4-libs/Manifest b/sci-libs/ccp4-libs/Manifest
index e822679791a0515ae8d1a8d02f7358465a358fab..2746e83ffd309990a8c979a5964a2ac8d0dc603c 100644 (file)
--- a/sci-libs/ccp4-libs/Manifest
+++ b/sci-libs/ccp4-libs/Manifest
@@ -17,15 +17,15 @@ AUX 6.1.3-unbundle-libs-ng2.patch 15485 RMD160 c4b07251ee584fbc66342cd97f15185eb
 AUX 6.1.3-unbundle-libs.patch 9063 RMD160 326af0e6990134546fb2607dae707b94d4588149 SHA1 ef929532e45c12fb168e5fca4eb7fa8c857c376a SHA256 7e5fc919b5204e2d9141f7715afdd8a8b4e3e2a96e2bf95aa00fbd56046f1aa4
 DIST ccp4-6.1.3-core-src.tar.gz 242134076 RMD160 e9b7deb0766fb95d5e8946881f20e086f0896fe9 SHA1 ee5ada892694db5dc9b2d7d2330b4ac694f56580 SHA256 1e529c660e7f390ec0feca9d45caa00a2813d23156c10a2747c427117293c324
 EBUILD ccp4-libs-6.1.3-r10.ebuild 10926 RMD160 db87b7c7369813df9bbe182ec3f520537c0d0e21 SHA1 b0988912ce1bcd47bed716ebbde50cebb140f12e SHA256 62b6daf7759bc9bc5873886912359b04dc0ec3d85a02ba08356e77807043219b
-EBUILD ccp4-libs-6.1.3-r11.ebuild 11013 RMD160 a74baf5881ac73c057275848edc15d446e659f52 SHA1 929a5663980c2567f5a194f9879bcccf4bd687e6 SHA256 f1bbc62c095de45f28902a99c2016d8f71f2351df858152a5b69bc5fa74fabc9
+EBUILD ccp4-libs-6.1.3-r11.ebuild 11016 RMD160 6bba779cf7ae050b0af1cf2e010382603d2e2c1f SHA1 fae9efcf94fca4f35bbdd89c9988020fea2429cb SHA256 da262dc377025d29e5b7759aa2560dd138a30b2684a3d90daf71d7ef1d0deb7a
 EBUILD ccp4-libs-6.1.3-r8.ebuild 10327 RMD160 40c4481539fa7bac9c4483e36ea845dbcaef1882 SHA1 f639c289ca397043a84474ce5f5aa0088180d815 SHA256 afb16e948de0bcdb1d2dca8d0f1d4e40d2e1e9737c6240b1fefb7a050780383b
 EBUILD ccp4-libs-6.1.3-r9.ebuild 10735 RMD160 0316a1d55d3231f8a2e91f461ad527885e92c1f2 SHA1 0fc4d8b31a232da4cc3097664f206fbddfcde6cb SHA256 b9314ba1ca94d7953c37c3cde39abbc02380d1e6383976c5217d95375971f224
-MISC ChangeLog 6635 RMD160 95874c60566d20a1558511f0d4474e8bda00c401 SHA1 be88eee97db3ba3f2426c2e9266789a7436ed7dd SHA256 938af90241e90d7fa8ae2fcd79367b783b7f2b609ae99728c122d9e8998aea5b
+MISC ChangeLog 6731 RMD160 fb7309ef8d8a9610c62007c7151e89fc4f1fe6d3 SHA1 0631a62bc377f0e744aabc054f684dd1f7e3aacf SHA256 cffe6b5e41c8e9ae658c263ec81a06cfa933337d928a3ed46502ed87afd6cde0
 MISC metadata.xml 265 RMD160 3147f5f0ce8982e3376bf6f833ee76e01409d813 SHA1 207dd5e946f2f945fbeb9059a945cb9fca736856 SHA256 6206181a1050a92258360204c836a620d6f016d552a4d829b3007242ee0d294f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk7olIcACgkQgAnW8HDreRYHTACeOd1ULx218I9/9qdZ1latg3LM
-JX0AoIvySCI+5GDHYPf5X/8oKbmdMWTE
-=IWQm
+iEYEAREKAAYFAk8Ia8AACgkQgAnW8HDreRa1/wCeOJEczPs3ldxvX7Dz0zhCBAmL
+Bl4An2V3FHHlWlnOwmLs+dlyQSRV2/sh
+=Vqf/
 -----END PGP SIGNATURE-----

diff --git a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
index 63528e377cf11e3afc27878022971ffd79ac074c..976813bdb7a5406a704e30880c1f8120f9f673fc 100644 (file)
--- a/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
+++ b/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.1 2011/12/14 12:20:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/ccp4-libs-6.1.3-r11.ebuild,v 1.2 2012/01/07 15:58:44 jlec Exp $
 
 EAPI=3
 
@@ -38,7 +38,7 @@ IUSE=""
 
 RDEPEND="
        !<sci-chemistry/ccp4-6.1.3
-       !<sci-chemistry/ccp4-apps-${PVR}
+       !<sci-chemistry/ccp4-apps-${PV}-r10
        app-shells/tcsh
        dev-lang/tcl
        >=sci-libs/cbflib-0.9.2.2