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 43C981382C5 for ; Sun, 14 Jun 2020 10:39:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A7EB9E0AB1; Sun, 14 Jun 2020 10:39:26 +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 8FF5AE0AB2 for ; Sun, 14 Jun 2020 10:39:26 +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 6E3F334F121 for ; Sun, 14 Jun 2020 10:39:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0696D2A8 for ; Sun, 14 Jun 2020 10:39:21 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1592062609.7c9fb8355533da7ce8cd718b601528308056ee64.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: sys-process/nvtop/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-process/nvtop/nvtop-1.0.0.ebuild X-VCS-Directories: sys-process/nvtop/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 7c9fb8355533da7ce8cd718b601528308056ee64 X-VCS-Branch: master Date: Sun, 14 Jun 2020 10:39:21 +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: ab1d416d-1c30-4f75-bfc0-300aa903460e X-Archives-Hash: f0b812fe91122b76ae0140e70f34c4d3 commit: 7c9fb8355533da7ce8cd718b601528308056ee64 Author: Huang Rui gmail com> AuthorDate: Sat Jun 13 15:36:49 2020 +0000 Commit: Andrew Ammerlaan riseup net> CommitDate: Sat Jun 13 15:36:49 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7c9fb835 sys-process/nvtop: change IUSE order and move CMAKE_CONF to local Optimize the ebuild file Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Huang Rui gmail.com> sys-process/nvtop/nvtop-1.0.0.ebuild | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys-process/nvtop/nvtop-1.0.0.ebuild b/sys-process/nvtop/nvtop-1.0.0.ebuild index 5d7ced8..b7b88af 100644 --- a/sys-process/nvtop/nvtop-1.0.0.ebuild +++ b/sys-process/nvtop/nvtop-1.0.0.ebuild @@ -19,7 +19,7 @@ fi LICENSE="GPL-3" SLOT="0" -IUSE="unicode debug" +IUSE="debug unicode" RDEPEND=" sys-libs/ncurses:0=[unicode?] @@ -32,20 +32,17 @@ BDEPEND=" virtual/pkgconfig " -BUILD_DIR="${WORKDIR}/build" - -CMAKE_CONF=" - !debug? ( -DCMAKE_BUILD_TYPE=Release ) - debug? ( -DCMAKE_BUILD_TYPE=Debug ) - unicode? ( -DCURSES_NEED_WIDE=TRUE ) -" - PATCHES=( "${FILESDIR}"/${PN}-1.0.0-add-nvml.patch "${FILESDIR}"/${PN}-1.0.0-fix-ncurses.patch ) src_configure() { + local CMAKE_CONF=" + !debug? ( -DCMAKE_BUILD_TYPE=Release ) + debug? ( -DCMAKE_BUILD_TYPE=Debug ) + unicode? ( -DCURSES_NEED_WIDE=TRUE ) + " local mycmakeargs=( -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DNVML_INCLUDE_DIRS="${S}/include"