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 | 4049a338c28f85bab5fd05f98bf3d60c9d69dfbf (patch) | |
| tree | d1e0b8d236a62a6e27b119a7cc186b433a0adc6d /dev-ml | |
| parent | Drop alpha keywords (diff) | |
| download | historical-4049a338c28f85bab5fd05f98bf3d60c9d69dfbf.tar.gz historical-4049a338c28f85bab5fd05f98bf3d60c9d69dfbf.tar.bz2 historical-4049a338c28f85bab5fd05f98bf3d60c9d69dfbf.zip | |
dev-ml/oasis: Resolve clash with sci-chemistry/oasis, #436800
Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64
Diffstat (limited to 'dev-ml')
| -rw-r--r-- | dev-ml/oasis/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-ml/oasis/Manifest | 13 | ||||
| -rw-r--r-- | dev-ml/oasis/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-ml/oasis/oasis-0.3.0.ebuild | 3 |
4 files changed, 15 insertions, 9 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/Manifest b/dev-ml/oasis/Manifest index 53beee3b86f5..ee8e80eb4dd3 100644 --- a/dev-ml/oasis/Manifest +++ b/dev-ml/oasis/Manifest @@ -2,13 +2,14 @@ Hash: SHA256 DIST oasis-0.3.0.tar.gz 298052 SHA256 2efa90a2dc31d0b731dc574f99ca3e1fd07079da1898b077d84db4a3fd212701 SHA512 b8b9bb694c0d29364b39ff4fa10647e2aad0371d5345cae47ac99f1853e331153e6db7d9088f898b7e21793b97af1b4aeecb0e78d962a54d5b6d2c99f4c3cfe7 WHIRLPOOL d3f91be86c858e634120f297359f45d81abe593c207fb182eb3b7af2ed3b676cdadfcf1bbb417f87bfd610934fdf8fd4b12ae0bceb4232e500553ecf31bd3b4d -EBUILD oasis-0.3.0.ebuild 912 SHA256 f7ab7fe5d100ac9346b454610951517669c89d42d3721e25063ee22314546c14 SHA512 2da90092b38c43d11f73e512f325af67b13955b62567b211f08358a2e2591e4cc79d370a35d32edc39fec345c465e290eeb6fd8f5aed624d75169af4c6d432c0 WHIRLPOOL 6846fc96acb5a76442ffb8a03e6b41c97f20de7274d1140f0cc04408892acac97322a1e875cf6ca8e4d56d8489b2656feb8abbad988be52df6ba65815642c8d7 -MISC ChangeLog 1189 SHA256 126e7f547bb4b7dd19a5549730b5575c8e401d8969e70c424abe3d8f2711585b SHA512 f6764f606166568423ab2d7dc1b0dec46151c70d6af63c0e315747f24e947fc9ed21eeb5491faaea79e26ad8630bac5474fafd9e536cf5cdc3be868ed03fae30 WHIRLPOOL c3d95f7c211d0df929ef7d99feb25fcc5c37cec435eaf2faeddae914a214de2c512c718225a625acc22022fb15a4775c20bff07a3834a17c616acd150e58b638 -MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6 +EBUILD oasis-0.3.0.ebuild 943 SHA256 07bab099640a2ae4dbed6229bab81cfc65f2cc54639e85ddcd9badfcc0476420 SHA512 6f5fefcd7dd77a527536df47249eb488edd3fdeb818f893707a2d295129dc99afd208cd2e041a84a215f6de3ad1532ea59f11d683c49d0d7c249197bdad0a44c WHIRLPOOL 00936657d1f8574951973e7026bf2a75214825f29e6b3f3fbe1abd1a40014987fd83329b77c89145a02bcf554689ca43771be12cd2f8684dbdd9b4780510d0f1 +MISC ChangeLog 1319 SHA256 d42b23a4e8b2fb05aa89ad9ba2d3a0d8ab7e409f49c2d039537ef0d4f4b8bd79 SHA512 206f554efd40af830043cda795a1f75b340404634f153e478596293c1b56d2a1f3be8435e63dea489faf52e0b3432fcf4a00a4317cbfdd864d28dfa8b256648f WHIRLPOOL 73dbaf539c603f9655c118019f831f31865620a66b6a27c22830c72e3aa88aecbb61f6e22892151dfa7033c83fbb15715d3423b3705be4f4e82ec83a707c7012 +MISC metadata.xml 156 SHA256 40d721e2107cc8aac043b574fdae94c9e31ae133bc8e275fbc0a56329b3f5cee SHA512 e8ee63fd086a54a8c1ff2cb6b8f976c894602e5185c08cb4853487bb266a3c30a122e1e53fa5801574093dbf087135238e1bb465ec491fce1b0d5c29274f2112 WHIRLPOOL 1bf739b8e8d41331e15ceef1b801643cd0ca79e3318e6eef7e927e8df7fa365b7893d2b4ee36db3776ce4a590fbfb1fb71fc2f1f5f66abf5ad3483840c9f4020 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) +Comment: GPGTools - http://gpgtools.org -iEYEAREIAAYFAlAhQxIACgkQvFcC4BYPU0qeIgCfc8z+EPd3JBB2Q8kQ0JwC2oEV -sZ4An3exBwg/Euxr5I3N/bRb+C5VttL3 -=qTNd +iEYEAREIAAYFAlBwYi0ACgkQgAnW8HDreRYRJQCfbHrpE2nmcsQAsEZWRQogScPU +ht8AniOzoWvPuyt9XGLWz04s6XvVurAF +=UYv7 -----END PGP SIGNATURE----- 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 |