new stable version

3 files changed, 100 insertions, 22 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index a9b1232..6de56f7 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,13 +1,15 @@
-AUX unison-2.27.57-as-needed.patch 432 RMD160 a6b5baf799f686764c7dc9285541cae9178c4fbd SHA1 f7566f358355b0ecb5e000101721d189363bbdc4 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d
-AUX unison-2.40.61-makefile.patch 523 RMD160 3ba6449ecddac57a91af646872b8de1fc88be16d SHA1 7329df33f09aa736991707f12c2bcc749bbaf5f1 SHA256 677f1380e5916c5c37ee17b022819d2013f02b3a6272ea8244484ac9b5941f08
-AUX unison-mymap.patch 466 RMD160 b317f3a79f11c2f9a91afa9801d196e8981f833b SHA1 5cc693b6bb2252a220b7db47227dd55cb0a7350e SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480
-DIST unison-2.40.16-manual.html 267159 RMD160 6b278d60711b3e7ac17b99a3f91bb3407d1cac8b SHA1 93958405ee07474ef9f1872ad8672fd884e84c34 SHA256 ffe6c85057ae8f8dcd76a02e2dfd1b37aa4681bc968f3be8945503547f038398
-DIST unison-2.40.16-manual.pdf 507350 RMD160 7b693ed1ad5507f0b88c5a21270c9a51193a9cfb SHA1 63733442a0f4538a7179d77001a04404574e58b3 SHA256 e49dcb0715152299fce11539c2d532bd4da9a4bb8af98670f8c61b6a13e241fe
-DIST unison-2.40.16.tar.gz 2712897 RMD160 b6a7c3fb8cd30b96352ea3a3cdcdb566ad9c52aa SHA1 148b2b617f18743128ba978b1cadad05624ce22c SHA256 7307824ec50507cc796608ae1da1bfa01216f0e7140e1a7344b325c7354b59b0
-DIST unison-2.40.61-manual.html 267159 RMD160 ba193743e36bdd868f9576610b94e59e7baf8cb8 SHA1 b941d7a40d1e9968d72ead4d61375091a28c9028 SHA256 b88c6c3a24c359e306e702672cc8da904e72c367861ef2a3dc3df07566948223
-DIST unison-2.40.61-manual.pdf 507350 RMD160 5fa0283fcf68849313214270698c27edd5b2aa41 SHA1 1410adf5edaf4be22598550dbfae5f861b440586 SHA256 75ff6909abcf6f9ea0a981a8e3827218491fcdfb03c088c8dd1e43fcc9c687ef
-DIST unison-2.40.61.tar.gz 2702722 RMD160 4a0bcc636d0e182be13723a5d9c676406824f638 SHA1 8645ce93a525b9561d51cceb9c4f9f08cea650e9 SHA256 e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
-EBUILD unison-2.40.16.ebuild 2505 RMD160 e27e364ce131a0a01f5cf132cb3b3cfdc76a7d89 SHA1 9f0b74b304aaabdbb816e871926388b16f9585d0 SHA256 0021cdb06755170a751195a17ccff1170efb7e55a66ca49eef767cf02565616d
-EBUILD unison-2.40.61.ebuild 2557 RMD160 6d2631b81ff5af20d3b1b55d48f17e9a2784dc93 SHA1 b45661c555a024c83e67ae3e40cc4cc263fb85c6 SHA256 8f7edf3ebb2636adacde6c963ecb83b490c50b858ffae63e4904ed8984b13ef8
-MISC unison-2.40.16.ebuild~ 2504 RMD160 bfeacb7069e2a15495a4308f191ed3a1ddd4b1c6 SHA1 0e6b6b32cf8f4352755fc4c1b04f85c7b98e9764 SHA256 c4ec7bbbedc42318a00e0c8521d6882c51d7a9fa1b47c59b39b883d2d7843436
-MISC unison-2.40.61.ebuild~ 2508 RMD160 257e0396f1caf90079d4f3a2b6de455eda021902 SHA1 d65b780dc71caf41de9bef92f707293c9601a9bd SHA256 46f6db43fe7bfca7d08cd5b7425f9143a8d24a3b5538943c423895911ce5d673
+AUX unison-2.27.57-as-needed.patch 432 SHA256 0284d72f0d9de0a824c2bc2a2f78baced3b84eb15ea10e0e6576ff52cf57686d SHA512 e980c7fe99fe2ff5a802ae63c240491a9d15bc44a52b00e54b33201e2f5f1215ecec06dfb4848d0ea33405c0169507b083e7b65fbe83e6d4973ea3edf9bbef26 WHIRLPOOL 263fcaaa27d4fa468d56476ebbd60344a8899e654bea55cdeb1f4dcf773ec57f51a598dd73bd3b927d842551fe71908e05ca2cf452a4895ca78d629c92669777
+AUX unison-2.40.61-makefile.patch 523 SHA256 677f1380e5916c5c37ee17b022819d2013f02b3a6272ea8244484ac9b5941f08 SHA512 e465976cb78cd643524e9b82c7fa063485cdb2641064e964ea5336314699c8476fe0aa1be77c076fc077496819a47b47ea3868439e0300a703f7a2eae3969506 WHIRLPOOL 84c781c9ea89952df47b5ec8a89603f23180e23f47179ef0970fbc5d590994f27c68c0c1e18af062b978be93e73dd24b02671181254f9f76e9fb1e228bb21cf8
+AUX unison-mymap.patch 466 SHA256 1b73b9b4cf308b2f538fddfe95ee2ae42f5090015fbce132d2ae5789ea25a480 SHA512 7d12dd54b6f287d84d45909fe67ecfe855d506b11b3fe6458787efa6040593a45b4fa79835f968c26b70b9c2c571705e794807ba4f2945194c508756022eedac WHIRLPOOL 911d0786b935719edf283454a46d80422be77b751df80f74bfadc3ad54c517a5fa3912fa7679b73ac7e3b8d4baa20399e916838ef6655a57f325a5e8107efec7
+DIST unison-2.40.102-manual.html 267095 SHA256 d45cf43bff8805143c53b9f58c4250b781dae04caa0f8f30048c32eb8cf8bf75 SHA512 08e6f446cc1d905f2bb82b05560c9c8f432e1357a7077a472eb9188ab5b3ef5f687f25d9f9c27a8e091d7fb76057dc9bd3eee50c3718e6f306f77ea5e75a1aad WHIRLPOOL 0d2bac765e0234535df239d14c42db1283a32aeba2074290e0aff407c79d9c469d957437328ea47ccd561ffd718e2639a1abea6aaba6f4764e33fa627efe20de
+DIST unison-2.40.102-manual.pdf 496539 SHA256 145b427a32cc4e295b128238cf2106853906f3e31b0b06d6757c000fd1e3c56b SHA512 dc0ddb3158ee12f5d25bda690c67b8631df2aee07bb1b3f8077dacf5ac9fab2fcd7587a78136972e805e907fcea5991d2655aca50a0e3dfc2156ae1bb5e55896 WHIRLPOOL ca0e4ac796df48a53c33dda68c93150597a0fe420985bc36c4bb90d9f24636e7a88335092094c7756a8ddf308cdb7cc3c2e8e06a862881f4e05e63c4bfaae44a
+DIST unison-2.40.102.tar.gz 2694761 SHA256 3d4a92f02b6998f156cb714d202d0358dd2846efbdce9de30e2c666d77c1e854 SHA512 1c4ec5bd7630baa06db240b5a8ed619cf0252d8097f2f011c7609d89cd49ea8254ec44135a1325aafc31bfe340ff3d3259273eafb31e1ab034a114f44d2a05f8 WHIRLPOOL 78fdc935ab46d8954a447d140b68688e366b0a3dc7a6bcae65b2b9e46711446c9572e3f0fa2f671e3851006aa58507f17e566d1cd2325324ec3c232da14a8721
+DIST unison-2.40.16-manual.html 267159 SHA256 ffe6c85057ae8f8dcd76a02e2dfd1b37aa4681bc968f3be8945503547f038398
+DIST unison-2.40.16-manual.pdf 507350 SHA256 e49dcb0715152299fce11539c2d532bd4da9a4bb8af98670f8c61b6a13e241fe
+DIST unison-2.40.16.tar.gz 2712897 SHA256 7307824ec50507cc796608ae1da1bfa01216f0e7140e1a7344b325c7354b59b0
+DIST unison-2.40.61-manual.html 267159 SHA256 b88c6c3a24c359e306e702672cc8da904e72c367861ef2a3dc3df07566948223
+DIST unison-2.40.61-manual.pdf 507350 SHA256 75ff6909abcf6f9ea0a981a8e3827218491fcdfb03c088c8dd1e43fcc9c687ef
+DIST unison-2.40.61.tar.gz 2702722 SHA256 e6114bf6a99d8bbe151250b7e28a74aa546d213f4f7f7914ca086a48b375277b
+EBUILD unison-2.40.102.ebuild 2385 SHA256 411fa90643481b5f09f5b43310e6c57066561e0d11ad44bd0bea0eb2f5a22b04 SHA512 54f5bb93e65e7e561353dea6ce703d418f29aeb60775176da8e10c475210b405bf4ed4b7f3720459e6b68467cb1b1a3ac48112e685b0f22358c762e1389a3fca WHIRLPOOL 62595d64435517718be956af5f7efae3e47e1e69593a559c1de240e9250abc0527a991a3eb3fc11e112521d9fddcf5e3564b8a734a2d1f447e8eaa5977a962b9
+EBUILD unison-2.40.16.ebuild 2505 SHA256 0021cdb06755170a751195a17ccff1170efb7e55a66ca49eef767cf02565616d SHA512 cd212d842da8b6c7c9417ad6df731d2ce63c5e6cc75378e953207c14bed7cc6c96518f272b320382fcf442cc896ae149f4873b2747dc60dc611fcf99be4578d3 WHIRLPOOL fc09144a835f668e5d5cc69d1b98e681c9aa5487d1ffc00cf20cf12ea7b87b0ae28beabf28fef550f639b7e170ea2c2d71743f94e8f0a86f9dc9e4b44c17eae4
+EBUILD unison-2.40.61.ebuild 2385 SHA256 411fa90643481b5f09f5b43310e6c57066561e0d11ad44bd0bea0eb2f5a22b04 SHA512 54f5bb93e65e7e561353dea6ce703d418f29aeb60775176da8e10c475210b405bf4ed4b7f3720459e6b68467cb1b1a3ac48112e685b0f22358c762e1389a3fca WHIRLPOOL 62595d64435517718be956af5f7efae3e47e1e69593a559c1de240e9250abc0527a991a3eb3fc11e112521d9fddcf5e3564b8a734a2d1f447e8eaa5977a962b9
diff --git a/net-misc/unison/unison-2.40.102.ebuild b/net-misc/unison/unison-2.40.102.ebuild
new file mode 100644
index 0000000..e2fc16d
--- /dev/null
+++ b/net-misc/unison/unison-2.40.102.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.40.65.ebuild,v 1.1 2012/06/06 16:36:31 heroxbd 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 ~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_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."
+}
diff --git a/net-misc/unison/unison-2.40.61.ebuild b/net-misc/unison/unison-2.40.61.ebuild
index 6173ddb..e2fc16d 100644
--- a/net-misc/unison/unison-2.40.61.ebuild
+++ b/net-misc/unison/unison-2.40.61.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/unison/unison-2.40.65.ebuild,v 1.1 2012/06/06 16:36:31 heroxbd Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="~amd64 ~ppc ~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?]
@@ -30,12 +30,6 @@ SRC_URI="http://www.cis.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.t
 	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.40.61-makefile.patch"
-	#epatch "${FILESDIR}/${PN}-2.27.57-as-needed.patch"
-	#epatch "${FILESDIR}/${PN}-mymap.patch"
-}
-
 src_compile() {
 	local myconf