Adding blocker for #453044

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

5 files changed, 28 insertions, 24 deletions

diff --git a/sci-biology/shrimp/ChangeLog b/sci-biology/shrimp/ChangeLog
index a3af6b4ff9ef..12caf9c9a3dd 100644
--- a/sci-biology/shrimp/ChangeLog
+++ b/sci-biology/shrimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/shrimp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.16 2012/10/18 18:17:38 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/ChangeLog,v 1.17 2013/01/23 10:06:29 patrick Exp $
+
+  23 Jan 2013; Patrick Lauer <patrick@gentoo.org> shrimp-2.0.1.ebuild,
+  shrimp-2.1.0.ebuild, shrimp-2.2.3.ebuild:
+  Adding blocker for #453044
 
 *shrimp-2.2.3 (18 Oct 2012)
 
@@ -68,4 +72,3 @@
 
   02 Apr 2009; Andrey Kislyuk <weaver@gentoo.org> ChangeLog:
   New package sci-biology/shrimp, ebuild written by me
-
diff --git a/sci-biology/shrimp/Manifest b/sci-biology/shrimp/Manifest
index a5c14b0fbd05..9e3119067077 100644
--- a/sci-biology/shrimp/Manifest
+++ b/sci-biology/shrimp/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST SHRiMP_2_0_1.src.tar.gz 158535 SHA256 62557cf256421aea17a2b221ef485410be177cfc777a6bb8a3de89718d186f63
 DIST SHRiMP_2_1_0.src.tar.gz 189121 SHA256 72a414fcbc528e98af70967942ecf32b377df0582c8076a0bf32c95fa8a8c39e SHA512 01a54dbcb645bfa55ec280d932cc947cab9b6f5266d273d8ea4103cb298e747da00aa04b56753f880d6de11663d9c4219b2402f84d5c15ebe4f1c5bb94e80a8a WHIRLPOOL d0f87dbad1a61c83527be166181eabd491fc3e5a2bd6e22aacd4b369146940e2d843b44ab6e6e9b7c092afe6c08b1cb7b060e3944e47f3d3c87acc634a2c7f36
 DIST SHRiMP_2_2_3.src.tar.gz 4596867 SHA256 a8bed999baeda2ae17ae5c128b2161b20b896228d754e6e446439c1040d6dd8c SHA512 029179aeeb317194b998c29aa91d1d2ce5ccbc6f9ad4a1043d1e5fc75d3344c2f39500ab07e8389c09fa179f0c9b59afee22691bc4eb5d396777f4e0fe25f2d5 WHIRLPOOL 84325b9db3f2e10baa3db935d6e3e2ecae9fd0f47cf5666ea7493f7a975fcd31515f2c77dbe8fcf5cfa099ac2735973e791fa96f0fe8371c5279353bc3f9995a
-EBUILD shrimp-2.0.1.ebuild 1267 SHA256 4685094dae4cd65bffa0da56634350599c5ec4748111e3ce81942b1eea2b63d0 SHA512 96698ffcabc0f57c763e080e935ebb89b19499786c9dc6cdda1cc04f71224cfd9745965ca48f396da501b099781c1fa66405332fac0c534eb969d2dcd7462ed4 WHIRLPOOL 042167c616f661495139539dc2936c3e75389da400f02400d85771375014c510b25f7d4645db667c78790d1ffd7df723ce1dd58532e3fcd42f68a4076b8fd3d0
-EBUILD shrimp-2.1.0.ebuild 1258 SHA256 fd9cb865e3fc3afec5ffd40134f94be6fe72d8c9be7ea211eff27a1298770b31 SHA512 6a7a4e416b9b00d1973e810a4026aa926516a7ba5046959bb90dbbc574ceb8fd34293f9995bd6cc55322612b10d4f2cca681ee0cde9541e2b903d3f685a56bad WHIRLPOOL 05205feb28fab7159797d51e539e67f55c3676836890fda8e984740828867b2c5a4d26468a22552350c968e4948ac05e4d633e31d42c1b95a9f33bf26d2ed920
-EBUILD shrimp-2.2.3.ebuild 1558 SHA256 be720864d3e4da68976225a6f2cf72683a67ec2a0e46414ca161d838940f1eb2 SHA512 a98fe2daf136656378baa5caea0241ae66896ac85ca502af10f0f7f1becb838cfb9c067e0341fa0f6bbd2169711f03e3a1ad69eabf9f8188ef52960b7025b83c WHIRLPOOL 81b9b701bda5a2283aac36a22b076754af60f3b3c88df292a317366fea53b8e5815e87a109668cd63937526b8838cd9b9998c53e98a1d4762796665b9fc32c79
-MISC ChangeLog 2319 SHA256 345021fa88912b6a06b167cdcdd1ae80e8e7b18648a5046f8141f7d7cbda3f80 SHA512 72bd6e0d6e089a764ce14dbec54c3406df49ba60d9afc5c7eb9369db9eb3fd56aa2ca06f8c8d8e85a86efb95b0f501404d93eee2a113e5a1a50fc6b0e0afc28e WHIRLPOOL 766adba4ce831c21279e022bda4b9c3ece20cc8b29434984046eb864ac5dffdbf69aa31c605abb792a0e96b5ead51bc854d4c757e8ced545df5e26fb847051fe
+EBUILD shrimp-2.0.1.ebuild 1369 SHA256 a136801762794e7ad71b39722ed5ba480cf478f938d9ac3d7c73fecd4c45ed3c SHA512 a25b3c881788a1eea84356aa40c63922c46a9ac30e9bdc60b8e0acb1f8ae255450a03c27a42ae8e24a752a4c7ebb5d90170b16797cbe9be03c3de2448e8f0c94 WHIRLPOOL d94fc41aad0b875cc0c5624b840d57d87695ccd5bbff31ab21cbbea0eebc128682e268836de2888cafca6319e3f446674b6991a10b273a10562df907f5e84554
+EBUILD shrimp-2.1.0.ebuild 1360 SHA256 326bd15a2203bcd2f5b51faa3cb07c9d2991f5dbd0b4335055ec5bfeaa1f26ef SHA512 96f22e9bbbe4b25e117847b8b2c0be16fd070a297d055b755d06c8839a6a30e755aa639ce45d681bf437e018424d8be31f0f56d511dfc281d97a9f4db18b0fe1 WHIRLPOOL 6c099e8bc33e46912d14b21d77d8774dd3c00378ba4c5af83ca4e8b4037aa89a4961c41a1097bee964b648deab67b3bd2dc826589e71c943fd68ffa49f818ee5
+EBUILD shrimp-2.2.3.ebuild 1660 SHA256 1a90ce1b8d172154e3700ec6fe076ffc69091629bad0e8a7754cfff0ab81a549 SHA512 2f05a880c480c562dc10da52f2fd4e32423615e832329ca4882c7e22231db99c7008dcffff6f4ceb3b5f41f56871fb243158f83592208523de360917279ac883 WHIRLPOOL 804c0110cff1dc64f586ca2df3baa4412a384736ec0cc18f1e4e914d022644d467a74a009487b578aa307b3ebb35920042329c2d305ab90b784573cc20dc562a
+MISC ChangeLog 2466 SHA256 0855d975e03a3bfb1965c7fbac23293c8fdefe06615b000ccba1a3c2b67dfb23 SHA512 d672607393e66a24a36a81be3da6cb7b813b05c5cd67335d9eda19796be82af842160cd3de603c2728b812d7821ee72a1bc0ec4f840cc611beb253f5f5076e93 WHIRLPOOL 52de96345806a99a9d9e25270124e942c08c5043fc348f046b9dae11b3925a98ec7135513b9fee669e81352afaa8c92211adc2f4c81db54824d7bc9008b4b19b
 MISC metadata.xml 259 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110 SHA512 c3aea4d69d75075af0108a03b7e109cfed6a1fe324f8ccbda3d4e5ca8a5070f1b24ddeb46b64787e10fd22252d867abcee1f31316d602f7e32fe3c990ae60d74 WHIRLPOOL e50da2f26fd4c908446d22da3edb595d60e61d72def374be46440358802a211fc34045b7ad970c4f94b57f7b17ff24cfe64dc94254fea20e047f1fbbbcae0c64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
-
-iEYEAREIAAYFAlCAR8MACgkQgAnW8HDreRbVAgCdG8teCjj+bI+3DDh3bm9cZNVk
-XVUAn3nXxtw1stoFHKck2U9ibyfIK6kY
-=+YCW
------END PGP SIGNATURE-----
diff --git a/sci-biology/shrimp/shrimp-2.0.1.ebuild b/sci-biology/shrimp/shrimp-2.0.1.ebuild
index 81f1bb11185d..f2780029be30 100644
--- a/sci-biology/shrimp/shrimp-2.0.1.ebuild
+++ b/sci-biology/shrimp/shrimp-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.6 2012/10/18 18:00:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.0.1.ebuild,v 1.7 2013/01/23 10:06:29 patrick Exp $
 
 EAPI=4
 
@@ -17,6 +17,10 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="custom-cflags"
 
+# file collision on /usr/bin/utils #453044
+DEPEND="!sci-mathematics/cado-nfs"
+RDEPEND="${DEPEND}"
+
 S=${WORKDIR}/SHRiMP_${MY_PV}
 
 pkg_setup() {
diff --git a/sci-biology/shrimp/shrimp-2.1.0.ebuild b/sci-biology/shrimp/shrimp-2.1.0.ebuild
index 17e3a7398a5f..12ffde4a156d 100644
--- a/sci-biology/shrimp/shrimp-2.1.0.ebuild
+++ b/sci-biology/shrimp/shrimp-2.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.1.0.ebuild,v 1.2 2012/10/18 18:00:44 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.1.0.ebuild,v 1.3 2013/01/23 10:06:29 patrick Exp $
 
 EAPI=4
 
@@ -17,6 +17,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="custom-cflags"
 
+# file collision on /usr/bin/utils #453044
+DEPEND="!sci-mathematics/cado-nfs"
+RDEPEND="${DEPEND}"
+
 S=${WORKDIR}/SHRiMP_${MY_PV}
 
 pkg_setup() {
diff --git a/sci-biology/shrimp/shrimp-2.2.3.ebuild b/sci-biology/shrimp/shrimp-2.2.3.ebuild
index ce8cbe51b610..1cf708f9c173 100644
--- a/sci-biology/shrimp/shrimp-2.2.3.ebuild
+++ b/sci-biology/shrimp/shrimp-2.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.1 2012/10/18 18:17:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/shrimp/shrimp-2.2.3.ebuild,v 1.2 2013/01/23 10:06:29 patrick Exp $
 
 EAPI=4
 
@@ -19,6 +19,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="custom-cflags"
 
+# file collision on /usr/bin/utils #453044
+DEPEND="!sci-mathematics/cado-nfs"
+RDEPEND="${DEPEND}"
+
 S=${WORKDIR}/SHRiMP_${MY_PV}
 
 pkg_setup() {