summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-10-06 16:53:01 +0000
committerJustin Lecher <jlec@gentoo.org>2012-10-06 16:53:01 +0000
commitd86d2ba5d2980c9c8ec17daa323483164fd07829 (patch)
tree459b883f9862f6280bb38d1ba268de24627731c1 /sci-chemistry/oasis/oasis-4.0-r2.ebuild
parentstabilize (diff)
downloadgentoo-2-d86d2ba5d2980c9c8ec17daa323483164fd07829.tar.gz
gentoo-2-d86d2ba5d2980c9c8ec17daa323483164fd07829.tar.bz2
gentoo-2-d86d2ba5d2980c9c8ec17daa323483164fd07829.zip
sci-chemistry/oasis: Resolve clash with dev-ml/oasis, #436800
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/oasis/oasis-4.0-r2.ebuild')
-rw-r--r--sci-chemistry/oasis/oasis-4.0-r2.ebuild3
1 files changed, 2 insertions, 1 deletions
diff --git a/sci-chemistry/oasis/oasis-4.0-r2.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
index de69266dab95..2a26987dedcd 100644
--- a/sci-chemistry/oasis/oasis-4.0-r2.ebuild
+++ b/sci-chemistry/oasis/oasis-4.0-r2.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-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.11 2012/04/14 09:50:57 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.12 2012/10/06 16:53:01 jlec Exp $
EAPI=3
@@ -18,6 +18,7 @@ LICENSE="ccp4 oasis"
IUSE="examples +minimal"
RDEPEND="
+ !dev-ml/oasis
sci-chemistry/ccp4-apps
sci-chemistry/pymol
sci-libs/mmdb