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 2891015800A for ; Sun, 16 Jul 2023 06:18:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0515AE0883; Sun, 16 Jul 2023 06:18:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E0A51E087D for ; Sun, 16 Jul 2023 06:18:42 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9AC3340D3C for ; Sun, 16 Jul 2023 06:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A813B5C for ; Sun, 16 Jul 2023 06:18:39 +0000 (UTC) From: "Haelwenn Monnier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Haelwenn Monnier" Message-ID: <1689350075.a4594255a5ccd63fb963240ccd2e568e0a423f5f.lanodan@gentoo> Subject: [gentoo-commits] repo/proj/guru:master 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: lanodan X-VCS-Committer-Name: Haelwenn Monnier X-VCS-Revision: a4594255a5ccd63fb963240ccd2e568e0a423f5f X-VCS-Branch: master Date: Sun, 16 Jul 2023 06:18:39 +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: 59cfb819-2177-4455-b5b0-6e90ebe82c83 X-Archives-Hash: 99f1026d31fb1bbbf2b603263187b019 commit: a4594255a5ccd63fb963240ccd2e568e0a423f5f Author: Gonçalo Negrier Duarte gmail com> AuthorDate: Fri Jul 14 15:49:50 2023 +0000 Commit: Haelwenn Monnier hacktivis me> CommitDate: Fri Jul 14 15:54:35 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a4594255 app-emulation/LookingGlass: unkeyword 1_beta6 for ~amd64 * fix ExcessiveLineLength Signed-off-by: Gonçalo Negrier Duarte gmail.com> .../LookingGlass/LookingGlass-1_beta6.ebuild | 43 +++++----------------- .../LookingGlass/LookingGlass-9999.ebuild | 42 +++++---------------- 2 files changed, 20 insertions(+), 65 deletions(-) diff --git a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild index 40df5e4c0..24cb79032 100644 --- a/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-1_beta6.ebuild @@ -12,7 +12,6 @@ HOMEPAGE="https://looking-glass.io https://github.com/gnif/LookingGlass" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64" IUSE="binutils X wayland pipewire pulseaudio gnome" REQUIRED_USE="|| ( binutils X wayland pipewire pulseaudio ) pipewire? ( !pulseaudio ) pulseaudio? ( !pipewire ) " @@ -40,41 +39,19 @@ BDEPEND="virtual/pkgconfig" CMAKE_USE_DIR="${S}"/client -src_prepare() { - default - +src_configure () { # Base on build.rst from the project - # https://github.com/gnif/LookingGlass/blob/master/doc/build.rst - - if ! use binutils; then - MYCMAKEARGS=" -DENABLE_BACKTRACE=no " - fi - - if ! use X; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_X11=no " - fi - - if ! use wayland; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_WAYLAND=no " - fi + # 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) + ) - if ! use pipewire; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PIPEWIRE=no " - fi - - if ! use pulseaudio; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PULSEAUDIO=no " - fi - - if ! use pulseaudio; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PULSEAUDIO=no " - fi - - if use gnome && use wayland; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_LIBDECOR=ON " - fi + cmake_src_configure +} - cmake_src_prepare +src_compile() { + cmake_src_compile } src_install() { diff --git a/app-emulation/LookingGlass/LookingGlass-9999.ebuild b/app-emulation/LookingGlass/LookingGlass-9999.ebuild index fb0224a86..59d91a492 100644 --- a/app-emulation/LookingGlass/LookingGlass-9999.ebuild +++ b/app-emulation/LookingGlass/LookingGlass-9999.ebuild @@ -38,41 +38,19 @@ BDEPEND="virtual/pkgconfig" CMAKE_USE_DIR="${S}"/client -src_prepare() { - default - +src_configure () { # Base on build.rst from the project - # https://github.com/gnif/LookingGlass/blob/master/doc/build.rst - - if ! use binutils; then - MYCMAKEARGS=" -DENABLE_BACKTRACE=no " - fi - - if ! use X; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_X11=no " - fi - - if ! use wayland; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_WAYLAND=no " - fi + # 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) + ) - if ! use pipewire; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PIPEWIRE=no " - fi - - if ! use pulseaudio; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PULSEAUDIO=no " - fi - - if ! use pulseaudio; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_PULSEAUDIO=no " - fi - - if use gnome && use wayland; then - MYCMAKEARGS=" ${MYCMAKEARGS} -DENABLE_LIBDECOR=ON " - fi + cmake_src_configure +} - cmake_src_prepare +src_compile() { + cmake_src_compile } src_install() {