diff options
author | Alexis Ballier <aballier@gentoo.org> | 2010-08-05 06:16:51 +0000 |
---|---|---|
committer | Alexis Ballier <aballier@gentoo.org> | 2010-08-05 06:16:51 +0000 |
commit | dec391eebd30955412935eca886b4d2af9a2f49d (patch) | |
tree | 0b623bda7d3dae7b6a04ca82a66eb84a103a8e1f /net-misc | |
parent | Version bump. Compatability fix for Rails ~>2.3.4. (diff) | |
download | gentoo-2-dec391eebd30955412935eca886b4d2af9a2f49d.tar.gz gentoo-2-dec391eebd30955412935eca886b4d2af9a2f49d.tar.bz2 gentoo-2-dec391eebd30955412935eca886b4d2af9a2f49d.zip |
import a patch from debian to fix build with ocaml 3.12, bug #331073
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/unison/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/unison/files/unison-mymap.patch | 13 | ||||
-rw-r--r-- | net-misc/unison/unison-2.13.16-r1.ebuild | 5 | ||||
-rw-r--r-- | net-misc/unison/unison-2.27.57-r1.ebuild | 5 | ||||
-rw-r--r-- | net-misc/unison/unison-2.32.52.ebuild | 3 |
5 files changed, 27 insertions, 6 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/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() { |