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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E7AB1382C5 for ; Tue, 15 Dec 2020 10:10:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C70F8E088F; Tue, 15 Dec 2020 10:10:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B82AE088F for ; Tue, 15 Dec 2020 10:10:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 207F733BDC9 for ; Tue, 15 Dec 2020 10:10:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85C8853 for ; Tue, 15 Dec 2020 10:10:54 +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: <1608027040.26ce9b92e1ae5b53aa98226624a91effe44238ae.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.3_p20201024.ebuild X-VCS-Directories: net-misc/unison/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 26ce9b92e1ae5b53aa98226624a91effe44238ae X-VCS-Branch: master Date: Tue, 15 Dec 2020 10:10:54 +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: 384093e7-144b-47c5-8a02-4fd289becf1b X-Archives-Hash: ab1169eb1ba46cf6138d6ea623a3670d commit: 26ce9b92e1ae5b53aa98226624a91effe44238ae Author: Sam James gentoo org> AuthorDate: Tue Dec 15 10:10:40 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 15 10:10:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26ce9b92 Revert "net-misc/unison: remove old" This reverts commit e0ee85de3d5d468dfd65d9d20934395cc1bb1770. Accidentally dropped stable in a slot. Signed-off-by: Sam James gentoo.org> net-misc/unison/Manifest | 1 + net-misc/unison/unison-2.51.3_p20201024.ebuild | 111 +++++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/net-misc/unison/Manifest b/net-misc/unison/Manifest index 78be0b0a168..6621fe5cba8 100644 --- a/net-misc/unison/Manifest +++ b/net-misc/unison/Manifest @@ -1,4 +1,5 @@ DIST unison-2.48.15v4.tar.gz 1911781 BLAKE2B d3dabea1b8b0d2a8c64716144d33265ba904d7658f64c7f0e74b47a1dd10cf2b692d150052e3234be74aedbcf35a37fe1da9f393802c96810e36ef115609dcec SHA512 658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78 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.51.3_p20201024.tar.gz 1371551 BLAKE2B 780cc176ed203345408551aaa11990e4da1ec0d4adfd928f3e8ff9c180f35fafb6ac097c00c95da8fe9178db122ea025e9f4336413f0694cea099ab80e2ae00e SHA512 87c7ce33621bc323607e901547da30b8fc0a842ba35128627f5d44fb4befd76ff94586ec1f8eb1f3359da756d09d8bf2481cf0d6eb2ea421113e0e4efdcbdf61 DIST unison-2.51.3_p20201127.tar.gz 1374770 BLAKE2B 83c133f2cb99e10fac96efde333291a671edab5eb45dd6dcf56cb25845385425353a5f413ab752361124ec7bbac21daf3f813d5539b21229d943cf7f0bfae2fd SHA512 4b978a5e3df620317b7a9214054d64f319d09c5617b07ddf3cf76b18c6888841ce791f7b6a4ef70c64b146e3e4f25a5904584fb576703c2de4b17cfcffa8905a diff --git a/net-misc/unison/unison-2.51.3_p20201024.ebuild b/net-misc/unison/unison-2.51.3_p20201024.ebuild new file mode 100644 index 00000000000..36616120b23 --- /dev/null +++ b/net-misc/unison/unison-2.51.3_p20201024.ebuild @@ -0,0 +1,111 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop xdg-utils + +MY_COMMIT="73f1bfa2476f907e2d781948ce9e764230bf8b27" +DESCRIPTION="Two-way cross-platform file synchronizer" +HOMEPAGE="https://www.seas.upenn.edu/~bcpierce/unison/" +SRC_URI="https://github.com/bcpierce00/unison/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="$(ver_cut 1-2)" +KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="debug doc gtk +ocamlopt threads" +RESTRICT="!ocamlopt? ( strip )" # https://bugs.gentoo.org/685776#c0 + +# 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= )" +RDEPEND="gtk? ( dev-ml/lablgtk:2= + || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass-fullscreen ) ) + >=app-eselect/eselect-unison-0.4" + +S="${WORKDIR}/${PN}-${MY_COMMIT}" + +DOCS=( BUGS.txt CONTRIB INSTALL NEWS README ROADMAP.txt TODO.txt ) + +src_prepare() { + # 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 + default +} + +src_compile() { + # build unison-manual.pdf but not .html + if use doc; then + local myconf="all docs HEVEA=false" + else + local myconf="all" + fi + + if use threads; then + myconf="$myconf THREADS=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="" +} + +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 + + # Waiting for https://github.com/bcpierce00/unison/issues/411 + 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 +}