sci-biology/allpaths: Block sci-biology/allpathslg due to file collision, #443740

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

5 files changed, 24 insertions, 15 deletions

diff --git a/sci-biology/allpaths/ChangeLog b/sci-biology/allpaths/ChangeLog
index 7c94ebdcd8ae..031e0138f44a 100644
--- a/sci-biology/allpaths/ChangeLog
+++ b/sci-biology/allpaths/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-biology/allpaths
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/ChangeLog,v 1.9 2012/11/08 20:54:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/ChangeLog,v 1.10 2012/11/19 10:27:46 jlec Exp $
+
+  19 Nov 2012; Justin Lecher <jlec@gentoo.org> allpaths-2.0.ebuild,
+  allpaths-3.1.ebuild, allpaths-3.1-r1.ebuild:
+  Block sci-biology/allpathslg due to file collision, #443740
 
 *allpaths-3.1-r1 (08 Nov 2012)
 
diff --git a/sci-biology/allpaths/Manifest b/sci-biology/allpaths/Manifest
index 52617a618fa5..dca16f2e1a96 100644
--- a/sci-biology/allpaths/Manifest
+++ b/sci-biology/allpaths/Manifest
@@ -10,15 +10,15 @@ DIST AllPathsV3_Manual_r1.0.docx 287870 SHA256 497ce1649e627c542ac676cca2a6ab054
 DIST allpaths-2.0.manual.docx 287123 SHA256 f89d15f31d511d6bad587562fa2539c1d5a37a097e4c3f33bb5a00d47fba7e69
 DIST allpaths-2.0.tar.gz 11211652 SHA256 16dce075e7b4ebd8924a79c765a7a7b87c01a68502e256ec200680ba42d95f02
 DIST allpaths-3.1.tgz 1482541 SHA256 bbdc43f82586fc0b67d3a2584e245c452c377f8b532c81e9fe4e2c309ac1a46b SHA512 c82fb89a9d2f9d6cf21082f54999546c8e5d9ce470e0ae4b6c57ad0f95c4e35ab8b5965b098f4444c38e40d1ee434ed22adf70dff4fe8320d9c154e2b904f4e2 WHIRLPOOL c3ceaaaec9ce40668796d72a864c9d903dd795825c2f2a6dcf9b4dff10e4b9b9d278b10c2b15982a8afd75f256f11e48a09fbd934e814b092666d14216678ab5
-EBUILD allpaths-2.0.ebuild 1182 SHA256 38d3f146740ba679abbd759f8f4122839a05d0edfe908c83e6be969128912df6 SHA512 9434603c0da9690bc7209dffb67d0da6553785b959a37d9fde510274691ca0878f748e81cf7c314f310fed4e0046022389fa062a08e3c1e9eb186d9c7ee5365c WHIRLPOOL e9084bee45ab437b8de69dbcf64b02c6f35b2bb18d11acf388a423354e8f4fe5cd449c26f968e2d95446f182efee961d3bee07b0a6970b4d4fff7fc8dd481b0d
-EBUILD allpaths-3.1-r1.ebuild 1674 SHA256 475e08b17b5bc12db208d472fefe32b16f15cd56388f0c266eaf71af7e25506c SHA512 c78343afa1c299ae991fb85df462b76e886679a6c1d36cef778755f2862e061c082550c5c4480077ed76266fc1da5460603a39f5863f7134e2882725ead0bb6f WHIRLPOOL e54318620c2fedfc189b5679db3e98df39716793afc8a69fc39b4418657b1470a47b2569d3efb563954eb0ce93eababd58ecb2091db33b2c30301c7a796dc1e2
-EBUILD allpaths-3.1.ebuild 1155 SHA256 3299b87038331cf9572bbce99e8f00d855e63a2f787650c86f6543114ae69db0 SHA512 5238906cc9dcab0beee768c27474f8c4ac45e35ff7747c39db9561222c3de0b63b67038a9a25aeb37f5b9d1cbc899adcd77ea3ae0d1cd31e98ee0717143f2b89 WHIRLPOOL 3ff32678f3674fc9369063032aba5fd7516e14ddb79da3e29f98d50953ca0405727e1c9094615bd8b4bf6d72094af85282228138dc6b8095912e1300df3b0252
-MISC ChangeLog 1568 SHA256 baf8345e113753054cfbda22f0e4b17fcb2de7f36cac7218e3c79b6636b2d10f SHA512 01a6d6ac4b73c317a2d4360c99efa2923cdd8dbace689a7f14d44c06cbaa1dd07289432fc54055d26cb1f13ac33abbeff4b260af94b156c1bace66e2d9993731 WHIRLPOOL 5d1e9e8f2f209b77d3c8abb50a5ef1e23e2650ebda5e41a42d74cb5cdd0fb404a24bc3ac0d18c3b683fa26d6f37b240b797ba93c8f6732c58edc9d5e4ca7bef0
+EBUILD allpaths-2.0.ebuild 1130 SHA256 1b8fcd636cabe68b5e6208f6a6fc34b95b237c79dee26404a951d175b1447e6e SHA512 2ff78cc969ecb0ed0dff7d0f9bdd2e8444c13e1a1acccffebe7556254d923e8aa743718815ebd25e4989b26b45fa5b889898e9b749286405395282e8915c0c03 WHIRLPOOL 223dc09ff6b810e5aaa8cdf48027f25ac389afb33b30507fbe07483ac9d09481b08f3cb351fe63dbf454186da2cbb760cc20d0978b07c860106c394c1687429d
+EBUILD allpaths-3.1-r1.ebuild 1728 SHA256 896ed6af7a48a74e843cec2c1c870bdde3a707f6d46a4f3f842b571c02d401fc SHA512 b5e190197d3b765bd04163e01603757c99e3a01283bf0c6b95f41df9387aef9fe3147ff768de924fc46228518948348d4d6aab9c44ab91ab5582ff3028ef35e9 WHIRLPOOL 95351986b1d007c0905a2d8a24f08e3bcce0616e50f9d7ff00bb847a707fccfebfc377098cc6a798ca642ec1f409709cdefcc5acfd9d2f6fb9bb1db1b200939d
+EBUILD allpaths-3.1.ebuild 1209 SHA256 78ecca1f1187d27fa1d9c272983bcc3cff4819ea84eae2e0df054ac37c600d38 SHA512 7f6d901d656ab328d48526edc88004213f92bb5e54cc2f6264ac97744d10a0259616a79e56e2fcf57222d8081d6960fbd306b1f08be901af2fa6185bccd19fd7 WHIRLPOOL b5d99a065498b1743e57e26a74ceaf3b58aacc31583f3d536a6b0e23e50a153c58134427f71028ab6d1d43e80a95285d4d27cf87c32e5e0f1df94b58ac54cb9b
+MISC ChangeLog 1747 SHA256 737e890f39d534dfbabcaba28560dc9391661619704d63a30358611105c95a75 SHA512 e33b4e17557c827cda817c7cf91824e639bc853f0e159d6e3977e7caea7df94015e5692f165e58af69164deab3e6c178c9fc31dfe7b63096122c3327fc61e2dc WHIRLPOOL e5ac9d15b42fce0bd8a229078dab301f9269c9b903b3392e6b4ced6505a84c9eead448a20c7776f6b5379bcc26dbfcb9e0aac8e1edf737f8c336ddbd2b89e39d
 MISC metadata.xml 259 SHA256 541c3fbcf299d9a8ccf4132ee61f9e53a5d737cefdaa6fdc77764d8d4c7f3110 SHA512 c3aea4d69d75075af0108a03b7e109cfed6a1fe324f8ccbda3d4e5ca8a5070f1b24ddeb46b64787e10fd22252d867abcee1f31316d602f7e32fe3c990ae60d74 WHIRLPOOL e50da2f26fd4c908446d22da3edb595d60e61d72def374be46440358802a211fc34045b7ad970c4f94b57f7b17ff24cfe64dc94254fea20e047f1fbbbcae0c64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlCcG/8ACgkQgAnW8HDreRYSfACZAb9gqEvSw9it3oTGtv0CQ2wt
-J98AoLfcMY3z58UEBb7TA2IHDmv+sUox
-=66mF
+iEYEAREKAAYFAlCqCaQACgkQgAnW8HDreRbWgwCbB8ADXg9n6soPs9PZWLIS+s1M
+L7YAn3E2p4CD3ybS8CEhMeKvPPOuGtv4
+=bNn/
 -----END PGP SIGNATURE-----
diff --git a/sci-biology/allpaths/allpaths-2.0.ebuild b/sci-biology/allpaths/allpaths-2.0.ebuild
index 25a946abfbbb..62a85a9c56d4 100644
--- a/sci-biology/allpaths/allpaths-2.0.ebuild
+++ b/sci-biology/allpaths/allpaths-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-2.0.ebuild,v 1.5 2010/01/03 14:08:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-2.0.ebuild,v 1.6 2012/11/19 10:27:46 jlec Exp $
 
 EAPI="2"
 
@@ -16,9 +16,8 @@ SLOT="0"
 IUSE=""
 KEYWORDS="amd64 x86"
 
-# TODO: info message on failure instructing to run gcc-config
-DEPEND=">=sys-devel/gcc-4.3.2"
-RDEPEND=""
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gcc-x86-no-autocast.patch
diff --git a/sci-biology/allpaths/allpaths-3.1-r1.ebuild b/sci-biology/allpaths/allpaths-3.1-r1.ebuild
index 0f4c36c25bfc..1793b2eaeb71 100644
--- a/sci-biology/allpaths/allpaths-3.1-r1.ebuild
+++ b/sci-biology/allpaths/allpaths-3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1-r1.ebuild,v 1.1 2012/11/08 20:54:22 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1-r1.ebuild,v 1.2 2012/11/19 10:27:46 jlec Exp $
 
 EAPI=4
 
@@ -17,6 +17,9 @@ SLOT="3"
 KEYWORDS="~amd64 ~x86"
 IUSE="openmp"
 
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/AllPaths"
 
 PATCHES=(
diff --git a/sci-biology/allpaths/allpaths-3.1.ebuild b/sci-biology/allpaths/allpaths-3.1.ebuild
index e913ccc7a2df..aea383b85949 100644
--- a/sci-biology/allpaths/allpaths-3.1.ebuild
+++ b/sci-biology/allpaths/allpaths-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1.ebuild,v 1.3 2012/08/30 07:46:16 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpaths/allpaths-3.1.ebuild,v 1.4 2012/11/19 10:27:46 jlec Exp $
 
 EAPI=4
 
@@ -19,6 +19,9 @@ KEYWORDS="~amd64 ~x86"
 
 S="${WORKDIR}/AllPaths"
 
+DEPEND="!sci-biology/allpathslg"
+RDEPEND="${DEPEND}"
+
 PATCHES=( "${FILESDIR}"/${P}-gcc4.7.patch )
 
 src_prepare() {