Initial import of the local overlay.

5 files changed, 131 insertions, 0 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
new file mode 100755
index 0000000..3239048
--- /dev/null
+++ b/net-misc/unison/Manifest
@@ -0,0 +1,7 @@
+AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
+AUX unison-2.32.52-arch-1.patch 325 RMD160 4ca54dc19763b7e63ba2f732658abee916e98300 SHA1 54e3b8c5d4d5e87050fddd1c5d475b1f5e39c2c6 SHA256 8030de5b8a3e473f053983e5338a497c6f3c0170fe3a0c4493367b1e6e5bb098
+AUX unison-mymap.patch 466 RMD160 b317f3a79f11c2f9a91afa9801d196e8981f833b SHA1 5cc693b6bb2252a220b7db47227dd55cb0a7350e SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480
+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.32.52.ebuild 2544 RMD160 54357ab2d647db6b34a8a82a48d5d1faa5101abe SHA1 3e221e268c36aac95853db3313be78332e529fa5 SHA256 b787564339daa4a0c656159ac2c4b0d0c5199517d89fc12985deaf4ba9ef156c
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 100755
index 0000000..ff5be04
--- /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/files/unison-2.32.52-arch-1.patch b/net-misc/unison/files/unison-2.32.52-arch-1.patch
new file mode 100755
index 0000000..bb364b4
--- /dev/null
+++ b/net-misc/unison/files/unison-2.32.52-arch-1.patch
@@ -0,0 +1,12 @@
+Index: src/terminal.ml
+===================================================================
+--- src/terminal.ml	(révision 463)
++++ src/terminal.ml	(copie de travail)
+@@ -191,7 +191,6 @@
+             exit 127
+           end
+       | childPid ->
+-          Unix.close slaveFd;
+           (Some masterFd, childPid)
+       end
+ 
diff --git a/net-misc/unison/files/unison-mymap.patch b/net-misc/unison/files/unison-mymap.patch
new file mode 100755
index 0000000..030eb0f
--- /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.32.52.ebuild b/net-misc/unison/unison-2.32.52.ebuild
new file mode 100755
index 0000000..f8b9408
--- /dev/null
+++ b/net-misc/unison/unison-2.32.52.ebuild
@@ -0,0 +1,88 @@
+# 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.4 2010/08/05 06:16:50 aballier Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="http://www.cis.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+	gtk? ( >=dev-ml/lablgtk-2.2 )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( >=dev-ml/lablgtk-2.2
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-admin/eselect-unison"
+
+#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_prepare() {
+	epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
+	epatch "${FILESDIR}/${PN}-mymap.patch"
+	epatch "${FILESDIR}/${P}-arch-1.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
+
+	use ocamlopt || myconf="$myconf NATIVE=false"
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake $myconf CFLAGS="" buildexecutable || 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.
+	newbin unison unison-${SLOT} || 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
+	use ocamlopt || export STRIP_MASK="*/bin/*"
+}
+
+pkg_postinst() {
+	elog "Unison now uses SLOTs, so you can specify servercmd=/usr/bin/unison-${SLOT}"
+	elog "in your profile files to access exactly this version over ssh."
+	elog "Or you can use 'eselect unison' to set the version."
+}