gentoo resync : 16.01.2021

author: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-01-16 20:27:28 +0000
commit: 2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree: 4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /media-gfx
parent: c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)
48 files changed, 606 insertions, 148 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 6e8b9008a78f..b0aeab92dfc9 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
index 1a48fc82d64a..5f8c03d8aa96 100644
--- a/media-gfx/brscan4/Manifest
+++ b/media-gfx/brscan4/Manifest
@@ -1,4 +1,7 @@
 DIST brscan4-0.4.10-1.i386.rpm 100151 BLAKE2B 94fd7daa5682b294740a6e1345c4ab8d488589896c3fa34eafc131b1cdc2ef2e022e11795ebc261538c6107583602a9622946ea049a3cfbbeb547e7e9c8825ad SHA512 5daeb9a1304f3aeb0a2e17823887a546ff872dfb42bf08ab403539815553da597504ac7afcbb2a34fbcfd8d973c03c8ca2c62617f8c499b9fc44b1719e4f2611
 DIST brscan4-0.4.10-1.x86_64.rpm 118863 BLAKE2B 1e518122b049a6cd594e4603311d37f289aef4ad3973cbe846700c2a5c0c8f0ec994f6608817a1c12d6494c3ae78178b43f4ba8450ab00153e27f533ec1957c8 SHA512 c648db8d8543dec9e1cd556f2e0415c170c06935febd1373d783191b159ed9ed67043644ef81fb18027de89270e10a5cedcee11ea66ee262df1a2d4f006e4875
+DIST brscan4-0.4.11-1.i386.rpm 100453 BLAKE2B d3801d208faf203700a6723619b1999722225400c135c7c5e6cc3cfd8a963375c2094d518ae2d18be0e0d0fbff96b238de5fd89bfc82baad5bef25b1e9b83c25 SHA512 0c07311b2f7e728f876b52d3da1473942487d4ce7dfd65d3c7aef8ff2321ac1a1e904446a60738e38722217af35d9d6455ab2bb390305da8a3c548fb024f0b70
+DIST brscan4-0.4.11-1.x86_64.rpm 119016 BLAKE2B 9b43c1e10e5e0ee63b89999390d214d71f694c885749401ac676999ffabfcc24174098b09586bd148144dd6e83f89c52c251be293e428edf0f70b964d5d5042c SHA512 c97a7f51398e34783a7099a118bad320b01e220f6ba942504194d6d2e5e10164168594820232f3861458916be1985ed23560b9b635d2755f03551c663768ebf7
 EBUILD brscan4-0.4.10.1.ebuild 1999 BLAKE2B b8b5f6ffbd1957599c4e1dc97ca3c6f71408cbe1dd7ba7fb59771a7a7320509f682836f4aca3e929c975c54f1e41626bafe397e0408c3ff489b9494ae94741a2 SHA512 206279557c150d4a0bf9fc6906f4f2fd560623b1dcfbf315abceadc2ad9ec3b648ac8ec6b0c042c13881d3f84f41bb6fcbd52e03d7ea71a25c171cb89b7a64ac
+EBUILD brscan4-0.4.11.1.ebuild 1999 BLAKE2B cd871cadaa3fce01528b7863f279ba0971e0f64aa2cef662dae55b1d73b2060ad5e89682d35a4c954fe69ec0d83ae4ebab3762f40413417e43334d38738ad8ee SHA512 c2a33e54071ab971e8a5dfe05f43641312d43eb2e7eddb319cf3a10822dc94a07b016cceef95eaaec0052cad45557e4520af1927eb1e7db2cb7bf691ed4332bc
 MISC metadata.xml 291 BLAKE2B 0743394c83c6ca0d593442aba2267e89843d6add29077ed21585fc94ae5844dbe99959f37c041ae67282e19c4cfd5a883e2defdba7394f041775b300cd4cb64e SHA512 e21a50d3094f9005676ebce4152259b719232293070710cae7d3ccc4139e391336761a9ac4141873e8f6e0c548ea4cee0de6a30a22f15c0804675f4cee7ff3f8
diff --git a/media-gfx/brscan4/brscan4-0.4.11.1.ebuild b/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
new file mode 100644
index 000000000000..7473ad81942d
--- /dev/null
+++ b/media-gfx/brscan4/brscan4-0.4.11.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eapi8-dosym readme.gentoo-r1 rpm
+
+MY_P="${PN}-${PV%.*}-${PV##*.}"
+DESCRIPTION="Brother scanner driver"
+HOMEPAGE="https://www.brother.com/"
+SRC_URI="
+	amd64? ( https://download.brother.com/welcome/dlf105203/${MY_P}.x86_64.rpm )
+	x86? ( https://download.brother.com/welcome/dlf105202/${MY_P}.i386.rpm )"
+S="${WORKDIR}/opt/brother/scanner/${PN}"
+
+LICENSE="Brother"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="zeroconf"
+RESTRICT="strip"
+
+RDEPEND="media-gfx/sane-backends
+	virtual/libusb:0
+	zeroconf? ( net-dns/avahi )"
+
+QA_PREBUILT="opt/brother/*"
+
+src_install() {
+	local dest=/opt/brother/scanner/${PN}
+	local lib=$(get_libdir)
+
+	insinto /etc${dest}
+	doins Brsane4.ini brsanenetdevice4.cfg
+	doins -r models4
+	dosym8 -r {/etc,}${dest}/Brsane4.ini
+	dosym8 -r {/etc,}${dest}/brsanenetdevice4.cfg
+	dosym8 -r {/etc,}${dest}/models4
+
+	exeinto ${dest}
+	doexe brsaneconfig4
+	dosym8 -r {${dest},/usr/bin}/brsaneconfig4
+
+	if use zeroconf; then
+		doexe brscan_cnetconfig
+		# Don't install brscan_gnetconfig because it depends on gtk+:2
+	fi
+
+	into ${dest}
+	dolib.so "${WORKDIR}"/usr/${lib}/sane/libsane-brother4.so.1.0.7
+	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so.1
+	dosym libsane-brother4.so.1.0.7 ${dest}/${lib}/libsane-brother4.so
+	dosym8 -r {${dest}/${lib},/usr/${lib}/sane}/libsane-brother4.so.1.0.7
+	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so.1
+	dosym libsane-brother4.so.1.0.7 /usr/${lib}/sane/libsane-brother4.so
+
+	insinto /etc/sane.d/dll.d
+	newins - ${PN} <<< "brother4"
+
+	local DOC_CONTENTS="If want to use a remote scanner over the network,
+		you will have to add it with \"brsaneconfig4\"."
+	use zeroconf || DOC_CONTENTS+="\\n\\nNote that querying the network
+		(\"brsaneconfig4 -q\") will not work unless you emerge ${PN} with
+		the zeroconf flag enabled."
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 044b3d54e1bf..024230137298 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -3,6 +3,7 @@ AUX darktable-3.0.2_cmake-march-autodetection.patch 908 BLAKE2B aa1c0cedfe1f2673
 AUX darktable-3.4.0_jsonschema-automagic.patch 891 BLAKE2B b0abdd7ea80a446e2556daf06f78343deeb781a12b670f3c3d2f8a34ec9877e16991f6a105c90d58f437915b30bd8bddfb995d515bc73563a44f3807258c9fee SHA512 57cdf87586c6382347334577fff71d415be0123ad101c073535e9d4e87e7edac275272e0b3be91bd34965bacf1f6166cfc64af34b4cdedfb27b409e27bc3bdc9
 AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93d00a62c1d996077514b3e55f370347f47e561707cb8da6a270aa42c3320142437691cc8b132718c485b5b7df40068d41ee5 SHA512 d94247c4f2c3b4894bd6455cd036a62ef5edb90a77bf8f930efc3e540d00712000fe8eeb7d4c937fa826aef1dd129448223c8696ff094e823894b17ef2669a4e
 AUX darktable-3.6.1_openexr.patch 1806 BLAKE2B 3f05c8fbb4dd5a76e98ef3d9a9432fb2c3d98818b5773d0fc007d5203d32b43fea25ec7286f396b4fcb23e02b32ab911ca0c504e8d01c299899e729b02a81d94 SHA512 a782116aa340bd8fd8c1fd98094bee943100f85c1194010b7a92b3aa532ff658f07cddccacdf06b902b74ac86ef1ab3cd07c694c072312e51ddc058caefcb944
+AUX darktable-3.8.0_libs-deps-automagic.patch 1034 BLAKE2B faac12e0c8459f7d5d3291b128a5d43e468a1c0a94d45b1c5c0d0e3fcfc6b740e5522c0c26515fc510f91061ab3aafd861465470b37d053e9d5cbee83989a8b9 SHA512 d59c6f11bcec1480eaee488e48a34b99ebfb9a30c65b9111f6a6241f9264b3602f47fbffef17315cf103bc104a135a0c951dc8ab8fbe7419dd8faaa456c8c4a6
 DIST darktable-3.6.1.tar.xz 4685928 BLAKE2B 8ff6224e21b44f9e881adb8f020a2ea5ff5abb2c38da1aeaed312f89e548918c6d3bba210dbb4fb6901fbf0872c6e14c2e12c5b5b27932914a00428a709e8965 SHA512 d53eb8472531c62ceebe97769c6e53f7c9ed6efb404905295f00b5bf547fd0f0c395b8b926ccafc78d6cf9fed0745da655a77eeb84d92fce5d6a7a576f277416
 DIST darktable-3.8.0.tar.xz 5415532 BLAKE2B a2295d9145806720c702d30a334f4d1c483fc651dfda8a39617daed4a71a436bfaa5b6b379f5ec0ee4bbec5f6f5eabbcb589b63644b5698100dd1672710d1531 SHA512 ce95983cbe3ca899103b4f5ee560fdbeeb441dccd453ac4d858b14a25050229e1e780595c66bfb491c88db35c128054f649b365d701ef4b19cf252bd847ffa59
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
@@ -13,5 +14,5 @@ DIST darktable-usermanual-3.8.pt_br.pdf 33648057 BLAKE2B afb6d3c1ea6b709e535e10a
 DIST darktable-usermanual-3.8.uk.pdf 33663424 BLAKE2B abeb7a04b58e7ef508b415fe11073396c78964e91fbd3face8481cd6b09cf88525b1b6bdd2988bd57d25112cd59c8c05e209931f94004349cf5b8a7a3ca59e39 SHA512 e1a81771006f5d6b7e4088455b6b444ea87b27a788cc196c2bc0b0b5d0afde241ea9e2bdbd3ffe79871f39d756d710d8e16c082a21b1194efb71f78e8724af9a
 EBUILD darktable-3.6.1-r2.ebuild 4402 BLAKE2B cd7e0a3147afb25cf1382bd009daaf5dd3c3c79da8db38e7d4471e454806c66af2594d9f1d1601524156d319c514578f790221a6ce470acd0183a642f78350a6 SHA512 16c91c5684a8184a8d0826204bba9d010f9f83b03e5f0592572236c53584dd679e14d7f6a4303434070670d401aaefc60cae7e134dd9e2d70fa50120170b1ff3
 EBUILD darktable-3.6.1-r3.ebuild 4851 BLAKE2B de2ab5411fc69f7d9cc97bebe15c9645a521daec063d03f4eeac366c8cb102053d2dee56b39c13cfd6e28b34def5f5d08034b918d387e5b9d55bc1c0b42cd5cc SHA512 e20509c07903607e9f4029b9419fedbfea3c7312faebd9ee25f7d38dd7000fc30c86ac1ab691798d914322d80e2a685a98c17b17a8b4ebb7f1ca4616933425f1
-EBUILD darktable-3.8.0-r1.ebuild 5005 BLAKE2B 957688c7fe0fb3ab9d1daafeb526aa0d580e0938767136c8ed3e7493197ccfca494b9775c679441c6c7309dbd16f954edc2ba7b99705b6baba25458b2714d844 SHA512 2cde68ff349c0e07d6c0cbe66e463f720163b4b5c48a6066db91c1c80f6444ceceffa03e33726ad9c0d0c4a5efb4604d70d8d1a25fa5a6a2422660ad0749aa94
-MISC metadata.xml 1152 BLAKE2B c43582dd3a0607de751a816c9856738d73b504422d6b21745a8f7948e2238a6be5c178bb224d787eb712aef222a592c6a712239a4a8dada4c66a453e158fc5de SHA512 8a20f53798359fec9eb45c1d2fdbe6cca623b2308f8391ece25c4100161a2056b52c44f3eba91d6d3c083f49843bac8e355982998d2c4217efdc976eb0d1a14c
+EBUILD darktable-3.8.0-r2.ebuild 5193 BLAKE2B 2db6226a7c29a0f31568d530ce7f950369ea49f434846defacf8438d3d8cc27fc94b1b40207ba7573954dc45aead92458f873a25faccaa09802bb62ddd1ce51c SHA512 b75febae3ad0a76b61ea48d26941299a33ba5aa7934a730ad91e6f37452a905847d1eaab4ab2cb4d98496b1a6eb4136d4a0ecbec4d5e05addcc7295f8437ec54
+MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-3.8.0-r1.ebuild b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
index b2adbe18b7ed..b972b07d4be7 100644
--- a/media-gfx/darktable/darktable-3.8.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -35,8 +35,7 @@ else
 	LANGS=" de eo es fi fr he hu it ja pl pt-BR sl uk zh-CN"
 fi
 
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr test tools webp
+IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet lto lua midi nls opencl openmp openexr test tools webp
 	${LANGS// / l10n_}"
 
 REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
@@ -68,6 +67,7 @@ DEPEND="dev-db/sqlite:3
 	colord? ( x11-libs/colord-gtk:0= )
 	cups? ( net-print/cups )
 	flickr? ( media-libs/flickcurl )
+	gamepad? ( media-libs/libsdl2 )
 	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
 	gmic? ( media-gfx/gmic )
 	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
@@ -75,6 +75,7 @@ DEPEND="dev-db/sqlite:3
 	graphicsmagick? ( media-gfx/graphicsmagick )
 	jpeg2k? ( media-libs/openjpeg:2= )
 	lua? ( ${LUA_DEPS} )
+	midi? ( media-libs/portmidi )
 	opencl? ( virtual/opencl )
 	openexr? ( media-libs/openexr:= )
 	webp? ( media-libs/libwebp:0= )"
@@ -87,6 +88,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
 	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
 	"${FILESDIR}"/${PN}-3.6.1_openexr.patch
+	"${FILESDIR}"/${PN}-3.8.0_libs-deps-automagic.patch
 )
 
 S="${WORKDIR}/${P/_/~}"
@@ -140,6 +142,8 @@ src_configure() {
 		-DUSE_OPENEXR=$(usex openexr)
 		-DUSE_OPENJPEG=$(usex jpeg2k)
 		-DUSE_OPENMP=$(usex openmp)
+		-DUSE_PORTMIDI=$(usex midi)
+		-DUSE_SDL2=$(usex gamepad)
 		-DUSE_WEBP=$(usex webp)
 		-DWANT_JSON_VALIDATION=$(usex test)
 	)
diff --git a/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch b/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
new file mode 100644
index 000000000000..25b89731a7c8
--- /dev/null
+++ b/media-gfx/darktable/files/darktable-3.8.0_libs-deps-automagic.patch
@@ -0,0 +1,37 @@
+--- a/src/libs/CMakeLists.txt
++++ b/src/libs/CMakeLists.txt
+@@ -83,11 +83,14 @@
+ add_library(timeline MODULE "tools/timeline.c")
+ add_library(image_infos MODULE "tools/image_infos.c")
+ 
++if (USE_PORTMIDI)
+ find_path(PORTMIDI_INCLUDE_DIR NAMES portmidi.h
+           DOC "The Portmidi include directory"
++          REQUIRED
+ )
+ find_library(PORTMIDI_LIBRARY NAMES portmidi
+           DOC "The Portmidi library"
++          REQUIRED
+ )
+ if(PORTMIDI_INCLUDE_DIR)
+   add_definitions("-DHAVE_PORTMIDI")
+@@ -96,8 +99,10 @@
+   add_library(midi MODULE "tools/midi.c")
+   target_link_libraries (midi ${PORTMIDI_LIBRARY})
+ endif()
++endif()
+ 
+-find_package(SDL2)
++if (USE_SDL2)
++find_package(SDL2 REQUIRED)
+ if(SDL2_INCLUDE_DIRS)
+   add_definitions("-DHAVE_SDL")
+   include_directories(${SDL2_INCLUDE_DIRS})
+@@ -105,6 +110,7 @@
+   add_library(gamepad MODULE "tools/gamepad.c")
+   target_link_libraries(gamepad ${SDL2_LIBRARIES})
+ endif()
++endif()
+ 
+ if(BUILD_BATTERY_INDICATOR)
+   add_library(battery_indicator MODULE "tools/battery_indicator.c")
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 7fa51feb6f79..c20058315b0b 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -12,10 +12,12 @@
 	<use>
 		<flag name="avif">Support importing and exporting AVIF images</flag>
 		<flag name="flickr">Add support for uploading photos to flickr</flag>
+		<flag name="gamepad">Support using game controllers as input devices</flag>
 		<flag name="geolocation">Enable geotagging support</flag>
 		<flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
 		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
 		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
+		<flag name="midi">Support using MIDI input devices such as Behringer X-Touch Mini, Arturia Beatstep or Korg nanoKONTROL2, as input devices</flag>
 		<flag name="opencl">Enable opencl support</flag>
 		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
 	</use>
diff --git a/media-gfx/eog-plugins/Manifest b/media-gfx/eog-plugins/Manifest
index 7cce006dccea..e70fbb24d907 100644
--- a/media-gfx/eog-plugins/Manifest
+++ b/media-gfx/eog-plugins/Manifest
@@ -1,3 +1,5 @@
 DIST eog-plugins-3.26.7.tar.xz 482336 BLAKE2B 9cd1d7e16f8e7f1fe06c3bc2ea79ab06c397beaf9d9bfb26568ad5fb90a144ceab11f6250c7dd51ebb5d3962fff47a4c855b85725b95abca07cdc4de739a2b7e SHA512 c9312eccc5529b01cb285a165c833243ea60bb12f8be6f40ccc6da0db1bd951916000a48aa31705b048659e8d637aa7e56d761fe0f9be720a4e0ce81289d2b83
+DIST eog-plugins-3.26.8.tar.xz 479356 BLAKE2B ab781311473e045ffbb88e741427ac59f129fa53e6c551231d7b6edae81d21483dd1f1e7874561dfa29c9e9b2ba01fbdb174302bf8363478b785ec2ce38c53ec SHA512 a58aa849b09761dd0c7f7d31098560969872b03788f3f3ee81445dfb9be653b29e0e6646abc4e0164e4146abf7a9d2e6aadf56071f71c119493dcf1fd706a069
 EBUILD eog-plugins-3.26.7.ebuild 1725 BLAKE2B 5063f5a3c9e9e9a55749b6df79a1b1dba448e071c517b8eac94dcea955db715f1c4ae979dd49b9c2e549c0b5ca85d6b86fa351936259e399efc3930105a48ac8 SHA512 b4ff645c5af1295765cd2f92bd44ed3fc5a188693e14e2237cd16f6a838940d3e9bc60e6b07e77818296a0ead6c8c0b102f798695c3b4d0092c24e2c7572972a
+EBUILD eog-plugins-3.26.8.ebuild 1727 BLAKE2B d11bdef0fbced2c5a08cc07e4aa37d4d8d175c381e887e9b661b30f49f1acec9c06db8bff60c5ff2c3b345006a77284ca0dbfd5a62915390e7999c09a8d536fd SHA512 8ef59b185005fbbe54c22b3265ff2c76bfe47c03882b14889e9a0dab051d159281f7148ca38f0826cb5421e9bf894cabf32d938cd1815c62a9e71f8689a90661
 MISC metadata.xml 429 BLAKE2B 61e0c5a268c0dbcb1a2b0a0e1d0ceb1b7795db34e022ba9229015ecf05210dcdd247c2c9867549f5c75028dcb20011f7757fd9b4ef507af65b80aa8aa1ca6f18 SHA512 d4b81d9f78bf49afe842990d9c1c9dde1c3f1bc68090f77dde1bd51b2be98ab647be10f8886da7dcc1831cabc4f7c81b18b7e6e5cadb2c5aeeec69db883509bf
diff --git a/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild b/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
new file mode 100644
index 000000000000..bb6d66aaee22
--- /dev/null
+++ b/media-gfx/eog-plugins/eog-plugins-3.26.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit gnome2 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.38:2
+	>=dev-libs/libpeas-0.7.4:=
+	>=media-gfx/eog-3.15.90
+	>=x11-libs/gtk+-3.14:3
+	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-2.32:2[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 plugins="fit-to-width,send-by-mail,hide-titlebar,light-theme"
+	use exif && plugins="${plugins},exif-display"
+	use map && plugins="${plugins},map"
+	use picasa && plugins="${plugins},postasa"
+	use python && plugins="${plugins},slideshowshuffle,pythonconsole,fullscreenbg,export-to-folder,maximize-windows"
+	gnome2_src_configure \
+		$(use_enable python) \
+		--with-plugins=${plugins}
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/{appdata,metainfo}
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 32f58c7bf600..fc1c37a677d8 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,6 +1,4 @@
 AUX eom-1.24.0-add-gdk-includes.patch 798 BLAKE2B db2156dadd2458100624a01e0724f7520529ace1aeabf78544aa780d91fe57d8db7aee8934401ede46810a8ee8f53f26d0e7304605386fd6fba080825c70abae SHA512 3a487cbbbfd94240858cb0a7221b9515720aeaab7adea3e7dd8be2d05d0369f5d3ecd5e3afc4ceb1cda0e2aecc0c72d0cae796f70ed181a90944e3d5d76a31f2
-DIST eom-1.24.1.tar.xz 2408284 BLAKE2B 70d660896dff42d5a91ea651697b50d4c90ced92023d5df48dfbed374c3777676f1f2dc99a0cb071a4eaa13353f31b11346136b963cf723397632cceafa64301 SHA512 70654b99f474d1b214cbbf8e799f82f3c38f47938df34cb5c8227c116b412364c568ae989b96d7082fb0d2fa319b3dba9b8dd499d19140a4d421bd09a46bffc0
 DIST eom-1.24.2.tar.xz 2428972 BLAKE2B 871cb98c4a308dbc4821e67bae41522dbebae446e64777d764d30ded2f0637bae33cb9090e813fd7e43206ba1a436f7795684c4c5e850a242e9db96804b08e81 SHA512 38497dc5fc42340ca1b356f40eab8c14c21b1467f82ec64024d633cfb7ebfc598020b35c02eedce4f73f7a5ecb9050b0f0af4ea00279a1a5e7a627e542f34951
-EBUILD eom-1.24.1.ebuild 1664 BLAKE2B f69a83f6925e9643f21c2ea2422cb994cbf72d1b7c7150c8df82889333226da23bbece1e3bd0ce6696dfc0ad06d725417e16a67776d8a1a605002431e8725830 SHA512 07bbb77b395b797a7927d74747335c5078f8c48a6ff6ab6abcbd372ebc445a0652d95a79c2a432bb3a8c2ad97f3a104943078d7aab3eef5351e71b99bad936f1
 EBUILD eom-1.24.2.ebuild 1671 BLAKE2B 79f787425f324d5e99f826b81f75930c4677d226b01c316d753d14538df4deac40b4b7c3ed1f804f40e4c20f0c626a0eb17b6fb3f149987326e2af1c7f79f3d6 SHA512 221e075180060204e530ec9c17b81c67c0d7f25d7bc8e0fbc601824266429f7f3a51b0ecdf552238ba7ec38c1ff450aa9c8315fd979130b5542b6b77e1f75970
 MISC metadata.xml 468 BLAKE2B 3dfeeca0297db2fc0dde74b8f23d365e6f33d53856bc32b568c2901a803097c69af05ecf881a9fd522a8f5a1e2a01e7aad496a8fd6571a1328746bf3376c541e SHA512 d605718c99007b9fb1b66b97f3078c7497b8bdeb46d3e487831d1b3e04dfe142d788ce83af67830d9f612c9077b69ee7eb197eef720b5da55327d9846d75478c
diff --git a/media-gfx/eom/eom-1.24.1.ebuild b/media-gfx/eom/eom-1.24.1.ebuild
deleted file mode 100644
index 2b3913815ccf..000000000000
--- a/media-gfx/eom/eom-1.24.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="FDL-1.1+ GPL-2+ IJG LGPL-2+"
-SLOT="0"
-
-IUSE="X debug exif imagemagick +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.52:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.36.5:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	imagemagick? ( >=media-gfx/imagemagick-6.2.6 )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!media-gfx/mate-image-viewer
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/eom-1.24.0-add-gdk-includes.patch" )
-
-src_configure() {
-	mate_src_configure \
-		--enable-thumbnailer \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(usex imagemagick \
-			--without-gdk-pixbuf-thumbnailer \
-			--with-gdk-pixbuf-thumbnailer \
-		) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 42954a75d0e4..a79f3fc8f701 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -8,7 +8,7 @@ AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAK
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4136 BLAKE2B 207003dacd7f02bd4782ebb0d5f9a7093d8fd3ef8011301454dab03d7a79bab7b2fd623c7d8e11d1f6557803b40f1d206dc75c41b1520e1dd2467dda72d91868 SHA512 d7d6096c1cfb06e6218673a927c5791ec820dc13a23c89df6233109e288d98f86920141e01a8cb680e7cbb8c83c4c655a7a66d5578d284a144dc3f44c028ceb5
-EBUILD freecad-0.19.2-r5.ebuild 10910 BLAKE2B 837cee24737a432cbe6a1d0415025680e73c09898e859edfe1f8a0a8d36fc7fb454e40c9998f589500a9a5ad366215558a494b4869e18c47de2c3c6d69229c07 SHA512 40686ce7313bd28c0fe5f381e392db650a2adbe1737b63eb1ccbd44cfc90ea6c92ad07a52bb566cb5401e87f8499fb12909db02fd779335ef955b2b338f33845
+DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 BLAKE2B bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e SHA512 5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e
+EBUILD freecad-0.19.2-r5.ebuild 10917 BLAKE2B 35866de96fe9b930182522f3728adad45342c15eacebfc798ff294b884b1fcbaebe9158765fd0d1bb2ae99b5894413cec1c6fecfb88e6ce7e64dee809f971840 SHA512 6fd55da6d9b1b4f0b6a68ae6dc1c2c1b40dedf298988dd873500a6da6ba02bc4eb8aeb6eff69f0bbc9e85e4b4ed63fc54e7cc87173c05ba745a28f3c094a523f
 EBUILD freecad-9999.ebuild 10822 BLAKE2B 89e8e85ab4e3d80ee7d3d346de53fda3adb07a5ea057324409ca52f91f5542569b7476b602999aca056088b66f6c51f75822ff4668aeff89ba53965ec280d716 SHA512 a92798699ab2349b3b1bd694a787935a4a01df88ca0ba669a45d96b5b9bb395db412ded3ed399607a7479886b9389ce42b27550e186fe2e40ff166d2c4e1383a
 MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
diff --git a/media-gfx/freecad/freecad-0.19.2-r5.ebuild b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
index c9287ed91fa5..7ebeed8e3168 100644
--- a/media-gfx/freecad/freecad-0.19.2-r5.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r5.ebuild
@@ -68,7 +68,7 @@ RDEPEND="
 	sci-libs/flann[openmp]
 	sci-libs/hdf5:=[fortran,zlib]
 	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
-	sci-libs/opencascade:=[vtk(+)]
+	<sci-libs/opencascade-7.6.0:=[vtk(+)]
 	sci-libs/orocos_kdl:=
 	sys-libs/zlib
 	virtual/glu
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 5ce8bfd1c79f..bcce2c0e1fec 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,7 +1,7 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 AUX gmic-3.0.0_ipa-sra.patch 665 BLAKE2B d1b47e2f0e8e63251172ee6cbc2c5b1bd86d100904a3d7bb0c5df39c051769b8b6c0aa0bb1f81010fd9ca195886a0dbce41528d31a811627ee28d1af58a83432 SHA512 4677fc93e72ed5e71a91197d364a04e1f8c6c13bb3f5b6eb5402a03c0d6ab395b54788669e028b932e207986121138419a58ed5f4333c0a45cbe6c0b9638ed96
-DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
 DIST gmic_3.0.0.tar.gz 10225122 BLAKE2B 1066c62c2c56fafbfd11608eb9e3b7c7e9a87b404aae1e7e673e21d9b7b76a599e241f16656786bfa35687f3b3921fcba96368227753105aa25e2fa451962bfa SHA512 89353d16d6304e322400c93bafb50f7557df93c933ed2994f33a17d877e4e12ec511a355b38058680f356bccab5aa84b607fab225354c19d4b8ab3e64424c87c
-EBUILD gmic-2.9.9.ebuild 4259 BLAKE2B 5958f96d7bab5481fe3b3800a2f7327e1d4d6fe4b46e318206379ecf3b4b2e6e6a34963568eafe35e9426732a9fe81d6b45be6f80d6f2385a6f44b1fb3210234 SHA512 01867f8b3377db39ffb365033d2545bd2c73a4684bd4e3fd1a3b1b8ad4996f7a2fb036a44096aaee09123e9596ba635f9435a04791b973c40f084bef7c05bdb0
-EBUILD gmic-3.0.0.ebuild 4221 BLAKE2B 8551d6173a0f218b079d16fe9452a11b3b21a32a62e47a9f7cacb1bc049a2d928c8520f529e8737964995e1b278703f1be7fb9f4a7cbd82fe76e7f972e505944 SHA512 4c3a41b7d5f64bf2e27400aebec50c8c649ff62703a15ed0a298391281d2cce5a8ad24d3eddac79119620d4fe8197714318e783f855d0a45d73c94b995e8aa7c
+DIST gmic_3.0.1.tar.gz 10457923 BLAKE2B b495d10237abf5abe3d7df166119d2fc0b04142975d97db01ab0c5aa177f6e681931799fb392844e5c34d0503874a16d946a7146c5152cca1e64107948c02c03 SHA512 4bc08a3510e8987eea0463bfcf04de6dfd9a8ee8a38c14661ff201b8f563cab1b914dc60dc35b082cb5e868eb6232e2240a2d6703e0751215a82d6709236946a
+EBUILD gmic-3.0.0.ebuild 4218 BLAKE2B bc0d0cad2242cb4ff8e828c390cc17b3ebf8bd50e18d81acbab8e02cf74b0de9a0bafb16545205bdaca11dd81c89caa343cfc2aa89747ee5102d5cb022f95eaf SHA512 9975caa9e60ca817e0257c5c872233e112bfa0199ca17521d4bda8d398f1a08588be3f7493bc7f7d6e7714972e83567f20de0a5502e683b9e2897a9acff3f3ed
+EBUILD gmic-3.0.1.ebuild 4202 BLAKE2B fedf953be4fc0b777861128959cceaf68df2c08d73ca6c2f3c4f191ef110d6739e971959b26e31bc72132705b6adef83352b09e3d186ab125fb77120f16fd113 SHA512 9623391c7c58dce6be157c8c8e0917af2d1a0fdc853f28318e212cab6595fe94d84f9c4033d192d89c11e254c76d30bd47aed9d3b18a52b2fee24856aa611d18
 MISC metadata.xml 534 BLAKE2B f229329b6cd7c9a79b7be93c64ce6e84e65391084c7d76b99ada95762c643fc445fe12fa55acc9b355b5f1fb86de7c0845ec34f921494df8cba3d90ca8c2a408 SHA512 e36403a679467cba0b0580810a27076214d676a74deb09a55f13a38bc06f5ff0999560e1ae00629047a682bcbf3b9e73243db8da3eaa24b275c24a0d1995fe3c
diff --git a/media-gfx/gmic/gmic-3.0.0.ebuild b/media-gfx/gmic/gmic-3.0.0.ebuild
index f8eead423554..2ef54b68ee93 100644
--- a/media-gfx/gmic/gmic-3.0.0.ebuild
+++ b/media-gfx/gmic/gmic-3.0.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-3.0.1.ebuild
index 5591771336db..b2a210733dc4 100644
--- a/media-gfx/gmic/gmic-2.9.9.ebuild
+++ b/media-gfx/gmic/gmic-3.0.1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-CMAKE_BUILD_TYPE=Release
-
 inherit cmake bash-completion-r1 toolchain-funcs
 
 if [[ ${PV} == "9999" ]]; then
@@ -12,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
@@ -20,10 +18,9 @@ HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X zlib"
 REQUIRED_USE="
 	gimp? ( png zlib fftw X )
-	krita? ( png zlib fftw X )
 	qt5? ( png zlib fftw X )
 "
 
@@ -43,7 +40,6 @@ COMMON_DEPEND="
 	)
 	graphicsmagick? ( media-gfx/graphicsmagick:0= )
 	jpeg? ( virtual/jpeg:0 )
-	krita? ( ${QT_DEPEND} )
 	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
 	openexr? (
 		media-libs/ilmbase:0=
@@ -62,13 +58,12 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	gimp? ( dev-qt/linguist-tools )
-	krita? ( dev-qt/linguist-tools )
 	qt5? ( dev-qt/linguist-tools )
 "
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+	"${FILESDIR}"/${PN}-3.0.0_ipa-sra.patch
 )
 
 pkg_pretend() {
@@ -83,7 +78,7 @@ src_prepare() {
 	cmake_src_prepare
 	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
 
-	if use gimp || use krita || use qt5; then
+	if use gimp || use qt5; then
 		# respect user flags
 		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
 			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
@@ -98,7 +93,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_LIB=ON
-		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_LIB_STATIC=no
 		-DBUILD_CLI=$(usex cli)
 		-DBUILD_MAN=$(usex cli)
 		-DBUILD_BASH_COMPLETION=$(usex cli)
@@ -134,11 +129,6 @@ src_configure() {
 		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
 	fi
 
-	if use krita; then
-		mycmakeargs+=( -DGMIC_QT_HOST=krita )
-		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
-	fi
-
 	if use qt5; then
 		mycmakeargs+=( -DGMIC_QT_HOST=none )
 		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
@@ -151,13 +141,12 @@ src_compile() {
 	# build gmic-qt frontends
 	local S="${S}/gmic-qt"
 	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
-	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
 	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
 }
 
 src_install() {
 	cmake_src_install
-	dodoc README
+
 	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
 
 	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
@@ -169,6 +158,18 @@ src_install() {
 		exeinto "${PLUGINDIR}"
 		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
 	fi
-	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
 	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
 }
+
+pkg_postinst() {
+	if [[ -n "${REPLACING_VERSIONS}" ]]; then
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ver_test "${v}" -le "3.0.0"; then
+				einfo "Note that starting with version 3.0.1 ${CATEGORY}/${PN} no longer provides a Krita interface."
+				einfo "Please use the built-in G'MIC plugin provided with Krita 5, or use an older version."
+				break
+			fi
+		done
+	fi
+}
diff --git a/media-gfx/gphoto2/Manifest b/media-gfx/gphoto2/Manifest
index 5270858691e3..73d18adfde3d 100644
--- a/media-gfx/gphoto2/Manifest
+++ b/media-gfx/gphoto2/Manifest
@@ -1,3 +1,5 @@
 DIST gphoto2-2.5.27.tar.bz2 803602 BLAKE2B ad62abc3e91ce3cee1edd8f991ac84616144997bff425eef5cea10c340f9c98694ecda783ec5762f4583d05f38cfecbb7b47e0884c05f114f931a7af8b0a676d SHA512 47001025d3647ac809ab7fd2d9319a2966d72b00471f9a9c865dfad7091c7cac2e299ecd41dfc7997a6665cf2612d4317591964f51a9d336f848e8199e3928b7
+DIST gphoto2-2.5.28.tar.bz2 797600 BLAKE2B 78a89eaf5f68f3b902751792404702fa656680e904bc750e6a51934b5cefd8458c95ffd553024e16977270f4b4806c5dc68d9e3accd8759b1357e0619a0dc6a3 SHA512 ca83c677bdaf7c16ed2bc22865bdcc24e1c5721dbcd36a76e2ebe8bb992d46614fd012cd8f38b37598b30b6b57e6bf533318f6a0d490e186f3026676249735c8
 EBUILD gphoto2-2.5.27.ebuild 1209 BLAKE2B f1f3547bffd426b36772ef930f7294f65f9877c23d4d7458185b75a1445dda1efd4a0ddabdee591354cb6ef5bbc9e2f795bf576f5ea4c1c49a44ff3d2a31ed4f SHA512 428e2f4abf2a68d3ed4db3be9041eca736ce0073e8d611e6f5bf69cc0b2afa6860861354c5bdb27f9b38c0284a3e334ad808f8c94f973fb3b7dd8463a70a620b
+EBUILD gphoto2-2.5.28.ebuild 1048 BLAKE2B 95b63ea934ff7481717ed63597011da47ea53efd994299f83deae611b07cf5e1607fd7874dd82abeee603843657a00730e47c65a6250333b17d91234c20b092d SHA512 39d6aaaf9a40ac770a4afe53c03ecd9cb58aa1d63bd7e7beb03a0f403980aa7720a9d7b61baf01c304d2fb034b123323a35950e990a6f7231396a4bcb55906bb
 MISC metadata.xml 330 BLAKE2B 59a3975ec454edf5966f52db0edb971491c88b2e8777ad0aeb1b66e334ff70e1a7f30e0dafabdba5fb7122c2485f9c787d0bd0415f2242f4e327e66797091b6f SHA512 b86a7023ca0d70907981f5c9d4d134c48d794a9737338c8cda610cd5066f7432ada968f064a36f2b948314508811dc6eba8d9f68c3036d392cf41e57f98fc718
diff --git a/media-gfx/gphoto2/gphoto2-2.5.28.ebuild b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
new file mode 100644
index 000000000000..d63911b2960c
--- /dev/null
+++ b/media-gfx/gphoto2/gphoto2-2.5.28.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Free, redistributable digital camera software application"
+HOMEPAGE="http://www.gphoto.org/"
+SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib ncurses nls readline"
+
+# aalib -> needs libjpeg
+RDEPEND="
+	>=dev-libs/popt-1.6.1
+	>=media-libs/libexif-0.6.9
+	>=media-libs/libgphoto2-2.5.17:=[exif]
+	aalib? (
+		media-libs/aalib
+		virtual/jpeg:0 )
+	ncurses? ( dev-libs/cdk:0= )
+	readline? ( sys-libs/readline:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.14.1 )
+"
+
+src_prepare() {
+	default
+	# Leave GCC debug builds under user control
+	sed -r '/(C|LD)FLAGS/ s/ -g( |")/\1/' \
+		-i configure{.ac,} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with aalib) \
+		$(use_with aalib jpeg) \
+		$(use_with ncurses cdk) \
+		$(use_enable nls) \
+		$(use_with readline)
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 7428356236de..2dfb6db446c9 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -4,6 +4,6 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 DIST GraphicsMagick-1.3.37.tar.xz 5623688 BLAKE2B d6d5c8a07ec2aa2e60399887fa788751104c6917af295bb5a7bb1281d4a547462dd76cdde98f09cc00322bc3d7c89258dcd9d50506cfcec47a606efd90163b2a SHA512 971e05480a65eb99ff3c0d874675bcbffc24eafec1cacd03f5ef410ae014f82329f3590393100927f753feb183be1105fe0cfc5b0f775a30b0e6dc0c6b8a77af
 EBUILD graphicsmagick-1.3.36.ebuild 3221 BLAKE2B 570b421b5a082c202cd00722dd458c4ca359879431d8d1f33287605ab6646dcb80e15c0367f4054bc294730b2cf80c46d5193f8c33e80d4b80e794c3769c038a SHA512 d042c1a723260fe4b9061855983cfdabaf8a4e36d2cafc47579a90c33143086c3efeff74ff380b7fef5efefcb50a2d9c9a8b9ed4f98eea0ae28826e73ea18df5
-EBUILD graphicsmagick-1.3.37.ebuild 3202 BLAKE2B 10299dd255c1e21bcc3cef07aa11e332fa7ec1888028acaf6786a92ef89a3a1b21dd80d7297f2b48dae4881a0989e05390a233e6db657afaec4e7b69503e1e7b SHA512 9d597c5794cf006f6ae6c48ab6e6f0b1ca3dceb70f3a0b068c4a54ca5db2c6204d13476248f30e6bfd997ed2045ae9e5119b14bbaaf815c1e5fad1317db43f9d
+EBUILD graphicsmagick-1.3.37.ebuild 3194 BLAKE2B 5637fb015a1fdbe686160a69b8010cdcff8a0b89c9ec90809007a26dcacdd077e99bebf668148830a56b4ba8d4eb72ecb0e6f0f1ef39a5244b279c920db73941 SHA512 9fab453650cbfcdfaab5f16e568413261074bebeea8a5e693c58ac97d0b0a4b835558c694cf2bb50f1b03c6241c0454e2e32e3e9746f721beea62f5f27254e93
 EBUILD graphicsmagick-9999.ebuild 3202 BLAKE2B 00c9664a42a33974782006a2d27043d7cce406ac6558b50af40eae04f6cabed858474223b7221ddafcb7a3b37ecbea45eedd64157a3134cbe9e85b16f88fc36d SHA512 6de55d703f28e0b87cfa6c16d952cc6cf56ad7ff967ac65ec9cb8c81fe696abbca2d62158467da7ce5d5aea96f0a10f27ef7c920ec7c1c4be4a522b29c896667
 MISC metadata.xml 1277 BLAKE2B 2dc552ca54b8776bbcf08f6939a7cd10fbae14a1b6062ffc3f4480b079d39caad022b1eac1eda95d03aaa30da01fd26da4fb59c5cf117300d446105f29b50a9c SHA512 8fa1382b7effbb5d8a56b3fbbb063abe5f60bcc85a57a834969878510be81fa255c1f09f8b5d839729e860c48b57d44a6666f3e89f4fba852b457df2940dcde0
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
index 981796d97f33..ff928ccc7da9 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.37.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 LICENSE="MIT"
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 30f678332101..1d66ea334ad6 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-462.tar.gz 39424447 BLAKE2B 4b7c84c4a8af8d263ebc597b54a535b66598f11d0df31b6e70597f6127dfaf8c7bfd980c1d706d82eadd29c502abb3b95793d3110d588e966ade8d0b73f02d62 SHA512 ff3c8cd94355670e7a6b2712e2c384ff09733b476d9097883f40e9dea8acc2a26b01d944743b7e19e557f20cf9b22e6125813329dae9239783bee18447de3560
 DIST hydrus-463.tar.gz 39435289 BLAKE2B d6e2f97f12b8141019012a0c86e3f99f2c1041cb70aff1e8c4aab3d1a6594d68f415afd8059a91407d151d72820b71dbb10516f5b717b0f7665563c1cd4f302c SHA512 3dcf2fb0107459171ce227edb1031c8478e20919e163d1c5779d524e3fcd66a038d4c278c29fc98ce34884e75a1ee50a22c0211f272afb1a4d1e7a977890202b
 DIST hydrus-466.tar.gz 39454888 BLAKE2B 12663c3781e71def858a262013018ce5ae29ce007a6755ae05abb8f44aa6c70a8b2f9c358dd8324f8148fa86d9d801121c1a6373d6faae1f9fec2bbf98aa0e7f SHA512 4e796a85f65d24f60e7a2e743b7924bb4ce40ab2f23b7816d0953dc696969d1c6690ae2384d71df5edfb6d9dc9fa548c41174c611c98c8ceb8a28c0453235d4c
 DIST hydrus-467.tar.gz 39386111 BLAKE2B 75c13f5aa3cb745c01d05fddb5e443b74a4c6cb09233d128f017f7741465215e4a62b402e222e974017486e7b75e6a1fd0ec0c61b58484897f7f74e712bf0e46 SHA512 af461003f1f1cc8eb93b0efdff609d184844ddd6defcda6d4cec8c1596a496d681ae383ea0d0a3ad71d3b841c1b68ad0480a3f726ad1fafdbc042ddbbbadc639
-EBUILD hydrus-462.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+DIST hydrus-468.tar.gz 39392634 BLAKE2B a6dd22e388a0f4d5b312985ea6686ee18fb51dd149188c3877ec3a44f1a2013617770a0b1234b862e9096ca1d61925fcf8dbd2f5871e44fdd695662651f5cec1 SHA512 0c6f6730304e1f48496bad0eae1694e2d5bb674bcf049555658f55246a03a9105e4e4a12534256c1c08e8337ed9dfaf0ae8f68a40b70a7e532df0ac6365e9fb6
 EBUILD hydrus-463.ebuild 4098 BLAKE2B a6b0a5817e577b1539d2b3a047f7253ba6bfe0babcf637f583daae1fe67b51da9350a846f27d04ca492e15e6de7a5a7375d0db31267fba89a52e3bba4690a5e7 SHA512 6be825a196983e5c4888e9a5877a48aea7119b300f068ac3961efc919e12bc8da60a413de8db277f7972765a3e32cec78b179fe6f17ac0596e31d97c7cbed53a
 EBUILD hydrus-466-r1.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
 EBUILD hydrus-467.ebuild 4103 BLAKE2B 0d16586f4b28806e5d074c5b235b443825e5f053512d1eba67f7f16f40c0429e5b87bc26e873d87acb9518f9e6243a13e5b7f017d0ba571285c2d383d6f14fdb SHA512 42cdf6377c3e6468b667c0a556ca892690c28722500e0cb21c921d58184f4318a25bdaa8d0ff957dec7b90113d41bfbd56f4a4ae338b11b023e4250b0e4d0626
+EBUILD hydrus-468.ebuild 4098 BLAKE2B 06af752b10b68099c338a4de0389154fa965fcc73bf58a745a00aa7c2feca46f55d81855c024c01d487fc13be3401ce2cad52cc5e9c03ca34ad7b26bc1c8f6ca SHA512 befb01f8efa6bb5bc225de34028a64ecf819c0c93838df9997498c9267cff399deb7a0ce7706c9a19cd5820464188240f94b67407fae016102f4f964013575e9
 EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 MISC metadata.xml 751 BLAKE2B 05dfcd30440ca7bc1375206469123c5bb93ff7fbb7612191faabee7abe87334bfb4f25db3291cd3a989264516c315eeb489eaac2c83c95b2436446966ba27880 SHA512 f2e7c839e4567355bb6ff1cdbf1355ab7a2fbf166a3f87ac7a8af92fc80efa7833010376317a38e2594a203be66bfcb3e0df9dc7346ac3d37d8466bb0368b50e
diff --git a/media-gfx/hydrus/hydrus-462.ebuild b/media-gfx/hydrus/hydrus-468.ebuild
index 0915a2ae5436..8ce7aabfa36d 100644
--- a/media-gfx/hydrus/hydrus-462.ebuild
+++ b/media-gfx/hydrus/hydrus-468.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 86f877c49603..6ef737ae2820 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,6 +1,6 @@
 AUX inkscape-1.1-poppler-21.11.0.patch 690 BLAKE2B 61fbaf22fa86170d1a72393795fb195b5c93d1c9f3e512751d4a9a355acda28656978529c1022caf9df701bc86e3c2b6e50b14eeed5d0c013013090b51ff6716 SHA512 9c7a312de85d11aa8ff3f7347a5c08ef84050522bc8ab59f9aa1aa84c405ddb707275cab7d447e34b1593d633b99fb8e482864e9397c576d688dcd7d34035c6d
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.tar.xz 34203156 BLAKE2B 38896509dcdcf1ef18523c790855035ef16dfae75e27c2d69f782270f52a579557edcb790bef30f3210b9f797a619369d7d16dd23f098debdd8e5b6abf9b30aa SHA512 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
-EBUILD inkscape-1.1-r1.ebuild 4358 BLAKE2B fc260280a82a33d0d81cb8f980dfcd3279fb018531a967c488525dc4b9b32ed27259691f623dafb97adcb7144d624b62e710532b65dd74f49b9c21fb9b8b93b8 SHA512 594c36bbc6c8e2f32794c44a1d2311fdee1eed00b9168ad68c679a804486ebc5edb87f5d0eb3c7586bd389779942aed8bc4cf857b262430674ca38e73cfc6c31
+EBUILD inkscape-1.1-r1.ebuild 4365 BLAKE2B 1a575b33c2b7a90851560291a17ffaeac85287c6dc1289c096a06e9a21da4490b8cd72590e61e390aad50542a0d18bd941c62e32ff625700071ec97383003461 SHA512 2f387d0c8283204aa667ba103274527b4ea9e97daef7775bab8b2cce42d44da5ad4b50ec1e4ae49d0409dd4c2f3c63a29f224451c8569497851113abf34fab2d
 EBUILD inkscape-9999.ebuild 4224 BLAKE2B ae54a77ce4d1aab3e2f9c550017632f54ccb1e41cccc4b32b3769afc934d5bbafe3f4935c24e61610bed7e8578e20b4eeb96f50248d819263d8476312ef3af0d SHA512 fe29d3e89ccdcac3088a7c369353d70eeee54b6e1c8e0b9716377e240f3ebbe498dd7ac8244f8e9f376eda86a0932ad65d9a76f05696d81992c7e39eefc25c37
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/inkscape-1.1-r1.ebuild b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
index c713d8b4e707..acc281e6d6ee 100644
--- a/media-gfx/inkscape/inkscape-1.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="cdr dbus dia exif graphicsmagick imagemagick inkjar jemalloc jpeg
 openmp postscript readline spell static-libs svg2 visio wpg"
 
diff --git a/media-gfx/pdf2svg/Manifest b/media-gfx/pdf2svg/Manifest
index b83329f2e042..1ad665ae4b2b 100644
--- a/media-gfx/pdf2svg/Manifest
+++ b/media-gfx/pdf2svg/Manifest
@@ -1,3 +1,3 @@
 DIST pdf2svg-0.2.3.tar.gz 89461 BLAKE2B 5857935195429f43cf9d6dc3bd66a88945be45225f0ae8324762937b7bfe407f0c4fb4013069d4eda2f0e036710a1a78b261093c18e4693622cc6fc9f7fd7916 SHA512 e8f0cc34c112c7d9ae02396ca587f1354462add882501f003b0173e05ebb09c09456dc1736679674fec5a2c04bdc0ef4141266090ba7efeba8b194ee602f5ee2
-EBUILD pdf2svg-0.2.3.ebuild 803 BLAKE2B a29ed2caf49d719a4777f6916de8b142ca83a94c48fba5b644337d47547aedf6c39c10903f627a0e0b1fd2d58a3f3212edf6876c118d743ce4cd1494db197f97 SHA512 90a225cee6b1268da2d0d0c9d545aeb4ffb80073117878d2a8843e7839c2c7c64e27bfcdb2b41d4469874da0f681e8b19e19401375bdc8f48c436a7af4ea0c6b
+EBUILD pdf2svg-0.2.3-r1.ebuild 767 BLAKE2B e744cef7b2bc242decd74028b1b45a133e16a474364642b21a3d445e5671d1532c168e4987b6813a90b61d595d3b0f586b04e8282767fbb5986fb8e22620d3af SHA512 3a476118a57ba86fec2cc89ca339d2bb5ac374338f511a750739290e01382c75a275c43f05bb4f5fa8d91b52b29bc5e9b0de73f230aa5a38420e882315a5d9f3
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild b/media-gfx/pdf2svg/pdf2svg-0.2.3-r1.ebuild
index 71d62a3a7b69..b3b335c75773 100644
--- a/media-gfx/pdf2svg/pdf2svg-0.2.3.ebuild
+++ b/media-gfx/pdf2svg/pdf2svg-0.2.3-r1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-DESCRIPTION="pdf2svg is based on poppler and cairo and can convert pdf to svg files"
-HOMEPAGE="http://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
+DESCRIPTION="Convert PDF to SVG files using poppler and cairo"
+HOMEPAGE="https://www.cityinthesky.co.uk/opensource/pdf2svg/ https://github.com/dawbarton/pdf2svg/"
 SRC_URI="https://github.com/dawbarton/pdf2svg/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND=">=app-text/poppler-0.12.3-r3[cairo]
+RDEPEND="
+	>=app-text/poppler-0.12.3-r3[cairo]
 	>=x11-libs/cairo-1.2.6:=[svg]
-	x11-libs/gtk+:2="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS="AUTHORS" # ChangeLog is only for <=0.2.1
+DOCS=( AUTHORS ) # ChangeLog is only for <=0.2.1
 # and README.md doesn't have anything useful for usage
 
 src_prepare() {
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index b5e011493f10..cc39e03370f8 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,5 +1,5 @@
-DIST plantuml-1.2021.15.tar.gz 4769780 BLAKE2B 7878d71964513e77d1f1412ab2e1e06db6a34863f9bd67868b915d86d38ee6ef6225af6f10b69d36825a768bb7f5a7f1baae0b33d329a385c1751ac4cbdaf58d SHA512 3918d6bb67eb142a9bafd399d2ae7b0b512bb3affcad31135970de5e54e23b7a7c5821f456c0f595958965eb9e957b855fd103e49187ee34b27bd5bd800e6932
 DIST plantuml-1.2021.16.tar.gz 5378332 BLAKE2B 717ada64ab3664eb790089520ed70106f45eb82186bd26471dcbc732ca0edf6df6d9e55598810c7b208ac5be5efd69452d48f1553b8cd13275ee7d4f0778b603 SHA512 70a0bd0453ed2457fc16a7544a82b53d45e42d3d3fe3d647e1f1509a25135b9adf3fbee70a8e64394829fc941cd5beb66494d8281431fdfe0595cdf2450cc1ec
-EBUILD plantuml-1.2021.15.ebuild 750 BLAKE2B 865ccd939984bee0220611676d21df2d6d9b6696cffb9befcc071cf82863852f1209b0945f9ad8f811ab497323a995ce4e060504c5bfe12bd0d8d68a1e1939e5 SHA512 2221e07a0a3b0e2a20494f9792041da9d0969050f0d8666bc75eaacdad0833fd8193081a879ecb876addb1a084caaafa8c8cdde186cf204d4a7ae5905a104b6c
-EBUILD plantuml-1.2021.16.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
+DIST plantuml-1.2022.0.tar.gz 5384395 BLAKE2B d6eae1d247aaded608d4e70e8eb97c242d95deb231d596c3069c695429345081dcad95436100b70dcccfa6bdfb2ad890009d2429d80d2f971df87de3e3cf6b95 SHA512 8fdead5696e6ddceb947a2d67aad4dce5d82511b795c5f5a5196fe8d7abc7c7de72f56d2982c82a3b784139dccaec53de7510f757eda758ab5f300b440a278b1
+EBUILD plantuml-1.2021.16.ebuild 750 BLAKE2B 865ccd939984bee0220611676d21df2d6d9b6696cffb9befcc071cf82863852f1209b0945f9ad8f811ab497323a995ce4e060504c5bfe12bd0d8d68a1e1939e5 SHA512 2221e07a0a3b0e2a20494f9792041da9d0969050f0d8666bc75eaacdad0833fd8193081a879ecb876addb1a084caaafa8c8cdde186cf204d4a7ae5905a104b6c
+EBUILD plantuml-1.2022.0.ebuild 751 BLAKE2B 118992e67563dedca5375ec285461a8826ab41fe337d69cd75e31edbc2999f8f0c1ec5ad101c856f25aa99810c7181a3037a10f4a38113542f7a53edb1957316 SHA512 2783b88dd3367bbae9d5c4ed3a93b647592822d9cde253fd3e23fb6ee351af15d221d7918876e582231b8b2a266941ac016c1c115fffa24db9012b5c74acbfd6
 MISC metadata.xml 879 BLAKE2B b711489e5c713d9b6ee8489e7ca080b9af19965e10ce3795e3dd16e3cabd0b9284bb1a75646baf2c0134cce31189a9e7dea499129750e20f4971f53aee66feaf SHA512 cfde5b9a2e44e38bc2eca2d7e32e6d4a18d0413325e41b0823091fdefcd15b035f32572397c27173887d370b2cca7673638ccf32690447dcab91ff31bc309c76
diff --git a/media-gfx/plantuml/plantuml-1.2021.16.ebuild b/media-gfx/plantuml/plantuml-1.2021.16.ebuild
index 6ff07a08c731..dc4ec7f18aad 100644
--- a/media-gfx/plantuml/plantuml-1.2021.16.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2021.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/plantuml/plantuml-1.2021.15.ebuild b/media-gfx/plantuml/plantuml-1.2022.0.ebuild
index dc4ec7f18aad..c1ad0e0aaa4f 100644
--- a/media-gfx/plantuml/plantuml-1.2021.15.ebuild
+++ b/media-gfx/plantuml/plantuml-1.2022.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 JAVA_PKG_IUSE="source"
 inherit java-pkg-2 java-ant-2 desktop xdg
@@ -11,7 +11,7 @@ HOMEPAGE="https://plantuml.com"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND=">=virtual/jdk-1.8:*"
 
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index 0221af55e651..e7e28131c24d 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..ba292506bb40
--- /dev/null
+++ b/media-gfx/ristretto/ristretto-0.12.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit xdg-utils
+
+DESCRIPTION="A fast and lightweight picture viewer for Xfce"
+HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
+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"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.44:2
+	media-libs/libexif:0=
+	sys-apps/file
+	x11-libs/cairo:0
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libX11:0=
+	>=xfce-base/libxfce4ui-4.16:0=
+	>=xfce-base/libxfce4util-4.16:0=
+	>=xfce-base/xfconf-4.12.1:0="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 9510f20dea12..22c00a4083ec 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -12,5 +12,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 DIST sane-backends-1.0.32.tar.gz 7349442 BLAKE2B 8841542ffd520b38bbeb532eaae7cce803f0bd868cae7edc28d2138729dcffb5a2a0908b56c16c25ffbba539525331c12c259e1768e105de1bdd1419d29efe83 SHA512 416757d9a69bbc18678d1f16a024ba5a949c571204a68f36009d416be28723886ccea71daaa7da90d20eac9696cd44e567802d6c21c3fc5914b97213bbedb6d5
 EBUILD sane-backends-1.0.31-r2.ebuild 8554 BLAKE2B 20ef534583a3052e699693472bca958e49426353f6f1cf8e721690657c657e1411fcbf7c49ed28a84367afbd5e1f40a70bf3551a06d3d0e169b3dbdf6d89075e SHA512 690006aef47beaaad149199cef5ee694a6fa74913e30dc61d14aedd1558ef8e14f238e88d71c316a4c38f29f4e6a069f9ccd8508f5ec536864d192eb504105cf
-EBUILD sane-backends-1.0.32.ebuild 8433 BLAKE2B dd2e631cd9c67b2505d7f56427d6a144c3107b22a9c2e14b07727d58434f83c330fb64fe4b0d2735be03611844c6bafcadf17569a53f99df2865ba250eab6b67 SHA512 653f02767b216f8e11afecdfa1eb23e58cc2f86edc061f395f8f275d8160461360114cac94f899070cf1d9cb339ddfd1bf8f4972940ceef569415ae1bf084bad
+EBUILD sane-backends-1.0.32.ebuild 8434 BLAKE2B 3266f481f30c51032f38e2fecffcb7da1c593796c0cc9dd3c37dd30b6e1e647555456c2ad15b2aeb99a02aef9175df9cf4fd615552cc0198055f0ed8264f6c06 SHA512 6d2b2cf5760dc6af74a633b1e4d8d3bcd9b3ab72263fc018c7cdb72710a03909ace6391c795ab5006bccc13b2197877d5c0b681f45c2f949b693c644cce1704a
 MISC metadata.xml 267 BLAKE2B cf3ca2583acfc7c5d4b3e053cef4d72bf240aa58c54e8a0f72b9393ee8587bd587d4a88bad4b041cfd50d4465879ed546afa71b6e4570477b376a92ab47bb415 SHA512 d471748b0a9f7d7d4aca203c6bd1ff222f3faa455e7d1df2f8437a188922a40e3a656a5e20032256caf58d664e0f723e25055871e62d102e0c677264942b6fb1
diff --git a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
index d88f04928455..151b7623b2af 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.32.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 # python-any-r1 required for a script in
 # backends/pixma/scripts/
diff --git a/media-gfx/scour/Manifest b/media-gfx/scour/Manifest
index e500820d8a3c..474832bbd7d1 100644
--- a/media-gfx/scour/Manifest
+++ b/media-gfx/scour/Manifest
@@ -1,3 +1,3 @@
 DIST scour-0.38.2.tar.gz 99910 BLAKE2B 4273287b201ecea64cb2be666bb7de4fbadc3483935515de92ec8dfb39f3b856584e35ac877958efd798bb5840baba4fc4d40a376d2c9f3b0c52a679d7ded6df SHA512 a2c418e25283af399be032322b3af0c336c2392ba361681d4b133b64ebc441ac5beeed2b920f42316cef376c971b230681e306687786a875162d33b659d3fdeb
-EBUILD scour-0.38.2.ebuild 621 BLAKE2B 6a2f9dd5b5a85de1d9f3aa7fe38fac6eda64aeef6332ab2e8762d4dcf33f18135fd4bd361d23d9bfd80fa2ed7166ff7a798a72b65e25da64e0c3bd582b3b8bfc SHA512 cafe74e84c706b40dafc8f5da74c45bb996be1ba0974a71cac4d52e8c9c19f7d3b648b8d6168af2f8f191fe4efdb08f8449198d04e32ed0abc036eb0d6e86ea7
+EBUILD scour-0.38.2.ebuild 628 BLAKE2B a1da83d1c76752627bdff90945c689269fe8c083a16d60fd862f1fa576647884637162bf44d768fd3c130632c510ae432188331c0e6cd7dc6ea9f30f7db8d25e SHA512 99291a5919e0a887f1235eb5636e102bc5a031053605b148635d593b7ed8df7edf3f316a361f1cd94b93d8ba4aa5bf2a0cc60bc53b1d3446430853c919bbfdaa
 MISC metadata.xml 282 BLAKE2B 6620cd1197d43d2a968e882186c2e144bf20ee709d4f3c812cec56f48899477fda8fbdd7f198d5e2bc9e9a3b7e8f72b547013e31b6d0d2fdc6271dc7680d48e1 SHA512 41c21e7c62696f6a337d3ed21585284972244e0cbb6b92247a1f745e75ce1a901d4b290f0e99ac6f866f110c08d926375f107e4eabbae000c918fe9f939af2cd
diff --git a/media-gfx/scour/scour-0.38.2.ebuild b/media-gfx/scour/scour-0.38.2.ebuild
index 1aa5120da935..596bb3e7187f 100644
--- a/media-gfx/scour/scour-0.38.2.ebuild
+++ b/media-gfx/scour/scour-0.38.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/scour-project/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index 87378525e31f..6674e7e0e732 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -6,5 +6,5 @@ DIST simple-scan-40.7.tar.xz 1480288 BLAKE2B 8068105db77196157495cbb2eb4c3e6a825
 EBUILD simple-scan-40.1.ebuild 1449 BLAKE2B 9db18c0d56c97dde6d9e503eb9502bff9a05739794b29f5fecbb0b01750b8939ea74b16012b2aa2adfd57de5580db7d7681e4faa872929cca562a933ef34bbf3 SHA512 f5fdc744882f5819ad050854392ff7885798eab8d470486e3257e1d567101721abf91c3d1955e37437586a5d467a7c794686d7c5a60d66b0898e6453ab9ca6ba
 EBUILD simple-scan-40.5.ebuild 1454 BLAKE2B 3bcef6fec47e329f3a9e12f5de11c1c3e2b9e8f3ce2291b302fad2da53e18fc6c515a744b83d022ac9da1a3c0e1057acf9caf5b6e57738936dff2c32824e0270 SHA512 6afb7164c60d5dc05dba8aec8cb93963078c1f5a36ca091c0ab0d63737411b0d4b35a1950d9ecdb395d922d3546a4c799b3eb0b7232eb9b1eeeaef5fa59c25e0
 EBUILD simple-scan-40.6-r1.ebuild 1454 BLAKE2B 3bcef6fec47e329f3a9e12f5de11c1c3e2b9e8f3ce2291b302fad2da53e18fc6c515a744b83d022ac9da1a3c0e1057acf9caf5b6e57738936dff2c32824e0270 SHA512 6afb7164c60d5dc05dba8aec8cb93963078c1f5a36ca091c0ab0d63737411b0d4b35a1950d9ecdb395d922d3546a4c799b3eb0b7232eb9b1eeeaef5fa59c25e0
-EBUILD simple-scan-40.7.ebuild 1454 BLAKE2B 3bcef6fec47e329f3a9e12f5de11c1c3e2b9e8f3ce2291b302fad2da53e18fc6c515a744b83d022ac9da1a3c0e1057acf9caf5b6e57738936dff2c32824e0270 SHA512 6afb7164c60d5dc05dba8aec8cb93963078c1f5a36ca091c0ab0d63737411b0d4b35a1950d9ecdb395d922d3546a4c799b3eb0b7232eb9b1eeeaef5fa59c25e0
+EBUILD simple-scan-40.7.ebuild 1461 BLAKE2B 75da5774e0a761b7aa5d42ed8fae05504a85a55430d663eccefa7f24705baaae72b2ceee524451d9f2f9ccc0503bcd4d74c90aee86a114d9676ec9bc4bd227d8 SHA512 df921f6bff966a2f14b2ae5ebb4a5e57a947d5b9ab836ed86c0dd7734eb8169f21c06762231e040fe8190a57d2f9019508ce3673ac62fd0c1d3b516ea7907625
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-40.7.ebuild b/media-gfx/simple-scan/simple-scan-40.7.ebuild
index 6647ed0c63da..6f4df2c8cd69 100644
--- a/media-gfx/simple-scan/simple-scan-40.7.ebuild
+++ b/media-gfx/simple-scan/simple-scan-40.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="colord webp"
 
 DEPEND="
diff --git a/media-gfx/tuxpaint-stamps/Manifest b/media-gfx/tuxpaint-stamps/Manifest
index a3974fa70610..be1530b0fee4 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,4 +1,7 @@
 AUX tuxpaint-stamps-20090628-make-382.patch 365 BLAKE2B d427c1867b47fde62f1dfb568240727fbef151fc6af6d45e33b5f83a8c30d0dd4e67ea91ee34af248dc6bbbf1a17d7da876dd848033757cad87d4e84116c351f SHA512 17915d5b7aaf9857a6e15a51a2039b00edd6a9adda27f529a10a5422b37df5e9ec500dd497c6e6df45fdae6617717f90d166fb04d5401d9bfa767e09fea31e49
+AUX tuxpaint-stamps-20211125-make-382.patch 341 BLAKE2B c00d68f5fa5cee47e79989574e2b7be2dd7bad715773e7d113f7da9768798b9168e82097019c64ebe86d82091532abc55141066001a50911cf11db960c1134ce SHA512 a9d735d6399e93f8cc994dd63b32034c8b08a5f331c367c9f0bbe868d2e30e78dcada4db7e5f9ad1fb8e304fb23798f637cd9009dafb3d89751deaf0f236569a
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a SHA512 ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
+DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e SHA512 db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10
 EBUILD tuxpaint-stamps-20090628-r1.ebuild 626 BLAKE2B 4531c55c9a3febee023974ac4386001a779bfd487d367dad37fd58690780345ce46c3a679b270f6554e85817c47e61269bf34140c71dbe89e0f2da0c89e2fd68 SHA512 0cb6a1e8b249ee3970c888c7aae9030746003d177b7f14b8541e4b213e5fc7d5b50abb0a3d278b8c6b180f643b8ee3057338cdd5acfee0d85f752402ba2f614f
+EBUILD tuxpaint-stamps-20211125.ebuild 605 BLAKE2B 0e377cb075d935965f70222a8384ca9462e8bd910f805d3a6b750e6f1484c4d0b91399c2c3c719d001d3ba62a69985b42cc473cf8ea3841a7d3ccc3ef4b2749b SHA512 35e78ac6e4dd4d4aaca34f17c0a881e2c64d50adfc8b4261a4ac94e3d8911ffe74d4515fe04e6f5edca9bf7bfc970f9c4ffd876c5fb8faca99885ce80d42ccb5
 MISC metadata.xml 251 BLAKE2B 0fe7a3445117953443b889fca63a22b869d7fb4148da73bd6c0d2eeaca6f543aa5c90695d6c10fae15856cf35392258e18b41f821a45fcc1af93873109b48a03 SHA512 913a2284f552cc6b2245860f106958c0d0c784f52d7f6fdd754b5fbd4c1c57a40afaf3533e55c8e145f0637ba1bb570413a5f9f9c785f2d14f1c90982911bd3d
diff --git a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch
new file mode 100644
index 000000000000..313b7bab67aa
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/334569
+
+--- a/Makefile
++++ b/Makefile
+@@ -79,9 +79,7 @@
+ 	@rm -rf "build/tuxpaint-stamps-$(VER_DATE)" "build/tuxpaint-stamps-$(VER_DATE).tar.gz"
+ 	@-if [ -d build ] ; then rmdir build ; fi
+ 
+-releasedir: build/tuxpaint-stamps
+-
+-build/tuxpaint-stamps:
++releasedir:
+ 	@echo
+ 	@echo "Creating release directory"
+ 	@echo
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
new file mode 100644
index 000000000000..5bbc7d186e65
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="http://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make-382.patch
+)
+
+src_install() {
+	emake PREFIX="${D}/usr" install-all
+
+	rm -f docs/COPYING.txt || die
+	dodoc docs/*.txt
+}
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index ecc62cfc3536..68dbc86438f2 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,6 @@
+AUX tuxpaint-0.9.27-Makefile.patch 5112 BLAKE2B fd6ddb8249373189bf577171d188af5b7f6afd662097f10a814ede17d9d39466d7919814935900cdcb96379f8a9a5f65def60a0ab12eae94b1d7d70c804d1c9e SHA512 5e543962d059c3825987f8c786888313f95e8f7b4a0910ef36b2e329055b0dff4acd06792665a3bacf27b2007080a84cb31901c4f659d72ec043f66962d3ac98
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
+DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
 EBUILD tuxpaint-0.9.24-r1.ebuild 1646 BLAKE2B 9c716616a56836e366dde79a3a944387a3dea15f54a20e95623234dbc9c75873166fcca9df3293cc5b3106618abbc09bb5ad8170433cceaaa5cdcf8babe05520 SHA512 aae79850b1e031edad079010423963491c4b2eacc0fa0a5e734a9ccdd318c667b8f5102ae626f994d7c9c1ce4c63680806690a5a77c31c1a87dae4163618f235
+EBUILD tuxpaint-0.9.27.ebuild 1336 BLAKE2B 5288f5eb8c4084406d830a9c4c8aae37cb47bbe8068a453f03678d1af44485103a2399b69dbabb423ddbf3cc07ebc960d7c0d44dd29d8c61acce6750225f87a1 SHA512 96e42f2b031bea036a354bfad7a9ed2648f06e6e0248b7500e384b943d8567a115a00b2466d0c82749acb14bb83bcbc41bb67288c72880e92c538617866b4c63
 MISC metadata.xml 619 BLAKE2B 4e629db78effd65e82d1098d85a9faed8f36f008ff84f0b9e74dad49534f919e2247f1a58971fda9b4e4446c9447c49cf18b37df63eda6ffad756daec85e393f SHA512 350ca34e3a685c774bddd67663bb7e1c73505a86780ee556e8d7b8223bf4735ad356f947a26f642a7e504266e19e164b490a4bb5979007a4a026d2a49c10b3f2
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
new file mode 100644
index 000000000000..7fd2e3ded8ec
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -0,0 +1,117 @@
+--- a./Makefile
++++ b./Makefile
+@@ -72,7 +72,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for <HOST>:
+ #   <HOSTROOT>/include        Header files.
+ #   <HOSTROOT>/lib            Library files.
+-#   <HOSTROOT>/lib/pkgconfig  *.pc files.
++#   <HOSTROOT>/$(LIBDIR)/pkgconfig  *.pc files.
+ #
+ ifdef HOST
+   ifdef HOSTROOT
+@@ -103,7 +103,7 @@ ifdef HOST
+     # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+     # *change* where pkg-config looks for .pc files instead of adding to the
+     # default path which may have libraries that aren't for HOST.
+-    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
+   endif
+ endif
+ 
+@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:= ${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+ 
+ windows_ARCH_LDFLAGS:=
+@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+ 
+ # Root directory to place files when creating packages.
+@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
+ 
+ # Docs and man page:
+ DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
++DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ 
+@@ -545,7 +545,7 @@ trans:
+ windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
+ macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion
+ ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
++linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+ 
+ # "make install" installs all of the various parts
+@@ -693,12 +693,12 @@ uninstall:	uninstall-i18n
+ 	-rm $(BIN_PREFIX)/tuxpaint-import
+ 	-rm -r $(DATA_PREFIX)
+ 	-rm -r $(DOC_PREFIX)
+-	-rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+-	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+-	-rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+-	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++	-rm $(MAN_PREFIX)/man1/tuxpaint.1
++	-rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++	-rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++	-rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++	-rm $(MAN_PREFIX)/man1/tp-magic-config.1
++	-rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ 	-rm -f -r $(CONFDIR)
+ 	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ 	-rm -r $(MAGIC_PREFIX)
+@@ -962,9 +962,9 @@ install-dlls:
+ 	@cp -R win32/etc/ $(BIN_PREFIX)
+ 	@echo
+ 	@echo "...Installing Library Modules..."
+-	@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+-	@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+-	@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++	@mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++	@cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++	@strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+ 
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1039,24 +1039,20 @@ install-man:
+ 	@install -d $(MAN_PREFIX)/man1
+ 	@# tuxpaint.1
+ 	@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ 	@# tuxpaint-import.1
+ 	@cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ 	@# tp-magic-config.1
+ 	@cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+-	@gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+-	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ 	@echo
+ 	for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ 		DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ 		echo "...Installing $$l man pages into $$DEST..." ; \
+ 		install -d $$DEST ; \
+ 		cp man/$$l/tuxpaint.1 $$DEST ; \
+-		gzip -f $$DEST/tuxpaint.1 ; \
+-		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++		chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ 	done
+ 	@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+ 
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
new file mode 100644
index 000000000000..7a1dffc5100d
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop optfeature toolchain-funcs xdg
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="http://www.tuxpaint.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	app-text/libpaper
+	dev-libs/fribidi
+	gnome-base/librsvg:2
+	>=media-libs/libpng-1.2:0=
+	>=media-libs/freetype-2:2
+	media-libs/libsdl[joystick]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer
+	media-libs/sdl-pango
+	media-libs/sdl-ttf
+	media-libs/sdl-gfx
+	media-gfx/libimagequant
+	x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gperf
+	virtual/imagemagick-tools
+	sys-devel/gettext
+"
+
+PATCHES=(
+	${FILESDIR}"/${P}-Makefile.patch"
+)
+
+src_compile() {
+	# parallel build may break things
+	emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install
+	local file size
+	for file in data/images/icon[0-9]*x[0-9]*.png; do
+		size=${file##*/icon}
+		size=${size%%x*}
+		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
+	done
+	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+	dodoc docs/*.txt
+	dodoc docs/en/*.txt
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 55e01376ec61..32fffb39cf34 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -3,5 +3,5 @@ AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee
 EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef
-EBUILD viewnior-1.8.ebuild 1029 BLAKE2B 96cb9f5ec298026cdc64e03830f7d5397bd735aea277f3407d940c74cb35981ae6bbad253e227481a37d534b066ab62ed35e77158ed4813e9c866fc27a4cfc63 SHA512 104eca03037e51324dfce39b5bf9460f76f876e757095b93211a49a613a033af60d811b1b40e2b926885a76e8fc1a01a741ff4188184b30dd3405f8b2478f196
+EBUILD viewnior-1.8.ebuild 1028 BLAKE2B bac983e60d6600280979b7a4942994a6ebe64a0de9d9e0a706606906073cfe0af0d4eae1be3a68de3174875d45c776bb945362aa14e845fe31b6ec75cfcd9827 SHA512 fa33261bbc86223974d8520d3160f1391ec428abd6865b695297a6cd52bae041ad994a2a7d4af095ceca408941522ab14abdcc9f09fc575c74698bbbb6ed90a6
 MISC metadata.xml 553 BLAKE2B 7fa77da8d1dcd0a0b6d53f1de26b13ead4edaf6be6ea93858328ce412c7c97e40240aebbedd68ccc66469992b637b11d14763435e3451ac16dc1a1a72e9f2e2a SHA512 e3b2daa2db92f02e6e2c7e51828a60acd9b74a99949643e1cdc429e9f02dacf0e3f7b7d7c8bc86c10eb46fe1aaa06f3b07d8e7ddc491951f8e14f881d69c61d0
diff --git a/media-gfx/viewnior/viewnior-1.8.ebuild b/media-gfx/viewnior/viewnior-1.8.ebuild
index 176819f4274c..05444706ef80 100644
--- a/media-gfx/viewnior/viewnior-1.8.ebuild
+++ b/media-gfx/viewnior/viewnior-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-gfx/waifu2x-ncnn-vulkan/Manifest b/media-gfx/waifu2x-ncnn-vulkan/Manifest
index 4ca7ec50cabf..58a48bb9c9c0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/Manifest
+++ b/media-gfx/waifu2x-ncnn-vulkan/Manifest
@@ -1,3 +1,4 @@
+AUX waifu2x-ncnn-vulkan-20210521-no-lto.patch 600 BLAKE2B a4fa9601b48d103c15ed8e93658e633cb0d63f304a5d5ad9336f0b1cdc05e58001fa80cd4ab50cb688d50037560446dd051256617dae51578dabd110586f13ab SHA512 c6bc6b33b26c9d4dbe6728685c9ff68b2b7b8bd1afdeae1e0d3283bc292eb1ccc81d7ba0cd7baaccdf4b367876140ed939e84b0dfe63e1eb1c1100094265e333
 DIST waifu2x-ncnn-vulkan-20210521.tar.gz 34076523 BLAKE2B d04c3ac1152be899292730fe06f317c92f1334ea3f91cc6208444574c271d401152b4432bf5293f7193f0c318ca1685145754dd78ad0a8523aefa0fd56d40b4a SHA512 b1a0202a94deb9faadda34c5d46bceabec7ee00960676ca98090af4101bb63648fdc266cc608bfc621a3ec65c8c5f9503a02a4db4e51e9b2048d574c7a7f368a
-EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1107 BLAKE2B 83be2724db19d19ae98b403949d38573e825234a74e8709d4deecbebdbfbe2b002af5eb1a9bbae57ebe959e2294eac4810ad908d417f4523fabb456e1e73cf33 SHA512 06521bb7ab249d3bed620343d34b7a869b2dc8b8e847c577bc66d3a7d2aa28e359efe3c9defec17d9b3c4d282ef3975eb3125c64a8ba32b63b7d25f3d1ec6720
+EBUILD waifu2x-ncnn-vulkan-20210521.ebuild 1163 BLAKE2B f6256ef3bc34a273b96ebf5dab5dc544a7ddd98a818c55ea4b3929f9964b9c22fa8c49dd815aae854f0b648a7b5a40c3d687217879afd370d5bd8cade60aac61 SHA512 a3869d2c954e554fde32c2d675db2fef7770e0f9563edf1eba99699567ed33e54adab45478c1bd82bda1eabf5503559f166843cccb93fe7aea4beec295f7a031
 MISC metadata.xml 449 BLAKE2B a1550ecad1311dd85b0ea9c0004205f001f9818c98636b3c5abaef1d4222c14336423ce3ba657b7465d46cdea4ee27ab5fb6bd46e4226c6f9500547205c7b527 SHA512 ec69b35edfcdced05b6903212db25626415162c780326142ffe784373410400f0c898300e001d7f50dd277af053effb9aee1d457fc653d058b864600c9edbb53
diff --git a/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
new file mode 100644
index 000000000000..301f6fca4276
--- /dev/null
+++ b/media-gfx/waifu2x-ncnn-vulkan/files/waifu2x-ncnn-vulkan-20210521-no-lto.patch
@@ -0,0 +1,18 @@
+Users should be the ones to choose to add -flto or not and how. The test
+may also cause unnecessary noise wrt https://bugs.gentoo.org/830950
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -42,13 +42,4 @@
+ 
+ # enable global link time optimization
+-cmake_policy(SET CMP0069 NEW)
+-set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
+-include(CheckIPOSupported)
+-check_ipo_supported(RESULT ipo_supported OUTPUT ipo_supported_output)
+-if(ipo_supported)
+-    set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
+-else()
+-    message(WARNING "IPO is not supported: ${ipo_supported_output}")
+-endif()
+ 
+ if(USE_SYSTEM_NCNN)
diff --git a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
index 3079c5c096f0..cc5fc8bd42a0 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
+++ b/media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20210521.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,6 +23,10 @@ DEPEND="
 	${RDEPEND}
 	dev-util/vulkan-headers"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-20210521-no-lto.patch
+)
+
 src_prepare() {
 	CMAKE_USE_DIR="${S}/src"
 	cmake_src_prepare
author	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-01-16 20:27:28 +0000
commit	2fd57282f0262ca084e05b0f2c63fbada395d02b (patch)
tree	4e0f23cea9ce9fd972e70ebc5214bf36fed465cc /media-gfx
parent	c3bc61051d7f12b4c682efa7a5460bbc8815649e (diff)