import a patch from debian to fix build with ocaml 3.12, bug #331073

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 36 insertions, 14 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index d108406504bb..982fe14a1dba 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/unison
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.63 2010/07/18 14:38:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.64 2010/08/05 06:16:50 aballier Exp $
+
+  05 Aug 2010; Alexis Ballier <aballier@gentoo.org>
+  unison-2.13.16-r1.ebuild, unison-2.27.57-r1.ebuild, unison-2.32.52.ebuild,
+  +files/unison-mymap.patch:
+  import a patch from debian to fix build with ocaml 3.12, bug #331073
 
   18 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   unison-2.32.52.ebuild:
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 644e6b240ef7..1fc2b43633e4 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
+AUX unison-mymap.patch 466 RMD160 b317f3a79f11c2f9a91afa9801d196e8981f833b SHA1 5cc693b6bb2252a220b7db47227dd55cb0a7350e SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480
 DIST unison-2.13.16-manual.html 196162 RMD160 cf6a9077eaee5f58381e5197b8cc14ffeb1e93b7 SHA1 c7bb5b547830a318a5dbe800d34fefb07f6f460e SHA256 52fbb03925c44c46837d919a3baebceefc723c09458ec7e95d3993f2a98f0e20
 DIST unison-2.13.16-manual.pdf 436229 RMD160 33e822129131a6da32099483a1767c4aaf615058 SHA1 0cf6d7873228c3b7dabb9419245ef05c36261028 SHA256 8f0851b5b34e2d85a6a02f5a374a7d743e5067a419fca689d14d278c951597df
 DIST unison-2.13.16.tar.gz 393266 RMD160 171d8bbc788be31227f6b09d1793a984d33bfdfc SHA1 3f119f6a6e8bc5ade8933d4693075a768f0abf9a SHA256 808400a933aeb67654edc770822cd186d1b2adc92e7cb5836996c71c69ffe656
@@ -11,15 +12,15 @@ DIST unison-2.27.57.tar.gz 617253 RMD160 15388e3f2b9b593aba140416216837c49e4800c
 DIST unison-2.32.52-manual.html 249124 RMD160 6c225f0826cfc40f82ed1cee9db17f3ed7f900d5 SHA1 f66a6489f6c9bdb046f0808a3dc8e344efe6789a SHA256 c898239d8139d8405b96d87e12c06c7f41fd3629cac0c83bc338aad50fed7f81
 DIST unison-2.32.52-manual.pdf 478388 RMD160 799f87d5a2452cfcf5b0ccc8a890a70f37b10d32 SHA1 22eb243d467d16fcd2101130cb7105e0d043fdfb SHA256 b3fee7ac99907f3b1ed02c6ac901678e82ea1eed936acb45e9735b95d55cc4eb
 DIST unison-2.32.52.tar.gz 697866 RMD160 8216a2e482d5a445dd7acdb62e1bb6377e90d1a1 SHA1 68ea5709de4fcc2f9aef7b01b24637503b61b5ac SHA256 1542e5d4ad03e928260e061a8ff9d5e0bca3282481ed8bec5552de17a0270485
-EBUILD unison-2.13.16-r1.ebuild 2697 RMD160 1ef399cde9dba97c5330434c4e705be3bd771081 SHA1 d9f2537f691e9dabfa79d37ef29f46cc560ea074 SHA256 43b75b012d0bca35f4c2f8331c5091f34924085ee83722590d4207346c9534ea
-EBUILD unison-2.27.57-r1.ebuild 2331 RMD160 76764510014816140d491eb869e1b242fb4e20dc SHA1 b2b8ae21a95581d346bb346415326845e0ac6091 SHA256 55567dcd1357d8cadb8117e73ed11565e4b9dfe05329f6c427b19672f574892d
-EBUILD unison-2.32.52.ebuild 2461 RMD160 d27c2c39271210b21d01909cc24c1f9bbe7acaa0 SHA1 ff952a6728ccf747fd5ac86a1254a41ac6eb349c SHA256 60fff0a84a4d5c155e1b02b4533e28bed5b36ff5285010a9be7ef25e6ed2f330
-MISC ChangeLog 9317 RMD160 4fb9398b2f9a556faad6f5bc8671e392f31e7453 SHA1 769b2774ca22c3a91d30930ca3fa0c710d8c52d4 SHA256 37fd73afb98828ffad949288adaad85a6eaae72b6ca4d46e5670a7cbcc537f5b
+EBUILD unison-2.13.16-r1.ebuild 2737 RMD160 6c868f0f9ef2918d8a81e16dbce2acff24824c91 SHA1 d95f4457b2efa3567d3a6e5482668ff3a15e49d4 SHA256 d262438722fd9b9639174aad7513247ffe62d3a435973cabfed9aad906b95f54
+EBUILD unison-2.27.57-r1.ebuild 2369 RMD160 137337a5e04ff3884a56cbfbeeb6e0e2697344d8 SHA1 0abb0a1412403c447a8461cb0fedb884d1807c8c SHA256 a07c959f2e43862b5676b0278a52b1c537d89b2072a94c209e64232f1ad0650e
+EBUILD unison-2.32.52.ebuild 2504 RMD160 bfeacb7069e2a15495a4308f191ed3a1ddd4b1c6 SHA1 0e6b6b32cf8f4352755fc4c1b04f85c7b98e9764 SHA256 c4ec7bbbedc42318a00e0c8521d6882c51d7a9fa1b47c59b39b883d2d7843436
+MISC ChangeLog 9550 RMD160 bbcb4d28a24604dddc9796ab2d81a9227657be4a SHA1 1643c5380d8f173b78f4aef2b93cfc0a5e83a72d SHA256 7e5dd1761b9a378f90dfec1feabc6e244033abb2528cb24192acf94c2cac5712
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxDEmkACgkQNQqtfCuFneO9tACfYLnb6lrWhp8TnYrSJPZRx1Fs
-wmsAn3YBnVymYtQDRS+BSZtR3VIX6p3/
-=Y1lA
+iEYEARECAAYFAkxaV1kACgkQvFcC4BYPU0pMawCgpkdFqbJCyDOWDAnkpHqEld9u
+fIsAoJP1fxtTX0gwkf90aw3sZBau0kx8
+=7BeT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/unison/files/unison-mymap.patch b/net-misc/unison/files/unison-mymap.patch
new file mode 100644
index 000000000000..030eb0f0174e
--- /dev/null
+++ b/net-misc/unison/files/unison-mymap.patch
@@ -0,0 +1,13 @@
+Index: unison-2.32.52/update.mli
+===================================================================
+--- unison-2.32.52.orig/update.mli
++++ unison-2.32.52/update.mli
+@@ -1,7 +1,7 @@
+ (* Unison file synchronizer: src/update.mli *)
+ (* Copyright 1999-2009, Benjamin C. Pierce (see COPYING for details) *)
+ 
+-module NameMap : Map.S with type key = Name.t
++module NameMap : MyMap.S with type key = Name.t
+ 
+ type archive =
+     ArchiveDir of Props.t * archive NameMap.t
diff --git a/net-misc/unison/unison-2.13.16-r1.ebuild b/net-misc/unison/unison-2.13.16-r1.ebuild
index 4823d696e85a..bb451f9e37bf 100644
--- a/net-misc/unison/unison-2.13.16-r1.ebuild
+++ b/net-misc/unison/unison-2.13.16-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v 1.3 2008/12/04 18:48:33 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.13.16-r1.ebuild,v 1.4 2010/08/05 06:16:50 aballier Exp $
 
 EAPI=1
 
@@ -44,6 +44,7 @@ src_unpack() {
 	cd "${S}"
 	sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml
 	epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-mymap.patch"
 }
 
 src_compile() {
diff --git a/net-misc/unison/unison-2.27.57-r1.ebuild b/net-misc/unison/unison-2.27.57-r1.ebuild
index b3f203fa37bd..aea8ba8e10de 100644
--- a/net-misc/unison/unison-2.27.57-r1.ebuild
+++ b/net-misc/unison/unison-2.27.57-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.12 2009/08/28 21:59:21 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.27.57-r1.ebuild,v 1.13 2010/08/05 06:16:50 aballier Exp $
 
 EAPI="2"
 
@@ -31,6 +31,7 @@ doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-man
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-mymap.patch"
 }
 
 src_compile() {
diff --git a/net-misc/unison/unison-2.32.52.ebuild b/net-misc/unison/unison-2.32.52.ebuild
index c4b5e848a645..3c20fcd9d3f7 100644
--- a/net-misc/unison/unison-2.32.52.ebuild
+++ b/net-misc/unison/unison-2.32.52.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.32.52.ebuild,v 1.3 2010/07/18 14:38:34 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.32.52.ebuild,v 1.4 2010/08/05 06:16:50 aballier Exp $
 
 EAPI="2"
 
@@ -32,6 +32,7 @@ SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.t
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-mymap.patch"
 }
 
 src_compile() {