summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-11-28 18:08:42 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-11-28 18:08:42 +0000
commit1bebcd2ab02234c582bb8e23ddc3afbe8e9bf35b (patch)
tree5d97e41b7112e9ec8d22e592b69ce6e51b5531e7 /dev-ml/camomile
parentFix automagic gnutls support (bug #522230). (diff)
downloadhistorical-1bebcd2ab02234c582bb8e23ddc3afbe8e9bf35b.tar.gz
historical-1bebcd2ab02234c582bb8e23ddc3afbe8e9bf35b.tar.bz2
historical-1bebcd2ab02234c582bb8e23ddc3afbe8e9bf35b.zip
update deps for ocaml 4.02
Signed-off-by: aballier@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x160F534A
Diffstat (limited to 'dev-ml/camomile')
-rw-r--r--dev-ml/camomile/ChangeLog5
-rw-r--r--dev-ml/camomile/Manifest10
-rw-r--r--dev-ml/camomile/camomile-0.8.4.ebuild7
3 files changed, 14 insertions, 8 deletions
diff --git a/dev-ml/camomile/ChangeLog b/dev-ml/camomile/ChangeLog
index 45fc5dd56377..26f956aaad1c 100644
--- a/dev-ml/camomile/ChangeLog
+++ b/dev-ml/camomile/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ml/camomile
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.37 2014/08/10 20:42:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/ChangeLog,v 1.38 2014/11/28 17:31:07 aballier Exp $
+
+ 28 Nov 2014; Alexis Ballier <aballier@gentoo.org> camomile-0.8.4.ebuild:
+ update deps for ocaml 4.02
10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> camomile-0.8.4.ebuild:
QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-ml/camomile/Manifest b/dev-ml/camomile/Manifest
index 789514e704f0..731951e3ff63 100644
--- a/dev-ml/camomile/Manifest
+++ b/dev-ml/camomile/Manifest
@@ -2,13 +2,13 @@
Hash: SHA256
DIST camomile-0.8.4.tar.bz2 2649800 SHA256 ef521f96fe984e6b0118041ed68a7a165beda54d8541c248ed402b7ef693de50 SHA512 f8d9b5288636eb3123b539a2c09bcd2f674acf10b16b83abea5d9e7f7f34a7359e36572f4ab3bc1ebeb42562e30f4fa9a1986e50060175186c0c2739e64130d1 WHIRLPOOL d2eb6b3c413424cb0c7e53cffeb01431f805f9124db6822e3b0fd8101cabee0ecec4caf2436d5151cd658bf53fe971842a3f5e3e901cc74b9ae35353e4be96a9
-EBUILD camomile-0.8.4.ebuild 863 SHA256 46923ce44a980ddf7bd8b6bf2f312e1a527da289d1ad6099294a0d59d9954c95 SHA512 bb7a7f4d93eef2def95f97f63f0c60108db6e88e075adb02ace1590ae283258a690f77bde9a22ddb001c6ebd94c7a9de7b9aa4b744bfff42be82127375e2eb6a WHIRLPOOL 74d09055b7fccaab63bd36849b7d2154be82fdf1e683e9fa11387d36986489184ae2d0fa4dbc785a8c9706b3797fb95ca160226ce49f009822ae80aa4fa0c6b1
-MISC ChangeLog 4335 SHA256 a787d5cdc85716d35ed8117680912efa32131a63075f8ae9869c55732f9f43d0 SHA512 1d36854b3939cf62dfea13d3f558226e221a20fc0541732645fcf767abfcd994bdd6c7bc0906dc4a8e078f06f44f6e22474595b7e92b56c00cdff1b33d248d96 WHIRLPOOL d31e1ea43bf6bd30cef1e1a8fba5cc1a7f6c6a26ac4b3d5f911e1960d4ca98da5b98a737f35300d731ede1f5a32e9c2167fff1864f0e94a4ac0d921cc009754b
+EBUILD camomile-0.8.4.ebuild 915 SHA256 813df298bf4dbd6ab7f358b5f94f10d52e5263b1eca9ff738369a08205c27285 SHA512 ab2afe27affdd30eb7f04697e1cd58e4a4a52f3a95698e7b5edcbf7612ad3afcea177150202288883c39fbe5caacf5b36e65c39f89aae9377985cda43dce7ea2 WHIRLPOOL 637e0c32ceea8be786f61702c8098775e98d7b3fae7607cd793e8cb815caf70c7341b7f1b60fccb133462ad685f7904fdcd914345214673220c53b3033c59747
+MISC ChangeLog 4442 SHA256 8c0902cd198dcd0a523dc3b2dc96062ec715d573219035ed4ecb89da3af8a15a SHA512 50443fe5f612964edf92cb4d15756a7d81e907c4efa1324f56d3afc032d2e50d4b20c62f5da75880d4bbef24cc242bcbf25c26a5f61ae8fe3281136e930b623d WHIRLPOOL 62d07deb10af2c857417271a1617782038c9bd1311983e9ba9938e021ed793ba7859f91fa7499394a75a537fb03756f66430d87efd06d18b6766bc686c8754af
MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iEYEAREIAAYFAlPn2TgACgkQcaHudmEf86qGjwCfWinBcLniI8nNuQo5uPeHUHTA
-I7UAn16YXXO4qU3p/XoMTK1lttkomxM4
-=PBf/
+iEYEAREIAAYFAlR4sVwACgkQvFcC4BYPU0pUmgCcCopKatoZRBeZtbsIpmIIkFR8
+1TUAnA5gTxW5XinVvSjUoFQ4ofiUlhwI
+=WN4A
-----END PGP SIGNATURE-----
diff --git a/dev-ml/camomile/camomile-0.8.4.ebuild b/dev-ml/camomile/camomile-0.8.4.ebuild
index 6fec6d377978..220d3d100aa4 100644
--- a/dev-ml/camomile/camomile-0.8.4.ebuild
+++ b/dev-ml/camomile/camomile-0.8.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.8.4.ebuild,v 1.5 2014/08/10 20:42:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camomile/camomile-0.8.4.ebuild,v 1.6 2014/11/28 17:31:07 aballier Exp $
EAPI="5"
@@ -15,7 +15,10 @@ SLOT="0/${PV}"
KEYWORDS="~amd64 ppc x86"
IUSE="debug +ocamlopt"
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+RDEPEND="
+ >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+ || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
+"
DEPEND="${RDEPEND}"
src_configure() {