gentoo auto-resync : 28:03:2023 - 09:49:10

18 files changed, 12 insertions, 474 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 58d71ae56bbe..f8ebcfd95b79 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/curtail/Manifest b/media-gfx/curtail/Manifest
index 56229faaf11b..5d042f6361a5 100644
--- a/media-gfx/curtail/Manifest
+++ b/media-gfx/curtail/Manifest
@@ -1,3 +1,3 @@
 DIST curtail-1.3.1.tar.gz 176042 BLAKE2B 0757c3c3eed24fea8f1493021d30df40fd8c78dad3bfd7f63cfaa83f36d36f69c47ba4e41a53a7a4299d436fb978ae3fc31afa07b5a1c9d82a6400a17c104966 SHA512 47d1b3939eaeaa3d27c497318bc80d0b7cb1c2674d66ed17c8cc5e6206b3efce7867ff01542b40ee6a4b4127160f2baed084b5b99cf518f2438dcf53af425f89
-EBUILD curtail-1.3.1.ebuild 1173 BLAKE2B 1bc7a4b07a3b48c864d1b6f92805089a291d52c2005fab104195a436f98c033ad7236c94ef96011756d9fc86ac0b3e8d460ce7fee317401d769d7d5507eb70d7 SHA512 689cc982d7ebd0bbfae301d568d9e186e9de45c56702e2bd5f686c984052334692366c04cd5ee9accbe8d7c2e5668165f0c6ae1da6f873c930d6be89c1e854ce
+EBUILD curtail-1.3.1.ebuild 1172 BLAKE2B d10a5ff7d72071e47de68e86df67f19515e064c98e5d00d9992cfef6cd8537420ab7c99bcb2a0f2d2b8ee20261503c9d9e545c5bad5b0376a20f3549694c9a61 SHA512 08dd3fd769bcd1d6a96a1e42391112141fd6ccdb64241e61e35ef71af01a0aa9d123cdfa84eb48b77a0f9c60c7ac3932b87c0e703008e3262da3cb05ee69ce3a
 MISC metadata.xml 817 BLAKE2B ea01ae4c58024699aae770d6e7f21a03adfc8da5f5f658a0b1708824bfda730a2fce4557de4fbccbc079c66a11ab08d6faef020bf897d47870f6581b5e0d68e6 SHA512 3d573feda8c750a08903203c1d2f2e1385e17242356c6f319e29944e530b2199a27e4e432a806dfe1f2c8c783dd67c4fe347d5160d4df99911f67623a3168eee
diff --git a/media-gfx/curtail/curtail-1.3.1.ebuild b/media-gfx/curtail/curtail-1.3.1.ebuild
index 0077c4c0406c..c0e081c90a01 100644
--- a/media-gfx/curtail/curtail-1.3.1.ebuild
+++ b/media-gfx/curtail/curtail-1.3.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/${P^}
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="test"  # Just desktop / schema / appstream file validation (fails).
 
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 02234273b17b..39d9b9f0b835 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -6,13 +6,11 @@ AUX darktable-4.0.1_libs-deps-automagic.patch 968 BLAKE2B e81e63814185d38cd85010
 AUX darktable-4.2.0_libs-deps-automagic.patch 1796 BLAKE2B da5c62e7331435bdcf8c72fa5f488a969c8fa1178782be6116add4a1c3212a8ac4169ab3657044d9d2a0c57ea4734f5aa867e1006faf6bee49f9f66d146afb04 SHA512 7998b809a46be079ac50109158c19518663489f2fd928a329461ef4d3be3aef59afe78cdf70fc80f4e9e4a0d11620e448cf538b132d85e8035416e49faef3f9b
 AUX darktable-4.2.1_cmake-musl.patch 796 BLAKE2B 2e26cc969f01dc948f4f92f42c768a28bb879b3592d98dc1de0c3b5b7335a2985fbb5659c58b421fbca896b1f2585a5cb993b5cdf3ee6f87d9834afe3fd1a23a SHA512 82c7a4f6d6112fa024503a99e05d3050922b120821c93922ae846f9da6b02cd6f2e27315448c20ed1032c5526b85cb6d01dd6eec5109db1af3f8e92e4818ea06
 DIST darktable-4.0.1.tar.xz 5958392 BLAKE2B 677ee85d8b353e9e4fa015226e7383b98b90b319f99142ce8c146c75b3a65a6f057412e8f2a4741d03c5e0a1bd60156245328380e1446c511ab2fb810077b0a3 SHA512 f7107024e52cedeb7775b410329e15a667c97f115d5722530add7d3d542974df1ceabeb7f33161d31e0388a682825941947fb9da2546ea2865a090acb7448729
-DIST darktable-4.2.0.tar.xz 5862080 BLAKE2B eb1c6ab821587cd9d79628d2be24659db6e698a52ee7a7f830b386dd409c96b243a017644a09cf38fcc366c9d7563d057200904aed3ac6f17d4a07fc2758f466 SHA512 17f3e1a97f0af8928b6a7936e1f8923e164344c6adb8393c7aaabce6e62541f2d941929b331283d4f73c477081850c98d694d01f9a002add71c0a41e2272289f
 DIST darktable-4.2.1.tar.xz 6112480 BLAKE2B bf6f60b1f01b16c7cc4ffae7fbb46c7d2ce465d6fafd507564b8dd20aeadb3cd1116e434214d07c9c53ca621228ea6f7ce75a01650d04d596d1e246789bae752 SHA512 05423c16ff813c10fa2bedbb22bbc886f2cff81aad2493c720f4b2fe32ba89b55c428287cd1c4b24cc98121d441375752015f88c30f796ea46db18461e212d5d
 DIST darktable-usermanual-4.0.en.pdf 26585692 BLAKE2B 85083af2227e4e16a658cfce435339410e2cf4f03df1a62cf2a54b743232b82093d8012c1212978f08c021585d5cb4ee4b47d4cbfd399a8a9505d0cb32932618 SHA512 789fb6a309608ad10fccfd61eca24b6176fe9ce8ad53dd9840a7e3175598d9d6b7c8357d4852fc787dbfe80e32e696d680e3a7b9a2663ef4d00ef424d3341fc6
 DIST darktable-usermanual-4.0.uk.pdf 26781033 BLAKE2B 6d73b690dfebc590971325242fdb6d6de5577219eff6b20dec08a3a53a9529cb53031a36fd0ac45b509f4cb885bafdce38ce1f8bd1c4a255aa2a137bc367d87c SHA512 e897bca98470d9d51bdfa807850af5222cbba527ba46df9b713776ebdc5dc8b946758e4c25f1df478c2c01408d08a91467cc75b5a199042b42c93627dc6d9846
 DIST darktable-usermanual-4.2.en.pdf 26559897 BLAKE2B 144b7e76567e92138c7e75c996a63f818dce7eb4f485f0d988d184874d2ee2a72e89efae1d0fb16bc25aac831da040ffbd4a7bbda08d8c750169f06668a98f88 SHA512 a23e9544026d9aff7b92b3ca874217ebc12e1dc876e9d7873e0e7e61a53090179a1377cc4409f2bb8f6d005133e4501ce444c1533c8d66f04b7cc0c5fc5a3531
 DIST darktable-usermanual-4.2.uk.pdf 26454596 BLAKE2B e497c87903f85ae7ebb9b9624124ba19936869db6d19d229182e5d249938f5d9461435ac7ae15f9a2fd64b367aa712ac1de5f32d053cc08a99a3bd672e8cac0b SHA512 ba37d680f29d2d79f517360a1b43d88b49cf5810b638aa5bc6eeeb8016bd1634801119c2d283473bafc72920db2525b122815fa475bac0c41a6cc8d2ac579a61
 EBUILD darktable-4.0.1-r1.ebuild 5778 BLAKE2B 67016be74606a3580c446135fb5059f82cd3e9ddd05f6b0acb9009b9b7e0e286d9ac73ccf1382511b35e13e03f0b438bc6bf94cbf55d6f8aaa6b54443533714a SHA512 e1debafcc7d037589843a1dc481dc3b2c3b7baf3ed7de27349bfa99fea96366f4926417c8e4929b62dfbfee7f8eba8d019c238654403d4269a7e0d304d1c93d6
-EBUILD darktable-4.2.0.ebuild 5776 BLAKE2B b7d6a90bbbc614dfec6bc15589f1cfcfca66164c65ae36d4fd47d983affc1fcaa27bcfa12da1cf8e9da8e62660bcaab4446ee114680ed81dcaeacca0bd17b5a4 SHA512 ce3ee5c4ed754dbb531926174f618a0edb2dbe9ae7cd60920025ddafd946e884c409a83f782f82ba10f3c945cc53534522b208df16c72c6dbb161d2188497340
-EBUILD darktable-4.2.1.ebuild 5814 BLAKE2B 6701832b455282f974a698a9131b3d3fe9e767e09d5fea9e14734be63f256191c9b0bb8685123203a9eb33af65ae06a041f967eee8d0625f9fd757feec4eebbd SHA512 ccd6ca8c52ac4a3d5eca2284dae4bd6369c2cac4a93f1edc246b2ac610df301e2ac1d9c0547c334e3811ce0277e1f79c1c5b53b04a3e21a03458b08faa8f496d
+EBUILD darktable-4.2.1.ebuild 5813 BLAKE2B 7b12cf4d2a344fcd05f0cfe87f53236cbcd0962e9e23c46730b1967a4dbaaa6c57e2c6a23ab447af94e50511ff5e38ed14d34a1b6828da6c934f04edb8c5094f SHA512 aca0eaa62774f9bc1d6c25610aac59f84e8330696f01234b25dbb53dd5a111da418b60becfa54db3429c746c0a812709e39e111cb9d59f7da76ede1d43c303c8
 MISC metadata.xml 1378 BLAKE2B 7373550c5362c32832830bd94dbd712f963246805af5119214a43cfe4dfb1aac9e7bb03d4af6f4f1dfae3cc44e09d6ba8baff53d67b5ddd96115c460b5e19ad9 SHA512 ffdc1ff8eb068372b1f24691bb0832d5a845e49b41adf211dec1c2faf0d1a573a0e4c62c38e97758a8f87de15569ce6f3cd2c7a768c95eb0d2b166e30b20ae3a
diff --git a/media-gfx/darktable/darktable-4.2.0.ebuild b/media-gfx/darktable/darktable-4.2.0.ebuild
deleted file mode 100644
index 7a8ae5b14958..000000000000
--- a/media-gfx/darktable/darktable-4.2.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2022 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 fi fr hu it ja nl pl pt-BR ru sl sq tr uk zh-TW"
-fi
-
-IUSE="avif colord cpu_flags_x86_avx cpu_flags_x86_sse3 cups doc flickr gamepad geolocation gmic gnome-keyring gphoto2 graphicsmagick heif jpeg2k 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 )
-	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 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	heif? ( media-libs/libheif:= )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	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.0.0_find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
-	"${FILESDIR}"/${PN}-3.4.1_libxcf-cmake.patch
-	"${FILESDIR}"/${PN}-4.2.0_libs-deps-automagic.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)
-		-DTESTBUILD_OPENCL_PROGRAMS=OFF
-		-DUSE_AVIF=$(usex avif)
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=$(usex gmic)
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-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/darktable/darktable-4.2.1.ebuild b/media-gfx/darktable/darktable-4.2.1.ebuild
index aba89cc810c2..0c74ea008ae7 100644
--- a/media-gfx/darktable/darktable-4.2.1.ebuild
+++ b/media-gfx/darktable/darktable-4.2.1.ebuild
@@ -31,7 +31,7 @@ else
 			)
 		)"
 
-	KEYWORDS="~amd64 ~arm64 -x86"
+	KEYWORDS="amd64 ~arm64 -x86"
 	LANGS=" cs de es fi fr he hu it ja nl pl pt-BR ru sl sq tr uk zh-CN zh-TW"
 fi
 
diff --git a/media-gfx/fim/Manifest b/media-gfx/fim/Manifest
deleted file mode 100644
index 2b97cecd32c1..000000000000
--- a/media-gfx/fim/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX fim-0.4_rc3-poppler031.patch 706 BLAKE2B b358bc51ccdb6b19533f4ef0571eb2f86e9f1259d4a6ca86d3cddeaf96b6e983a19993ce523a8edb45037eafd12412a56ca641276eb5ba6a915d0cd1bef8b88d SHA512 ddd9d5a9a8fee1269af6daed3edf965f3a2eba33c31c86bfae5af1b1db2e6809e6ad92439b9a438a7ab8a8dc7e30f9c472aad8d13c96b3d5371726b6fac6972c
-AUX fim-0.5_rc3-deg-symbol.patch 401 BLAKE2B 8958840677cec9fa2947f447394036a729ef110a3ebb635faf58450b338c10ffaee3320d9970da95176649ca38b974f38005532fb65b2af3e4348a0a1fb894e9 SHA512 07ee638f606d94ef4efe558454c35f3d73ecba2332d367d5c9e3d2c32f746e0fec6fafe8e78f8a79e738c2f9c196045bf5cdedb71c349afebf1969cdd4d33aa9
-AUX fim-0.5_rc3-jpeg-9c.patch 723 BLAKE2B de59fa7a985fb38900ae3089bbbb20e2efeff2dbb7ccba3212155aff59a339af2f7c30488875cfb88691652682c78f56231366448d11e741f865c7c83133281b SHA512 be5692fc3a84a84aadccee3a5e86f0b3a1c4a2b8c2394640a762b98f1896463762a9d67f2ed62fa52d09d73224b2270b785725aac2ed658d5da497d8fdf9c9f8
-AUX fim-0.5_rc3-jpeg.patch 434 BLAKE2B a0de955643df8602a940f42f1727b4d7ae4ed1d65ce62ee32b0bf9882b1143aecf1566bc0328ae2ca7e6fd21d5331b78e43638fb2a295da09a816854e2e22f53 SHA512 e7918287d59a6677f2c0701a3e03871c2913aacb525438e56daf26064192606ff50b82b8334a3f96e1651fce895d7018606e24a06408fe1981a241f8b874dc7c
-AUX fim-0.5_rc3-libsdl.patch 905 BLAKE2B 5ee899dfa13c362ff4b5de243968376bd9c602f1c4d34763c99556fa0aa8ed523480fe4a65043124d5d65ebf67f376768647284db4a8ccfb812b62b33deee858 SHA512 b96dff8e07f44f24aa2324344889c6828f0d913f40a0b9eab8dffc58e3fddecafa36baa18eee08e19cbf5d1ad3996b1cbcda195c3f58f91537ce309a1345150c
-DIST fim-0.5-rc3.tar.bz2 564226 BLAKE2B 117e4a8644f1b7133f8a5337ce1a606017bee81180ff9a6fbd0c19d3056d2e670a84db20f2a0080ff5bf8e6e91108fdc952b77e4799f47968b38a108f145871e SHA512 946825e683a9020740b6e2115e44e4cd99b4d6bf59fde53d08d90666f00cdb8d98797d4e88b4513dd0e8d8fe5fbab3073cb1aae72117d129688050adf73da306
-EBUILD fim-0.5_rc3-r1.ebuild 2731 BLAKE2B 95f22cea513e4afa1a2c26fbd30d9fcb41d76f7d323654f0b9dcf880547a599ded6c94ee7135e86e4911336b2eb2ed040f42e7d6236a0d886ddae62bc56450d0 SHA512 d31209b3303e5b116958ffc0a909edc803b5499f10993f8e57e303a6e19d0c36fc8a527f7a8ec2305b89b46bce2316148edebe16f27afd903039152adf9f5e9c
-MISC metadata.xml 638 BLAKE2B ab52c320b61079ecc9339ba51e9cc5b843a81471d2cfd8ed3c99dc4c861e36e248c5d8d2e6328d30e249930060fc16e4e1b15d4f41e27e0760571cebd319f709 SHA512 a4efd83d6033e1a5b9b03c4b39b8b3bf3a645afd88ceb78c65f6e5b4edab5cb5a77479cd7af0552ae6e4bae74a320c527dd84f88bf8865c139cd540ef3afb592
diff --git a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch b/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch
deleted file mode 100644
index 74ba50aa5155..000000000000
--- a/media-gfx/fim/files/fim-0.4_rc3-poppler031.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN fim-0.4-rc3.orig/src/FbiStuffPdf.cpp fim-0.4-rc3/src/FbiStuffPdf.cpp
---- fim-0.4-rc3.orig/src/FbiStuffPdf.cpp	2014-12-22 23:54:29.000000000 +0100
-+++ fim-0.4-rc3/src/FbiStuffPdf.cpp	2015-05-18 21:13:07.058115455 +0200
-@@ -199,7 +199,7 @@
- 	if (!ds->od)
- 	{
-         	GBool bitmapTopDown = gTrue;
--        	ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown,gFalse/*antialias*/);
-+        	ds->od = new SplashOutputDev(gSplashColorMode, /*4*/3, gFalse, gBgColor, bitmapTopDown);
- 	        if (ds->od)
- #ifdef POPPLER_VERSION	/* as of 0.20.2, from poppler/poppler-config.h */
- 			/* FIXME: this is an incomplete fix (triggered on 20120719's email on fim-devel);
diff --git a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch b/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch
deleted file mode 100644
index dd34f80cbaa4..000000000000
--- a/media-gfx/fim/files/fim-0.5_rc3-deg-symbol.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/723462
---- a/src/fim.cpp
-+++ b/src/fim.cpp
-@@ -343,8 +343,8 @@
-  .P
-  .nf
-  Shift+D         delete image
-- R               rotate 90° clockwise
-- L               rotate 90° counter-clock wise
-+ R               rotate 90 degree clockwise
-+ L               rotate 90 degree counter-clock wise
-  .fi
-  .P
-  The delete function actually wants a capital letter 'D', thus you have
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
deleted file mode 100644
index 3e0c3067a310..000000000000
--- a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://bugs.gentoo.org/670020
-
---- a/src/FbiStuffJpeg.cpp
-+++ b/src/FbiStuffJpeg.cpp
-@@ -115,7 +115,7 @@
-     cinfo->src->bytes_in_buffer = h->tsize;
- }*/
- 
--static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
-+static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
- {
-     FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n");
-     exit(1);
---- a/src/FramebufferDevice.h
-+++ b/src/FramebufferDevice.h
-@@ -37,8 +37,8 @@
- #include "DisplayDevice.h"
- 
- /* these are required by FbiStuffJpeg.cpp */
--#define FIM_FBI_TRUE            1
--#define FIM_FBI_FALSE           0
-+#define FIM_FBI_TRUE            TRUE
-+#define FIM_FBI_FALSE           FALSE
- 
- #ifndef FIM_WITH_NO_FRAMEBUFFER
- 
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
deleted file mode 100644
index 1887196f7cbf..000000000000
--- a/media-gfx/fim/files/fim-0.5_rc3-jpeg.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/src/FbiStuffJpeg.cpp?r1=1041&r2=1076
-
---- trunk/src/FbiStuffJpeg.cpp
-+++ trunk/src/FbiStuffJpeg.cpp
-@@ -179,7 +179,7 @@
- 
- 	if(nsp)
- 		/* std::cout << "|" << title << "|\n", */
--		nsp->setVariable(string("EXIF_") + title,value);
-+		nsp->setVariable(string("EXIF_") + string(title),value);
- }
- 
- static void fim_ExifDataForeachContentFunc (ExifContent *content, void * user_data)
diff --git a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch b/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
deleted file mode 100644
index 0f1e6beb6feb..000000000000
--- a/media-gfx/fim/files/fim-0.5_rc3-libsdl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-https://svn.savannah.gnu.org/viewvc/fbi-improved/trunk/configure.ac?r1=1474&r2=1521
-
---- trunk/configure.ac
-+++ trunk/configure.ac
-@@ -1128,15 +1128,17 @@
- 			fim_handle_sdl='no'
- 		fi
-         else
--dnl		if test x$fim_cv_want_static == x1 ; then 
--			LIBSDL_CONFIG_FLAGS=--static-libs
--dnl		else
--dnl			LIBSDL_CONFIG_FLAGS=--libs
--dnl		fi
- 		AC_MSG_NOTICE([Activating LIBSDL.])
- 		fim_handle_sdl='yes'
-                 LIBSDL_CXXFLAGS=`$LIBSDL_CONFIG --cflags`
-                 CXXFLAGS="$CXXFLAGS $LIBSDL_CXXFLAGS"
-+		LIBSDL_CONFIG_FLAGS=--static-libs
-+		if $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS ; then 
-+			LIBSDL_CONFIG_FLAGS=--static-libs
-+		else
-+			LIBSDL_CONFIG_FLAGS=--libs
-+		fi
-+		AC_MSG_NOTICE([Invoking $LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS.])
-                 LIBS="$LIBS `$LIBSDL_CONFIG $LIBSDL_CONFIG_FLAGS`"
- 		# finish this !
-                 #FIM_LIB_OBJECTS="$FIM_LIB_OBJECTS SDLDevice.o"
diff --git a/media-gfx/fim/fim-0.5_rc3-r1.ebuild b/media-gfx/fim/fim-0.5_rc3-r1.ebuild
deleted file mode 100644
index 501dba88e50d..000000000000
--- a/media-gfx/fim/fim-0.5_rc3-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Fbi-IMproved is a framebuffer image viewer based on Fbi and inspired from Vim"
-HOMEPAGE="https://savannah.nongnu.org/projects/fbi-improved"
-SRC_URI="http://download.savannah.gnu.org/releases/fbi-improved/${P/_rc/-rc}.tar.bz2"
-S="${WORKDIR}"/${P/_rc/-rc}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="aalib bmp dia djvu exif fbcon gif graphicsmagick imagemagick jpeg pcx pdf png postscript readline sdl static svg tiff xfig"
-
-RDEPEND="media-fonts/terminus-font
-	aalib? ( media-libs/aalib[slang] )
-	dia? ( app-office/dia )
-	djvu? ( app-text/djvu )
-	exif? ( media-libs/libexif )
-	gif? ( media-libs/giflib )
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-	imagemagick? ( virtual/imagemagick-tools )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	pdf? ( >=app-text/poppler-0.31 )
-	png? ( media-libs/libpng:= )
-	postscript? ( app-text/libspectre )
-	readline? ( sys-libs/readline:= )
-	sdl? ( media-libs/libsdl )
-	svg? ( media-gfx/inkscape )
-	tiff? ( media-libs/tiff:= )
-	xfig? ( media-gfx/xfig )"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
-	"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
-	"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
-	"${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch"
-	"${FILESDIR}/${PN}-0.5_rc3-deg-symbol.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable aalib aa) \
-		$(use_enable bmp) \
-		$(use_enable dia) \
-		$(use_enable djvu) \
-		$(use_enable exif) \
-		$(use_enable fbcon framebuffer) \
-		$(use_enable gif) \
-		$(use_enable graphicsmagick) \
-		$(use_enable imagemagick convert) \
-		$(use_enable jpeg) \
-		$(use_enable pcx) \
-		$(use_enable pdf poppler) \
-		$(use_enable png) \
-		$(use_enable postscript ps) \
-		$(use_enable readline) \
-		$(use_enable sdl) \
-		$(use_enable static) \
-		$(use_enable svg inkscape) \
-		$(use_enable tiff) \
-		$(use_enable xfig) \
-		--disable-hardcoded-font \
-		--disable-imlib2 \
-		--disable-jasper \
-		--disable-matrices-rendering \
-		--disable-xcftopnm \
-		--enable-fimrc \
-		--enable-history \
-		--enable-loader-string-specification \
-		--enable-mark-and-dump \
-		--enable-output-console \
-		--enable-raw-bits-rendering \
-		--enable-resize-optimizations \
-		--enable-scan-consolefonts \
-		--enable-screen \
-		--enable-scripting \
-		--enable-seek-magic \
-		--enable-stdin-image-reading \
-		--enable-unicode \
-		--enable-warnings \
-		--enable-windows \
-		--with-default-consolefont=/usr/share/consolefonts/ter-114n.psf.gz
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-}
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
deleted file mode 100644
index cb428df6f061..000000000000
--- a/media-gfx/fim/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="bmp">Enable BMP file support</flag>
-		<flag name="dia">Enable DIA file support via <pkg>app-office/dia</pkg></flag>
-		<flag name="imagemagick">Use convert from <pkg>media-gfx/imagemagick</pkg> as fallback file opener</flag>
-		<flag name="pcx">Enable PCX file support</flag>
-		<flag name="xfig">Enable FIG file support via <pkg>media-gfx/xfig</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="savannah-nongnu">fbi-improved</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index ffd1402b30f0..5dc12581ff25 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-1.1.0.tar.xz 829056 BLAKE2B a44cb527d8fa3ac447944aa68f425ce2768455fc85460a944b745b033b119d6bee82ac4c33e4bce47aea0523817c09def71396cbb65ed1128b68dfef5ffd6f18 SHA512 8d64bb35a56c5f565c1dde7f74534440e4decb9c4435e46986b713dad5b6c87aec0f0d9cb927a73f2f0b94f7101957fe1660737559b30c68b1d93cecfdf2e187
 DIST lximage-qt-1.2.0.tar.xz 837692 BLAKE2B a51ad797882d2725e488226954672df1d6a175237ba5d0f21930af135c92afb46648ba3965f5e65c026eceb324a1e109a08b8f9921dff27d3f6685d35e898da7 SHA512 aa7cbc9f9e2e0ea1ea0cda446887002e285a17b54adb0bd87def1fabc9ad9dd5d25c5c1db56785e67f4767c2da8d8db9b4e73a440c676f80d7094434357b86e1
-EBUILD lximage-qt-1.1.0.ebuild 1080 BLAKE2B d3a2630e4fb16dfa6a34f3939dd17c99cc47607f5a5626bbc4f7514c58272964bf2eb8cc04baf2971ccb7197a196f30a5052064c61fd2d4c3424af50b3ffb201 SHA512 beaf8b8ce1005e04155f711e1b8f917876b6ccc0e24a1413244e0944e41380ebc6ad33a92528c0008792d0fb383cbba484ab4352722549c7b009c19e976a5595
 EBUILD lximage-qt-1.2.0.ebuild 1087 BLAKE2B f8201d38252614c3f909584680dac82eb3a3e66a5e0a276fbf26e05267e0b7d93ddd6d4529ffe1c7a6c883848acc5f44968d145150a41a1c98514753f32a14fc SHA512 592a518a0d6087529c04a21b160c4cbe86fcf36500f75ce368df18c11211796857129344dcc5f705c203f39ab16f34fa8a9dd73882defbdb4f795289c7d391f7
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild b/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild
deleted file mode 100644
index 0abc55383f9a..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-1.1.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PV="$(ver_cut 1-2)"
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Image Viewer"
-HOMEPAGE="https://lxqt-project.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
-else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-5.15:5
-	>=dev-util/lxqt-build-tools-0.11.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	>=dev-qt/qtcore-5.15:5
-	>=dev-qt/qtdbus-5.15:5
-	>=dev-qt/qtgui-5.15:5
-	>=dev-qt/qtnetwork-5.15:5
-	>=dev-qt/qtprintsupport-5.15:5
-	>=dev-qt/qtsvg-5.15:5
-	>=dev-qt/qtwidgets-5.15:5
-	>=dev-qt/qtx11extras-5.15:5
-	media-libs/libexif
-	=x11-libs/libfm-qt-${MY_PV}*:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}"
-
-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-airscan/Manifest b/media-gfx/sane-airscan/Manifest
index 7215809211bd..d324f80cc804 100644
--- a/media-gfx/sane-airscan/Manifest
+++ b/media-gfx/sane-airscan/Manifest
@@ -1,4 +1,4 @@
 AUX sane-airscan-0.99.27-makefile-fixes.patch 1913 BLAKE2B 1fe9fc148e3ac4f9928cb46a9ef35d2b94104dca39ffec09617d6143ce619c8739afad2811d7c5455ce4c0f190a88c68069a800607926009d2121c90aa8bca8b SHA512 8ed38a9debaf0520d7576f1874dd05b634a43825fb258fa3a0df0f3a93ebac6391d5a7e30ba460221d4174b7865f0372e91ff88f430baeca567dd4f633c0099a
 DIST sane-airscan-0.99.27.tar.gz 198418 BLAKE2B bcf2aff08feb90a65c10a4abaca67939874ad7c9376745b572f18ebfdaf7bff3e344d1379b00c73904a6892731a75f4632a90ea7c20f7cb4e30eab43413b829d SHA512 a35a92e26a4e3831f127e59bc520248abde8a7b304eb63ecf1d68092f51a8bc49bbc7503bead47ac84d0333d59ae0045d6d7a9f7b89d95f3ddfa2458f3781256
 EBUILD sane-airscan-0.99.27.ebuild 804 BLAKE2B 80b56646bdc0c4dfde9c0a0eb3cba9e3683ac0f7eea5f70d0ce57d0ea9da3ef4445b0d897b36b74ce4b6a31e9cc1e8a423507b0aaea1142e7c6e6ee99f86f353 SHA512 8c7861f806874899968160f0d2c6077785ea405f15ec440012e53ad9230b36fc72bd538b1c91f6207721f6397c05f748233bf0476006af813ca2c668ecdd2141
-MISC metadata.xml 245 BLAKE2B c146502191378e07b2d7d4d97bcb6daa8eb65f6c0b0d947b8214c19e5302fefc9921d9f8d13516c8bf31d9f642782d098a5d8aa67f45ed4fb33f65c25b1ef8ed SHA512 e901bb8274c666979c1a357a6681d5a0a0f73d5e1d6a4e87eb2f23b16e2ba28592b7d5bd9e2a3e37cf5aec66c159707deaf68619d0cda5e51e1ca98b73253c3a
+MISC metadata.xml 340 BLAKE2B c9c2c847ab7adb2109f7fee5346019acfbdbac25394c052ecef5dd263de2991388c272b37c46bd405078f93a0fdaa4a47ddbd976f468d1acb37fc6b8c9014e99 SHA512 92ba711173b57be840567bf539ad1c6a99698a267994dfbedb8067e25edeed38a87bb142e1a34dc16752afb65a134ce6af338cbbc5a69cdd652d5dc96fd234c7
diff --git a/media-gfx/sane-airscan/metadata.xml b/media-gfx/sane-airscan/metadata.xml
index 78a9d6b02d0f..e71a161f0adf 100644
--- a/media-gfx/sane-airscan/metadata.xml
+++ b/media-gfx/sane-airscan/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-<name>Jason A. Donenfeld</name>
-</maintainer>
+	<maintainer type="person">
+		<email>zx2c4@gentoo.org</email>
+		<name>Jason A. Donenfeld</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">alexpevzner/sane-airscan</remote-id>
+	</upstream>
 </pkgmetadata>