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 C4E4E139335 for ; Tue, 29 Jun 2021 04:58:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0C38AE0891; Tue, 29 Jun 2021 04:58:00 +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 DFBE2E0894 for ; Tue, 29 Jun 2021 04:57:59 +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 ADB30335C5D for ; Tue, 29 Jun 2021 04:57:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 666FC7BC for ; Tue, 29 Jun 2021 04:57:57 +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: <1624942630.89a63f6916d92d33d9913b0dc1cdf47b3cc43660.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild X-VCS-Directories: net-misc/tigervnc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 89a63f6916d92d33d9913b0dc1cdf47b3cc43660 X-VCS-Branch: master Date: Tue, 29 Jun 2021 04:57:57 +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: 2380ee6a-db30-4d53-9c38-aef850122e12 X-Archives-Hash: b937167d80e7981a6f2f3423105ac673 commit: 89a63f6916d92d33d9913b0dc1cdf47b3cc43660 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Jun 27 07:04:29 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 29 04:57:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a63f69 net-misc/tigervnc: move away from cmake-utils Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/21398 Signed-off-by: Sam James gentoo.org> net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild index 09c050aec41..cf6b7e952c9 100644 --- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild +++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 CMAKE_IN_SOURCE_BUILD=1 -inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils +inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils XSERVER_VERSION="1.20.0" @@ -88,7 +88,7 @@ src_prepare() { sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \ cmake/BuildPackages.cmake || die - cmake-utils_src_prepare + cmake_src_prepare if use server ; then cd unix/xserver || die @@ -111,7 +111,7 @@ src_configure() { -DBUILD_JAVA=$(usex java) ) - cmake-utils_src_configure + cmake_src_configure if use server ; then cd unix/xserver || die @@ -148,7 +148,7 @@ src_configure() { } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use server ; then # deps of the vnc module and the module itself @@ -163,7 +163,7 @@ src_compile() { } src_install() { - cmake-utils_src_install + cmake_src_install if use server ; then emake -C unix/xserver/hw/vnc DESTDIR="${D}" install