Version bump, thanks to everyone in bug #183019, fix build with asneeded, thanks to Santiago M. Mola, bug #189238

(Portage version: 2.1.4)

4 files changed, 102 insertions, 2 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index bc0ce142e06e..82e84c73c774 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/unison
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.44 2007/07/22 08:10:38 dberkholz Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.45 2008/01/27 15:06:14 aballier Exp $
+
+*unison-2.27.57 (27 Jan 2008)
+
+  27 Jan 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/unison-2.27.57-as-needed.patch, +unison-2.27.57.ebuild:
+  Version bump, thanks to everyone in bug #183019, fix build with asneeded,
+  thanks to Santiago M. Mola, bug #189238
 
   22 Jul 2007; Donnie Berkholz <dberkholz@gentoo.org>;
   unison-2.13.16.ebuild, unison-2.17.1-r1.ebuild:
diff --git a/net-misc/unison/files/digest-unison-2.27.57 b/net-misc/unison/files/digest-unison-2.27.57
new file mode 100644
index 000000000000..dee8d8018fa3
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.27.57
@@ -0,0 +1,9 @@
+MD5 0d15059f968d847ce75bafea34fe1c30 unison-2.27.57-manual.html 232117
+RMD160 705e5cf7f82cee9f23f0c3d3e091dd6bb228d28e unison-2.27.57-manual.html 232117
+SHA256 6916be92391aba8c9176d26d9e22805dc5c6978c12299b37d41a035f15adcf92 unison-2.27.57-manual.html 232117
+MD5 453659e6088617b850daefcbb37a98e7 unison-2.27.57-manual.pdf 453871
+RMD160 c4402abe5efe09ce5d0715d8e039898e73e9d42e unison-2.27.57-manual.pdf 453871
+SHA256 fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308 unison-2.27.57-manual.pdf 453871
+MD5 4ba0a3e4bf4b4ad0c063f86391371f78 unison-2.27.57.tar.gz 617253
+RMD160 15388e3f2b9b593aba140416216837c49e4800c0 unison-2.27.57.tar.gz 617253
+SHA256 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae unison-2.27.57.tar.gz 617253
diff --git a/net-misc/unison/files/unison-2.27.57-as-needed.patch b/net-misc/unison/files/unison-2.27.57-as-needed.patch
new file mode 100644
index 000000000000..ff5be04853ff
--- /dev/null
+++ b/net-misc/unison/files/unison-2.27.57-as-needed.patch
@@ -0,0 +1,11 @@
+--- unison-2.17.1/Makefile.OCaml
++++ unison-2.17.1/Makefile.OCaml
+@@ -330,7 +330,7 @@
+ 
+ $(NAME)$(EXEC_EXT): $(CAMLOBJS) $(COBJS)
+ 	@echo Linking $@
+-	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $(CLIBS) $^
++	$(CAMLC) -verbose $(CAMLFLAGS) -o $@ $(CFLAGS) $(CAMLLIBS) $^ $(CLIBS)
+ 
+ # Unfortunately -output-obj does not put .o files into the output, only .cmx
+ # files, so we have to use $(LD) to take care of COBJS.
diff --git a/net-misc/unison/unison-2.27.57.ebuild b/net-misc/unison/unison-2.27.57.ebuild
new file mode 100644
index 000000000000..f497e1fbdbb6
--- /dev/null
+++ b/net-misc/unison/unison-2.27.57.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2008 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.ebuild,v 1.1 2008/01/27 15:06:14 aballier Exp $
+
+inherit eutils
+
+IUSE="gtk doc static debug threads"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+
+DEPEND=">=dev-lang/ocaml-3.04
+	gtk? ( >=dev-ml/lablgtk-2.2 )"
+
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+|| ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
+
+PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+doc? ( http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+	http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+}
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf="$myconf THREADS=true"
+	fi
+
+	if use static; then
+		myconf="$myconf STATIC=true"
+	fi
+
+	if use debug; then
+		myconf="$myconf DEBUGGING=true"
+	fi
+
+	if use gtk; then
+		myconf="$myconf UISTYLE=gtk2"
+	else
+		myconf="$myconf UISTYLE=text"
+	fi
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake -j1 $myconf CFLAGS="" || die "error making unsion"
+}
+
+src_test() {
+	emake selftest ||  die "selftest failed"
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	dobin unison || die
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+	      README ROADMAP.txt TODO.txt || die
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html" || die
+		dodoc "${DISTDIR}/${P}-manual.pdf" || die
+	fi
+}