summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Grozin <grozin@gentoo.org>2009-07-26 16:11:44 +0000
committerAndrey Grozin <grozin@gentoo.org>2009-07-26 16:11:44 +0000
commit15e60355e24ae7b6163849d29238ab53bd70b68e (patch)
treeecedd842085f28df9733044bc1c999bce5b6807a /sci-chemistry/tinker/tinker-4.2-r1.ebuild
parentBlocking sci-chemistry/tinker (file collision, bug #279018) (diff)
downloadhistorical-15e60355e24ae7b6163849d29238ab53bd70b68e.tar.gz
historical-15e60355e24ae7b6163849d29238ab53bd70b68e.tar.bz2
historical-15e60355e24ae7b6163849d29238ab53bd70b68e.zip
Blocking dev-util/diffuse (file collision, bug #279018)
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'sci-chemistry/tinker/tinker-4.2-r1.ebuild')
-rw-r--r--sci-chemistry/tinker/tinker-4.2-r1.ebuild8
1 files changed, 5 insertions, 3 deletions
diff --git a/sci-chemistry/tinker/tinker-4.2-r1.ebuild b/sci-chemistry/tinker/tinker-4.2-r1.ebuild
index 0fc7a5dd399b..bddeb8091546 100644
--- a/sci-chemistry/tinker/tinker-4.2-r1.ebuild
+++ b/sci-chemistry/tinker/tinker-4.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-4.2-r1.ebuild,v 1.4 2008/11/06 23:53:23 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/tinker-4.2-r1.ebuild,v 1.5 2009/07/26 16:11:44 grozin Exp $
inherit fortran toolchain-funcs
@@ -14,7 +14,9 @@ LICENSE="Tinker"
SLOT="0"
KEYWORDS="~x86"
-DEPEND="X? ( dev-java/sun-java3d-bin )"
+# file collision, bug #279018
+DEPEND="!dev-util/diffuse
+ X? ( dev-java/sun-java3d-bin )"
S=${WORKDIR}/tinker/source
src_compile() {