From 8f8245b9aeff5bd4d12c92562af9398c25002929 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 19 Nov 2012 10:27:46 +0000 Subject: sci-biology/allpaths: Block sci-biology/allpathslg due to file collision, #443740 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) --- sci-biology/allpaths/ChangeLog | 6 +++++- sci-biology/allpaths/allpaths-2.0.ebuild | 9 ++++----- sci-biology/allpaths/allpaths-3.1-r1.ebuild | 5 ++++- sci-biology/allpaths/allpaths-3.1.ebuild | 5 ++++- 4 files changed, 17 insertions(+), 8 deletions(-) (limited to 'sci-biology') 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 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/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() { -- cgit v1.2.3-65-gdbad