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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ADAA815800A for ; Fri, 14 Jul 2023 16:32:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6A34E08AA; Fri, 14 Jul 2023 16:32:39 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CC3D2E08AA for ; Fri, 14 Jul 2023 16:32:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BBA083409EC for ; Fri, 14 Jul 2023 16:32:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25A08ACF for ; Fri, 14 Jul 2023 16:32:37 +0000 (UTC) From: "Gonçalo Negrier Duarte" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gonçalo Negrier Duarte" Message-ID: <1689352346.4f234f78c86259fc29c6394399f9a0b037278550.gonegrier.duarte@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-emulation/LookingGlass/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild app-emulation/LookingGlass/LookingGlass-9999.ebuild X-VCS-Directories: app-emulation/LookingGlass/ X-VCS-Committer: gonegrier.duarte X-VCS-Committer-Name: Gonçalo Negrier Duarte X-VCS-Revision: 4f234f78c86259fc29c6394399f9a0b037278550 X-VCS-Branch: dev Date: Fri, 14 Jul 2023 16:32:37 +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: 9a724d11-a538-42fc-bf34-b0afb9b2d5e6 X-Archives-Hash: 0985239f97c89db4a4b1f9a0305775f8 commit: 4f234f78c86259fc29c6394399f9a0b037278550 Author: Gonçalo Duarte gmail com> AuthorDate: Fri Jul 14 16:26:49 2023 +0000 Commit: Gonçalo Negrier Duarte gmail com> CommitDate: Fri Jul 14 16:32:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4f234f78 app-emulation/LookingGlass: fix error compiling Signed-off-by: Gonçalo Duarte gmail.com> .../LookingGlass/LookingGlass-1_beta6.ebuild | 24 ++++++++++++---------- .../LookingGlass/LookingGlass-9999.ebuild | 20 +++++++++++------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild index 24cb79032..be30b690a 100644 --- a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild @@ -12,8 +12,9 @@ HOMEPAGE="https://looking-glass.io https://github.com/gnif/LookingGlass" LICENSE="GPL-2" SLOT="0" -IUSE="binutils X wayland pipewire pulseaudio gnome" -REQUIRED_USE="|| ( binutils X wayland pipewire pulseaudio ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " +IUSE="binutils gnome pipewire pulseaudio wayland X" +USE="pipewire pulseaudio" +REQUIRED_USE="|| ( binutils gnome pipewire pulseaudio wayland X ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " RDEPEND="dev-libs/libconfig dev-libs/nettle @@ -39,19 +40,20 @@ BDEPEND="virtual/pkgconfig" CMAKE_USE_DIR="${S}"/client -src_configure () { +src_prepare () { + default + # Base on build.rst from the project # doc/build.rst - local mycmakeargs=( - -DENABLE_BACKTRACE=$(usex binutils) -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ - DENABLE_PIPEWIRE=$(usex pipewire) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_LIBDECOR=$(usex gnome) + MYCMAKEARGS=( + -DENABLE_BACKTRACE=$(usex binutils) \ + -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ + -DENABLE_PIPEWIRE=$(usex pipewire) \ + -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ + -DENABLE_LIBDECOR=$(usex gnome) ) - cmake_src_configure -} - -src_compile() { - cmake_src_compile + cmake_src_prepare } src_install() { diff --git a/app-emulation/LookingGlass/LookingGlass-9999.ebuild b/app-emulation/LookingGlass/LookingGlass-9999.ebuild index 59d91a492..dd0ff1ea2 100644 --- a/app-emulation/LookingGlass/LookingGlass-9999.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-9999.ebuild @@ -11,8 +11,9 @@ HOMEPAGE="https://looking-glass.io https://github.com/gnif/LookingGlass" LICENSE="GPL-2" SLOT="0" -IUSE="binutils X wayland pipewire pulseaudio gnome" -REQUIRED_USE="|| ( binutils X wayland pipewire pulseaudio ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " +IUSE="binutils gnome pipewire pulseaudio wayland X" +USE="pipewire pulseaudio" +REQUIRED_USE="|| ( binutils gnome pipewire pulseaudio wayland X ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " RDEPEND="dev-libs/libconfig dev-libs/nettle @@ -38,15 +39,20 @@ BDEPEND="virtual/pkgconfig" CMAKE_USE_DIR="${S}"/client -src_configure () { +src_prepare () { + default + # Base on build.rst from the project # doc/build.rst - local mycmakeargs=( - -DENABLE_BACKTRACE=$(usex binutils) -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ - DENABLE_PIPEWIRE=$(usex pipewire) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_LIBDECOR=$(usex gnome) + MYCMAKEARGS=( + -DENABLE_BACKTRACE=$(usex binutils) \ + -DENABLE_X11=$(usex X) -DENABLE_WAYLAND=$(usex wayland) \ + -DENABLE_PIPEWIRE=$(usex pipewire) \ + -DENABLE_PULSEAUDIO=$(usex pulseaudio) \ + -DENABLE_LIBDECOR=$(usex gnome) ) - cmake_src_configure + cmake_src_prepare } src_compile() {