gentoo auto-resync : 21:08:2023 - 21:44:47

9 files changed, 15 insertions, 384 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 02a7d8ea8085..c58a85e92e6c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 7d3796bb0299..50810eedbcf1 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -4,13 +4,11 @@ AUX darktable-3.4.1_libxcf-cmake.patch 788 BLAKE2B b6ecb84de804b0bf16f907f825d93
 AUX darktable-4.2.1-exiv2-0.28.patch 9139 BLAKE2B 82eb190e1fe9d93af8bce40fdfd7647e69bf620915d5d1cc76faefda17577f7480c7c5b9649b2f5ce7efb86b274b19c426393e2c943383637fe8c18a9ceac372 SHA512 dcdfdf9d62983428c4b0bfc87a747a437cd07cc640cba948309095680c077f118da1a4208362b76eba14044ad0fd8dabbb3715335d30e35e2f84a171ca275c6e
 AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
-DIST darktable-4.4.1.tar.xz 5956860 BLAKE2B 429086161c56005f902565509525d84a86fb54d318584c4ce8c2da65ea23bebf5772440a5f4cfa023f4738526b2b19c5055257702b2ae1f49349a77462ccd78d SHA512 20af12232957416693515745d28e49351c8e2c20a5c0ea4b11672167aa8521b5377cdbd17fad1a258d97aad0e9f31f55b9f86c816e613e91ef1910edc7d71099
 DIST darktable-4.4.2.tar.xz 6033932 BLAKE2B 99fec3b3ebc80a03af068d9a9a27a1cbd601183a15d52129495e1bb924be03d274cb768a34ec8c6ad432946f46a78a5d2ba325ae133a82988d828c2170f70991 SHA512 7b87879e865001491bbeaa12b9ac42b006bfa3fbcb50e73384c76cce0ee5d87200be3ce9b11f56d669d5eaf9b1add0a018ec5a021653bb84dfb6a0b379cb5594
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88 SHA512 a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b SHA512 ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 DIST darktable-usermanual-4.4.en.pdf 34311705 BLAKE2B 98094ed8288be092ec9c0398bf1719992ce80723aa803e3924e9d28c1c5f2717b120ed618cbec6eebb958be59d15fe107428099efd87926622b5d08110e36b67 SHA512 90e8b8912776b674a436a7e2377d16b0ef374d879ba16501a1c8a0c8407776ef362b747121859884e0aac1d9fc94f3bf0a58bbccdc6fce27cbcaf4cf169d6ef3
 DIST darktable-usermanual-4.4.uk.pdf 33796107 BLAKE2B 060218ec9b7fbcec947506ea9fdf355411d0b1242d41b9ffb7abd8dd991ece29e75c06231251d2ec2701e319e1b1e8134c08603649fe7e933d21b4aef597f7c3 SHA512 f2a6837a05114d4254fade358382be5fabcbd980a3c4fad702b1102176c7e261fd8646aeef1c0328001da8f7cb25d50b06c9f1163a54987985f556c616728bf5
 EBUILD darktable-4.2.1.ebuild 5867 BLAKE2B ef5d2906890ce74564a1d7f7968849f6975e3f57e62db9fccbe9825a7daf2982e6ed63a625630f67b56a74fce25f0fb90df41464e7a4d49a78410806a18265a6 SHA512 413b43340abce057c736ee124cc7c4c6344a2db48d2a204669ad3813eb8229f288e8d4c8cd5cf87a35d0024df166643eb417f17514fc7b91f28d04b265dd75f4
-EBUILD darktable-4.4.1.ebuild 5715 BLAKE2B 3250cdd36df3cd99b5cb8cfcae4705b34ed161a83f869315055c009a1f08aa26660ba54d71447bb688b498d3ef59bd90bf7cee129e7c72f1eb8a5fe11d195021 SHA512 312331a7bf8c56bff0668078f250b49fe7c3ce83cd3c13983b2fe95b9b587ffb426f25ed3d1d9ff125f5c87f20289ec85252500d728976b562d253e02a615b65
 EBUILD darktable-4.4.2.ebuild 5715 BLAKE2B 3250cdd36df3cd99b5cb8cfcae4705b34ed161a83f869315055c009a1f08aa26660ba54d71447bb688b498d3ef59bd90bf7cee129e7c72f1eb8a5fe11d195021 SHA512 312331a7bf8c56bff0668078f250b49fe7c3ce83cd3c13983b2fe95b9b587ffb426f25ed3d1d9ff125f5c87f20289ec85252500d728976b562d253e02a615b65
 MISC metadata.xml 1447 BLAKE2B 8334b506a34aa6628548473bc8ccef22c3fefe21905fd436a9b4d6fce90a6331b7e02ea6d078e43c482aa0a0ae2fdf1ddd0f3e508ecf3371351a5e7cd3b064ac SHA512 0f386d07ec79cdf385c00a83b03917521268989b07c6eb8fe285d99ce49ae930dd809f052c19ea7160da084e04bce7990e4c7a8013fec11adb31408f8a1e4847
diff --git a/media-gfx/darktable/darktable-4.4.1.ebuild b/media-gfx/darktable/darktable-4.4.1.ebuild
deleted file mode 100644
index c9b9baea653e..000000000000
--- a/media-gfx/darktable/darktable-4.4.1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-4 )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/darktable-org/${PN}.git"
-
-	LANGS=" af ca cs da de el es fi fr gl he hu it ja nb nl pl pt-BR pt-PT ro ru sk sl sq sv th uk zh-CN zh-TW"
-else
-	DOC_PV=$(ver_cut 1-2)
-	MY_PV="${PV/_/}"
-	MY_P="${P/_/.}"
-
-	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-		doc? (
-			https://docs.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.en.pdf
-			l10n_uk? (
-				https://docs.darktable.org/usermanual/${DOC_PV}/uk/${PN}_user_manual.pdf
-					-> ${PN}-usermanual-${DOC_PV}.uk.pdf
-			)
-		)"
-
-	KEYWORDS="~amd64 ~arm64 -x86"
-	LANGS=" de es fr he hu ja pl pt-BR sl sq uk zh-CN zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc gamepad geolocation gmic keyring gphoto2 graphicsmagick heif jpeg2k jpegxl kwallet lto lua midi nls opencl openmp openexr test tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# It is sometimes requested, by both users and certain devs, to have sys-devel/gcc[graphite]
-# in BDEPEND. This has not been done *on purpose*, for the following reason:
-#  - darktable can also be built with sys-devel/clang so we'd have to have that, as an alternative,
-#    in BDEPEND too
-#  - there are at least two darktable dependencies (media-libs/mesa and virtual/rust) which
-#    by default pull in sys-devel/clang
-#  - as a result of the above, for most gcc users adding the above to BDEPEND is a no-op
-#    (and curiously enough, empirical observations suggest current versions of Portage are
-#    more likely to pull in Clang to build darktable with than to request enabling USE=graphite
-#    on GCC; that might be a bug though)
-BDEPEND="dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( >=dev-python/jsonschema-3.2.0 )"
-DEPEND="dev-db/sqlite:3
-	dev-libs/icu:=
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	avif? ( >=media-libs/libavif-0.8.2:= )
-	colord? ( x11-libs/colord-gtk:= )
-	cups? ( net-print/cups )
-	gamepad? ( media-libs/libsdl2 )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gmic? ( media-gfx/gmic )
-	keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	jpegxl? ( media-libs/libjxl:= )
-	lua? ( ${LUA_DEPS} )
-	midi? ( media-libs/portmidi )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:= )
-	webp? ( media-libs/libwebp:= )"
-RDEPEND="${DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-4.2.1_cmake-musl.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			if ! test-flags-CC -floop-block &> /dev/null; then
-				eerror "Building ${PN} with GCC requires Graphite support."
-				eerror "Please switch to a version of sys-devel/gcc built with USE=graphite, or use a different compiler."
-				die "Selected compiler is sys-devel/gcc[-graphite]"
-			fi
-		fi
-
-		use openmp && tc-check-openmp
-	fi
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-	use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-	use cpu_flags_x86_avx && append-flags -mavx
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=ON
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DRAWSPEED_ENABLE_WERROR=OFF
-		-DRAWSPEED_MUSL_SYSTEM=$(usex elibc_musl)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_JXL=$(usex jpegxl)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-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)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	# This USE flag is masked for -9999
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.*.pdf
-
-	if use nls; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26cf01f36d20..a6ea7da87ab5 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -4,10 +4,9 @@ AUX gmic-3.2.0-makefile_automagic.patch 5397 BLAKE2B f5678cf7aba485c9d035fc34c0a
 AUX gmic-3.2.0-relative_rpath.patch 406 BLAKE2B cb92f21c090bfdb3c91aef60fc854fd21531ba8e7560458503ae0c123baf89a703057b870dc9a4366f179575373861696dedebd930c472a51644d4ef41553520 SHA512 8653697eea7da0b0db5ad9f7d8882a147a6aa9bd80085e6bfba21922431e52fa0b7e67c1c74afe8237a994861864f1df07ca2855c5d99bc0e69d0c630f11ebc7
 AUX gmic-3.2.4-makefile_automagic.patch 5367 BLAKE2B 7f720d964746fdb745f7741b092f3b313d9d92fb885e4660cc869ee0cd11affd57ec405e6db4002bd1085d8809c9b5af310b78103cf036ca3a7af272adcc1f63 SHA512 bca841fbd9bbca0c89833fcc77c3921db1a3fd83a156b1d58c2d8cebdb025ff0c9ab5c29a2ff9e9ffefb739f9513a1e2844fd0746973423cfcd2ace60ab95743
 AUX gmic-3.2.5-relative_rpath.patch 759 BLAKE2B 0c6deda724d6f983e9d1cf3101862fc5c3096fecd5951fc185c814bdb8e59774a30591ec969b4121951c3a1662ab5cb4040d4e9b9cfaa463496fc90bc59a301f SHA512 9c5daf6ad03002867594fc48c19c19b1050d9e7be3cab161e8fbe2f84a5fc31ceece2241c0bfa6cc9eaced44a6ceb0d716f485ca04e62a1160530316e4a3d50c
+AUX gmic-3.2.6-makefile_target_deps.patch 354 BLAKE2B bfa068ecb9f2b1e98c2eb992f9a5a90fbe3ed017c64840bec016677b204a2c18d5983a4e1fe6a9a372637684c51dcff1664bd82a5ad29fee0d03a9b81d12c64f SHA512 5d4b7ff4b08b24dede995f842ea768c69db03073c0026e0ca472abf6bb8cfe76c793a2980360fe162f6f9b611b22c567e393c6c5abab0b86dd8cf8566cdafe48
 DIST gmic_3.2.0.tar.gz 10933655 BLAKE2B 6b87acb2a356d3d0c00e795d8b66de75acffa1f87b63caf58986ab52730fcd58bb9dfa37caf057ac2ab2a58695dd783c09018305f21d258427d9c1e450d1c14d SHA512 2eccf179e865416ce5a6cc38fd5587fe79fb30cda381ca2bcb1e587f101a55c502422121d4696834bc25b6200aa3c2292ff30947f2704a610f46e61460685f5b
-DIST gmic_3.2.5.tar.gz 11352319 BLAKE2B 812e28119bcbe485a7551c7afc89d7efb2a46ba3d9cc31597fddcd4c4ba48fa040827eccd92c1abbef3035c057d432f6b7b783ff9067da8be2806a05902bdf35 SHA512 e453b83201fa7aff7dc193c529c6b81306e94990a03356488abbbe3acdf8eb6b07e12c16e496e9607bcb730258218b3431c489b3fd1434bb31e28727be7eae27
 DIST gmic_3.2.6.tar.gz 11574989 BLAKE2B abd33048a448ca8406169c61a9d97bf6e785cbb286cec1d5104f12960640de9eb292677256c074eee5371fa77ed7041671f77a63140c2fa58070c01404962be6 SHA512 26b222c94d68273a8ad4a0c72dca315cb0e17695e601f69cb06d44c49166b8c1050926b8c5d73d21a64613e6ba3b0462e730617db83d2c67b53674bf22e50395
 EBUILD gmic-3.2.0.ebuild 3456 BLAKE2B 5e98b8d4ce0bc98c91ce5f77a92833ca4a48a17986fdac664528981451a723061b469ab3b502f5cb9988768cd9afd5bf03edf51573169f1a0bd261386b65fd98 SHA512 209ab91667f7574fb5cdd9e42a54f444d6c96ff91b55a5677c3e4c05284eae79d48237eac8bda942408df9ca7a2aa3b50f4827364cdba5a865e9774b4fe475d5
-EBUILD gmic-3.2.5.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
-EBUILD gmic-3.2.6.ebuild 3471 BLAKE2B 877f5bcbf0b15e202ca28fdd35e6b5b38883cba8f808647c9a75cc6357b53b62eb66c5e54431afb4122028bdcff01cb79382163c2eba7387621ceb0af7f3edbd SHA512 f76eb11a0827bd026b3e234342e446bbc08e0ca8ba0a78a040dcd7a592b4749343a56def6f9f9eed81243f1a57dbbf45e9bc7fef1dc6735c52f9355459e1059b
+EBUILD gmic-3.2.6.ebuild 3524 BLAKE2B b1ee9a48763b527e8e93db4aa7c7b34fd44599d118eb8af5c7dec3039c3377154f3a981ebbd580d1395859b9241a6a23cfc61a1e19b5ee7105e8256e145c3971 SHA512 28a135b0b34f5b770566770564b336e0afd1d3784eb93e4cafceffe4031ad29ae210d111c33780905470fdb030dd5cbbe94042c500434b2ffea0f519dfff655a
 MISC metadata.xml 466 BLAKE2B 672259377cf7d693bc2493557b22150ddd3504d5bcb3f7b11c8e7e9a8ff591573503e5c9481d8a81e27757d4ebe205dd51a0fb57c0e691461988bc99fc714fc5 SHA512 62d65a13a3061fb31954fc08d753f6df7d76c262dc1c14304c1473dbe3f3412fb77cf808f0f205dc73d124f6dd1104c13d9dc79194eba702a0acdfb112fe6530
diff --git a/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
new file mode 100644
index 000000000000..6aea9e1579eb
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-3.2.6-makefile_target_deps.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -503,7 +503,7 @@
+ libcgmic.o: gmic_libc.cpp CImg.h gmic_libc.h gmic.h
+ 	$(CXX) -o libcgmic.o -c gmic_libc.cpp -Dgmic_core $(PIC) $(CFLAGS)
+ 
+-use_libcgmic: use_libcgmic.c gmic_libc.h
++use_libcgmic: use_libcgmic.c libcgmic.so
+ 	$(CC) -std=c99 -o use_libcgmic use_libcgmic.c -lcgmic $(LIBS)
+ 
+ # libcgmic (static).
diff --git a/media-gfx/gmic/gmic-3.2.5.ebuild b/media-gfx/gmic/gmic-3.2.5.ebuild
deleted file mode 100644
index e49f4fe6fe0d..000000000000
--- a/media-gfx/gmic/gmic-3.2.5.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="GREYC's Magic Image Converter"
-HOMEPAGE="https://gmic.eu/ https://github.com/GreycLab/gmic"
-SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-
-LICENSE="CeCILL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
-
-REQUIRED_USE="
-	gimp? ( png fftw X )
-	qt5? ( png fftw X )
-"
-
-MIN_QT_VER="5.2.0"
-QT_DEPEND="
-	>=dev-qt/qtcore-${MIN_QT_VER}:5
-	>=dev-qt/qtgui-${MIN_QT_VER}:5
-	>=dev-qt/qtnetwork-${MIN_QT_VER}:5
-	>=dev-qt/qtwidgets-${MIN_QT_VER}:5
-"
-DEPEND="
-	sys-libs/zlib:0=
-	curl? ( net-misc/curl )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	gimp? (
-		media-gfx/gimp:0/2
-		${QT_DEPEND}
-	)
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	opencv? ( >=media-libs/opencv-2.3.1a-r1:= )
-	openexr? (
-		dev-libs/imath:=
-		media-libs/openexr:=
-	)
-	png? ( media-libs/libpng:= )
-	qt5? ( ${QT_DEPEND} )
-	tiff? ( media-libs/tiff:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)"
-RDEPEND="${DEPEND}
-	ffmpeg? ( media-video/ffmpeg:= )
-"
-BDEPEND="
-	virtual/pkgconfig
-	gimp? (
-		dev-qt/linguist-tools:5
-		media-gfx/gimp:0/2
-	)
-	qt5? ( dev-qt/linguist-tools:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.6-ar_so.patch
-	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
-	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
-	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-gmic_emake() {
-	local mymakeargs=(
-		CC="$(tc-getCC)"
-		CXX="$(tc-getCXX)"
-		STRIP="/bin/true"
-		LIB="$(get_libdir)"
-		OPT_CFLAGS="${CXXFLAGS}"
-		OPT_LIBS="${LDFLAGS}"
-		GMIC_USE_CURL=$(usex curl)
-		GMIC_USE_EXR=$(usex openexr)
-		GMIC_USE_FFTW=$(usex fftw)
-		GMIC_USE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		GMIC_USE_JPEG=$(usex jpeg)
-		GMIC_USE_OPENCV=$(usex opencv)
-		GMIC_USE_OPENMP=$(usex openmp)
-		GMIC_USE_PNG=$(usex png)
-		GMIC_USE_TIFF=$(usex tiff)
-		GMIC_USE_X11=$(usex X)
-		QMAKE="qmake5"
-	)
-
-	# Possibly unnecessary since 3.2.0, just in case though.
-	tc-is-clang && mymakeargs+=( OPENMP_LIBS="-lomp" )
-
-	emake -j1 -C src \
-		"${mymakeargs[@]}" \
-		$@
-}
-
-src_compile() {
-	gmic_emake lib
-	gmic_emake libc
-	use cli && gmic_emake cli_shared
-	use gimp && gmic_emake gimp_shared
-	use qt5 && gmic_emake gmic_qt_shared
-}
-
-src_install() {
-	# See below for why this has to name a directory even if USE=-gimp
-	local gimp_plugindir="/deleteme"
-	if use gimp; then
-		if type gimptool &>/dev/null; then
-			gimp_plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif type gimptool-2.0 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
-		elif type gimptool-2.99 &>/dev/null; then
-			gimp_plugindir="$(gimptool-2.99 --gimpplugindir)/plug-ins"
-		else
-			die "Cannot find GIMP plugin directory"
-		fi
-	fi
-
-	gmic_emake DESTDIR="${ED}" PLUGINDIR="${gimp_plugindir}" install
-
-	# Upstream build scripts create PLUGINDIR and write some files to it
-	# regardless of whether the GIMP plug-in has been built or not, or even
-	# when they haven't been able to execute gimptool to get the base path.
-	use gimp || rm -rf "${ED}/${gimp_plugindir}"
-
-	# These are already gzipped in the source tarballs
-	find "${ED}/usr/share/man" -name "*.gz" -exec gunzip {} \; || die
-}
diff --git a/media-gfx/gmic/gmic-3.2.6.ebuild b/media-gfx/gmic/gmic-3.2.6.ebuild
index e49f4fe6fe0d..2b300e5482d0 100644
--- a/media-gfx/gmic/gmic-3.2.6.ebuild
+++ b/media-gfx/gmic/gmic-3.2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
 
 LICENSE="CeCILL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 arm64 ~ppc64 ~riscv ~x86"
 IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg opencv openexr openmp png qt5 tiff X"
 
 REQUIRED_USE="
@@ -65,6 +65,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.0-grep38.patch
 	"${FILESDIR}"/${PN}-3.2.4-makefile_automagic.patch
 	"${FILESDIR}"/${PN}-3.2.5-relative_rpath.patch
+	"${FILESDIR}"/${PN}-3.2.6-makefile_target_deps.patch
 )
 
 pkg_pretend() {
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 220bded9286e..cfcb2d3b4c1d 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -2,5 +2,4 @@ AUX viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch 1669 BLAKE2B db9e54bc5
 AUX viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch 2695 BLAKE2B 7b1f23195267443b5920b1e11cb1bc4f9177e86f32bc74f92f6afcc8b2a16bf42dc7f40e9865e37ca0d5bb76a3f9916654df34b41a66bd11f03540f10624c5b1 SHA512 b2921294703d2791f2bc8e71de758ae42031b14b422eab462cebb5f49c410736c67dce919358425f77ef17c941f7e4f363f932af605696cc745c40fc4fa5c9a7
 DIST viewnior-1.8.tar.gz 169219 BLAKE2B 6f6da16aa987acce8a48d24a645e1c033f113bb6e291da9f17810a7a04e5007d27c2f1afe3c62cc2d192003633a4128fb04a031160fbd51efbd0bb7dfabd8970 SHA512 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee
 EBUILD viewnior-1.8-r1.ebuild 1171 BLAKE2B 8de7ca3d51a65481206f8c3a1e0102b5a7567266042d2a2d441e3232bcad1a326f6064f729d96f4773787cf6f6cc03d11a6933269325048b790c273aea62e813 SHA512 99bd3b280ca8c385b6c7570af2426ee1214b839c86c3f140212be8a0c6367e4fcc9f79301cad7479f3683e5ebed9695eb14e75f257cd7ed9667bfbca07ca9e37
-EBUILD viewnior-1.8.ebuild 1027 BLAKE2B 427897227918751fdaa92ae2395ce90c78d9bdc88fa3ff9c9547e7b7e067b9be4deb432be0f947f58995a2b458cc0197409e49f5252ac198ad7a014be8421282 SHA512 1daf715031ad705376d19321c1d493514157add317bb74449a967fe14d9183ca897e12b1b7e3cb223d94915ef4158fc17ce54541a4047268328ec172d5213a3c
 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
deleted file mode 100644
index 3c7bc2cde40e..000000000000
--- a/media-gfx/viewnior/viewnior-1.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-DESCRIPTION="Fast and simple image viewer"
-HOMEPAGE="https://siyanpanayotov.com/project/viewnior"
-SRC_URI="https://github.com/hellosiyan/${PN^}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~riscv x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/exiv2:0=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN^}-${P}"
-
-src_prepare() {
-	# That script would update icon cache and desktop database.
-	sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build \
-		|| die 'Failed to remove post-install-script invocation from meson.build'
-	# Don't let meson compress the manpage.
-	sed -i "s/subdir('man')//" meson.build \
-		|| die 'Failed to remove manpage compression from meson.build'
-
-	default
-}
-
-src_install() {
-	meson_src_install
-	doman man/viewnior.1
-}