[gentoo-commits] repo/gentoo:master commit in: gui-apps/mako/

[Sam James]

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
+}