From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1495345-garchives=archives.gentoo.org@lists.gentoo.org> 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 9484015802F for <garchives@archives.gentoo.org>; Sat, 11 Mar 2023 17:04:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6AAAEE07D4; Sat, 11 Mar 2023 17:04:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 4929DE07F9 for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 17:04:27 +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 4D8DD340D65 for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 17:04:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA8708DC for <gentoo-commits@lists.gentoo.org>; Sat, 11 Mar 2023 17:04:24 +0000 (UTC) From: "Sam James" <sam@gentoo.org> 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" <sam@gentoo.org> Message-ID: <1678554246.1639fd9e5b6f15fc4a4f77be5f4044a48e34e1f4.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.7.1-r1.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: 1639fd9e5b6f15fc4a4f77be5f4044a48e34e1f4 X-VCS-Branch: master Date: Sat, 11 Mar 2023 17:04:24 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 21c9f2bd-b3dd-4d6f-9ae8-03422db04df6 X-Archives-Hash: 50a76bc3a780727769a1c1eb4b3231de commit: 1639fd9e5b6f15fc4a4f77be5f4044a48e34e1f4 Author: Aisha Tammy <aisha <AT> bsd <DOT> ac> AuthorDate: Fri Feb 24 21:38:13 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Mar 11 17:04:06 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1639fd9e gui-apps/mako: wayland-scanner/protocol BDEPEND/DEPEND fixes Signed-off-by: Aisha Tammy <aisha <AT> bsd.ac> Signed-off-by: Sam James <sam <AT> gentoo.org> gui-apps/mako/mako-1.7.1-r1.ebuild | 12 ++++++------ gui-apps/mako/mako-9999.ebuild | 25 +++++++++++++++++-------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/gui-apps/mako/mako-1.7.1-r1.ebuild b/gui-apps/mako/mako-1.7.1-r1.ebuild index 6ffde2623461..13a9eb711c00 100644 --- a/gui-apps/mako/mako-1.7.1-r1.ebuild +++ b/gui-apps/mako/mako-1.7.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,9 +20,8 @@ LICENSE="MIT" SLOT="0" IUSE="elogind +icons systemd" -DEPEND=" +RDEPEND=" dev-libs/wayland - dev-util/wayland-scanner x11-libs/pango x11-libs/cairo || ( @@ -36,13 +35,14 @@ DEPEND=" x11-libs/gdk-pixbuf ) " -RDEPEND=" - ${DEPEND} +DEPEND=" + ${RDEPEND} >=dev-libs/wayland-protocols-1.21 " BDEPEND=" - virtual/pkgconfig app-text/scdoc + dev-util/wayland-scanner + virtual/pkgconfig " src_configure() { diff --git a/gui-apps/mako/mako-9999.ebuild b/gui-apps/mako/mako-9999.ebuild index a92179a0efdb..13a9eb711c00 100644 --- a/gui-apps/mako/mako-9999.ebuild +++ b/gui-apps/mako/mako-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit meson +inherit meson systemd DESCRIPTION="A lightweight notification daemon for Wayland. Works on Sway" HOMEPAGE="https://github.com/emersion/mako" @@ -20,9 +20,8 @@ LICENSE="MIT" SLOT="0" IUSE="elogind +icons systemd" -DEPEND=" +RDEPEND=" dev-libs/wayland - dev-util/wayland-scanner x11-libs/pango x11-libs/cairo || ( @@ -36,18 +35,22 @@ DEPEND=" x11-libs/gdk-pixbuf ) " -RDEPEND=" - ${DEPEND} +DEPEND=" + ${RDEPEND} >=dev-libs/wayland-protocols-1.21 " BDEPEND=" - virtual/pkgconfig app-text/scdoc + dev-util/wayland-scanner + virtual/pkgconfig " src_configure() { local emesonargs=( -Dicons=$(usex icons enabled disabled) + -Dzsh-completions=true + -Dfish-completions=true + -Dbash-completions=true ) if use systemd ; then @@ -60,3 +63,9 @@ src_configure() { meson_src_configure } + +src_install() { + meson_src_install + + systemd_douserunit contrib/systemd/mako.service +}