summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-11-19 10:26:16 +0000
committerJustin Lecher <jlec@gentoo.org>2012-11-19 10:26:16 +0000
commit0d43aa7790c327c32ae0083091ae51eb92ae70c6 (patch)
treee6c6822df4e50cf922b7f1f45d753fbaa8c04c20 /sci-biology
parentMerge changes from net-misc/usbip-3.6 that just came out when I was not looking. (diff)
downloadgentoo-2-0d43aa7790c327c32ae0083091ae51eb92ae70c6.tar.gz
gentoo-2-0d43aa7790c327c32ae0083091ae51eb92ae70c6.tar.bz2
gentoo-2-0d43aa7790c327c32ae0083091ae51eb92ae70c6.zip
sci-biology/allpathslg: Block sci-biology/allpaths due to file collision, #443740
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-biology')
-rw-r--r--sci-biology/allpathslg/ChangeLog6
-rw-r--r--sci-biology/allpathslg/allpathslg-37578.ebuild9
-rw-r--r--sci-biology/allpathslg/allpathslg-41839.ebuild7
-rw-r--r--sci-biology/allpathslg/allpathslg-42337.ebuild7
4 files changed, 18 insertions, 11 deletions
diff --git a/sci-biology/allpathslg/ChangeLog b/sci-biology/allpathslg/ChangeLog
index 6568253d00ee..252406d8a0fd 100644
--- a/sci-biology/allpathslg/ChangeLog
+++ b/sci-biology/allpathslg/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-biology/allpathslg
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/ChangeLog,v 1.8 2012/07/09 17:55:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/ChangeLog,v 1.9 2012/11/19 10:26:16 jlec Exp $
+
+ 19 Nov 2012; Justin Lecher <jlec@gentoo.org> allpathslg-37578.ebuild,
+ allpathslg-41839.ebuild, allpathslg-42337.ebuild:
+ Block sci-biology/allpaths due to file collision, #443740
*allpathslg-42337 (09 Jul 2012)
diff --git a/sci-biology/allpathslg/allpathslg-37578.ebuild b/sci-biology/allpathslg/allpathslg-37578.ebuild
index 02eff40c6821..616b16173efb 100644
--- a/sci-biology/allpathslg/allpathslg-37578.ebuild
+++ b/sci-biology/allpathslg/allpathslg-37578.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-biology/allpathslg/allpathslg-37578.ebuild,v 1.4 2011/10/15 20:04:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-37578.ebuild,v 1.5 2012/11/19 10:26:16 jlec Exp $
EAPI="2"
@@ -15,8 +15,9 @@ SLOT="0"
IUSE=""
KEYWORDS="amd64"
-DEPEND="dev-libs/boost
- >=sys-devel/gcc-4.3.3
+DEPEND="
+ dev-libs/boost
+ !sci-biology/allpaths
sci-biology/vaal"
RDEPEND=""
diff --git a/sci-biology/allpathslg/allpathslg-41839.ebuild b/sci-biology/allpathslg/allpathslg-41839.ebuild
index 9fb76e4cae4d..a96d6e87c242 100644
--- a/sci-biology/allpathslg/allpathslg-41839.ebuild
+++ b/sci-biology/allpathslg/allpathslg-41839.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/allpathslg/allpathslg-41839.ebuild,v 1.1 2012/05/29 02:51:11 weaver Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-41839.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
EAPI=4
@@ -15,8 +15,9 @@ SLOT="0"
IUSE=""
KEYWORDS="~amd64"
-DEPEND="dev-libs/boost
- >=sys-devel/gcc-4.3.3
+DEPEND="
+ dev-libs/boost
+ !sci-biology/allpaths
sci-biology/vaal"
RDEPEND=""
diff --git a/sci-biology/allpathslg/allpathslg-42337.ebuild b/sci-biology/allpathslg/allpathslg-42337.ebuild
index c86c7de6d62d..76c108334460 100644
--- a/sci-biology/allpathslg/allpathslg-42337.ebuild
+++ b/sci-biology/allpathslg/allpathslg-42337.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/allpathslg/allpathslg-42337.ebuild,v 1.1 2012/07/09 17:55:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/allpathslg/allpathslg-42337.ebuild,v 1.2 2012/11/19 10:26:16 jlec Exp $
EAPI=4
@@ -15,8 +15,9 @@ SLOT="0"
IUSE=""
KEYWORDS="~amd64"
-DEPEND="dev-libs/boost
- >=sys-devel/gcc-4.3.3
+DEPEND="
+ dev-libs/boost
+ !sci-biology/allpaths
sci-biology/vaal"
RDEPEND=""