net-misc/unison: version bumps, remove outdated changelogs.

  Deal with issues of ocaml-4.03.

Bug: 592020 594088 594104 594108 594110

Package-Manager: portage-2.3.0

4 files changed, 256 insertions, 0 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 93252ded4013..ddc8ce73ba6b 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -7,9 +7,18 @@ DIST unison-2.32.52.tar.gz 697866 SHA256 1542e5d4ad03e928260e061a8ff9d5e0bca3282
 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 2717566 SHA256 4a63395e45bf6b93d5fee5cacbf686c3d9fe43dd7e6fc75ec6fe1a85cf1285ef SHA512 813b5fcad43a3472d0eac38977a6268463db71f133b5f9b08c4357774f8f46ae234f9ffc42dfa3fe960588c61607a5f7dd37ab6553045668fcf53dce59aeec22 WHIRLPOOL e5e81539c9ddb4da5817740d95607ffde0b6543dbed13ca476300138056d7c486e1b8a1493b3f28b0b42b0d932fcc68ca8e65a48a6525d009a033ba8e5f6111c
+DIST unison-2.40.128-manual.html 267099 SHA256 8cd3901dffab27203fab1702a7eb25555539f1b566ebe08036aef695f39e8593 SHA512 037959c50c61cfda45963765901e34ec96a76bcbaa5d77c614c481e2d97ec94b1aa235b8316b69ac181ce251cf8f14ce0ff517e252a669c09502cc84cf313a0c WHIRLPOOL e245bd7575b25ca1e2a9ad52166dd585c688e0e671bbcd969a62c55335ea93526ea64c8508ec416cb2661f5fa7f0a22bbd7cbfd52482487f404bc3dcd636940e
+DIST unison-2.40.128-manual.pdf 496593 SHA256 346f8d027adfafc9b042c8d4a144b6f0619cce43fa551dc3d4318a15464cd86a SHA512 eda0c31a1836a64e2069eb8ec30c98f52ac51b818693b79b86adb484dd91aba96c88579b4cb3c15ae16a1e669ed3dd83bc25e7cea28f80debabd83d2d553d353 WHIRLPOOL d509d3c87eb6667a646e2a49e72c5335050067063da78b1f89dd99e8cfd49bf68ba3ab9688fbe22ade60e00084f83733efc8583b0fc4c20cb58b9e92496021b6
+DIST unison-2.40.128.tar.gz 2717593 SHA256 5a1ea828786b9602f2a42c2167c9e7643aba2c1e20066be7ce46de4779a5ca54 SHA512 f33450445e2a83c5b62696b8b0aaa7d9fcbdd02cccda8e4bce4a9efe1e2b4a32d38c49a4716315e7b4bec6e21e4eb8efac529a31f45062765a6e53e02c600d11 WHIRLPOOL 0990ed4ac5bd85341a6bd52ae9150624515b08c30862076c554e6429ada82bc1d468fd993a219e3655cbc8c1185b2737ebb7a2b3954bde6693ae380acf27e486
+DIST unison-2.45.28-manual.html 272770 SHA256 2fb3181008923683ca05fb8d4ceedffe41d4334fc39ab3df627f5b2f027bd553 SHA512 aaed892f5108eefd57f172c72198ccb1b6e83456d75779238bfca0ee39d14dc0f60fc884d807c954bbfa2263f0b9ece9dd1f7f142832ea90778df7efe636be10 WHIRLPOOL abee2b0901c1c6f045bb3829d4e694db733856f4882b6c1b72ab6b66f2c86a0f21140191becb53ac8148e4a725c44edfccd85c06dfa2bee1e2fadff54f091715
+DIST unison-2.45.28-manual.pdf 507997 SHA256 27abb31912527f65dc6d57d348dbe787df3ead1532d0242f17da6d29776289d2 SHA512 94c40ab1b4d9b48ca12e67d0e43aa169ace81143becd186a8f851bfd5762b553ce178e1a604f28b6e7d926af901ee100ab019f3b14c03e59778a08a56e8ffa02 WHIRLPOOL 68f789c2fb2be7caa24401fe3f21afdeef4d9faf89db7e92c95e35dc46a90ae7449644572e56d4f61ecaf74fdf24c71e44d175157a24a491518480b418ba79c3
+DIST unison-2.45.28.tar.gz 2701909 SHA256 00ebb62767b1a438ecef2b16f999109ad4d2dbc0595d837b148461e8ca9774ee SHA512 4adfdf28c1bc7baaf9f6e23c13bb39966f1288a603352c4064da985638abbebd5d3092726bcc8991e3eb027202654c10baeb57241530e68398076e8e5d912b8a WHIRLPOOL cff8e25d2dc8e27d8330d6b0fc00521d05f6d302f0c26f6e80fbae6dbf4b686478772c6bd7fb975c87ff8a726e5ab780cd3b8ae8ef496f2d5710f1023ab3b5bf
 DIST unison-2.45.4-manual.html 270543 SHA256 472598d57ef74972a6488f412ba29200f66c809c165b224aef0458708d00a93b SHA512 4faa79620bdf78fd84635f9595ec1048f3a5782e6284d26f26dcaea9193e9199d4be7d4f800900ce01890333af250857763678d271d623346650676ddc5eda3c WHIRLPOOL 271142522f732bae204989ac4022b36cfdf3b4e688d4cf0ee2f271fb09b8a31af952f5d94b8f3d6c7a38859fb5fcc690fa280fa1db87d377e5ab66803609f59b
 DIST unison-2.45.4-manual.pdf 513121 SHA256 f6488eae9fd1e5be405054d96df3aacd5b51c7ce64f615cfed7a43b516f0e839 SHA512 ce27591d77bbc09d41d02af15ae1618226fcb86833969cd3d199798252565f0b507bdb0d7ac3d0201c36a9a9138c89b3b0d2e3a08f28bd1d9cd1692c0d7dea18 WHIRLPOOL 49bd398fa04b9972044f9a6a164216d6032f785da2caedfc3c971f6a5f5d2f4a7d953841092ebe19ddc949a0f6a8082a7d43c8e1eea145a2fccbd943c2baf01f
 DIST unison-2.45.4.tar.gz 2716641 SHA256 f60a3327137129381b2028be43f84d79709ca5794d6394a6ca67a0f5f4d481c1 SHA512 f9ff18b6f2bd46fbb416a90b71e75c641e4c42bdd97f3f4bb13f47e3b629fa5f640ac9a2fca36322838c8ab790770ccaf47526260bdd655e65b1344b6eee02ef WHIRLPOOL a09d54da541866499b59675a2fd3ab998206c140b25df21e25dbb57788b75db11c3313eca613926d2c12b571422e1ef41ace691ee97322b750b8c65c026003b8
 DIST unison-2.48.3-manual.html 278156 SHA256 500d8f83770fc3b07cf443dfb1579281d4379002d51523aa73451e03f6cdbe1a SHA512 50924c624abd86f231ad8cbcfd4e383322a55733108685255df21df6da26d9ad1ac7d4f7d7dcd82faf4696f3f0136c0ff3c8cf5ffda4042f63451f2b7c8e9502 WHIRLPOOL 9a48a23049cd8753ebfd71e2f396107039b1fdc76877a8dc4f229ef8dda6a9481b80156e66c27015c96e7a752dedb2ca7781f42c01a8839ec0361f150910dfcd
 DIST unison-2.48.3-manual.pdf 516703 SHA256 cba2946656e04b856d98184b539e382ed85d987d24458a39e156946125f7b578 SHA512 3a16d6e0df6370784f960d37749f56a223c5eaab24ded299f6a61058f7692139239d0d64436d93268b4cbd8031de6139e187aca0beb54345a615e71253bce977 WHIRLPOOL fd57fec2e5a2605bca216bc4ae441ecd122faa26cd5abdfb39ea19ca4f44961691d266e86b702536dd7326b4072718d9c67739d7a264f9b4127330a41aff6823
 DIST unison-2.48.3.tar.gz 1172646 SHA256 f40d3cfbe82078d79328b51acab3e5179f844135260c2f4710525b9b45b15483 SHA512 169b272119b33146e4f770d1fc9a45d8278502a85a4ae02fd5cb94bade667bdd0ee31bef9acf6cf5170368ecfff948ee668ee195ff7e956c4eeaeed6f83d8d0d WHIRLPOOL a903f1f5e996655e3e001f33b959d839d2540d0a5c0584fded7aa483a774d8b07b3e7997357f03426f41ef6505cf3d40dec18616252c02add4a417dfef4c8df4
+DIST unison-2.48.4-manual.html 278110 SHA256 2b5674e2fd7751148784a716ce5a03f8cd0a321c8a3bd4343832ed9b83d2d404 SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68 WHIRLPOOL c843519b90faf440e1ef6c2a5cd2e4a64fe7044e76f55be26ca61ff54d8ca0ee5f4c2e9e827df27a2af03351d1532ccb22a36010f0420cd7ee476dc451650e6f
+DIST unison-2.48.4-manual.pdf 516093 SHA256 eaf9bf89967eb17c59b98f0a7ba6b6ff260b6c6de73277a633d954ceb42f5f93 SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9 WHIRLPOOL a2fd465e13c7d5832684e2ddf194c24d5e4e278ed5c8b53f2e7acac8f4ae2810bf74a3db0674ef73e2a686cf3a66db5b28dbf1320f78b8dc7568ee3cec4cd152
+DIST unison-2.48.4.tar.gz 1200861 SHA256 30aa53cd671d673580104f04be3cf81ac1e20a2e8baaf7274498739d59e99de8 SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024 WHIRLPOOL 73d8637106cf43ab945a026310276f3636867f609e7d4491a80ff4b7dc98d5d737ee56d00987253e98200e13d971d09e41164b40283530df19f681000bf4733e
diff --git a/net-misc/unison/unison-2.40.128.ebuild b/net-misc/unison/unison-2.40.128.ebuild
new file mode 100644
index 000000000000..55f9393b99bf
--- /dev/null
+++ b/net-misc/unison/unison-2.40.128.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~arm ~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-4.03[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-eselect/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.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
+}
+
+src_test() {
+	emake selftest
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT}
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html"
+		dodoc "${DISTDIR}/${P}-manual.pdf"
+	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.45.28.ebuild b/net-misc/unison/unison-2.45.28.ebuild
new file mode 100644
index 000000000000..55f9393b99bf
--- /dev/null
+++ b/net-misc/unison/unison-2.45.28.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~arm ~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-4.03[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-eselect/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.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
+}
+
+src_test() {
+	emake selftest
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT}
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html"
+		dodoc "${DISTDIR}/${P}-manual.pdf"
+	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.48.4.ebuild b/net-misc/unison/unison-2.48.4.ebuild
new file mode 100644
index 000000000000..7d93a418f105
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils versionator
+
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+LICENSE="GPL-2"
+SLOT="$(get_version_component_range 1-2 ${PV})"
+KEYWORDS="~amd64 ~arm ~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[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )
+	test? ( || ( dev-util/ctags virtual/emacs ) )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	!net-misc/unison:0
+	app-eselect/eselect-unison"
+
+#PDEPEND="gtk? ( media-fonts/font-schumacher-misc )"
+
+SRC_URI="https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}.tar.gz
+	doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.pdf
+		https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${P}/${P}-manual.html )"
+S="${WORKDIR}"/src
+
+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
+}
+
+src_test() {
+	emake selftest
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	newbin unison unison-${SLOT}
+	dodoc BUGS.txt CONTRIB INSTALL NEWS \
+		  README ROADMAP.txt TODO.txt
+
+	if use doc; then
+		dohtml "${DISTDIR}/${P}-manual.html"
+		dodoc "${DISTDIR}/${P}-manual.pdf"
+	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."
+}