From: Alexis Ballier <aballier@gentoo.org>
Date: Sun, 15 Feb 2015 09:29:46 +0000 (+0000)
Subject: fix deps with ocaml 4.02, bug #537252
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a7175d23a2ab61215e0c5b944e62a045ae96abc0;p=gentoo.git

fix deps with ocaml 4.02, bug #537252

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
---

diff --git a/app-misc/wyrd/ChangeLog b/app-misc/wyrd/ChangeLog
index f78538fbdcc4..b6e4cf58109f 100644
--- a/app-misc/wyrd/ChangeLog
+++ b/app-misc/wyrd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-misc/wyrd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/ChangeLog,v 1.24 2013/02/03 16:20:46 tove Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/ChangeLog,v 1.25 2015/02/15 09:29:43 aballier Exp $
+
+  15 Feb 2015; Alexis Ballier <aballier@gentoo.org> wyrd-1.4.6.ebuild:
+  fix deps with ocaml 4.02, bug #537252
 
 *wyrd-1.4.6 (03 Feb 2013)
 
diff --git a/app-misc/wyrd/Manifest b/app-misc/wyrd/Manifest
index 1ece958bbc30..f795e415e908 100644
--- a/app-misc/wyrd/Manifest
+++ b/app-misc/wyrd/Manifest
@@ -7,13 +7,13 @@ DIST wyrd-1.4.5.tar.gz 398294 SHA256 c8844d85767b3b9cc9ce4f430e0ef83ba29d96c630f
 DIST wyrd-1.4.6.tar.gz 425829 SHA256 b2b51d6fb38f8b8b3ec30ee72093f791ba9b6fe35418191bc2011d2c8079997e SHA512 fc09c4567ea8d6225638ee6851ddab716665913b7d7b2f6b5a3cc7f2af9144df617e2a95ca78c74874bec3ff355aba028c7c51eafe1426d9ae803ab77ce84477 WHIRLPOOL 651fc8b8e2d12b35bb8a4e9a4284a2a428737b1856edb4bbfc112e5a8db5686220bacbd77c6f1513894ba69ee9b8eed719a7b8596bce76af0887bd11575c133a
 EBUILD wyrd-1.4.4.ebuild 809 SHA256 37d9e0ae43f9c1bf7b39187467ddaad61a123993eda12262ce6ea21a60e5fb3b SHA512 6a50faf2ce00db460ee82aa7194c16e52440d0c3e3a83edcc6164231d7bd7e0692c9f6870ffcc485ab480f50c8a35b1089a69e73d353a9fa8a09e8fadc455d9b WHIRLPOOL 7421cc6d70f8c20a70da6c245d63ad00bb4919d34c718a6834a9f43dfa3cc2b9b0af633c17b9caff16cf96edaa0b8c8342b9478ee4a92b5f8641407a3a205632
 EBUILD wyrd-1.4.5.ebuild 937 SHA256 0c95d8f4190ede6c4bba39b1ae70229c9c30711dcfa814be38236bc94468f48d SHA512 ea60f0ac40074bec4e1bb1e601a4b3edf7c9d430fc79df33cdda94e7a90160a9681b70be2cd6f85a0a539e2c308a2195a531b5c77929e2ff441e7dcad88ec25a WHIRLPOOL c6aec57ac616c4dc45cc149f2f9c053c202cd793a1a8c054d6d62beb34066962c6743b49e1d17bf07bedb91485d19950f36575e03545029aff2440939b90a093
-EBUILD wyrd-1.4.6.ebuild 740 SHA256 7dc288707fa66f6d3587826f3c7e3db4de43003c80e0d147be93c201c9f2b0e3 SHA512 d7a9fed2076e05c035e71f8394e3ef7c0dad86056bc65e82db3d32abb36947574c4dcc3d19f5b2dd20e366e9d93f1464183d81acde9033e8b90ffa2eeea22e87 WHIRLPOOL 0a11271779d642995836bd7d08925b6b7ef7bca68d982d6476939413f48d2d9cfd0aaf5295f556b8232f41c670d4224c6e1d13d728899d266af7670f3e450201
-MISC ChangeLog 3454 SHA256 731244f6e98b0ed4a6417dc4a6eb7bcaf81816727bac7f37bb91d42d43ebac00 SHA512 19d16be506e9b9637112561348dd76ace41a6e9a9d800f11f6396560d9980b3f563b9e1f63580f0b6f951bd1922e0456ea9a9dacf57d8eb5b652738d04cba8a5 WHIRLPOOL 64e6cd36156fc64472ccf1edef1ec628dfc081fd4b4626e4380ee92edf2d400337dd258133b4a37437b9d8c9dc287a4408b1c7305e67710d66fbf7f54c1cfade
+EBUILD wyrd-1.4.6.ebuild 791 SHA256 87bbc2e7be35f8c4a0adfdc097550cc338b469b170222e5b85f2f36e3c487abf SHA512 3600f88a4f2b780bc9fc77ca9038a553dd28ecda0e8384068d6bce478cb5380bdd804595b99b70c2229c5d346cd0cc7f2dac77fd11f97cee150f1e9eac632dfe WHIRLPOOL 87041b4ef7c0eb14733b9315eca7e61f6247644c01c364fcaff206af4ad79d73923d4d65c0a7051e68e3db3a45a47a28dd0f56129446c644f048f5f80410b0b0
+MISC ChangeLog 3570 SHA256 50d9a3ca18b16105572d086d50e1fb482ef703ff5e1d6f7ffe01ab5787e698f3 SHA512 8ca1582a8edb720dfbbd5ee7aac4bde8545a28e34560d7e8167cb73bb01d990ddbc858dea8067ab68ae8e456309d1df34b85695e409609493061ac3b933e8610 WHIRLPOOL e5e4add1a7e92921eb29dd2a35d793b22d80309f792e45fe64d0a74287b489ea7f172ed38d3a4d9fd8d7d03aeb55881c0f56900a053e8fdf06a6c288cc3c2fd4
 MISC metadata.xml 594 SHA256 30489821e93d8b96fa80d135e8725902e015aeae2fc5064fc842e90fd3e08a22 SHA512 eaf4d9020672e6bb0119b4ab691bfc734e2bcb2ddff401fc28fbc3c44dad5405fd65e1f624b9fdf2e9578c17d3986de116f47eba46e5deb46be92e495f343105 WHIRLPOOL 3381438b3de0d1bf3af509aed4917a148d0e0cf5cf9d719c5ee59d87460514e3864ed1e60a3403c39b0df85e8858294fb69f0c6b1168e4c9055a3278025c7890
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlEOjl8ACgkQV3J2n04EauynFgCfbOlO/eH2e32UQBCl9J9QnRR+
-zdQAnAvm7d15iircGSm+Bb6ze0UETWm3
-=svj6
+iEYEAREIAAYFAlTgZwgACgkQvFcC4BYPU0oDZgCfaGAfzW93/3MY7FgVaKEQdhlG
+H6gAoJqD49DwIf25JY3gijQLSda8EqZF
+=29eK
 -----END PGP SIGNATURE-----
diff --git a/app-misc/wyrd/wyrd-1.4.6.ebuild b/app-misc/wyrd/wyrd-1.4.6.ebuild
index e03aa7496034..448cb464e3f0 100644
--- a/app-misc/wyrd/wyrd-1.4.6.ebuild
+++ b/app-misc/wyrd/wyrd-1.4.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/wyrd-1.4.6.ebuild,v 1.1 2013/02/03 16:20:46 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/wyrd/wyrd-1.4.6.ebuild,v 1.2 2015/02/15 09:29:43 aballier Exp $
 
 EAPI=5
 
@@ -16,6 +16,7 @@ IUSE="unicode"
 RDEPEND="
 	sys-libs/ncurses[unicode?]
 	>=app-misc/remind-03.01
+	|| ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 )
 "
 DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-3.08