[gentoo-commits] repo/gentoo:master commit in: net-misc/unison/

["Virgil Dupras" <vdupras@gentoo.org>]

commit:     27dfa0e4f1a7848454d19177bde693415a6d45e1
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 27 18:44:31 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Aug 27 18:45:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27dfa0e4

net-misc/unison: bump to 2.51.2

Closes: https://bugs.gentoo.org/651972
Package-Manager: Portage-2.3.48, Repoman-2.3.10

 net-misc/unison/Manifest                |  3 ++
 net-misc/unison/unison-2.48.4-r1.ebuild | 87 +++++++++++++++++++++++++++++++++
 net-misc/unison/unison-2.51.2.ebuild    | 82 +++++++++++++++++++++++++++++++
 3 files changed, 172 insertions(+)

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index f1479c9334e..9ceab2eb127 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,3 +1,6 @@
 DIST unison-2.48.4-manual.html 278110 BLAKE2B 8a85662399aff31a016964783b32c195cb32f5e6bab44c2f0f08740ab88393f4c73b98ecf58d6930bf103c1bec45720306343fa9fe39d3cdd73ffbbac2b9093c SHA512 b995712cda51d612bd81c89589d872099b3b9c90f7413268b24ab399a1eff7690200980514a834ee3d12bd3c89ef61bb8a29b3970c01433e0c4671d363a96b68
 DIST unison-2.48.4-manual.pdf 516093 BLAKE2B 8e752a01b8c4335d6687b1f4f20ee09fda90b7521b7ed87af43273416fb3119682078d969772e8c3f7395ef499257dafd67c455a4646868008090ea15063869e SHA512 514da1eda0405416e53b1c8e027d39a803f9030824deccfaf5630aec21c52c6c9ea0d1006461faa8fb26738f4a33eecfe1ae24126fdb7a53ada6b90db270e6c9
 DIST unison-2.48.4.tar.gz 1200861 BLAKE2B 8e262e3e28b9f4cbe3925340aa3b08e99f1c30e8d3253cf2c82647e30708d30eb20c544184d54d1683ff9b01ac6913af0df924f0b16431ea2ac79bc95ec4a71f SHA512 c8e7bd2b14edae31e7d08154cdc2dce8173546b6163b9e5f4f2b1c8255792a7645d8449da88d7acfcbf498746481d24d0a3936978969920530a15a16bcbc6024
+DIST unison-2.51.2-manual.html 311981 BLAKE2B 1e1bc18d5bca5d50976b28c4e59cc27fcc1ef4415514c6a8db4be02659c168949738cf2941f88cb949097c16e455bd3fb50aee0fdc6023d3d36d6821f74acd05 SHA512 2fc47e51ffde2e9176ca85d4d29fe0d254b539112d867782e9bb0f71ea74ad02892a88b6bfe59756268875f0d62abfb125406e4939671a0eb8a64696ba01b997
+DIST unison-2.51.2-manual.pdf 518963 BLAKE2B 30d0010e7a11b10bb9fba3f5836e084452429f09a94cfcc639305d17ea69499eeeac1026a0bd35c785b08456d79b1b4c68c348c10237509c8cf4e45720d037e0 SHA512 170b280e5a9ad0fc4ed848aaa1c4a6a8977edfdcc133bf3288c03e1d4d6d20383cfa06593b9d149e746795945f6afb8d807cfa16f5cf8ab47795e3074776518d
+DIST unison-2.51.2.tar.gz 691251 BLAKE2B 39f72e7229826ec1a2151b7d7af416d85ffe2f9e6f1277be77d2202088d41fa3aca45413b931e661d72b787710f7d3429352542554990bb638589d52f77fe43f SHA512 9ba24f8d46f3f8bf3c26ea1beb396e276a82a742d9e8479cb421ff9f97fa2051fc8fb809b5f47ebc88dcb6a04878e1bdeae8081540e35af710ccbdaead84c115

diff --git a/net-misc/unison/unison-2.48.4-r1.ebuild b/net-misc/unison/unison-2.48.4-r1.ebuild
new file mode 100644
index 00000000000..55e5485844d
--- /dev/null
+++ b/net-misc/unison/unison-2.48.4-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+
+# Upstream, for this version, has explicitly disabled test with marker
+# "Skipping some tests -- remove me!". Given the potentially destructive nature
+# of those tests, let's not try to run them (they're re-enabled in subsequent
+# releases).
+RESTRICT="test"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+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
+PATCHES=( "${FILESDIR}"/${PN}-2.48.4-Makefile-dep.patch )
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+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 CFLAGS=""
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+	if use doc; then
+		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+	einstalldocs
+	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."
+	eselect unison update
+}

diff --git a/net-misc/unison/unison-2.51.2.ebuild b/net-misc/unison/unison-2.51.2.ebuild
new file mode 100644
index 00000000000..25776c6fb51
--- /dev/null
+++ b/net-misc/unison/unison-2.51.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/"
+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
+	)"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="gtk doc static debug threads +ocamlopt test"
+
+# ocaml version so we are sure it has ocamlopt use flag
+DEPEND="dev-lang/ocaml[ocamlopt?]
+	gtk? ( dev-ml/lablgtk )"
+
+RDEPEND="gtk? ( dev-ml/lablgtk
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+S="${WORKDIR}"/src
+
+DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+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 CFLAGS=""
+}
+
+src_install () {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+	if use doc; then
+		DOCS+=( "${DISTDIR}/${P}-manual.pdf" )
+		HTML_DOCS=( "${DISTDIR}/${P}-manual.html" )
+	fi
+	einstalldocs
+	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."
+	eselect unison update
+}