diff options
| -rw-r--r-- | net-misc/unison/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/unison/Manifest | 6 | ||||
| -rw-r--r-- | net-misc/unison/files/digest-unison-2.9.1-r1 | 1 | ||||
| -rw-r--r-- | net-misc/unison/files/ocaml-3.08-extnames.patch | 14 | ||||
| -rw-r--r-- | net-misc/unison/metadata.xml | 5 | ||||
| -rw-r--r-- | net-misc/unison/unison-2.9.1-r1.ebuild | 53 |
6 files changed, 86 insertions, 2 deletions
diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog index d3fb0fde4d3c..9cc0859ae09b 100644 --- a/net-misc/unison/ChangeLog +++ b/net-misc/unison/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/unison # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.16 2004/07/26 14:31:01 alexander Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.17 2004/08/09 10:40:37 mattam Exp $ + +*unison-2.9.1-r1 (09 Aug 2004) + + 09 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> + +files/ocaml-3.08-extnames.patch, +unison-2.9.1-r1.ebuild, +metadata.xml: + Fix compilation bug with ocaml-3.08, thanks for Bardur Arantsson + <gentoo@scientician.net> for the patch (bug #59762). Stable on ppc. 26 Jul 2004; Alexander Plank <alexander@gentoo.org> unison-2.9.1.ebuild: adding macos keyword (thanks Philippe Bouamriou who started bug #57918) diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index c1bc43951dd6..10bad201d8aa 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,3 +1,7 @@ -MD5 bc2969596a6daec4555ff657bbae56cf ChangeLog 1726 +MD5 7b094abebe2baa9c36e88333a2f25102 ChangeLog 2020 MD5 3708dbd1314ee0bd23a8938d110d2606 unison-2.9.1.ebuild 1060 +MD5 7d7071feae0e1599ee75b417bd332cb0 unison-2.9.1-r1.ebuild 1217 +MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155 MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1 64 +MD5 29b28492666138199820e9df8fcc6a47 files/digest-unison-2.9.1-r1 64 +MD5 5abcf068ada1ab9eedbe3dfa16ad15fb files/ocaml-3.08-extnames.patch 748 diff --git a/net-misc/unison/files/digest-unison-2.9.1-r1 b/net-misc/unison/files/digest-unison-2.9.1-r1 new file mode 100644 index 000000000000..0431bf98c368 --- /dev/null +++ b/net-misc/unison/files/digest-unison-2.9.1-r1 @@ -0,0 +1 @@ +MD5 d8084fa87c13671de21ec1b701a4606c unison-2.9.1.tar.gz 319081 diff --git a/net-misc/unison/files/ocaml-3.08-extnames.patch b/net-misc/unison/files/ocaml-3.08-extnames.patch new file mode 100644 index 000000000000..e959be2f3991 --- /dev/null +++ b/net-misc/unison/files/ocaml-3.08-extnames.patch @@ -0,0 +1,14 @@ +diff -ur unison-2.9.1/ubase/uprintf.ml unison-2.9.1.patched/ubase/uprintf.ml +--- unison-2.9.1/ubase/uprintf.ml 2002-04-11 07:13:23.000000000 +0200 ++++ unison-2.9.1.patched/ubase/uprintf.ml 2004-08-08 14:10:09.784776851 +0200 +@@ -10,8 +10,8 @@ + (* *) + (***********************************************************************) + +-external format_int: string -> int -> string = "format_int" +-external format_float: string -> float -> string = "format_float" ++external format_int: string -> int -> string = "caml_format_int" ++external format_float: string -> float -> string = "caml_format_float" + + let fprintf outchan doafter format = + let format = (Obj.magic format : string) in diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml new file mode 100644 index 000000000000..2193d772e351 --- /dev/null +++ b/net-misc/unison/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>ml</herd> +</pkgmetadata> diff --git a/net-misc/unison/unison-2.9.1-r1.ebuild b/net-misc/unison/unison-2.9.1-r1.ebuild new file mode 100644 index 000000000000..217d1fb24354 --- /dev/null +++ b/net-misc/unison/unison-2.9.1-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.9.1-r1.ebuild,v 1.1 2004/08/09 10:40:37 mattam Exp $ + +inherit eutils + +IUSE="gtk" + +DESCRIPTION="Two-way cross-platform file synchronizer" +HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="x86 sparc ppc alpha ~amd64 macos" + +DEPEND=">=dev-lang/ocaml-3.04 + gtk? ( =dev-ml/lablgtk-1.2* )" +RDEPEND="gtk? ( =x11-libs/gtk+-1.2* )" + +SRC_URI="mirror://${P}.tar.gz" + +src_unpack() { + unpack ${P}.tar.gz + + # Fix for ocaml-3.08 change in exported symbol names + if has_version '>=ocaml-3.08'; then + epatch ${FILESDIR}/ocaml-3.08-extnames.patch + fi + + # Fix for coreutils change of tail syntax + cd ${S} + sed -i -e 's/tail -1/tail -n 1/' Makefile.OCaml +} + +src_compile() { + + local myconf + + if use gtk; then + myconf="$myconf UISTYLE=gtk" + else + myconf="$myconf UISTYLE=text" + fi + + make $myconf CFLAGS="" || die +} + +src_install () { + # install manually, since it's just too much + # work to force the Makefile to do the right thing. + dobin unison + dodoc BUGS.txt CONTRIB COPYING INSTALL NEWS \ + README ROADMAP.txt TODO.txt +} |