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 A6D7C158086 for ; Sat, 25 Dec 2021 22:10:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87C852C4017; Sat, 25 Dec 2021 22:10:10 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 195082C4017 for ; Sat, 25 Dec 2021 22:10:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 837ED342B95 for ; Sat, 25 Dec 2021 22:10:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5FA3F1BD for ; Sat, 25 Dec 2021 22:10:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1640470190.97985fb97c421b1301b70c750f90051fbcf70bae.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-apps/mako/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-apps/mako/mako-1.6-r2.ebuild gui-apps/mako/mako-1.6-r3.ebuild gui-apps/mako/mako-9999.ebuild X-VCS-Directories: gui-apps/mako/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 97985fb97c421b1301b70c750f90051fbcf70bae X-VCS-Branch: master Date: Sat, 25 Dec 2021 22:10:04 +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: 4f766c78-4c43-4fbe-a95f-d818ba40b245 X-Archives-Hash: cdf932ccebec6f6fa5794e86d778f840 commit: 97985fb97c421b1301b70c750f90051fbcf70bae Author: Sam James gentoo org> AuthorDate: Sat Dec 25 22:08:39 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 25 22:09:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97985fb9 gui-apps/mako: fix automagic basu usage Not sure how I missed that before! Fixes: 8f162d2e7717b30d130925a72129d56a4fbd4daa Closes: https://bugs.gentoo.org/783156 Reported-by: Arsen Arsenovic aarsen.me> Signed-off-by: Sam James gentoo.org> .../mako/{mako-1.6-r2.ebuild => mako-1.6-r3.ebuild} | 17 +++++++++++++---- gui-apps/mako/mako-9999.ebuild | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gui-apps/mako/mako-1.6-r2.ebuild b/gui-apps/mako/mako-1.6-r3.ebuild similarity index 72% rename from gui-apps/mako/mako-1.6-r2.ebuild rename to gui-apps/mako/mako-1.6-r3.ebuild index 89b09c2d756e..dc520d5f6127 100644 --- a/gui-apps/mako/mako-1.6-r2.ebuild +++ b/gui-apps/mako/mako-1.6-r3.ebuild @@ -13,20 +13,20 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/emersion/${PN}.git" else SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 arm64 x86" + KEYWORDS="~amd64 ~arm64 ~x86" fi LICENSE="MIT" SLOT="0" -IUSE="+icons" +IUSE="elogind +icons systemd" DEPEND=" dev-libs/wayland x11-libs/pango x11-libs/cairo || ( - sys-apps/systemd - sys-auth/elogind + systemd? ( sys-apps/systemd ) + elogind? ( sys-auth/elogind ) sys-libs/basu ) sys-apps/dbus @@ -49,5 +49,14 @@ src_configure() { -Dicons=$(usex icons enabled disabled) "-Dwerror=false" ) + + if use systemd ; then + emesonargs+=( -Dsd-bus-provider=libsystemd ) + elif use elogind ; then + emesonargs+=( -Dsd-bus-provider=libelogind ) + else + emesonargs+=( -Dsd-bus-provider=basu ) + fi + meson_src_configure } diff --git a/gui-apps/mako/mako-9999.ebuild b/gui-apps/mako/mako-9999.ebuild index 920feefafb99..dc520d5f6127 100644 --- a/gui-apps/mako/mako-9999.ebuild +++ b/gui-apps/mako/mako-9999.ebuild @@ -18,15 +18,15 @@ fi LICENSE="MIT" SLOT="0" -IUSE="+icons" +IUSE="elogind +icons systemd" DEPEND=" dev-libs/wayland x11-libs/pango x11-libs/cairo || ( - sys-apps/systemd - sys-auth/elogind + systemd? ( sys-apps/systemd ) + elogind? ( sys-auth/elogind ) sys-libs/basu ) sys-apps/dbus @@ -37,7 +37,7 @@ DEPEND=" " RDEPEND=" ${DEPEND} - dev-libs/wayland-protocols + >=dev-libs/wayland-protocols-1.21 " BDEPEND=" virtual/pkgconfig @@ -49,5 +49,14 @@ src_configure() { -Dicons=$(usex icons enabled disabled) "-Dwerror=false" ) + + if use systemd ; then + emesonargs+=( -Dsd-bus-provider=libsystemd ) + elif use elogind ; then + emesonargs+=( -Dsd-bus-provider=libelogind ) + else + emesonargs+=( -Dsd-bus-provider=basu ) + fi + meson_src_configure }