fix build with latest ocaml, bug #547078

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

4 files changed, 28 insertions, 22 deletions

diff --git a/net-p2p/mldonkey/ChangeLog b/net-p2p/mldonkey/ChangeLog
index bdf68da65a5c..0101d7239fc0 100644
--- a/net-p2p/mldonkey/ChangeLog
+++ b/net-p2p/mldonkey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/mldonkey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.268 2015/03/11 17:24:05 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/ChangeLog,v 1.269 2015/07/27 13:44:18 aballier Exp $
+
+  27 Jul 2015; Alexis Ballier <aballier@gentoo.org> mldonkey-3.1.5.ebuild,
+  +files/ocaml4.patch:
+  fix build with latest ocaml, bug #547078
 
   11 Mar 2015; Manuel Rüger <mrueg@gentoo.org> -mldonkey-3.0.5.ebuild,
   -mldonkey-3.0.7.ebuild, -mldonkey-3.1.0.ebuild:
diff --git a/net-p2p/mldonkey/Manifest b/net-p2p/mldonkey/Manifest
index 1c18ef3e83f4..8e13f517653b 100644
--- a/net-p2p/mldonkey/Manifest
+++ b/net-p2p/mldonkey/Manifest
@@ -1,31 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 2.9.5-execstacks.patch 1542 SHA256 b93ee5199c1ecc943abad4de69079280a2292ab437e155384eb0e06a76c44544 SHA512 5d131b183bad5b992e97e1f8de914edca13cc24368d7506b778c01fbd38477d7a70a972bd5013b677e6cdd7b874ab9eedf30156369ead2989624ef08c718bbda WHIRLPOOL f671f9443d7144b0a78c5f80955cbabaab2b2c9e6f0da7e0a4250cbd5c3abc40b04920c19f2f9f3bf4dae4df7805767c7dfcafa56d97e01c4330138e63236db1
 AUX mldonkey.confd-2.8 887 SHA256 d395ecece23a23dcb41addf63b70220996011ceb29d8738afb3c048b666cd96e SHA512 0ec0fe4fcf87222e31852e7e254e5e054bc31b713d5e4679b2a794c6df8cf0347f9a1d3d345bb48144b13d3e8dcb38168d0be32c766b7d678a8055fc066beb4d WHIRLPOOL 9c90eda42233ee60c988fdaca0a0ddb567c0deb84ae32fd77a7ac7d947d1b2b612a691e0e32e7f3dc4263a6d201c95519422a461712aec79d4183f7256fa6e0a
 AUX mldonkey.initd 3157 SHA256 fa7584dbaf187715ebeca005ab60a2d379c97e8fc2b87862194f5ffb5f802869 SHA512 3a8c7d834093fa0e947970cdd142a5bc6359767f21f115f2f0da5e539efbe7c8b2bfc1b175be1ff8a904ea2de0a89d8435056ae8f05d116b9866e4446161853f WHIRLPOOL b99b579603987ddeb4a1fa3c1089d0c2bbe763740cd0dfb7b67e18389be060b65485f65201c7902745042d64e2f5b5c3144278fee088faa3b60570237143952c
+AUX ocaml4.patch 547 SHA256 465361e9b96a2fc69b61105ade1a14715bd2e93f1c2fb80a35a2ee11cb06dd37 SHA512 f99d4050613e210c2092153a7b1a45028ea26d4e90d295b1d19ed3a25b7ae656c15efca84a5f694703dca339c1a5e7baec5d71ad815f96c41620a8ed7c34422c WHIRLPOOL 77e859eba9e9cea69c5fb6d2f4ed43116dcfaee0b0e4797960b4e2a53656e42cd0a568b7b334d751956954e0f4f628de60ef6bca01e127ac421a42cb72ee6823
 DIST mldonkey-3.1.3.tar.bz2 2848964 SHA256 7c259f9f41cc12899045710ddce02e6d25962b2cb5c22f9cf58af0483f06d9e2 SHA512 921e428743934cd7a94fcdb8fea43a5a57cc3232a68fff443dbeb7f724fbe6805c38f4ae8c6e58c552e7a42c49f1c233f622239d6c7ee1ccf920bc19b2aef8f9 WHIRLPOOL 3e544fa8000e27d16a34af19969a8830f6c22de9ec21e4da2310ca4674a009e64b3bb03b530a03bf2d4cd71346f6de13288bae4b1b04ec0dc9df92f79835afdc
 DIST mldonkey-3.1.5.tar.bz2 2847382 SHA256 74f9d4bcc72356aa28d0812767ef5b9daa03efc5d1ddabf56447dc04969911cb SHA512 96e75acf91d7ecc41490f898e06d284da27404c7e567f173936d8113885a3b4b6bc93341358f92a30d3f699eef681d97ce56414a37bb02a535ad2da4d4ad13a3 WHIRLPOOL b9e15809a49cc12e69a6d1188441e9d5603ec76cb7bfe2b2e0bfce3c50abb31296904c842f487076b227f577046ccbd3ceb7cd1a601d3faa6928b1bfde8c780f
 EBUILD mldonkey-3.1.3.ebuild 4489 SHA256 2e5f8722e2311d459814628b3acedbeb0608394068b34d628250e11170f76b02 SHA512 9e87a1e72ea1c0c9e7398f4673b445d78b223cde9b7ef610c6936dd7fb369c68d42e356f2cfc14b8d961d56b25930cfa4c71633105615339d9c89261514295e6 WHIRLPOOL 286e8ae03f96d8a48103e3d8e89e4dacbb8dd108667c401a14a810b257b3ad572bf649629dbcfff82c968104d2e4347b978618e706310463ac7c783285a6d3ce
-EBUILD mldonkey-3.1.5.ebuild 4382 SHA256 602beb63d63998a75bdd4c435eb9fe76fbec4d71c56c43ce8a21457cb6130b42 SHA512 429eb1b04055b9f68770fd870ac565fe5e351462929e4502dd871ef66dca0f057d8fc7d9ebfe252ca4a3736f74b13b9e7e33f2382bf8abcaba38f9f0d1c9bc80 WHIRLPOOL 1898b63a2a43f427232cd02ea65b7ef0c0132bf62e0a98c3c4fbc3abcbe654d0b4ccb9a208dc7f124deacbeaca4b04eca75d88f1412eaf6f4ad0ba6efc60dcb6
-MISC ChangeLog 38926 SHA256 9b37a60b7276fbde5d363bd3e7a1a023d7e31f5d6a335ef3d0c159c51d6927c2 SHA512 97beafce4fb461bb62db4ea8b2cc5f1cb89cacd12fb96392d073799b695926cb3359a8b108659dc76e2b70760939fa288012de3c6590e219111936db02a098dc WHIRLPOOL 39e0951eda32fd19f9f00e4e2ec6a553573ab7431b4da19daa0b627108bfd5c9ba51134c4aa236bf7467d546617d8292446b80e8bd5f1cc9b5230526c7dfc18d
+EBUILD mldonkey-3.1.5.ebuild 4419 SHA256 442ad8e4e87f763a70e774447422742892c3acb4bf4abcf54d1b66ada5042de9 SHA512 280418fea9ebea4b50f32541d5fe2220acee76717552abb92f46a7be8dd442bb80698bcef75e5d0d58749d99df714a2499b86e9b08f11d94731cd6b74ad7ef10 WHIRLPOOL 818d16c1a969e666a8fa4ec58dd4a605c8ad7368aaa49060cabc3f7984a99c61309214b51bf810d4343073194a80d82987e0f24baaeae10311d54c0ce1aadcfd
+MISC ChangeLog 39071 SHA256 c1ed6b1aec282601df4c8ba44349a435b42881e8daca5777f1403255561532d7 SHA512 cb3f49538750c65a410db4b61c689d8b2e1412bf7b5ce4f2a7f5a6b0157fd1c800424f1e7a03cf9bdd779c791df84d9942d6c60a9553cb45ff5cee6a16198c29 WHIRLPOOL ad788fc24545330a172b3522b91457b60546eb1471140bacbc0fc8b3bae4e60fcc4a068428359eea3edfb0fac83b50e0888042a789d152f0172aab47f6889084
 MISC metadata.xml 646 SHA256 597773f1a6ca0191493bd06847efc9373f405beab749edf62969ffdffd34dad2 SHA512 422da0fabf77cab9aad20e9ca3245d4ba92c137af594e13a9b78362b1bf1be4492a46268e1da33c862f9d86eb2931ade452a93438a78bd8b80f6e9fb0e69c17f WHIRLPOOL 8811bf97f67f09b6ed807b0d4d73a726d2f6bba8df16074a0c2b940f7f7330d4bae24f48515278f1f4e0781e23bf1842455c8ce5047887eb1c96ceb57c83b9df
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfxbYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiMB0QAKds1wEAyUht2kFk6U0n6cNk
-OLU5tW7SLopnBwMDQ5nKIp0xAc1HsvxHTyZ3EdfW9wKG3xP8VKx8E3QpIE/gEY2H
-+fXD3lqDlzFIqvql0ej5dZgtQ5FO299X1bnvxhmVP6i94SvxuvQpp/SWhPznHhK6
-gJRoQTrTEmTWSVa9Yf4GI8rss5ngONoiL9EJQbkLTDO+Gze215Y7Yl/QtSAm772f
-z/qmfRuzlsKY7TAt27q9Jv7P6/FaAzCiINDLe7D9HAJ1tQGyiws0kQm/8eMevzHw
-/vf/YuVYnP0mGVB5n2cXrem5vMN9R9NRUzwoB0soLPujCun0kP9zbp1AzQEXBKq3
-GyuBYps99WwvhOwBG8rIUI/Xcu7KBmG7FxJAOOF6YNf78a8tyimd2c1NCHjKy4ZF
-gSHOEY1h4J8u3glQhcEX53sv9dpEZB/0U+yx7y6m8qqO6kNGtzSw82gytn3pbsNl
-moRyXvc6L1bm5bvsIcpCXpg+Jm1cnDhPTRDLrd1H8u1ixV9OVBAcYQJ16EUUFdoV
-+7SMPIfyxwl3rllLTPHxptTeQtdvWZnAcQj57yKUR70GVWbBhqamjc7TyPhdV517
-tzuNF2NBrIzBpWG4e4MOuZYEQ7BN3wXrFzJNxHHpxz2G36n6/1f/nf4n3pVXa8o2
-JzxuRhKkVjwKthOxV2QQ
-=PfKk
+iEYEAREIAAYFAlW2NbQACgkQvFcC4BYPU0oz+ACfQDj2m6HA0SChf5YZGrVZf8qu
+83UAniS+vy/Pk96bGY2tpBDU3zwrIF3N
+=0efg
 -----END PGP SIGNATURE-----
diff --git a/net-p2p/mldonkey/files/ocaml4.patch b/net-p2p/mldonkey/files/ocaml4.patch
new file mode 100644
index 000000000000..32882417b62c
--- /dev/null
+++ b/net-p2p/mldonkey/files/ocaml4.patch
@@ -0,0 +1,12 @@
+Index: mldonkey-3.1.5/src/utils/net/terminal.ml
+===================================================================
+--- mldonkey-3.1.5.orig/src/utils/net/terminal.ml
++++ mldonkey-3.1.5/src/utils/net/terminal.ml
+@@ -185,7 +185,6 @@ module Output = struct
+   let canal = List.assoc chan !chanmap in
+   etat.chan <- Some (chan, canal);
+   info (sprintf "connecte au canal '%s'" chan);
+-  (* {| canal ALL } *)
+        with Not_found -> (* pas encore de recepteur pour ce canal *)
+   try (* on en cree un *)
+     let serveur = nsrecord.get_loc chan in
diff --git a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
index 1d672977878f..584c6447ab6e 100644
--- a/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
+++ b/net-p2p/mldonkey/mldonkey-3.1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.5.ebuild,v 1.3 2014/08/10 20:37:42 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/mldonkey/mldonkey-3.1.5.ebuild,v 1.4 2015/07/27 13:44:18 aballier Exp $
 
 EAPI="5"
 WANT_AUTOCONF=2.5
@@ -57,6 +57,7 @@ src_prepare() {
 	eautoconf
 	cd "${S}"
 	use ocamlopt || sed -i -e "s/ocamlopt/idontwantocamlopt/g" "${S}/config/configure" || die "failed to disable ocamlopt"
+	epatch "${FILESDIR}/ocaml4.patch"
 }
 
 src_configure() {