commit: 4f234f78c86259fc29c6394399f9a0b037278550 Author: Gonçalo Duarte <gonegrier.duarte <AT> gmail <DOT> com> AuthorDate: Fri Jul 14 16:26:49 2023 +0000 Commit: Gonçalo Negrier Duarte <gonegrier.duarte <AT> gmail <DOT> 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 <gonegrier.duarte <AT> 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() {
