gentoo auto-resync : 03:07:2023 - 22:06:45

5 files changed, 68 insertions, 6 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 0b7c406c181d..d8432e072ece 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index 3007d60ab79e..d9eceabde50c 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,4 +1,6 @@
 DIST grim-1.4.0.tar.gz 18287 BLAKE2B 72606de01624c98876fe1018877a3cf0b25b44ac4bd6a053f82c40ad1ea2c6c0e510cbb6a0bce988f14607ea162dda1d8350b9f30b0f2b9acd8f8e20ba50bc99 SHA512 d0b33528a00528b3ef7488a0984cde5034de4f5a211eb5c8d3299aea356d9348c5d02d08171802bc0315afb19d2446f5f132ea9dca0579ace803b7d5d90a89cc
-EBUILD grim-1.4.0-r3.ebuild 1070 BLAKE2B ded6897cad4cb5f09492469ba7084a1280c0cb1fd5e00ea14588627e28957963b090096b0389a9d140874aedef21248d2317da6ac1fc0c73930ae89fb5d086c3 SHA512 648e6b5ef18201d32d4b660283fc4cbf5a080fe2063dddc25287708bdf4576ed12ee0cbefb1cf7a695942ae888a292e3e17efc8c53d6c91b537daec4a8fbb306
-EBUILD grim-9999.ebuild 1102 BLAKE2B 7645ed551bad34e5f7299aee1ce7ec1502b8609c1ab1aaf515e9e7bcc1ae6b296a6351a03748ec4b20d99abe8f55120cf347516a23b25f078f8ab9d3787316bd SHA512 3752c3589ef10b133b5c1f6de68bd4c2a0213a190c3b73b30dc6b5b97df401ef1e5beffd839a7c039fe43e54928f75c772036a091d5d5ddd829d7bcb5345a8cd
+DIST grim-1.4.1.tar.gz 18372 BLAKE2B cfb432205c9ef47bc292e995c0095f2df492bf0eae63556baa3c1f8a845171f71c5b632c78394b7fad02ac6508d266ea43f912f9cbb75bb786df91c4d38df1e9 SHA512 e6f5e540a4e70467971b932c4a36bda88742de360925cf1bb1908823f76ac295c8ef5ec953fcdeb083c39b13a8cd24a01d4739ae4cc37e106b60956266eeef22
+EBUILD grim-1.4.0-r3.ebuild 1099 BLAKE2B 2dfe8d79bf4373a80627a375367ef78b13ce1cd0f43e953a7a2067cfd2cf38510cd188199cc7f0418ec687c96a4a8031da4bf875847e54fc2ac11f73b4b32c05 SHA512 ade407fd07feb9a45065d059a1b0f4cb0363762a643057cb4f6b06e1a03312d7eadce4466b8872d1e78b2f14e45252aa20d38de080fefb0cc90d9639a80993a9
+EBUILD grim-1.4.1.ebuild 1131 BLAKE2B 5fff9872b0028f03b22d907c0dca6c4ec80f00124432222519bb61c6c96e8bbd3d62ef429d475eb70286c68a9c4db908f25c949c74166687dddadb1263bb3198 SHA512 bd8c87545e2b8752f4b96c739dd18108f7ff0d7a53d1b18b7dcefb2a8eeca9dc5feea6067a1a2dca667c18c7ce03eb8c46f524bee1682f5dd0a289688a2795a3
+EBUILD grim-9999.ebuild 1131 BLAKE2B 5fff9872b0028f03b22d907c0dca6c4ec80f00124432222519bb61c6c96e8bbd3d62ef429d475eb70286c68a9c4db908f25c949c74166687dddadb1263bb3198 SHA512 bd8c87545e2b8752f4b96c739dd18108f7ff0d7a53d1b18b7dcefb2a8eeca9dc5feea6067a1a2dca667c18c7ce03eb8c46f524bee1682f5dd0a289688a2795a3
 MISC metadata.xml 514 BLAKE2B 48be3679b17a0e46ac29453d7eba0886ce6f31cf47a25c7ea2d9a810792478401f9493fbac7e1c0fbf6e246d67ab80bed4c7c936c0eae7a1536614c58dee6294 SHA512 5064c4a13c8168a5691d19dfeb281847b33899822169b13523d48842fb9eedbea28341725769933ba15a830c1d2acd8f399de99a58ad4f6dacc9d5dad53fb05c
diff --git a/gui-apps/grim/grim-1.4.0-r3.ebuild b/gui-apps/grim/grim-1.4.0-r3.ebuild
index 1a332add693b..bc362032ee7d 100644
--- a/gui-apps/grim/grim-1.4.0-r3.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r3.ebuild
@@ -29,7 +29,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/wayland-protocols-1.14
 "
-BDEPEND="man? ( app-text/scdoc )"
+BDEPEND="
+	dev-util/wayland-scanner
+	man? ( app-text/scdoc )
+"
 
 src_configure() {
 	local emesonargs=(
diff --git a/gui-apps/grim/grim-1.4.1.ebuild b/gui-apps/grim/grim-1.4.1.ebuild
new file mode 100644
index 000000000000..a2ae2ffd137c
--- /dev/null
+++ b/gui-apps/grim/grim-1.4.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Grab images from a Wayland compositor"
+HOMEPAGE="https://sr.ht/~emersion/grim"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
+else
+	SRC_URI="https://git.sr.ht/~emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man jpeg"
+
+RDEPEND="
+	dev-libs/wayland
+	media-libs/libpng
+	x11-libs/pixman
+	jpeg? ( media-libs/libjpeg-turbo )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/wayland-protocols-1.14
+"
+BDEPEND="
+	dev-util/wayland-scanner
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature jpeg)
+		$(meson_feature man man-pages)
+		"-Dbash-completions=false"
+		"-Dfish-completions=false"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newbashcomp contrib/completions/bash/grim.bash grim
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completions/fish/grim.fish
+}
diff --git a/gui-apps/grim/grim-9999.ebuild b/gui-apps/grim/grim-9999.ebuild
index 654a78d5cc27..a2ae2ffd137c 100644
--- a/gui-apps/grim/grim-9999.ebuild
+++ b/gui-apps/grim/grim-9999.ebuild
@@ -12,9 +12,9 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
 else
-	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	SRC_URI="https://git.sr.ht/~emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-v${PV}"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
@@ -30,7 +30,10 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	>=dev-libs/wayland-protocols-1.14
 "
-BDEPEND="man? ( app-text/scdoc )"
+BDEPEND="
+	dev-util/wayland-scanner
+	man? ( app-text/scdoc )
+"
 
 src_configure() {
 	local emesonargs=(