slotted 2.13.16 for bug #183019

Package-Manager: portage-2.1.5.5

3 files changed, 94 insertions, 5 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index b81f3287d71c..5235e33bf9f3 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/unison
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.49 2008/06/13 19:34:39 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.50 2008/06/16 20:20:07 aballier Exp $
+
+*unison-2.13.16-r1 (16 Jun 2008)
+
+  16 Jun 2008; Alexis Ballier <aballier@gentoo.org>
+  +unison-2.13.16-r1.ebuild:
+  slotted 2.13.16 for bug #183019
 
   13 Jun 2008; Matti Bickel <mabi@gentoo.org> unison-2.27.57-r1.ebuild:
   ~ppc added (bug #207746)
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index e410b4c547b9..2603f6c24b16 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -16,16 +16,17 @@ DIST unison-2.27.57-manual.html 232117 RMD160 705e5cf7f82cee9f23f0c3d3e091dd6bb2
 DIST unison-2.27.57-manual.pdf 453871 RMD160 c4402abe5efe09ce5d0715d8e039898e73e9d42e SHA1 9a9565f682a38f264f5419e838f6563788d242d1 SHA256 fabda0833b4c7c39080b00ad7e945872986246df243c728c586ed97e4110e308
 DIST unison-2.27.57.tar.gz 617253 RMD160 15388e3f2b9b593aba140416216837c49e4800c0 SHA1 9892680d8bd3e3c50031451cc6e77eb5431768ea SHA256 49299ec14216a8467b2c6ba148f8145bec31fa787433f9ce3851c2d62f0035ae
 EBUILD unison-2.12.0-r1.ebuild 1442 RMD160 53a50858ed9e624103427290a2fe582384a18e2b SHA1 ee30ffdc4dc7c5a34696be69f91660ab6aa71d2a SHA256 422c6774809470ee2c0f3721383ba942a5852980607fc174157d74416c3a3776
+EBUILD unison-2.13.16-r1.ebuild 2227 RMD160 e4f1540fdf9249b75589b6d134b7a07ff129a1c1 SHA1 480e2c4a35648907cab0c2c1a9b5b7d9060c42dd SHA256 56a0385e894161ae9c23bbcb88e250df313e43377e5e96c8e70af45c05dc08e7
 EBUILD unison-2.13.16.ebuild 1751 RMD160 5659a045f2ded2a106f8349692693fab01202601 SHA1 f1f3aba07f301f4a78485d26165f767037a12295 SHA256 b23db89e6fe55ca5622310f71bfed146f79480e5f5da313e5f2addb62230eab1
 EBUILD unison-2.17.1-r1.ebuild 1960 RMD160 7d41ea2878e072e0601e8317a6d7e5a199280d6c SHA1 588cae292d6d21928c57bcb7a33c2811dd029496 SHA256 e15caf6168b8e6654cb5e5c5306c9de4f44d230e2daeaf232d25cadf022ae877
 EBUILD unison-2.27.57-r1.ebuild 2171 RMD160 4e1fd8ac5483c376e096504dfbda46330f2b0fed SHA1 510233f0add2b286298ccbcfff63f8c5a1c7310c SHA256 9eb6d2de6a7715e6225ca39be6e3de3c4d4ffa437c75805334c327872dd26c59
 EBUILD unison-2.27.57.ebuild 1816 RMD160 7c3718a8141f14639a4c68f37972c9c095fffe5a SHA1 a64a0977591c0b8ff681f015349232a28f2d9efb SHA256 ad5d406fcd30ee90412a3574cce24b1a7dd12b5b4f820f24156f04a16142b916
-MISC ChangeLog 7266 RMD160 d93c4441681ea8c67ab3399a008cc89d44be8c06 SHA1 5fa103dbe1276db2d03a48a535a86f208b5ca29b SHA256 17e52fc61d3d894465922c08dff09aa4fbe07707f0c699ff6e1852f0b22fadc1
+MISC ChangeLog 7420 RMD160 312dfc97aecf9bc3d2b7316220bf1eafd9701d0a SHA1 a91d6c6831a7c0abfab06e7aad432f5bbfc15c39 SHA256 9c87b3e8b4f6bcb85b74a2472dc8737d319661a780dd076109a724a7e236fa21
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhSzdsACgkQfNMcoUhJ7GwwZwCfcwPOqWe6rOdFY96JILR9wYD2
-OGoAn0mOvTJrhgvCt/tQhSS88vTYMca9
-=8iC6
+iEYEARECAAYFAkhWy0EACgkQvFcC4BYPU0olCwCgs5mGADisVr8I9EfrGn7G5PSQ
+YLYAn1Ql1tmkV1WLNjqTanB9z49uVPPq
+=iQTQ
 -----END PGP SIGNATURE-----
diff --git a/net-misc/unison/unison-2.13.16-r1.ebuild b/net-misc/unison/unison-2.13.16-r1.ebuild
new file mode 100644
index 000000000000..d3c0973d15a9
--- /dev/null
+++ b/net-misc/unison/unison-2.13.16-r1.ebuild
@@ -0,0 +1,82 @@
+# 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.13.16-r1.ebuild,v 1.1 2008/06/16 20:20:07 aballier Exp $
+
+EAPI=1
+
+inherit eutils versionator
+
+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="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+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 ) )
+	!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_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
+	epatch "${FILESDIR}/${PN}-2.27.57-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_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
+}
+
+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."
+}