| 1 |
commit: 97985fb97c421b1301b70c750f90051fbcf70bae |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 25 22:08:39 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 25 22:09:50 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97985fb9 |
| 7 |
|
| 8 |
gui-apps/mako: fix automagic basu usage |
| 9 |
|
| 10 |
Not sure how I missed that before! |
| 11 |
|
| 12 |
Fixes: 8f162d2e7717b30d130925a72129d56a4fbd4daa |
| 13 |
Closes: https://bugs.gentoo.org/783156 |
| 14 |
Reported-by: Arsen Arsenovic <arsen <AT> aarsen.me> |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../mako/{mako-1.6-r2.ebuild => mako-1.6-r3.ebuild} | 17 +++++++++++++---- |
| 18 |
gui-apps/mako/mako-9999.ebuild | 17 +++++++++++++---- |
| 19 |
2 files changed, 26 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/gui-apps/mako/mako-1.6-r2.ebuild b/gui-apps/mako/mako-1.6-r3.ebuild |
| 22 |
similarity index 72% |
| 23 |
rename from gui-apps/mako/mako-1.6-r2.ebuild |
| 24 |
rename to gui-apps/mako/mako-1.6-r3.ebuild |
| 25 |
index 89b09c2d756e..dc520d5f6127 100644 |
| 26 |
--- a/gui-apps/mako/mako-1.6-r2.ebuild |
| 27 |
+++ b/gui-apps/mako/mako-1.6-r3.ebuild |
| 28 |
@@ -13,20 +13,20 @@ if [[ ${PV} == 9999 ]]; then |
| 29 |
EGIT_REPO_URI="https://github.com/emersion/${PN}.git" |
| 30 |
else |
| 31 |
SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 32 |
- KEYWORDS="amd64 arm64 x86" |
| 33 |
+ KEYWORDS="~amd64 ~arm64 ~x86" |
| 34 |
fi |
| 35 |
|
| 36 |
LICENSE="MIT" |
| 37 |
SLOT="0" |
| 38 |
-IUSE="+icons" |
| 39 |
+IUSE="elogind +icons systemd" |
| 40 |
|
| 41 |
DEPEND=" |
| 42 |
dev-libs/wayland |
| 43 |
x11-libs/pango |
| 44 |
x11-libs/cairo |
| 45 |
|| ( |
| 46 |
- sys-apps/systemd |
| 47 |
- sys-auth/elogind |
| 48 |
+ systemd? ( sys-apps/systemd ) |
| 49 |
+ elogind? ( sys-auth/elogind ) |
| 50 |
sys-libs/basu |
| 51 |
) |
| 52 |
sys-apps/dbus |
| 53 |
@@ -49,5 +49,14 @@ src_configure() { |
| 54 |
-Dicons=$(usex icons enabled disabled) |
| 55 |
"-Dwerror=false" |
| 56 |
) |
| 57 |
+ |
| 58 |
+ if use systemd ; then |
| 59 |
+ emesonargs+=( -Dsd-bus-provider=libsystemd ) |
| 60 |
+ elif use elogind ; then |
| 61 |
+ emesonargs+=( -Dsd-bus-provider=libelogind ) |
| 62 |
+ else |
| 63 |
+ emesonargs+=( -Dsd-bus-provider=basu ) |
| 64 |
+ fi |
| 65 |
+ |
| 66 |
meson_src_configure |
| 67 |
} |
| 68 |
|
| 69 |
diff --git a/gui-apps/mako/mako-9999.ebuild b/gui-apps/mako/mako-9999.ebuild |
| 70 |
index 920feefafb99..dc520d5f6127 100644 |
| 71 |
--- a/gui-apps/mako/mako-9999.ebuild |
| 72 |
+++ b/gui-apps/mako/mako-9999.ebuild |
| 73 |
@@ -18,15 +18,15 @@ fi |
| 74 |
|
| 75 |
LICENSE="MIT" |
| 76 |
SLOT="0" |
| 77 |
-IUSE="+icons" |
| 78 |
+IUSE="elogind +icons systemd" |
| 79 |
|
| 80 |
DEPEND=" |
| 81 |
dev-libs/wayland |
| 82 |
x11-libs/pango |
| 83 |
x11-libs/cairo |
| 84 |
|| ( |
| 85 |
- sys-apps/systemd |
| 86 |
- sys-auth/elogind |
| 87 |
+ systemd? ( sys-apps/systemd ) |
| 88 |
+ elogind? ( sys-auth/elogind ) |
| 89 |
sys-libs/basu |
| 90 |
) |
| 91 |
sys-apps/dbus |
| 92 |
@@ -37,7 +37,7 @@ DEPEND=" |
| 93 |
" |
| 94 |
RDEPEND=" |
| 95 |
${DEPEND} |
| 96 |
- dev-libs/wayland-protocols |
| 97 |
+ >=dev-libs/wayland-protocols-1.21 |
| 98 |
" |
| 99 |
BDEPEND=" |
| 100 |
virtual/pkgconfig |
| 101 |
@@ -49,5 +49,14 @@ src_configure() { |
| 102 |
-Dicons=$(usex icons enabled disabled) |
| 103 |
"-Dwerror=false" |
| 104 |
) |
| 105 |
+ |
| 106 |
+ if use systemd ; then |
| 107 |
+ emesonargs+=( -Dsd-bus-provider=libsystemd ) |
| 108 |
+ elif use elogind ; then |
| 109 |
+ emesonargs+=( -Dsd-bus-provider=libelogind ) |
| 110 |
+ else |
| 111 |
+ emesonargs+=( -Dsd-bus-provider=basu ) |
| 112 |
+ fi |
| 113 |
+ |
| 114 |
meson_src_configure |
| 115 |
} |
Archives