diff options
| author |   Andrey Grozin <grozin@gentoo.org> | 2009-07-26 16:11:44 +0000 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2009-07-26 16:11:44 +0000 |
| commit | 6146e2b7547e79b1134a3afe5e07560def7ac0c9 (patch) | |
| tree | ea23746dc20b957cd5f2be78db3a9c087fb6e1d7 /sci-chemistry/tinker | |
| parent | Blocking sci-chemistry/tinker (file collision, bug #279018) (diff) | |
| download | gentoo-2-6146e2b7547e79b1134a3afe5e07560def7ac0c9.tar.gz gentoo-2-6146e2b7547e79b1134a3afe5e07560def7ac0c9.tar.bz2 gentoo-2-6146e2b7547e79b1134a3afe5e07560def7ac0c9.zip | |
Blocking dev-util/diffuse (file collision, bug #279018)
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'sci-chemistry/tinker')
| -rw-r--r-- | sci-chemistry/tinker/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-chemistry/tinker/tinker-4.2-r1.ebuild | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sci-chemistry/tinker/ChangeLog b/sci-chemistry/tinker/ChangeLog index 4b9be42dfa3c..bd52330e3bb5 100644 --- a/sci-chemistry/tinker/ChangeLog +++ b/sci-chemistry/tinker/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/tinker -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.10 2008/11/06 23:53:23 dberkholz Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tinker/ChangeLog,v 1.11 2009/07/26 16:11:44 grozin Exp $ + + 26 Jul 2009; Andrey Grozin <grozin@gentoo.org> tinker-4.2-r1.ebuild: + Blocking dev-util/diffuse (file collision, bug #279018) 06 Nov 2008; Donnie Berkholz <dberkholz@gentoo.org>; tinker-4.2-r1.ebuild: (#245504) This ebuild was wrongly updated for the blackdown removal, which 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() { |