Revision bump for slotted version, mainly by Martin von Gagern <Martin.vGagern@gmx.net> in bug #207746 and bug #183019

Package-Manager: portage-2.1.5_rc2

3 files changed, 104 insertions, 2 deletions

diff --git a/net-misc/unison/ChangeLog b/net-misc/unison/ChangeLog
index 82e84c73c774..8df0e305c8d3 100644
--- a/net-misc/unison/ChangeLog
+++ b/net-misc/unison/ChangeLog
@@ -1,6 +1,13 @@
 # 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.45 2008/01/27 15:06:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/ChangeLog,v 1.46 2008/04/07 21:35:31 aballier Exp $
+
+*unison-2.27.57-r1 (07 Apr 2008)
+
+  07 Apr 2008; Alexis Ballier <aballier@gentoo.org>
+  +unison-2.27.57-r1.ebuild:
+  Revision bump for slotted version, mainly by Martin von Gagern
+  <Martin.vGagern@gmx.net> in bug #207746 and bug #183019
 
 *unison-2.27.57 (27 Jan 2008)
 
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index f68ab2ddda37..8b2bb63f6107 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ocaml-3.08-extnames.patch 748 RMD160 0b468d28c7531974b5db4450a90ce7fb684855f3 SHA1 92eb4e481ebc717a7b2cf87b6ef5620f7e719196 SHA256 0f81c08dd7a668614d9316a0b7a88cc791876e2727308b865a97adbd16e75bc5
 AUX unison-2.12.0-gtk2-bug.patch 490 RMD160 d9d49dfa0c8e2a144e5883384b321f58a409273c SHA1 000524de4c3eb577a2aa35c5ad78e5773978906b SHA256 b0edb4750f6025cc1f8f53ba09fe8285a56283c2a4fe3435e645aa656f2bf35f
 AUX unison-2.17.1-io-error.patch 3077 RMD160 9e1c15556008e878f39cf337507d4bef4c3e8d34 SHA1 19031bc6a9c510a0a5e2c7eb9358aaf1e02f2919 SHA256 45a921c7f38584da08169a5c19cad2bf231abc9d83a220dec657815c639ca6e3
@@ -15,6 +18,14 @@ DIST unison-2.27.57.tar.gz 617253 RMD160 15388e3f2b9b593aba140416216837c49e4800c
 EBUILD unison-2.12.0-r1.ebuild 1442 RMD160 53a50858ed9e624103427290a2fe582384a18e2b SHA1 ee30ffdc4dc7c5a34696be69f91660ab6aa71d2a SHA256 422c6774809470ee2c0f3721383ba942a5852980607fc174157d74416c3a3776
 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 2159 RMD160 6a914f0c2d278d25001dc4b95b6637e6f667b087 SHA1 ef4ec593ad71f654c18a7da68ef913ae97dde9a5 SHA256 e7752e2c3a18d1a159cc980bffb3cc37ce62ee95552c26d8917b0656e9190a04
 EBUILD unison-2.27.57.ebuild 1816 RMD160 7c3718a8141f14639a4c68f37972c9c095fffe5a SHA1 a64a0977591c0b8ff681f015349232a28f2d9efb SHA256 ad5d406fcd30ee90412a3574cce24b1a7dd12b5b4f820f24156f04a16142b916
-MISC ChangeLog 6731 RMD160 623b0ff39135bf1d1b79bcc7b03e45a00f53888f SHA1 4daa0c7b1bca640840f5555407f5b95926f76daf SHA256 43c88f18493f707491175cb994e77d1d9540c9edb5b027b094ccad61e2f37272
+MISC ChangeLog 6970 RMD160 14ece3e60189bcacb0a811f48f095b402480fc6d SHA1 26c74a12ff67adfb4e2784ae0b59d9e03716510e SHA256 9d267bab80405159269f09ccc016566f21ea09091450870035ed28a3f6caf55c
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkf6k7EACgkQvFcC4BYPU0oHMgCgrO8haDsj24hcIwtaAl1MN5fz
+MzgAnRcRIp4DylmlEiNTZBIpk9cilUO2
+=qBB2
+-----END PGP SIGNATURE-----
diff --git a/net-misc/unison/unison-2.27.57-r1.ebuild b/net-misc/unison/unison-2.27.57-r1.ebuild
new file mode 100644
index 000000000000..133391839b8e
--- /dev/null
+++ b/net-misc/unison/unison-2.27.57-r1.ebuild
@@ -0,0 +1,84 @@
+# 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-r1.ebuild,v 1.1 2008/04/07 21:35:31 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"
+
+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 ${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.
+	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."
+}