gentoo auto-resync : 21:06:2024 - 00:11:18

9 files changed, 597 insertions, 145 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 55e39dc20e61..a9a4529b8aab 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 968b91725477..c4fac7d8c9ef 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -4,7 +4,10 @@ AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a1
 AUX tigervnc-1.13.1.confd 518 BLAKE2B ee5e354a36638850595cda0c4d083c6837609201cca520175f78b03aa8cce18c6b89f534cdaf6c409ecd5aacf0c0115a52ebd458cc4aaa4aa0ba19942e2352cf SHA512 57db5b7ba590a48fc7e91da13cbe2ff0bf6e96088d522d214f6dc5266ea9dc214c561c9705380477f25d65eede870ef3b054fa77fabac78cd5ac449204e07b59
 AUX tigervnc-1.13.1.initd 2635 BLAKE2B 4600e73a22cb774030bcb0f750a50b134f06183a30008781e78c5e64034ab4ae8e5598e8e65f01c2bee96276ded4ec583df73f5eee0bc1ff1e8c2524af9ea6fd SHA512 acdbd97e3f559474c0c5b9211a8a3885f70d7d59a89c236d01b50490c6c2a70c4b7f9c2346f161640b09123cadb8803f0cbe9ddaa0efd046bcdd00033f133673
 DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
+DIST tigervnc-1.13.90.tar.gz 2082778 BLAKE2B 204f2bdc503f4f13ead2cb641c78390763ebc590822d5759fdb3f1c1e052c761ffa443bdbb8f380d5b6b9f45215506bbd1c20d4bae336ee14d9e3621161a182a SHA512 8787d8b18e491df841947b42492e6ac09ed57c72a2b3a1aa901676b7b73bd8dfab5ce45177333913cf66d604804c55357d15eefe5747c31e97b91ce2b9f44093
+DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
 DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
 EBUILD tigervnc-1.13.1-r3.ebuild 5432 BLAKE2B e9104059ab3ca717699f38329a8c428f24f7ff9d42ebd27181f30f0dd4bad7ba7af86f7e1a75406a0f08a6570cf1bed9ee4d03c50f266d6bf9c681d1b7bd2c86 SHA512 b921c52372954381ae535c6c7e9fa518c31f33a62e13a63ae9cca0f0fd210f4efa40d769966d86a4c3d4ad71d6b2d0caa30de6fd4d4b1de61f41faedb87e803a
+EBUILD tigervnc-1.13.90.ebuild 5359 BLAKE2B b10621b987dfb8d37882e4d3e6ac6fbb7231acd895851f6f5461c6b94d578d4fcca8114f6b7835c13b7ddb0f1b3df6acf2803e8a8b6f3363a9bb6ae241993904 SHA512 9b0f5ef0e54e371ad80583503dd2ffe121999722835bd32a39b20969117b939677e41e97e467f0f188cb0b5d9a7661ec0e5ee65c9818dbce2daf5bcad4be5ea6
 EBUILD tigervnc-9999.ebuild 5364 BLAKE2B f2bc3c8b4a83d01989fc5d353a2afb78f7e04413c5fab6bfdcf927a9b992dfa5426e25db8ec541aaaa3b0cc3160323cfc340d5a034ee51c47b1a27076dc2d7c6 SHA512 060c2b282be98fa105fc862beafd60632e9b5967dc6f57b1149ab0be7b33b899875a2af32abfd88fff16d82d2f0a57361373d28726e225c2fd7be5ddc7150fd1
 MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/tigervnc-1.13.90.ebuild b/net-misc/tigervnc/tigervnc-1.13.90.ebuild
new file mode 100644
index 000000000000..5115c063e325
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.13.90.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.13"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+	server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.8:* )
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-libs/xtrans
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+		eautoreconf
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os present hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-1.13.1.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.13.1.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	use server && {
+		elog 'OpenRC users: please migrate to one service per display as documented here:'
+		elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+	}
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest
index 476415a8d264..af7844ce32f7 100644
--- a/net-misc/unison/Manifest
+++ b/net-misc/unison/Manifest
@@ -1,5 +1,7 @@
 DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440
 DIST unison-2.53.3.tar.gz 1415490 BLAKE2B 1142419781f5084da7ae8d043897f2f80aa4c3770a1c5cb44f8d7f669f718c41dd7fa6d13069cd95c71842233309eb886f63ab525e5e446ff761ea970de0e794 SHA512 f3fafd5e1a2950a00ed8bcc682036180ea40eff1ccfa1fc671cca49954890a535ee48faf1e8e62002563143e5479b9df1eca1db1caf03dffc50449fb467b8e2b
-EBUILD unison-2.51.5.ebuild 2581 BLAKE2B 390079d02bc2ab9a312f03309ce0c051f6bd6e470f01ccb8462abc47c20e613b5946063d9c884ea198a140ba8ac3fc30beaa450fcec97f127097c22535919820 SHA512 551e0153b1e156557ff22b8f6807b51cccf163210a8454cceafc0746966252c72e8e50627d65d1f6dd8170dfe64559d7dd6225f25242a1be721c2624ec5abf61
-EBUILD unison-2.53.3.ebuild 2229 BLAKE2B 2490f9a9c31179c9c5bd00a657cecb767ccf2039c9eef6ef586740891fc4128948beb7b6be621acddcab8b67b25b3a1e8d2061b4ce72d41c603bdd2aafa67188 SHA512 8f673f62833f15a79af93c438e10d9129694c668e80160e0799c48d86eea940bef4b3ea7af1da28604d88ca3d0e28817c3c0d24404b8196642f71dcb89f95c21
-MISC metadata.xml 451 BLAKE2B e84c101fb93728a569747cfd4ba69e4e746bde0ec1154aa940dfb963fe4313f6e37a2725df55d7921139b52ea021d1196592d8323617f084f50c18e4cff7cc32 SHA512 708a52b7f47377099de539ee768951d67e98a8173c6b168547135cfa80fda37c8c26cf9dfee038c76bc5bdabc966652e686f818af35905e58bd17396181c02ea
+DIST unison-2.53.5.tar.gz 1408926 BLAKE2B e7e3db458a485fca8820508a964df5877aed0a2d6a3ea8305298d0c6516591323f3cacdd86c4e057585c0f3b2da8a03a5a3653f543d6f1acb20701f23a81f470 SHA512 eabeed7b428f1985610b47ce8bc7faac515fd24937727612aa45435da3e38d40b6cd6d227eb3b65dc370d46458cecfca9d0e9e1712b2b7fa41b76675f8115c4c
+EBUILD unison-2.51.5-r1.ebuild 2893 BLAKE2B 761794ffe658525bacdc8e749d46793c07a08321f1ef5d551d31f12f414b0deee3276c27ba3667ae896fb279b347df65fa19305714d54cee3229a8ab96db1b84 SHA512 66a5f028bb2fd1d211e5b1e98f9816def4feaf11a2cc1849717931f6e2b90f5d70f805b314cbf76c4b246f0fae5747585ea9d28754223e957762bf4931365986
+EBUILD unison-2.53.3-r1.ebuild 2642 BLAKE2B 64d338b29e990e18240ee0250485806413b54f25140823c79dd79de5749437d0b6e36505c6a7c501da55043b62cf9b71d926adb7eac00786996e67c611dea17e SHA512 489c261ef5d9ae1f11eb39ebdf4e4d565d96148a482eae978c5fc8dcbfaeb934ae154c1b291d87450d484f39df8295ae977e830ecd1e980308eaad1707731d49
+EBUILD unison-2.53.5.ebuild 2617 BLAKE2B 65a9fc7f413884058caae84a80daa74b70d27e97f337a849f6dcee46c3632d56f021e6d31633cfbb1c084bf83cd6b88931850a0c7139c772a4786602ac02c878 SHA512 578f80ecdbf73353f6af0ff66391781bba4afd518f44d3cdeb32b852658ad91dbfdc64b5a30cdc2b2bb71ccebf61c657f5a00ae74c761585111f8448ef54a067
+MISC metadata.xml 533 BLAKE2B b8ab17513b1bfdb3467fd5f728caa0e782c8092737577c7ba9fd38c064842cc06136a1e84fc76d90c9c52785d54cce6916f4930c4e582a0138ecc8bbf623bd70 SHA512 6fb4be0ee5c3750f73c080aef8724535a470607966c3b8086ae95e7e962666dabbffb2536f6859e4cfe4018c985903a78b759d3cde498b0f97ad060af3b6eead
diff --git a/net-misc/unison/metadata.xml b/net-misc/unison/metadata.xml
index ddea0b516f37..bb6a9ec8d72c 100644
--- a/net-misc/unison/metadata.xml
+++ b/net-misc/unison/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">bcpierce00/unison</remote-id>
-		<bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to>
-		<doc>https://github.com/bcpierce00/unison/wiki</doc>
-		<changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog>
-	</upstream>
+  <maintainer type="project">
+    <email>ml@gentoo.org</email>
+    <name>ML</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">bcpierce00/unison</remote-id>
+    <bugs-to>https://github.com/bcpierce00/unison/issues</bugs-to>
+    <changelog>https://www.cis.upenn.edu/~bcpierce/unison/changes.html</changelog>
+    <doc>https://github.com/bcpierce00/unison/wiki</doc>
+  </upstream>
 </pkgmetadata>
diff --git a/net-misc/unison/unison-2.51.5.ebuild b/net-misc/unison/unison-2.51.5-r1.ebuild
index 914cd4876cd3..6c916a9fa788 100644
--- a/net-misc/unison/unison-2.51.5.ebuild
+++ b/net-misc/unison/unison-2.51.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,32 +6,67 @@ 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"
+HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/
+	https://github.com/bcpierce00/unison/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git"
+else
+	SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
 
 LICENSE="GPL-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug doc gtk +ocamlopt threads"
+IUSE="debug doc gui +ocamlopt +threads"
+RESTRICT="!ocamlopt? ( strip )"
 
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-	doc? ( app-text/dvipsk
+BDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	doc? (
+		app-text/dvipsk
 		app-text/ghostscript-gpl
-		dev-texlive/texlive-latex
 		dev-tex/hevea
+		dev-texlive/texlive-latex
 		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"
+	)
+"
+DEPEND="
+	gui? (
+		dev-ml/lablgtk:2=[ocamlopt?]
+	)
+"
+RDEPEND="
+	gui? (
+		dev-ml/lablgtk:2=[ocamlopt?]
+		|| (
+			net-misc/ssh-askpass-fullscreen
+			net-misc/x11-ssh-askpass
+		)
+	)
+"
+IDEPEND="
+	>=app-eselect/eselect-unison-0.4
+"
 
 DOCS=( CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt )
 
 QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
 
+gui_cache_update() {
+	if use gui ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
 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
@@ -39,26 +74,28 @@ src_prepare() {
 }
 
 src_compile() {
-	local myconf
+	local -a myconf=()
 
-	if use threads; then
-		myconf+=( THREADS=true )
+	if use debug ; then
+		myconf+=( DEBUGGING=true )
 	fi
 
-	if use debug; then
-		myconf+=( DEBUGGING=true )
+	if use doc; then
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs
 	fi
 
-	if use gtk; then
+	if use gui ; then
 		myconf+=( UISTYLE=gtk2 )
 	else
 		myconf+=( UISTYLE=text )
 	fi
 
-	use ocamlopt || myconf+=( NATIVE=false )
+	if ! use ocamlopt ; then
+		myconf+=( NATIVE=false )
+	fi
 
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=true docs
+	if use threads ; then
+		myconf+=( THREADS=true )
 	fi
 
 	# Discard cflags as it will try to pass them to ocamlc...
@@ -72,18 +109,19 @@ src_test() {
 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}
+	local binname
+	for binname in unison unison-fsmonitor ; do
+		exeinto /usr/bin
+		newexe "${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}"
+	if use gui ; then
+		newicon -s scalable ../icons/U.svg "${PN}-${SLOT}.svg"
+		make_desktop_entry "${PN}-${SLOT}" "${PN} (${SLOT})" "${PN}-${SLOT}"
 	fi
 
-	if use doc; then
+	if use doc ; then
 		DOCS+=( ../doc/unison-manual.pdf )
 		HTML_DOCS=( "../doc/unison-manual.html" )
 	fi
@@ -95,15 +133,14 @@ 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
+	eselect unison update
+
+	gui_cache_update
 }
 
 pkg_postrm() {
-	if use gtk; then
-		xdg_icon_cache_update
-	fi
+	eselect unison update
+
+	gui_cache_update
 }
diff --git a/net-misc/unison/unison-2.53.3-r1.ebuild b/net-misc/unison/unison-2.53.3-r1.ebuild
new file mode 100644
index 000000000000..1b149dccc0c0
--- /dev/null
+++ b/net-misc/unison/unison-2.53.3-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2024 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/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git"
+else
+	SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="debug doc gui +ocamlopt +threads"
+
+BDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	doc? (
+		app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex
+	)
+"
+DEPEND="
+	gui? (
+		dev-ml/lablgtk:3=[ocamlopt?]
+	)
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	gui? (
+		dev-ml/lablgtk:3=[ocamlopt?]
+		|| (
+			net-misc/ssh-askpass-fullscreen
+			net-misc/x11-ssh-askpass
+		)
+	)
+"
+IDEPEND="
+	>=app-eselect/eselect-unison-0.4
+"
+
+DOCS=( src/CONTRIB src/README src/ROADMAP.txt src/TODO.txt )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
+
+gui_cache_update() {
+	if use gui ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+src_compile() {
+	local -a myconf=()
+
+	if use debug ; then
+		myconf+=( DEBUGGING=true )
+	fi
+
+	if use doc ; then
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
+	fi
+
+	if use gui ; then
+		myconf+=( UISTYLE=gtk3 )
+	else
+		myconf+=( UISTYLE=text )
+	fi
+
+	if ! use ocamlopt ; then
+		myconf+=( NATIVE=false )
+	fi
+
+	if use threads ; then
+		myconf+=( THREADS=true )
+	fi
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake "${myconf[@]}" CFLAGS="" -j1 src manpage
+}
+
+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.
+	cd "${S}/src" || die
+
+	local binname
+	for binname in unison unison-fsmonitor ; do
+		exeinto /usr/bin
+		newexe "${binname}" "${binname}-${SLOT}"
+	done
+
+	cd "${S}" || die
+
+	doman "man/${PN}.1"
+
+	if use gui ; 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 )
+	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
+
+	gui_cache_update
+}
+
+pkg_postrm() {
+	eselect unison update
+
+	gui_cache_update
+}
diff --git a/net-misc/unison/unison-2.53.3.ebuild b/net-misc/unison/unison-2.53.3.ebuild
deleted file mode 100644
index 0de016690ac1..000000000000
--- a/net-misc/unison/unison-2.53.3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2024 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://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"
-IUSE="debug doc gtk +ocamlopt threads"
-
-BDEPEND="dev-lang/ocaml:=[ocamlopt?]
-	doc? ( app-text/dvipsk
-		app-text/ghostscript-gpl
-		dev-texlive/texlive-latex )"
-DEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?] )"
-RDEPEND="gtk? ( dev-ml/lablgtk:3=[ocamlopt?]
-	|| ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) )
-	>=app-eselect/eselect-unison-0.4
-	>=dev-lang/ocaml-4.08"
-
-DOCS=( CONTRIB README ROADMAP.txt TODO.txt )
-
-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=gtk3 )
-	else
-		myconf+=( UISTYLE=text )
-	fi
-
-	use ocamlopt || myconf+=( NATIVE=false )
-
-	if use doc; then
-		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
-	fi
-
-	# Discard cflags as it will try to pass them to ocamlc...
-	emake "${myconf[@]}" CFLAGS="" src
-
-	emake manpage
-}
-
-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
-	doman ../man/unison.1
-
-	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 )
-	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
-}
diff --git a/net-misc/unison/unison-2.53.5.ebuild b/net-misc/unison/unison-2.53.5.ebuild
new file mode 100644
index 000000000000..95aaf5401b6c
--- /dev/null
+++ b/net-misc/unison/unison-2.53.5.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 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/"
+
+if [[ "${PV}" == *9999* ]] ; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/bcpierce00/${PN}.git"
+else
+	SRC_URI="https://github.com/bcpierce00/unison/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="$(ver_cut 1-2)"
+IUSE="doc gui +ocamlopt"
+
+BDEPEND="
+	dev-lang/ocaml:=[ocamlopt?]
+	doc? (
+		app-text/dvipsk
+		app-text/ghostscript-gpl
+		dev-texlive/texlive-latex
+	)
+"
+DEPEND="
+	gui? (
+		dev-ml/lablgtk:3=[ocamlopt?]
+	)
+"
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	gui? (
+		dev-ml/lablgtk:3=[ocamlopt?]
+		|| (
+			net-misc/ssh-askpass-fullscreen
+			net-misc/x11-ssh-askpass
+		)
+	)
+"
+IDEPEND="
+	>=app-eselect/eselect-unison-0.4
+"
+
+DOCS=( CONTRIBUTING.md README.md src/FEATURES.md src/ROADMAP.txt src/TODO.txt )
+
+QA_FLAGS_IGNORED="usr/bin/${PN}-fsmonitor-${SLOT}"
+
+gui_cache_update() {
+	if use gui ; then
+		xdg_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+src_compile() {
+	local -a myconf=()
+
+	if ! use ocamlopt ; then
+		myconf+=( NATIVE=false )
+	fi
+
+	# Discard cflags as it will try to pass them to ocamlc...
+	emake "${myconf[@]}" CFLAGS="" -j1 tui fsmonitor manpage
+
+	if use gui ; then
+		emake "${myconf[@]}" CFLAGS="" -j1 gui
+	fi
+
+	if use doc ; then
+		VARTEXFONTS="${T}/fonts" emake "${myconf[@]}" CFLAGS="" HEVEA=false docs
+	fi
+}
+
+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.
+	cd "${S}/src" || die
+
+	local -a bins=(
+		unison
+		unison-fsmonitor
+	)
+
+	if use gui ; then
+		bins+=( unison-gui )
+	fi
+
+	local binname
+	for binname in "${bins[@]}" ; do
+		exeinto /usr/bin
+		newexe "${binname}" "${binname}-${SLOT}"
+	done
+
+	cd "${S}" || die
+
+	doman "man/${PN}.1"
+
+	if use gui ; then
+		newicon -s scalable icons/U.svg "${PN}-${SLOT}.svg"
+		make_desktop_entry "${PN}-${SLOT}" "${PN^} GUI (${SLOT})" "${PN}-${SLOT}"
+	fi
+
+	if use doc ; then
+		DOCS+=( doc/unison-manual.pdf )
+	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
+
+	gui_cache_update
+}
+
+pkg_postrm() {
+	eselect unison update
+
+	gui_cache_update
+}