From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B353815808B for ; Tue, 22 Feb 2022 01:41:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DDBFBE0A5D; Tue, 22 Feb 2022 01:41:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD013E0A5D for ; Tue, 22 Feb 2022 01:41:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18923342FE6 for ; Tue, 22 Feb 2022 01:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 949222A4 for ; Tue, 22 Feb 2022 01:41:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645494019.916d5d52de676833b5006e68a5d00b3dccb1f8c0.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/unison/Manifest net-misc/unison/unison-2.51.5.ebuild X-VCS-Directories: net-misc/unison/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 916d5d52de676833b5006e68a5d00b3dccb1f8c0 X-VCS-Branch: master Date: Tue, 22 Feb 2022 01:41:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4a848d56-9faa-4851-8723-8d5b52c26b88 X-Archives-Hash: aed8ed58fe45180b93bc2688aa2fb42f commit: 916d5d52de676833b5006e68a5d00b3dccb1f8c0 Author: Dennis Eisele dennis-eisele de> AuthorDate: Tue Feb 22 00:09:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 22 01:40:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=916d5d52 net-misc/unison: bump version to 2.51.5 and bump EAPI to 8 Closes: https://bugs.gentoo.org/818247 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Dennis Eisele dennis-eisele.de> Closes: https://github.com/gentoo/gentoo/pull/24294 Signed-off-by: Sam James gentoo.org> net-misc/unison/Manifest | 1 + net-misc/unison/unison-2.51.5.ebuild | 105 +++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+) diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 0e186b02e774..e20b41c58602 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,2 +1,3 @@ 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 +DIST unison-2.51.5.tar.gz 1385407 BLAKE2B cdad4683518ec9c7c43d9107d8533fa393a68f602782d96ddba345df07b1ef70cc2ebf7dfd205fc7535349553a5e0d3c2931099bde99e5c736bc815ccdd294f8 SHA512 4a31df4d043d2b7552438f9fc2056098b9a35cd1cae1a037083cb56d91ec6fec0c3164de73914ff46cb8821f78c1594f48bf0334a94d9d706cd82ce3a6b70440 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..9e1573deb3a6 --- /dev/null +++ b/net-misc/unison/unison-2.51.5.ebuild @@ -0,0 +1,105 @@ +# 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/" +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" + +# ocaml version so we are sure it has ocamlopt use flag +BDEPEND="dev-lang/ocaml:=[ocamlopt?] + doc? ( app-text/dvipsk + app-text/ghostscript-gpl + dev-texlive/texlive-latex )" +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 ) + +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=false 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=( "${DISTDIR}/${P}-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 +}