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 A5CAA1382C5 for ; Fri, 5 Mar 2021 19:56:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E848EE0830; Fri, 5 Mar 2021 19:56:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 CC1D9E0830 for ; Fri, 5 Mar 2021 19:56:55 +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 DE705340EB2 for ; Fri, 5 Mar 2021 19:56:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9867E56F for ; Fri, 5 Mar 2021 19:56:53 +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: <1614974206.193dfb05dd5d2b884574f78a6f5972bf2781d6f6.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.51.3_p20201127.ebuild X-VCS-Directories: net-misc/unison/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 193dfb05dd5d2b884574f78a6f5972bf2781d6f6 X-VCS-Branch: master Date: Fri, 5 Mar 2021 19:56:53 +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: 69b73fcd-114f-4f34-a8d0-5052b46c3ca5 X-Archives-Hash: ac9a911455555b5f22561abbaeb8ba4c commit: 193dfb05dd5d2b884574f78a6f5972bf2781d6f6 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Wed Jan 27 11:57:45 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 5 19:56:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=193dfb05 net-misc/unison: fix graphical UI logic in 2.51.3_p20201127 Use same logic as 2.51.4_rc1. Bug: https://bugs.gentoo.org/758386 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/19043 Signed-off-by: Sam James gentoo.org> net-misc/unison/unison-2.51.3_p20201127.ebuild | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/net-misc/unison/unison-2.51.3_p20201127.ebuild b/net-misc/unison/unison-2.51.3_p20201127.ebuild index a035fe9b721..a0420d55da8 100644 --- a/net-misc/unison/unison-2.51.3_p20201127.ebuild +++ b/net-misc/unison/unison-2.51.3_p20201127.ebuild @@ -39,7 +39,7 @@ src_prepare() { } src_compile() { - local myconf="all" + local myconf if use threads; then myconf="$myconf THREADS=true" @@ -57,13 +57,12 @@ src_compile() { use ocamlopt || myconf="$myconf NATIVE=false" - # Discard cflags as it will try to pass them to ocamlc... - emake $myconf CFLAGS="" - if use doc; then - myconf="$myconf docs HEVEA=false" - emake $myconf CFLAGS="" + emake $myconf CFLAGS="" HEVEA=false docs fi + + # Discard cflags as it will try to pass them to ocamlc... + emake $myconf CFLAGS="" src } src_test() {