gentoo resync : 20.03.2022

3 files changed, 114 insertions, 3 deletions

diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 141f63dbc822..64dfb8209ebd 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,7 @@
 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a
 DIST unison-2.51.4_rc2.tar.gz 1377263 BLAKE2B d403e019f0757f66be5157cff97596c9dae1306a5ba33af27fe55a69fb1ae50d6ef6db54403d14a0afb27cb7a0ebe198021d6cdf58430c530575fc934c837703 SHA512 c61f827490036fbe3074ce5d970e6b4e981a4fde848c307c817f51d73f450d4b5d437503f5392bd2b654121547919b9724112383f71736a9e0e7b308bc3e99b6
-EBUILD unison-2.51.3_p20201127.ebuild 2775 BLAKE2B 5171b9656a9d6d7b624875d172f6bc19204973e62ecb9dd1b3c5a1a30f16d42a16ac4a0bab9dcfee89b30e96ea46d2a0d04ddf7d49c79e9b610d2f0232432dfa SHA512 bbdefdaf03776ba61885984dcbeedbf5e01577787228e5ace678405c038f61813c91dd3cdddae420ecf2cdd2d1ee5f94b18f2e90d5cd7541b38c1eadf725a7d4
+DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440
+EBUILD unison-2.51.3_p20201127.ebuild 2776 BLAKE2B 5240c18e68dd1b70de7f1665bf26a0b33b4e37386d74f19fe4d7f27599b313257296bdbf111de7052905fab1df82027794f1759cfb177d0da2dd7a439747d3ba SHA512 a7b0ae58acb90554ce29105e998bf2f87acd3581f0b5868cb480da48565aa0458cab7cba08e256d3e0b9471d86ed3b8b918d4501c818f2b556e271d3320b8599
 EBUILD unison-2.51.4_rc2.ebuild 2673 BLAKE2B ea6dc6f918957077501fffb8e1a51d57e4315af86765a7a3236c44911e91836f1afe9dcbf7db3d6711e93bee0098f827afe9a0965e31db6441dbe0ed47f7db19 SHA512 fa6ef5f4d5b8009031d8a4608d837827121d149bc76e149f55c13087d4238013955ce20fc28cbe3e7b030281e77d2b1fc25977bc39de3c15a66d92eff30480aa
+EBUILD unison-2.51.5.ebuild 2598 BLAKE2B 13b60b077b0e6fd6c8cf04075e679168af54b72c77bbb94a5a79438177bd2b65357a3acea35a6c835c29bbf44fdc80b55212c26211641ea06339960ca8b7d90a SHA512 78fad0d9b8db05b058620c33369fb26a274ff7fa969f43545ae547c0b50db895a3a488462b4a1b32bd61666cf576393341bea1c005cac6ecaa30bd04e955d3da
 MISC metadata.xml 451 BLAKE2B e84c101fb93728a569747cfd4ba69e4e746bde0ec1154aa940dfb963fe4313f6e37a2725df55d7921139b52ea021d1196592d8323617f084f50c18e4cff7cc32 SHA512 708a52b7f47377099de539ee768951d67e98a8173c6b168547135cfa80fda37c8c26cf9dfee038c76bc5bdabc966652e686f818af35905e58bd17396181c02ea
diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild
index 484fcb308f39..4c244d239442 100644
--- a/net-misc/unison/unison-2.51.3_p20201127.ebuild
+++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="debug doc gtk +ocamlopt threads"
 RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0
 
diff --git a/net-misc/unison/unison-2.51.5.ebuild b/net-misc/unison/unison-2.51.5.ebuild
new file mode 100644
index 000000000000..b378e9c13a3c
--- /dev/null
+++ b/net-misc/unison/unison-2.51.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Two-way cross-platform file synchronizer"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/ https://github.com/bcpierce00/unison"
+SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="debug doc gtk +ocamlopt threads"
+
+BDEPEND="dev-lang/ocaml:=[ocamlopt?]
+	doc? ( app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex
+		dev-tex/hevea
+		www-client/lynx
+		)"
+DEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?] )"
+RDEPEND="gtk? ( dev-ml/lablgtk:2=[ocamlopt?]
+	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
+	>=app-eselect/eselect-unison-0.4"
+
+DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
+
+src_prepare() {
+	default
+	# https://github.com/bcpierce00/unison/issues/416
+	sed -e "/ifdef\ HEVEA/,/endif/d" -i doc/Makefile || die
+	# https://github.com/bcpierce00/unison/pull/415
+	sed -e "/myName/d" -i doc/docs.ml || die
+}
+
+src_compile() {
+	local myconf
+
+	if use threads; then
+		myconf+=( THREADS=true )
+	fi
+
+	if use debug; then
+		myconf+=( DEBUGGING=true )
+	fi
+
+	if use gtk; then
+		myconf+=( UISTYLE=gtk2 )
+	else
+		myconf+=( UISTYLE=text )
+	fi
+
+	use ocamlopt || myconf+=( NATIVE=false )
+
+	if use doc; then
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs
+	fi
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake "${myconf[@]}" CFLAGS="" src
+}
+
+src_test() {
+	emake test CFLAGS=""
+}
+
+src_install() {
+	# install manually, since it's just too much
+	# work to force the Makefile to do the right thing.
+	local binname
+	cd src || die
+	for binname in unison unison-fsmonitor; do
+		newbin ${binname} ${binname}-${SLOT}
+	done
+
+	if use gtk; then
+		newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg
+		make_desktop_entry ${PN}-${SLOT} "${PN} (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	if use doc; then
+		DOCS+=( ../doc/unison-manual.pdf )
+		HTML_DOCS=( "../doc/unison-manual.html" )
+	fi
+
+	einstalldocs
+}
+
+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 || die
+
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use gtk; then
+		xdg_icon_cache_update
+	fi
+}