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 1ED76138359 for ; Tue, 20 Oct 2020 06:53:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FCA5E082D; Tue, 20 Oct 2020 06:53:52 +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 35431E082D for ; Tue, 20 Oct 2020 06:53:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 37398340CD7 for ; Tue, 20 Oct 2020 06:53:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE67D39F for ; Tue, 20 Oct 2020 06:53:49 +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: <1603176825.23501d1efa116037dedb3ab3f5e184bae0c9c6cf.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/unison/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/unison/unison-2.48.15_p4-r1.ebuild net-misc/unison/unison-2.48.15_p4-r2.ebuild X-VCS-Directories: net-misc/unison/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 23501d1efa116037dedb3ab3f5e184bae0c9c6cf X-VCS-Branch: master Date: Tue, 20 Oct 2020 06:53:49 +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: f12c21f2-085a-406c-917a-819bd8fd3fca X-Archives-Hash: fa6122751a62240e6a543dc3ea4791ba commit: 23501d1efa116037dedb3ab3f5e184bae0c9c6cf Author: Sam James gentoo org> AuthorDate: Tue Oct 20 06:52:35 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Oct 20 06:53:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23501d1e net-misc/unison: install docs for unison-2.48.15_p4 Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> ....15_p4-r1.ebuild => unison-2.48.15_p4-r2.ebuild} | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/net-misc/unison/unison-2.48.15_p4-r1.ebuild b/net-misc/unison/unison-2.48.15_p4-r2.ebuild similarity index 83% rename from net-misc/unison/unison-2.48.15_p4-r1.ebuild rename to net-misc/unison/unison-2.48.15_p4-r2.ebuild index d8102533b70..17bbdc2c4a4 100644 --- a/net-misc/unison/unison-2.48.15_p4-r1.ebuild +++ b/net-misc/unison/unison-2.48.15_p4-r2.ebuild @@ -5,17 +5,20 @@ EAPI=7 inherit desktop xdg-utils +# Use the docs for the last 'normal' release +DOC_P="${PN}-2.48.4" 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/_p/v}.tar.gz -> ${P/_p/v}.tar.gz" # No manual.pdf or manual.html available for this version -# 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 )" +SRC_URI+=" doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_P}-manual.pdf + https://www.seas.upenn.edu/~bcpierce/unison/download/releases/${DOC_VER}/${DOC_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="debug gtk +ocamlopt threads" +IUSE="debug doc gtk +ocamlopt threads" # Upstream, for this version, has explicitly disabled test with marker # "Skipping some tests -- remove me!". Given the potentially destructive nature @@ -77,14 +80,14 @@ src_install() { if use gtk; then newicon -s scalable ../icons/U.svg ${PN}-${SLOT}.svg - make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" "${EPREFIX}/usr/share/${PN}/${PN}-${SLOT}.svg" + make_desktop_entry unison-${SLOT} "${PN} (${SLOT})" "${EPREFIX}/usr/share/icons/hicolor/scalable/apps/${PN}-${SLOT}.svg" + fi + + if use doc; then + DOCS+=( "${DISTDIR}/${DOC_P}-manual.pdf" ) + HTML_DOCS=( "${DISTDIR}/${DOC_P}-manual.html" ) fi -# No manual.pdf or manual.html available for this version -# if use doc; then -# DOCS+=( "${DISTDIR}/${P}-manual.pdf" ) -# HTML_DOCS=( "${DISTDIR}/${P}-manual.html" ) -# fi einstalldocs }