gentoo auto-resync : 11:03:2023 - 18:08:11

6 files changed, 31 insertions, 21 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index d36af38a788f..ce49078aa968 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index 9fbdf0934c55..dbf3ad393325 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,5 +1,5 @@
 DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
-EBUILD grim-1.4.0-r1.ebuild 1068 BLAKE2B e2c28e3c00629303f9016e05639be339a53ccfd7d17405b899da408a451970e58ad1209022fb22d395de910e9eb845a2dfe80712752c2e2835ef369a6d48d252 SHA512 568f8c6b0abf4cf9fa4cabe23bac69ddfcc8bf5ff904a989e562e39d2f22d8991080b437cd19dd3fa939a7d22cd9b4a6f787f325cbae7c7d5c967181c2f06a80
+EBUILD grim-1.4.0-r1.ebuild 1065 BLAKE2B 4703eaead2310f84e4de8a9ef0797f31fe232f4e64de3a031960dbe6b1a75b0fbc14cadc9d6eb188935b8d425982c3fd8e17b43b7f5653b0c1232bd045a46e81 SHA512 873f906038608fc5a8df65f370fb95ae58a7aab57ff62dbae2f84acb7422b4bd1725d9f61b42fee153967d840be6d391bd5fbb1325c04dfb28634bad75be3d75
 EBUILD grim-1.4.0-r3.ebuild 1073 BLAKE2B da0d77cde31f7985131448d34eea587635333d8836854757c34b94b958746626af8ae84c62da126caa08ec1d8379112b35c76df7e20dad87968be3e61fcad802 SHA512 29ba3c1267a723a2970dc628594d976ddd4fc4b3a1239c8a0e39d116036e6334dc8948bab80caf7fc8da0597ec90dacdfb02ef96d6ecf8f1aaba69212f33fd58
 EBUILD grim-9999.ebuild 1102 BLAKE2B 7645ed551bad34e5f7299aee1ce7ec1502b8609c1ab1aaf515e9e7bcc1ae6b296a6351a03748ec4b20d99abe8f55120cf347516a23b25f078f8ab9d3787316bd SHA512 3752c3589ef10b133b5c1f6de68bd4c2a0213a190c3b73b30dc6b5b97df401ef1e5beffd839a7c039fe43e54928f75c772036a091d5d5ddd829d7bcb5345a8cd
 MISC metadata.xml 514 BLAKE2B 48be3679b17a0e46ac29453d7eba0886ce6f31cf47a25c7ea2d9a810792478401f9493fbac7e1c0fbf6e246d67ab80bed4c7c936c0eae7a1536614c58dee6294 SHA512 5064c4a13c8168a5691d19dfeb281847b33899822169b13523d48842fb9eedbea28341725769933ba15a830c1d2acd8f399de99a58ad4f6dacc9d5dad53fb05c
diff --git a/gui-apps/grim/grim-1.4.0-r1.ebuild b/gui-apps/grim/grim-1.4.0-r1.ebuild
index a3bbdf2d9a17..fd3752c9452e 100644
--- a/gui-apps/grim/grim-1.4.0-r1.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r1.ebuild
@@ -20,14 +20,15 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="+man jpeg"
 
-DEPEND="
+RDEPEND="
 	dev-libs/wayland
-	>=dev-libs/wayland-protocols-1.14
 	media-libs/libpng
 	x11-libs/pixman
 	jpeg? ( media-libs/libjpeg-turbo )
 "
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.14
+"
 BDEPEND="man? ( app-text/scdoc )"
 
 src_configure() {
@@ -45,5 +46,5 @@ src_install() {
 
 	newbashcomp contrib/completions/bash/grim.bash grim
 	insinto /usr/share/fish/vendor_completions.d/
-	doins contrib/completions/fish/grim.fish
+	doins contrib/completions/grim.fish
 }
diff --git a/gui-apps/mako/Manifest b/gui-apps/mako/Manifest
index fb348a8aa029..f982a4065079 100644
--- a/gui-apps/mako/Manifest
+++ b/gui-apps/mako/Manifest
@@ -1,5 +1,5 @@
 DIST mako-1.7.1.tar.gz 62511 BLAKE2B 2556e0be7181999624cfa09898649c61a18691559c9693660db0ff79966bead32c327f217ecc66110526f5dfe02154083334ae8fa82f110869a59f29fa9bc5ae SHA512 a6066327fe6f19eb2717773dca0ea52eb1ad5c402780d12aa07b184f8a11c27a7c77e5c037cd9ff618bce35caa740da1af6ad3b41509e80e75ab5c0efb032588
-EBUILD mako-1.7.1-r1.ebuild 1347 BLAKE2B 0c7224bead6b12288cf1c00a0c2189771d018f8a54d85f9047f0815c10d6b82446911f6db73583a4e48a805d9005a94fe730aab98d8f8b281e08cca22aaae2c6 SHA512 22c53697e0052aacc0a728f42d4679df74dbf01a26045ddd9401fa4d39c64a2881832141bb2ebc05a58172f1cf655d4cb1ceb94e6e003bedc1ce4ea605f2fa26
+EBUILD mako-1.7.1-r1.ebuild 1348 BLAKE2B bd07cade08d52298c358b124589a080d49d1bfa7f4b88457ad1e84b4508178a66f77f65e94da410a3d8b00a90ef550f98be56634d4c3187c564c27f47934f0cb SHA512 45d5c24425dc28f52d40b3b6c6358bdbb2307ad27eeaefd3278d063a9b80b83b2f2d554342a9209c43e2bbcacc036f74eb8a43cc47e39d7b81e162a314a30d5b
 EBUILD mako-1.7.1.ebuild 1172 BLAKE2B 9981e00c6aa928052b4c84a218c2f6f9f05212908c06691ffebb6130f51ae9ebb586bf77f5e4efad42e4196db91d2755f77bf0413de275469bf5b5bf5fe2d368 SHA512 4d67a4b0e07525652ed949c160e05aa202c174edcfb037eae6ba7d1ee02f74100ac8445879362ce17f2d9f94e26fd22d4fa5f058e1c61db858c12a32ddbf6739
-EBUILD mako-9999.ebuild 1174 BLAKE2B 38855f660571ea69062473caa2c5d3f37e8d0a2997c8cfa9a153edb146d2fb50de9cfad842dc22a62298e09fecdd1960a22537369beb6a91bab3fb60f92dfe4f SHA512 e78402531183c279c83a560dc081624c6f8b34c1b967556d91a76e82a84e1c3a2467cb38fa7c16ad85700b44611c724fea020aead449aac720fb55f0fb1a73cc
+EBUILD mako-9999.ebuild 1348 BLAKE2B bd07cade08d52298c358b124589a080d49d1bfa7f4b88457ad1e84b4508178a66f77f65e94da410a3d8b00a90ef550f98be56634d4c3187c564c27f47934f0cb SHA512 45d5c24425dc28f52d40b3b6c6358bdbb2307ad27eeaefd3278d063a9b80b83b2f2d554342a9209c43e2bbcacc036f74eb8a43cc47e39d7b81e162a314a30d5b
 MISC metadata.xml 529 BLAKE2B 4f2efb156f415c6ac8c411f200ef91235304bb2b4cc794ccab638e401164964d8e0268f3ecba0f5dc59bd80c38d0af6fe90b8b8498c317fed041615e4d965ee3 SHA512 f7186a5e6122993c032d502103485093db262193834f568b19a3c19b3b5187e7cfc658c11a53fd47ebb57e091db8734e6f83c4cf99b740fd6f99478bc4275405
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
+}