Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/
Date: Tue, 29 Jun 2021 04:58:00
Message-Id: 1624942630.89a63f6916d92d33d9913b0dc1cdf47b3cc43660.sam@gentoo
1 commit: 89a63f6916d92d33d9913b0dc1cdf47b3cc43660
2 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
3 AuthorDate: Sun Jun 27 07:04:29 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 29 04:57:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89a63f69
7
8 net-misc/tigervnc: move away from cmake-utils
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.2
11 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
12 Closes: https://github.com/gentoo/gentoo/pull/21398
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 12 ++++++------
16 1 file changed, 6 insertions(+), 6 deletions(-)
17
18 diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
19 index 09c050aec41..cf6b7e952c9 100644
20 --- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
21 +++ b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild
22 @@ -1,11 +1,11 @@
23 # Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 -EAPI=6
27 +EAPI=7
28
29 CMAKE_IN_SOURCE_BUILD=1
30
31 -inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
32 +inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg-utils gnome2-utils
33
34 XSERVER_VERSION="1.20.0"
35
36 @@ -88,7 +88,7 @@ src_prepare() {
37 sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \
38 cmake/BuildPackages.cmake || die
39
40 - cmake-utils_src_prepare
41 + cmake_src_prepare
42
43 if use server ; then
44 cd unix/xserver || die
45 @@ -111,7 +111,7 @@ src_configure() {
46 -DBUILD_JAVA=$(usex java)
47 )
48
49 - cmake-utils_src_configure
50 + cmake_src_configure
51
52 if use server ; then
53 cd unix/xserver || die
54 @@ -148,7 +148,7 @@ src_configure() {
55 }
56
57 src_compile() {
58 - cmake-utils_src_compile
59 + cmake_src_compile
60
61 if use server ; then
62 # deps of the vnc module and the module itself
63 @@ -163,7 +163,7 @@ src_compile() {
64 }
65
66 src_install() {
67 - cmake-utils_src_install
68 + cmake_src_install
69
70 if use server ; then
71 emake -C unix/xserver/hw/vnc DESTDIR="${D}" install