gentoo resync : 25.03.2022

26 files changed, 317 insertions, 21 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 04868939e596..482a80aab97a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 330ed7da241d..a95b0cffd5cd 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-3.26.8.tar.xz 479356 BLAKE2B ab781311473e045ffbb88e741427ac59f129fa53e6c551231d7b6edae81d21483dd1f1e7874561dfa29c9e9b2ba01fbdb174302bf8363478b785ec2ce38c53ec SHA512 a58aa849b09761dd0c7f7d31098560969872b03788f3f3ee81445dfb9be653b29e0e6646abc4e0164e4146abf7a9d2e6aadf56071f71c119493dcf1fd706a069
+DIST eog-plugins-42.0.tar.xz 132008 BLAKE2B 0dbe9ddcdf8f9a7f4da46caffe091a5d6e09327e1277b41474ecf8a3ec63ee7217fdc0cbafd1c47007f83b8ae30f30d91031c76f31473df79cda01aee23314ea SHA512 297b31fefa28f4eda73734ddcdb7702b9c9fa3493b4c13d3bf013e24ddb9015299bcd8f2af6a1976c4bf8c694fea0cc9699e82755d5e0689e71738a6d2fb2fe4
 EBUILD eog-plugins-3.26.8.ebuild 1725 BLAKE2B f685d824292edc02b08cb0b2adc7d68fff1ef2868c742be61be0ff579795ebd3514f46a2594cc0d7d42eb8b95ee903a733ce88e9b2eca889944e08670c3480c2 SHA512 57604bd1094981357339c5a1382a21a517cd4538c09189a65e1927c61b63363ab36519c52cb99cf9a003e62ff887080b272a39bf4214050b7532749747da03c3
+EBUILD eog-plugins-42.0.ebuild 1681 BLAKE2B 95fdd675235a22c6800fff0d27f95ba3ec2e1c6802a7ded06e07c249a1c1e6c2d58c529c75c60bf1a8add7ec9d147de74226c6ec1df818c191dd0f949c3ef12c SHA512 a71006c09e8e82f7e6f2a8789f0ea0d893f6246f451b295f7093786eb84af307a9ec4098f2d35dbda371364ecc79801c2def9ea41bb9f239b820fc4f49c7dbdd
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-42.0.ebuild b/media-gfx/eog-plugins/eog-plugins-42.0.ebuild
new file mode 100644
index 000000000000..ae3bb0bb211a
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-42.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org meson python-single-r1
+
+DESCRIPTION="Eye of GNOME plugins"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome/Plugins"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+exif map picasa +python"
+REQUIRED_USE="
+	map? ( exif )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-1.14.1:=
+	>=media-gfx/eog-41.0
+	exif? ( >=media-libs/libexif-0.6.16 )
+	map? (
+		media-libs/libchamplain:0.12[gtk]
+		>=media-libs/clutter-1.9.4:1.0
+		>=media-libs/clutter-gtk-1.1.2:1.0
+	)
+	picasa? ( >=dev-libs/libgdata-0.9.1:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/glib[dbus]
+		dev-libs/libpeas:=[gtk,python,${PYTHON_SINGLE_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_USEDEP}]
+		')
+		gnome-base/gsettings-desktop-schemas
+		media-gfx/eog[introspection]
+		x11-libs/gtk+:3[introspection]
+		x11-libs/pango[introspection]
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif plugin_exif-display)
+		$(meson_use python plugin_export-to-folder)
+		-Dplugin_fit-to-width=true
+		$(meson_use python plugin_fullscreenbg)
+		-Dplugin_light-theme=true
+		$(meson_use map plugin_map)
+		$(meson_use python plugin_maximize-windows)
+		$(meson_use picasa plugin_postasa)
+		-Dplugin_postr=false
+		$(meson_use python plugin_pythonconsole)
+		-Dplugin_send-by-mail=true
+		$(meson_use python plugin_slideshowshuffle)
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index 10750f51dc8e..94f58cd3a3e8 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,3 +1,5 @@
 DIST eog-41.1.tar.xz 3603320 BLAKE2B 8b0d7affe921bcb2c917f89dc3845360f784b5d5f394a7f94379c98cd905504cde7a8fb6f59aa09bc778e302113ad27ec5815e529b418d68a3012fbf9b018d65 SHA512 0fa514dd6ef195e449bbde183f94850dfca764815a95423376bc0da422d07b6cbd7b35bbdd5ba9d8f995f55aae1e1b65d57626d1809cccf95389767d0ed594e8
+DIST eog-42.0.tar.xz 4446392 BLAKE2B bb89eadaf2066f0ef3b6f99d47d75b438adfd3bca0451e8fa5d4513e98d1e8c6acc518eb7564f2768d43205a56843852edc1aa1ecce9fac8018ae4954376b852 SHA512 3901dbac9a371bac1e1bdc143e3d257a8e25fa2743a97bd9f9ecdb06e43cd5278edf33a46ab24c5e40babef6825181c986c99d9b4fafead71e04f51e65ae2acb
 EBUILD eog-41.1.ebuild 1638 BLAKE2B 1a794ce6f1dad0814421a93c46b50fe01db32105f6f02ff5c0be382331abd2c830a836f293f879902e0cbff5cad17a79c011e8cac357f3673edec997b0ac9140 SHA512 007349404c2bbd0d24a9b84843e9c4ca6db8bc9c9c09fe7638234fe8dc022b6297fe4e903bd286c0c58fad566a43dee8711f256b45d2fad9db3fff3f4da2b18b
+EBUILD eog-42.0.ebuild 1669 BLAKE2B eec46e687c48aea2c7e8dfa64ac63dd411e7d254792684305455b8ed4be21fcc63114b94760e284ce149e999f97bf08aac339a8cf59d23f8e94681af88b21293 SHA512 a9cff1c2f4429660a79a162cb912897caacbf469d15bbe1b61796d9c95c1f7b71b800ae496442e9a03666bef6e824ed5d38d73a8f3d32fab24db9525941b0f25
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-42.0.ebuild b/media-gfx/eog/eog-42.0.ebuild
new file mode 100644
index 000000000000..e5b638b70d44
--- /dev/null
+++ b/media-gfx/eog/eog-42.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-42_beta
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.24.15:3[introspection,X]
+	>=gui-libs/libhandy-1.5.0:1
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? (
+		dev-util/gi-docgen
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # As of 40.3, all libportal usages are flatpak-specific
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/farbfeld/Manifest b/media-gfx/farbfeld/Manifest
index 8b24e8ab313f..3beebcf91b2d 100644
--- a/media-gfx/farbfeld/Manifest
+++ b/media-gfx/farbfeld/Manifest
@@ -1,4 +1,4 @@
 DIST farbfeld-4.tar.gz 10340 BLAKE2B 0ef13baabe70f0be485746602a77eb4002c8611d1ccb0468de512b687eb9a5c48dafb81c12274e29377697bc70d3586f4a71b47e82ffd3f6238398741565c1b9 SHA512 5139dd81cf1e3cb7a32108c0acad0e4ae0de13e86b997f1a759aa1b1f7be6c1ad2a93a69af7126e3512a7c9b1669a2a301ff60171b098b3450f1da0594e3b6ac
-EBUILD farbfeld-4.ebuild 761 BLAKE2B e5746da38c2a34fe6cc9cff7764f19988d2aa15b28776835f7afb0e975d93b0faa970920b02f806aeba06447ced6ebe07bb8689fdec323ae5f0ccbf46911e8cb SHA512 d17a0f75ed5063c3a898c6eaab81031e3604364e1dfef5209ceb6523e25cd1c4df4efb421f738f64bbf2ee0fc703d9dcbaa70703907a5ca891b013232c2d807d
-EBUILD farbfeld-9999.ebuild 757 BLAKE2B 11f98fef448e43c042811cce0d00a545ed79ec2ba0f732569b64d23bb0e08ebc534d5d60591d0a7aa297c01d5a7088ea076d09362cb0cd03c0aeb4b07c17a68b SHA512 38482a2850a26b59b87bd35179ac740d382e0b6f6b63ae7febb395717ee874627d0e45257915ba32e5e6e2e3c8782290f4090b411d5d9d031366d6ed338d6122
+EBUILD farbfeld-4.ebuild 760 BLAKE2B ee98282c9a4f1eb49700147790bdc9514e7b32413b8c6fa79ea1dd7ede3bfcbc9a3509fdd4765634370b9005af5eca00859e60c430d8cfe94896a1e29753d323 SHA512 e91ea4a0ef341f87b4065613bfc0971b2f25cd0fcb5b6658cf2ed4c887e2c45e6a6ec3c2e0956936fadb0952523bafa4c39b844df06f8d87d4a9f6f360b7cb23
+EBUILD farbfeld-9999.ebuild 759 BLAKE2B 291733ed12f46d3b192d82e52c86ccc1dac76e2dae90bca11b523b028cda9675f038bdc608a02495d9659c93ebcc9c7571966a696a4d446cad1a59eaf3dce68a SHA512 e8be720120707369a5e909599184ed08e3e18e8e7c5af9d2857f2562953cdd9a95be15767af1c29f102bcdeaa638d5546cbaad8e3e5db4be22264b3fb4cda186
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/farbfeld/farbfeld-4.ebuild b/media-gfx/farbfeld/farbfeld-4.ebuild
index d41a6ee63dd3..a5077ea2ef7a 100644
--- a/media-gfx/farbfeld/farbfeld-4.ebuild
+++ b/media-gfx/farbfeld/farbfeld-4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/media-gfx/farbfeld/farbfeld-9999.ebuild b/media-gfx/farbfeld/farbfeld-9999.ebuild
index fb16c050f043..22c5798976ce 100644
--- a/media-gfx/farbfeld/farbfeld-9999.ebuild
+++ b/media-gfx/farbfeld/farbfeld-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC)
+	emake CC="$(tc-getCC)"
 }
 
 src_install() {
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index a0a13b257a37..fe43185f4412 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,5 +5,5 @@ DIST gimp-2.99.10.tar.bz2 26782056 BLAKE2B 103e7fa2d04b1989e59fb03964a122891831d
 EBUILD gimp-2.10.28-r1.ebuild 5566 BLAKE2B 6475774d4d3af42eeb436c01b84fb14991c707b209e0b0aa3b9115d120cbc09f33c811a35e2e39a7ba373c0c3649f840527ac60fc42b8fa3dc1066d346e6d9fb SHA512 a956a96435e584b74166e0a015fbd376d0402f552f211dd0947a8b049d8cb3826a657de6ba3cf4697bd2e64638194d2692776897c8809f81d177fc8a78147bec
 EBUILD gimp-2.10.30.ebuild 5566 BLAKE2B ebd2a95b71587d02a31d422a405d3e3865ae89c4100b70e3c0a88912fb39a0436bad8bde3faab4d3337f20713a0ca251996cd7b57c5c3bbd568b2f1407b52f6a SHA512 28f5384828301e3c61a3698ebf7d465ae0f40d2776bdff808b45f5444917d8038d7938a9712180b8fae1fd33b48d1cd33debb5ed9bb1ffcb347175ebba8c7959
 EBUILD gimp-2.99.10.ebuild 6542 BLAKE2B df05e1a2e301c88a892d8415dc82fc5b4e7a25df9b2c14fcb3f955230763eae67bbf7ca20e1d79ad27a31943c59e99d3243f11c6f8a26bde6b7454043f4d99ca SHA512 de9c1627f5f38fbb254ac019fe3f21c85337025df3b49e407963cc291a83b7f857e0876a3c1997652e356d55d2c6177036fdd73b29cd8ed20c2bde08b3c97390
-EBUILD gimp-9999.ebuild 6573 BLAKE2B ab7573eb230ad1553532ddfa3331f87de8d7ed93c1156fe243686bf5313652ad619813e1b1ce159ca6c2d0c7d364bbfc8517ba0ce6e46c21b1f559e06c7ffc13 SHA512 e3e39eb903626c5da6bc96714a3fee032c847e1a4fdaffb3670677190a848614711ab36589cd839414e0111bb9fc1c14db9d5f3b26229f199e387ca06c9a12fa
-MISC metadata.xml 577 BLAKE2B a8bfdc064608bf0bb4a2f81a5de928d7eb35da9eaf2db64198ca34ca8b2542116ed1f341fe822354fa60b8d447676eb892c38dc4093b4b9db16622fe9d64bba8 SHA512 12e030815c13bc253aa877c7da837e01f8d259a6297807c0543f05e21edb92fda38b3a54a064b4721172fcc3db9d0ed2ae580118d51f03fc37f6ac4bacde5154
+EBUILD gimp-9999.ebuild 6642 BLAKE2B 6c76ac84a1a10b0b9fa6677b7048ec557374d903c087f35a7ad1931a806391a23220086941d81ba07d0c88789662246d0d016d08ba297551a5fbe34fd47cca92 SHA512 8b4be348bd2d139ed54a3e90a1d0fa299e85fe0d5059469ec841d181e8ea9347b213f31eafba7fad65c31ff4185dd0e6618bf60da69858b94dd484ae91fd1d96
+MISC metadata.xml 646 BLAKE2B 167cb95fb064b2470cdbb6b625f7d6e24aacac57081a1177fdc9e878b4cf1a20c6b86a7e621530b45bc7db5f07e173a47829fd5be9dde6f9b9fcf54a39f24236 SHA512 9f6501b6a14f860be69e29baaace61fe4c964413b8c43882bf06144406333f4d69d6adaa315503dc83fbdb467cd47e3d752ed6abe4b78bd5cb32fb9f3be1ac1d
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 28a370966ece..bcead23bec7b 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -18,7 +18,7 @@ SRC_URI=""
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
 
-IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k jpegxl lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="
 	lua? ( ${LUA_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -63,6 +63,7 @@ COMMON_DEPEND="
 	heif? ( >=media-libs/libheif-1.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
 	lua? (
 		${LUA_DEPS}
 		$(lua_gen_cond_dep '
@@ -181,6 +182,7 @@ src_configure() {
 		$(use_with heif libheif)
 		$(use_with javascript)
 		$(use_with jpeg2k jpeg2000)
+		$(use_with jpegxl)
 		$(use_with lua)
 		$(use_with mng libmng)
 		$(use_with openexr)
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index a88c4f2091f9..a6a6e9603073 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+		<flag name="jpegxl">Enable support for JPEG XL image format</flag>
 		<flag name="vector-icons">Enable support for vector icons (experimental)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/gnome-photos/Manifest b/media-gfx/gnome-photos/Manifest
index d14ba3d5ea06..9eb1e60809c8 100644
--- a/media-gfx/gnome-photos/Manifest
+++ b/media-gfx/gnome-photos/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-fix-build-with-meson-0.61.1.patch 779 BLAKE2B 12af9247983044bf674c38f4011dc497e8f10f77dd46e87b4a2ae882922f8936a19bcda0cd440cb96f5be646852e27d0d994987ab0a070288193c76c04b33df6 SHA512 96fb1217b6265f229e0d70a65413fb0b56c110c28f300b26020cb7bf575cf1ec8dd8905bddae2e7c334f90b213f8a5bf208ce664e66343fda713ac98f472d6b4
 DIST gnome-photos-40.0.tar.xz 632440 BLAKE2B 4a3be35e627169afa4b3b9aca2c675f6035f3e46822450fc479550a3e48aebba6f9e335dc528a6593f1bd844fde501b8535ed368be9825f229280a08d5ead7e6 SHA512 70641e7fc6375e15cadc62ad75804d3ffb1d2193dd0bbed21b291b38f1d271ba7d34a4714a1658b9f13345f20e421190958b4713aae64f4f46913628079ba814
+DIST gnome-photos-42.0.tar.xz 2855624 BLAKE2B a980cc2f581f1f6834925426ba3e0e7e6c341d939b2fbe2aa40c737669fb09fcdd8bb64fd0dfbee640d8dd73061281b6b92f97cfb5737cbeca9788c9e01d7fbe SHA512 cddaa84596a180fb2a4d70db65c6e625e3d94bccbdc7bcc83ed577b9306210a2879e3d40f8823a9e097f78caa6fccc53404194e7dce0629db3ebda1aa428b714
 EBUILD gnome-photos-40.0.ebuild 2493 BLAKE2B 1d72bed250adf2098adeb9ec402751bd45817f3969cec39c459feaa3c93b066bbfc9c7f92a780f95e400cb4bac429db0c512464788e1fe6fdcccca27850e3c46 SHA512 e8dc79d269d3c1506dfaf16e03c87239a51f24c2d56f8b611c4d3f44a2cb7fffb0db9ee5af1b2a93b990c12363e7643bed58b1269c45662a7581f9beb763e973
+EBUILD gnome-photos-42.0.ebuild 2444 BLAKE2B d4dec905f1a30fe7439b9aee77bd1abf43baa3502a7f7b7b63b54334880652b4a5e19c577d17e867ca12bfd6815b0e98c2497dab4a193cb1b3acb5f225e7fd16 SHA512 b2998fa278183fb7643d1870050205e24c1f88269782fdb22982e22b8d63253c4a351eaf9bfbbc5ebc5f5fd43f59cc10680d4ce672e7c2c7944c634d0d30b17d
 MISC metadata.xml 993 BLAKE2B 19e15d88f2176fa80739650a2d3ae57e34a662e5a4424a00a33bc785e4e4a35d57fc28d678885e4e18564318e93957b689ff36ea96bea69038a377400c6217f2 SHA512 19300545f23b83e06df0db74a605b48a62f5dd462db1ef69de903123209b50331ceffec783bd9564a15ee10dd1f0a6fc9e396f1384e56f7bb0cc83af08d1fda4
diff --git a/media-gfx/gnome-photos/gnome-photos-42.0.ebuild b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
new file mode 100644
index 000000000000..0ad5b2620be4
--- /dev/null
+++ b/media-gfx/gnome-photos/gnome-photos-42.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome.org gnome2-utils meson python-any-r1 virtualx xdg
+
+DESCRIPTION="Access, organize and share your photos on GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Photos"
+
+LICENSE="GPL-3+ LGPL-2+ CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="flickr test upnp-av"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/babl
+	>=x11-libs/cairo-1.14.0
+	>=x11-libs/gdk-pixbuf-2.36.8:2
+	>=media-libs/gegl-0.4.0:0.4[cairo,raw]
+	sci-geosciences/geocode-glib
+	>=media-libs/gexiv2-0.10.8
+	>=dev-libs/glib-2.62.0:2
+	>=net-libs/gnome-online-accounts-3.8.0:=
+	>=media-libs/grilo-0.3.5:0.3=
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.22.16:3
+	>=dev-libs/libdazzle-3.26.0
+	>=dev-libs/libgdata-0.17.13:0=[gnome-online-accounts]
+	>=net-libs/libgfbgraph-0.2.1:0.2
+	>=gui-libs/libhandy-1.1.90:1=
+	virtual/jpeg:0
+	>=media-libs/libpng-1.6:0=
+	app-misc/tracker:3=
+	sys-apps/dbus
+"
+# gnome-online-miners is also used for google, facebook, DLNA - not only flickr
+# but out of all the grilo-plugins, only upnp-av and flickr get used, which have USE flags here,
+# so don't pull it always, but only if either USE flag is enabled.
+# tracker-miners gschema used at runtime.
+RDEPEND="${DEPEND}
+	net-misc/gnome-online-miners[flickr?]
+	upnp-av? ( media-plugins/grilo-plugins:0.3[upnp-av] )
+	flickr? ( media-plugins/grilo-plugins:0.3[flickr] )
+	app-misc/tracker-miners:3
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+	dev-util/desktop-file-utils
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
+"
+
+DOCS=() # meson installs docs itself
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	sed -i -e "/photos_docdir.*=.*join_paths/s/meson.project_name()/'${PF}'/" meson.build
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use test dogtail)
+		-Dflatpak=false
+		-Dinstalled_tests=false
+		-Dmanuals=true
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index 8d887983ed0a..8c1fcd8b2166 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,3 +1,3 @@
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.7-r1.ebuild 1258 BLAKE2B 551f1fa6286a211f64d841eafe91ef8ae5eb682d0dc4de7b726d88f14023fd9206b96d23932c71f7356294e748883cac790db96ab32d14b2ec6f3c7758abacf3 SHA512 472db0bf70083f78713c7e57293741e085fe18aeadbdccce14ac0646c9c74108158a5a2eb47cafd40184fc885daa3d8ca61f43d126431d65220a2b23146672f2
+EBUILD optipng-0.7.7-r1.ebuild 1260 BLAKE2B 79bbb714e6278a8439d5235b723a29808c484be8d6363864c75f0926d3a0f93af8fa01ce46be55ac4f0ebbf89f61a4061fa51ff96c9c715b97f120e37b4217c1 SHA512 3685288cd378cd1f3c1fb18aeb41eb16d8b85005a4a279e0b8c328d1c7645c8ce5a0c50f9164c1b45de78e0aaf4a2ade641318fe3302d96c9a31b023ef3a8784
 MISC metadata.xml 327 BLAKE2B 745b2e0c0f28536549ac19222922e33d7dc69089b79274930fd58ea6e9f4d706c2a6eb78e7d2d8b2cd96c6d9a1252fe35794e08b7254eeb8b3379aca6b9a1856 SHA512 cc024af7ee59e0e27b30963434fde5f655943cc51d20e74912881a43087564f28df0fc4bf93651e479451fd381d57f321b491097b408e45e601394a0507c3b07
diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index e1a8dac9716e..d2a2ee2a0c7f 100644
--- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -31,7 +31,7 @@ src_prepare() {
 		src/optipng/ioutil.c || die
 
 	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
+	export LD="$(tc-getCC)"
 
 	eapply_user
 }
diff --git a/media-gfx/pngnq/Manifest b/media-gfx/pngnq/Manifest
index fa9d498d9b44..21872a312bbf 100644
--- a/media-gfx/pngnq/Manifest
+++ b/media-gfx/pngnq/Manifest
@@ -1,5 +1,7 @@
+AUX pngnq-1.0-Wimplicit-function-declaration.patch 184 BLAKE2B 61f77336540a5e5c4ce53276bb83c49247ca57c19e872b36c088c007e6a732e86b7e0ce087d5b1849e44d2f85a0a65fff3c689e1975d7fc8fed3d31d849906a2 SHA512 e6b3872818e272b847210926d6a3339199d23c5e6d10604ff593506413f7fc6ef52556f88a05f60692f907f9cae1738148cda18fd1c60d19db92226ddf037352
 AUX pngnq-1.0-libpng14.patch 382 BLAKE2B e85fbdccf1765efff65b638dccab6d3e5afa83aa6782f8be8188414985e18000bb68273e2250d2063eac56bca4f1e0481dadf747fc05e94f1d340eb21cdfdc59 SHA512 4194becadf43c3e8c1d63a15e3de1118c386dab4e4e7e6e5622dbc896d3c1cab5ffaac6f6f8c7a504fdf303bb6c0fad44351e7d89b304cd3c4d15908e347fe4f
 AUX pngnq-1.0-libpng15.patch 359 BLAKE2B f031f310aed6a30ed48e8e0754f3e392ccbc2fe9a929443885f3e2f040fb081f5122d6e1c9b89e63bdc0594051faebdcf53e5085a01b1520f256e60d1e06e9b6 SHA512 e2542833a6950b8e8ab09a9973a0df237d5667ce9d75b2e909485398d38517bd7d7d0237d8b1c3875c4538a6157219870cf6c7e29a98e6a1dbb93d11476d1059
 DIST pngnq-1.1.tar.gz 117372 BLAKE2B 94c670342d514c577c386b8fe207307f057e5c0c3816b35ab2b625258051269410b9c5ad45f89c047715bb1ad927909498a6faef5591eb61039fd68c94fc44a6 SHA512 3bbc4ace1375517a7a73bbc65ff39512ef316e4b67fc3941cd0b7269e584a26f915f30591f8aa1c44eea73fe4ebe9519063a7bc426841e412c648aaa188be234
+EBUILD pngnq-1.1-r1.ebuild 628 BLAKE2B bbb2cca24220b88fc81029d19a9417ff702004c5d8230ece077d424014b62d61acc79ca618b9920bf22fb7b5792b7c2f11e1be67eeed18c31eb3c090340b3c64 SHA512 e222e7679494b7ead44f52befea902fe70a1afe7214217cdedb74ecca9170e9bf1d5f450f623212fbef96e00a543393e93806a8ccb591451a365222e80c47c83
 EBUILD pngnq-1.1.ebuild 542 BLAKE2B 034bc177d9d3b5cdd4c957abd3b2c33f3704187d7cdf53beffa4fd65422484774b315cdcdacc7e30359f110829c5ca46aa4b8da7cfdccee6c40961f56f6976fe SHA512 33a67929a65e92063da4f266f0c496ec12109fe620abf737b6fb32b323df9acf06fcd1d1513e4c463d22f031996a32ece5677a0d9a78aa5cf19d204144b19460
 MISC metadata.xml 243 BLAKE2B bc28a5bf618a465e4fe0f7eb0ce8eca6f60cdfa875d7c9d96aea4071a84f17b5a3f7ce20adace95946e312fd8db0583dc2b83a81ec47184f03d6851f05620b49 SHA512 91ef91f45537a1a41d6df99d077d886c517583c7d23c48558d04308f05d9f8c13ee57709c93c4b0852f15b339e75e2b27ff0ddf12b20dec07c4e944679e555e2
diff --git a/media-gfx/pngnq/files/pngnq-1.0-Wimplicit-function-declaration.patch b/media-gfx/pngnq/files/pngnq-1.0-Wimplicit-function-declaration.patch
new file mode 100644
index 000000000000..4b3ffbf0aaad
--- /dev/null
+++ b/media-gfx/pngnq/files/pngnq-1.0-Wimplicit-function-declaration.patch
@@ -0,0 +1,10 @@
+--- a/src/rwpng.c
++++ b/src/rwpng.c
+@@ -31,6 +31,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <zlib.h>
+ 
+ #include "png.h"        /* libpng header */
diff --git a/media-gfx/pngnq/pngnq-1.1-r1.ebuild b/media-gfx/pngnq/pngnq-1.1-r1.ebuild
new file mode 100644
index 000000000000..f8d71e93fc9d
--- /dev/null
+++ b/media-gfx/pngnq/pngnq-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Pngnq is a tool for quantizing PNG images in RGBA format"
+HOMEPAGE="http://pngnq.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD pngnq rwpng"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0-libpng14.patch
+	"${FILESDIR}"/${PN}-1.0-libpng15.patch
+	"${FILESDIR}"/${PN}-1.0-Wimplicit-function-declaration.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-gfx/pngrewrite/Manifest b/media-gfx/pngrewrite/Manifest
index cf5f0a2357cf..635927fbc6fb 100644
--- a/media-gfx/pngrewrite/Manifest
+++ b/media-gfx/pngrewrite/Manifest
@@ -1,3 +1,3 @@
 DIST pngrewrite-1.4.0.zip 149760 BLAKE2B 7ae0acabe8d231233bfab3fe0c6a71da4f835d5c6c6943aa394ec0e83f126c93127d5f798e2206f2c45ed5b9b016a14c45a99ea450b40fd63af09a321fb5d2bd SHA512 9ed9d220a4d8066f752d7ba123dd831ce6550072e7f8dd2327bf257b3d8e886f781c4878896c633a9a251a1311a10af56434e2c9ff773d174233a340a1f37e42
-EBUILD pngrewrite-1.4.0.ebuild 636 BLAKE2B e06e969c4727d71dc64fb57bcf665ceb84601a00d25f9dac7756dab400f98df02160d4c95777b53b28d78cd7c4fcb3f8d088075519b0c5e9725689c532cfedf8 SHA512 057686c8e59d0e7e2408f1199f28a94772adf9c0a587c95df7bd8c861c58cac868414845df4224759dc68d738160bbe9949c96f2be677a888566b75843e2115e
+EBUILD pngrewrite-1.4.0.ebuild 638 BLAKE2B b0b5e1a216dc8a968cd1f8e696aead27cb587fe6f447b9ff11659a178c637c683d404c6c9826e38067a4b23d8a26cb621d066d4ed0386a8c4dcfc8064f8dce1d SHA512 4e98653d02bfabef7b3404b0cbede14b3df0f38d3dbe15adece5ff78c2d51a7e817de9495807badbe2164437d4a2c05a44629adfee275415025c12d288849af0
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
index 78bd15d1a013..88b46ee16108 100644
--- a/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
+++ b/media-gfx/pngrewrite/pngrewrite-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}"
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index e2d87e7f66e9..351d229644b7 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,6 +1,6 @@
 AUX prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch 1601 BLAKE2B 0c30817c51c1cf2a914b1faad9923109cbae111e8538d6c7257885ab29b5944bdb97b0927ced972133ffd8fe12d2fe36f0826bb9839e3cbedd716719b0d26881 SHA512 21377080026fa43bf23dc06c4925decd6c6e7827599caebc2ba2e7b3f4f4428fcd6fe4044f3bc3d0f059cf2ede043cafe2928622046bf9443bdd3f21f1ff6c59
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47 SHA512 e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
 DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7 SHA512 895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
-EBUILD prusaslicer-2.4.0-r2.ebuild 1677 BLAKE2B 1dfd7abe15a808fce2e03d8b561e183e8174e5e3fa3655d760cf376b7b77042473ebcfc3bf648020002426f47b7a8bf599057da578b3a6027f95b7f4387a0d9a SHA512 0cd62a20ca04af6ca609a0020c3f80f300a7092b23b319b557ca557733d38bf6cecdad9889c8594f51b65a3d45f25d0930d4de59faa443be74171539a557b659
+EBUILD prusaslicer-2.4.0-r2.ebuild 1676 BLAKE2B 596d5acea9300e6245f4d0879175c492f13485f2a6c5108d1b35a3e9b6b65867b6c7fb417c315aaea3f0661fd3e172fbd25fa5098f6612a7bb040af17502a12f SHA512 b7dba08d44dc5a3e835ec1376faf904a8c6f4c1f7b8f9a81979719766e4353305967bf4bb895973b8a258fe032ef4a57f2f7e1b56b3d47154d42ba03daf1b0b0
 EBUILD prusaslicer-2.4.1.ebuild 1684 BLAKE2B 3c3fe39d1dbf883743e9371eeae3d1f2f4ded1d0017e49847540808766dc1f48014842d5c9dff2ae973657aefd1bf61bddf73e69a812152093b8dbb1684b621c SHA512 f370197b41f4f21e2578f43c40bdcd9475544a8636b910ddd9a7597d1a70dced32a0e94b9ad4e5f891f286cb20e35d7ed1c1055ee374b3b18f3c6764d4443421
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
index f0e766df6b30..6965a84a96a9 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index e7e28131c24d..3b7fb552c9c5 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,5 @@
 DIST ristretto-0.12.1.tar.bz2 610696 BLAKE2B 60aede252a7817ad1b008e01ce15e371aad13fcb2bea9b61dbca3ceffdae18d5fd2c4c1690bb699648a64769ba9d06b6b9d8eaa3b08ed56cdd15682f6d785f43 SHA512 58e61b7ead3f78770132d1ba3b480f0300279dd42bf78c248d7927c0a6703c75edce051bcaa23acd46d92865c4f5e03fd085bcc6cfdc3fe2bd2b4abd4eb3fa3c
 DIST ristretto-0.12.2.tar.bz2 612128 BLAKE2B d845da75f5139ca73702b2ea2154026ecadacc72587d81a22564d0c0ae84e605303a368ee42a9c915c3d00a0b8471f6a6e1a6c6c2f7d7626f766602a29022ee0 SHA512 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379
 EBUILD ristretto-0.12.1.ebuild 891 BLAKE2B f38ee36065007c1a66de6c9138e87e7e6ae9d1488b021426d39d7b7252ea54b4403ce7a57b3bd7ce6fe2d0f7a933bab7950c16a7f958f0aed00de29569b78784 SHA512 11e2354b059d6e164e7bbc7dc9092c47a114eaabc4d767cd634b9cb09da223f5db1903ac3111bbd6383b28bbd297e9a687dd06123d8137107c8aabfa60d13a2f
-EBUILD ristretto-0.12.2.ebuild 893 BLAKE2B e06969fcbc8f5bf57808102c5fa828cbb2b809a2eed86f10ce28c8f45d6d265eea6eb1d8a4622c3ce430cda1f7f599c28778d23e3b41ee4cb4f08752f6e3f18d SHA512 dad5059a84558e6cf08552d2707cb2457eca0b152f23daef15894b498cf2c655ab768aa9b8e568dd2c842655b2d68af72e0948729074bfe0ca5711d646973902
+EBUILD ristretto-0.12.2.ebuild 892 BLAKE2B cdbd586b3741e89bf3c431b81253e31e2bcba5a2596d89e259fbc3aba656fd39bf578635aa413953820ae38d8b15007459997e4ab97e66bbb167ba33c39b8fa8 SHA512 a34cd9b61ab31f87b94868de34b5fbf59998975e22862d7df73cccc864c6229546ff6be4dc0f7f8050fdbb9429dd91eef0f62a36c2d2ceb457d8ee1241db1785
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.2.ebuild b/media-gfx/ristretto/ristretto-0.12.2.ebuild
index ba292506bb40..2d377a601b0a 100644
--- a/media-gfx/ristretto/ristretto-0.12.2.ebuild
+++ b/media-gfx/ristretto/ristretto-0.12.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.44:2
diff --git a/media-gfx/ttygif/Manifest b/media-gfx/ttygif/Manifest
index 25453522c5d1..65f06f772bb8 100644
--- a/media-gfx/ttygif/Manifest
+++ b/media-gfx/ttygif/Manifest
@@ -1,4 +1,4 @@
 AUX ldflags-support.patch 550 BLAKE2B 1cf7bc0cb2a9ce13654524204e7b3d47e9df1a0d4ceb5e60e63c52c2d8508d6d8dfb353be35147d8419fa57d4fdde2bc00b9b12292de789d0d559caa25c60b5b SHA512 ec238c42a9b7574ee7b18b8fd2d2aedb23bb4b86981fdccb09aab8e5671c4f9494d448f9d9ecb5f4279cc1c2ca850a64d80364de002430278986155332116dbb
 DIST ttygif-1.80_p20181218.tar.gz 8428 BLAKE2B 376b6dca4d13120b90e3055e8a37acd017aa7966267d6ad76af6eb2cc4155c8b8ce9d618c682cf1c999095c96ae78e11ec343e0752362851f9a2b660820dc403 SHA512 f992094c0baa625106eefdebbde1d91f2686c0b01c4b3ec22ec9339c88df42c830e4417338c685b375646b212db0213983b41b8d6ee9bd9644dfb56f6db31f52
-EBUILD ttygif-1.80_p20181218.ebuild 776 BLAKE2B 57a41aa243d7f75e628cebeac04c0c27609f033be1c667c8e0f9b9ad28d373bf3d53a541b72e401d4a07455634be692a097d7bc506a512fe36c0828d66d58997 SHA512 9ac733ac43d720f1fd7f81e820dcb398409e69f30e3392bb21f0edfb964cf53446162bd7a72c86a4ec76ea08d27a57cbdccab35a3f405d15df87761743298308
+EBUILD ttygif-1.80_p20181218.ebuild 778 BLAKE2B 33aa6ced690ecc8288bf29280d76b7865d07cade08b1a087d91dca46de00a24217e13daefc128fbbcb9465b8e68c6ad0c5f0f55e54320c42322a95c1277305bf SHA512 f7560108e89aef4fe4884b9e9b31de73fe3baf86a0a709124d67ef5a87d1c6efa2475b26f675340ae24e08d31545bdf848e47070bebd3c6d466b8e8da2cf6906
 MISC metadata.xml 340 BLAKE2B f9763d941976e5d058e4de954dd992640b7c66c251b32ef2dd755be4c61b1cf6939decd2e3075cdd30ce41bebbd411333484918dcf3b4c50e9baa7e9c8fb4fb7 SHA512 a3b915f1e53a23515a767fa21a459e6298bedb5acff522a65efd736258a04903efe787784e3a2ba0898a6722cd13a549d19fdd2a83eb85f7333bf08f8a55e371
diff --git a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
index a88b74156eb8..299f1934a05b 100644
--- a/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
+++ b/media-gfx/ttygif/ttygif-1.80_p20181218.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	media-gfx/imagemagick"
 
 src_compile() {
-	emake CC=$(tc-getCC) \
+	emake CC="$(tc-getCC)" \
 		CFLAGS="${CFLAGS} -DVERSION='\"${PV}\"' -DOS_LINUX" \
 		LDFLAGS="${LDFLAGS}"
 }