diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-12-19 20:08:01 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-12-19 20:08:01 +0000 |
| commit | 8edb4105d390a68e86d69a98ae6f2d797d939c47 (patch) | |
| tree | e998fd5f586859278c393f3e0a9632c88424742b /sci-mathematics | |
| parent | whitespace (diff) | |
| download | gentoo-2-8edb4105d390a68e86d69a98ae6f2d797d939c47.tar.gz gentoo-2-8edb4105d390a68e86d69a98ae6f2d797d939c47.tar.bz2 gentoo-2-8edb4105d390a68e86d69a98ae6f2d797d939c47.zip | |
fix depends so that portage doesnt try to downgrade ocaml if you have 3.10 installed but not camlp5, thanks jakub for the help there
(Portage version: 2.1.4_rc10)
Diffstat (limited to 'sci-mathematics')
| -rw-r--r-- | sci-mathematics/coq/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-mathematics/coq/coq-8.1_p2.ebuild | 4 | ||||
| -rw-r--r-- | sci-mathematics/coq/coq-8.1_p3.ebuild | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog index 906985461e36..282635095fe4 100644 --- a/sci-mathematics/coq/ChangeLog +++ b/sci-mathematics/coq/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-mathematics/coq # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.22 2007/12/17 21:28:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.23 2007/12/19 20:08:01 aballier Exp $ + + 19 Dec 2007; Alexis Ballier <aballier@gentoo.org> coq-8.1_p2.ebuild, + coq-8.1_p3.ebuild: + fix depends so that portage doesnt try to downgrade ocaml if you have 3.10 + installed but not camlp5, thanks jakub for the help there 17 Dec 2007; Alexis Ballier <aballier@gentoo.org> coq-8.0_p3.ebuild, coq-8.1_p1.ebuild, coq-8.1_p2.ebuild: diff --git a/sci-mathematics/coq/coq-8.1_p2.ebuild b/sci-mathematics/coq/coq-8.1_p2.ebuild index 2fe44cf4df01..dfdcf58e202c 100644 --- a/sci-mathematics/coq/coq-8.1_p2.ebuild +++ b/sci-mathematics/coq/coq-8.1_p2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p2.ebuild,v 1.2 2007/12/17 21:28:47 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p2.ebuild,v 1.3 2007/12/19 20:08:01 aballier Exp $ inherit eutils multilib @@ -19,7 +19,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -DEPEND="|| ( >=dev-ml/camlp5-5.01 <dev-lang/ocaml-3.10 ) +DEPEND="|| ( ( >=dev-lang/ocaml-3.10 >=dev-ml/camlp5-5.01 ) <dev-lang/ocaml-3.10 ) >=dev-lang/ocaml-3.08 ide? ( >=dev-ml/lablgtk-2.2.0 )" diff --git a/sci-mathematics/coq/coq-8.1_p3.ebuild b/sci-mathematics/coq/coq-8.1_p3.ebuild index c5c0ffc0ffaa..a18a2d63d89c 100644 --- a/sci-mathematics/coq/coq-8.1_p3.ebuild +++ b/sci-mathematics/coq/coq-8.1_p3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild,v 1.1 2007/12/17 21:26:44 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p3.ebuild,v 1.2 2007/12/19 20:08:01 aballier Exp $ inherit eutils multilib @@ -19,7 +19,7 @@ LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" -DEPEND="|| ( >=dev-ml/camlp5-5.01 <dev-lang/ocaml-3.10 ) +DEPEND="|| ( ( >=dev-lang/ocaml-3.10 >=dev-ml/camlp5-5.01 ) <dev-lang/ocaml-3.10 ) >=dev-lang/ocaml-3.08 ide? ( >=dev-ml/lablgtk-2.2.0 )" |