Fix for bug #115376

(Portage version: 2.1-r1)

4 files changed, 89 insertions, 4 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index ec888a48c09d..5752e168ed06 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/unison
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.36 2006/02/09 21:33:20 tove Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.37 2006/07/04 10:37:22 mattam Exp $
+
+*unison-2.17.1-r1 (04 Jul 2006)
+
+  04 Jul 2006; Matthieu Sozeau <mattam@gentoo.org> unison-2.17.1.ebuild,
+  +unison-2.17.1-r1.ebuild:
+  Adding fix for bug #115376, need a font installed with modular-x.
 
 *unison-2.12.0-r1 (21 Sep 2005)
 
diff --git a/net-misc/unison/files/digest-unison-2.17.1-r1 b/net-misc/unison/files/digest-unison-2.17.1-r1
new file mode 100644
index 000000000000..4f433147a008
--- /dev/null
+++ b/net-misc/unison/files/digest-unison-2.17.1-r1
@@ -0,0 +1,3 @@
+MD5 6c782837db28944b6083adc37eff2b28 unison-2.17.1-manual.html 219449
+MD5 e619b39db27ec8dbc36db35e808dd3bb unison-2.17.1-manual.pdf 404886
+MD5 c62611dda096da360ad645fad8e8ce3e unison-2.17.1.tar.gz 415057
diff --git a/net-misc/unison/unison-2.17.1-r1.ebuild b/net-misc/unison/unison-2.17.1-r1.ebuild
new file mode 100644
index 000000000000..d1c6ec8e2d14
--- /dev/null
+++ b/net-misc/unison/unison-2.17.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1-r1.ebuild,v 1.1 2006/07/04 10:37:22 mattam 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-font/font-schumacher-misc <virtual/x11-7 ) )"
+
+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 )"
+
+pkg_setup() {
+	ewarn "This is a beta release, use at your very own risk"
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+
+	# 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 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
+
+	make $myconf CFLAGS="" || die "error making unsion"
+}
+
+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 COPYING 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
+}
diff --git a/net-misc/unison/unison-2.17.1.ebuild b/net-misc/unison/unison-2.17.1.ebuild
index 206adb19cb86..83301dd58953 100644
--- a/net-misc/unison/unison-2.17.1.ebuild
+++ b/net-misc/unison/unison-2.17.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1.ebuild,v 1.2 2005/09/21 21:35:41 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.17.1.ebuild,v 1.3 2006/07/04 10:37:22 mattam Exp $
 
 inherit eutils
 
@@ -18,6 +18,8 @@ DEPEND=">=dev-lang/ocaml-3.04
 RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
 || ( net-misc/x11-ssh-askpass net-misc/gtk2-ssh-askpass ) )"
 
+PDEPEND="|| ( media-font/font-schumacher-misc <virtual/x11-7 )"
+
 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 )"