public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Gonçalo Negrier Duarte" <gonegrier.duarte@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-emulation/LookingGlass/
Date: Fri, 14 Jul 2023 15:55:15 +0000 (UTC)	[thread overview]
Message-ID: <1689350075.a4594255a5ccd63fb963240ccd2e568e0a423f5f.gonegrier.duarte@gentoo> (raw)

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


             reply	other threads:[~2023-07-14 15:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-14 15:55 Gonçalo Negrier Duarte [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-07-14 16:32 [gentoo-commits] repo/proj/guru:dev commit in: app-emulation/LookingGlass/ Gonçalo Negrier Duarte
2023-07-18 13:49 Gonçalo Negrier Duarte
2023-07-18 13:49 Gonçalo Negrier Duarte
2023-07-26 13:03 Gonçalo Negrier Duarte
2023-07-26 13:03 Gonçalo Negrier Duarte

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1689350075.a4594255a5ccd63fb963240ccd2e568e0a423f5f.gonegrier.duarte@gentoo \
    --to=gonegrier.duarte@gmail.com \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox