diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-10-06 16:54:04 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-10-06 16:54:04 +0000 |
| commit | ee1f708eb6601115be539bba007c4b54bf5d435e (patch) | |
| tree | d8763fc42608baf7ede8f6830ede923f5a854d3a /dev-ml/oasis | |
| parent | Drop alpha keywords (diff) | |
| download | gentoo-2-ee1f708eb6601115be539bba007c4b54bf5d435e.tar.gz gentoo-2-ee1f708eb6601115be539bba007c4b54bf5d435e.tar.bz2 gentoo-2-ee1f708eb6601115be539bba007c4b54bf5d435e.zip | |
dev-ml/oasis: Resolve clash with sci-chemistry/oasis, #436800
(Portage version: 2.2.0_alpha135/cvs/Linux x86_64)
Diffstat (limited to 'dev-ml/oasis')
| -rw-r--r-- | dev-ml/oasis/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ml/oasis/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-ml/oasis/oasis-0.3.0.ebuild | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/dev-ml/oasis/ChangeLog b/dev-ml/oasis/ChangeLog index f1f82a7806ce..b9eae8c42f3a 100644 --- a/dev-ml/oasis/ChangeLog +++ b/dev-ml/oasis/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-ml/oasis # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/ChangeLog,v 1.8 2012/08/07 16:32:13 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/ChangeLog,v 1.9 2012/10/06 16:54:04 jlec Exp $ + + 06 Oct 2012; Justin Lecher <jlec@gentoo.org> oasis-0.3.0.ebuild, + metadata.xml: + Resolve clash with sci-chemistry/oasis, #436800 07 Aug 2012; Alexis Ballier <aballier@gentoo.org> -oasis-0.3.0_rc6.ebuild: remove old diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml index 2193d772e351..a273949ac559 100644 --- a/dev-ml/oasis/metadata.xml +++ b/dev-ml/oasis/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>ml</herd> + <herd>ml</herd> </pkgmetadata> diff --git a/dev-ml/oasis/oasis-0.3.0.ebuild b/dev-ml/oasis/oasis-0.3.0.ebuild index 1ce139779023..60a861bfe565 100644 --- a/dev-ml/oasis/oasis-0.3.0.ebuild +++ b/dev-ml/oasis/oasis-0.3.0.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/dev-ml/oasis/oasis-0.3.0.ebuild,v 1.2 2012/07/09 20:56:49 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-ml/oasis/oasis-0.3.0.ebuild,v 1.3 2012/10/06 16:54:04 jlec Exp $ EAPI=3 @@ -23,6 +23,7 @@ RDEPEND=">=dev-ml/ocaml-data-notation-0.0.3" DEPEND="${RDEPEND} dev-ml/ocamlify dev-ml/ocamlmod + !<sci-chemistry/oasis-4.0-r3 test? ( >=dev-ml/ocaml-fileutils-0.4.2 >=dev-ml/ounit-1.1.0 |