15 files changed, 247 insertions, 59 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3130193b3edf..972000c76bfa 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/argyllcms/Manifest b/media-gfx/argyllcms/Manifest
index 8e61b42f04d9..92e59d0cfa4a 100644
--- a/media-gfx/argyllcms/Manifest
+++ b/media-gfx/argyllcms/Manifest
@@ -1,6 +1,8 @@
 AUX argyllcms-2.1.2-fno-common.patch 5132 BLAKE2B 5398d60a364a36ea24d6cce682330db177aaaec874a39e4f2a9c754a8862504938471851a14ce0871bb7863a9fd9a794f7ede2144090e1f44718f001344032e8 SHA512 d60f0eb9bd6d32b85d8ac88aa32558d1446357c6643fbdb393e90eba08f8f701ba8185741879b2320bda73e08ed14989cc1a16ffd4d2996d5e9afb05774e4e76
 DIST Argyll_V2.1.2_src.zip 13837056 BLAKE2B cf6181549e37b1deda11bdd4a63b27e101180a1e82b132ea8dca5af6830a74d5e2f940633f5aecf9a8d62fe8c2b0cdce8f2af44124ce7432b33d2a1bdbaa2c21 SHA512 f49b588c5f0a39edcc30a068a8bde8c7b74611d3feb15d07d4a61b205ed1231c288629f65e1a5a60a3921d552a28e075667ada555401a0d9694fd882bddd4b06
 DIST Argyll_V2.2.0_src.zip 14020205 BLAKE2B e278f31de2c09e7d736d13b0ada01a6ff8b0641dcbef2e82ba83987f7835d3cfbe71e479314c76be91725698dbdff8f5a77b607dbdda340a9c583c82477cc9d0 SHA512 42552ebd10280df16ec419e3c7ce6700db2c290e26ab4ab62296bf92abc90dd50265aef04b5b8f0a5bee735d485760bab4278e38d27b2a245c5a3122cbf2ba88
+DIST Argyll_V2.2.1_src.zip 14030108 BLAKE2B 22785536a3a5113998947294c34512e3b6dd5d080a11dbcfe3c4b0c22e34277656ba8dc6fa8f59a9dd20cf69692bd24b4e53044086d21bcf7c6d93820c6dbc4e SHA512 58339dfc550950703a5ab6708765a4f01e5fcdeeac54c750e8db82b7ea0dd9b42e9f1163524811a93beabb86cbf557b37302fc4a6a5c1a339cba8af9dcd3e239
 EBUILD argyllcms-2.1.2-r1.ebuild 2109 BLAKE2B 613f7e41d8f53956e534b962f21f8c0ac95ce5658fc63228b75bc9610a13bfa73c25e18b8c5c0cfaa49af53105a6389ebd2b926337b73cf732bf072dca448db2 SHA512 a2b8af905f634fbebf45073fa5fd7f9885b483e2e9c16015c701b79bdb7802840d5f3fa4ce67fee29c801448efaa7947160a808b9a4e229de56ea4b881d62aac
 EBUILD argyllcms-2.2.0.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
+EBUILD argyllcms-2.2.1.ebuild 2070 BLAKE2B 96061849cc2b8601111b30ab9f301216fbe0a7e90da29e04f628ecb631c9e062a30df128857f583fc70bbf40ee5400497b4c0f331ea3bfb7d6ae9263abab2d15 SHA512 601dbe59b9e94f45cc0f2cdac3156c77bcaa97672a018d664de88e998a0021bc9eb7f700d6d4da61cd1505994dc7be2c8a82c81164d103f54818f2a31b16d948
 MISC metadata.xml 253 BLAKE2B 8557c513beef73e834b0a000c523a3241da961c6307b6e98ac857dad0888c4bbd028c98f8499f01086c24e8f2f57c64bc75db20154dab232adefc2510fccac03 SHA512 67dd372ef7b684101d9198c6199a6403f8750132d80aab4f4daa4b31ebaea3d82eb9a18e904734e2ac10c77b237d67210055949ff1c6d5aad4f75951a096884a
diff --git a/media-gfx/argyllcms/argyllcms-2.2.1.ebuild b/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
new file mode 100644
index 000000000000..d4e795b9baee
--- /dev/null
+++ b/media-gfx/argyllcms/argyllcms-2.2.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multiprocessing toolchain-funcs udev
+
+MY_P="Argyll_V${PV}"
+
+DESCRIPTION="Open source, ICC compatible color management system"
+HOMEPAGE="http://www.argyllcms.com/"
+SRC_URI="http://www.argyllcms.com/${MY_P}_src.zip"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~hppa ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	media-libs/tiff:0
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXxf86vm
+	x11-libs/libXScrnSaver
+	dev-libs/openssl:0=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/ftjam"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	# Make it respect LDFLAGS
+	echo "LINKFLAGS += ${LDFLAGS} ;" >> Jamtop
+
+	# Evil hack to get --as-needed working. The build system unfortunately lists all
+	# the shared libraries by default on the command line _before_ the object to be built...
+	echo "STDLIBS += -ldl -lrt -lX11 -lXext -lXxf86vm -lXinerama -lXrandr -lXau -lXdmcp -lXss -ltiff -ljpeg ;" >> Jamtop
+
+	append-cflags -DUNIX -D_THREAD_SAFE
+
+	sed \
+		-e 's:CCFLAGS:CFLAGS:g' \
+		-e "s:ar rusc:$(tc-getAR) rusc:g" \
+		-i Jambase || die
+
+	tc-export CC RANLIB
+
+	jam -dx -fJambase "-j$(makeopts_jobs)" || die
+}
+
+src_install() {
+	jam -dx -fJambase install || die
+
+	rm bin/License.txt || die
+
+	pushd bin > /dev/null
+	local binname
+	for binname in * ; do
+		newbin ${binname} argyll-${binname}
+	done
+	popd > /dev/null
+
+	dodoc log.txt Readme.txt ttbd.txt notes.txt
+	if use doc;  then
+		docinto html
+		dodoc doc/*html doc/*jpg doc/*gif
+	fi
+
+	insinto /usr/share/${PN}
+	doins -r ref
+
+	udev_dorules usb/55-Argyll.rules
+}
+
+pkg_postinst() {
+	elog "If you have a Spyder2 you need to extract the firmware"
+	elog "from the CVSpyder.dll of the windows driver package"
+	elog "and store it as /usr/share/color/spyd2PLD.bin"
+	echo
+	elog "For further info on setting up instrument access read"
+	elog "http://www.argyllcms.com/doc/Installing_Linux.html"
+	echo
+}
diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest
index e27f4f325898..017383a13d0b 100644
--- a/media-gfx/feh/Manifest
+++ b/media-gfx/feh/Manifest
@@ -4,11 +4,13 @@ DIST feh-3.6.2.tar.bz2 2116515 BLAKE2B c813f1bcee2170b509c4579472f2106ed01bcba49
 DIST feh-3.6.3.tar.bz2 2116771 BLAKE2B 062381cc744617f0c8e0a4a7aac7e0841ef78993d3f65e9853dce6b81d6ce36caf4c72ce35785b96c8e0644da41a6ad12706e6a740740fb27cddf281d780e749 SHA512 53e9e1903f256fee9d49af2f8ce4bf153317e7d5de6b396448f16fd54ae1a13217edb44566cd0433e25675a25175cc412a726f058856136f19629661e2f62ce2
 DIST feh-3.6.tar.bz2 2116101 BLAKE2B 8ad47c6b456746d951728fd8a0ba1a2fed4ceb4a7e15554f68b4de071da7b3f4e9e16a10b1a05e51291b8b4127bab98f2b96231298fd181d8dc544bc089a772f SHA512 1df017adcf0650ff2cdc26556cbea5a6b8c9dad1dd44128cccc79312334d0140ab9e5c9c8bac7249dcfbdd7985ae75d847752eadad14216102d8ab7bcb2c42c7
 DIST feh-3.7.1.tar.bz2 2119324 BLAKE2B 203c557ec40590a19cacf4de1e192907608a6d3a7b09890f6196a99560d02220fbe619e02ffb74e8e7a4c12f725e2baf866f2882e32c3aa1a8c3274a66b71791 SHA512 7e6d4c4ccee5a0aadc0b535350da4d515ba7f75bbd5e95eb6a6e5e553a352f764bd91e39d3a59168d749bcf1528a7db75f40016885273c0bedd814eef0a0acd7
+DIST feh-3.7.2.tar.bz2 2121677 BLAKE2B ce9acf27dc312ef46bcfbbdb5bf982d3a5c5a32ea56e716982c0e3dfaa3a66643bc9471353cca4dde9e28fcb8d002d38bfbafab699d952b81c59bababfafb82f SHA512 e74c4a4ce655711dc3c777f83c9376d54aa82aa7e38e07837b8593ed19ba813217f99d5768c8f8d0b6c1a0f6475a5e36cf404f4bc024674214568715a931b9e3
 DIST feh-3.7.tar.bz2 2118355 BLAKE2B 40cd0e53249d474cb8ff8e236bdaf8be322253600f2233a5748379fefe8592a22a43ccc47d44380b2c84038272c1c194e50fb8ad4892a61e48d54ac18c6ba143 SHA512 687d0863bb6bf99bc88ca22760ab670525e6d8ee4c984fa00d686adabd39b7bee2449d93beeb8863a161d2b1dfabed3cff035911711eb445b358ff5a4b77da3f
 EBUILD feh-3.6.1.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.6.2.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.3.ebuild 1510 BLAKE2B 4f025973871e4f60fd467603e58df078db0cd93ab240a8ce320b3c50034c907cf6729f5c36185c376581236d4bce6913224e842ba711e6c481409e7691a307c4 SHA512 54677a9d00d4135041ed124893bb9fe7e36af5f2afe8d9baca2e52deb8a5bf1a6347a1b597ce938873d2caa54f3ed9c5ef1428760e10fe566ebe65edacc5ccc2
 EBUILD feh-3.6.ebuild 1469 BLAKE2B a4e68a319f63055c4997c72abf39c49c0373b47465873539edf872ed282c5012ae40ddc7cac10968d757b6f9e775bd754a069aac2e42945650e50c6d7be968e1 SHA512 3bca9ab073f234d23d2609e755bc6741742150ac3d3df22e3c831b674d79f7d893ce2b3bcf3b86399b051fe754f8de9e349d5884564bed1cd6b7a1cf1c24c1a5
 EBUILD feh-3.7.1.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
+EBUILD feh-3.7.2.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 EBUILD feh-3.7.ebuild 1508 BLAKE2B 5a9c85a66b898188667ff222c686abf8002548c20e0b642471d6ce3a7fff6426c580a8b7bc0c103267b73ec12515767772b02e7784170b4428df57382528c990 SHA512 35bc572448d0738dd19500d2c1a1d2e9597a25767ee963c05caa34f1c0ff9c759f70ddf02c5161628d4ef8cb3b24141fa17cc3b7d2eba5ab59f926b79454471d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/media-gfx/feh/feh-3.7.2.ebuild b/media-gfx/feh/feh-3.7.2.ebuild
new file mode 100644
index 000000000000..9ccef7a27f03
--- /dev/null
+++ b/media-gfx/feh/feh-3.7.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="A fast, lightweight imageviewer using imlib2"
+HOMEPAGE="https://feh.finalrewind.org/"
+SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2"
+
+LICENSE="feh"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="debug curl exif test xinerama inotify"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="media-libs/imlib2[X]
+	>=media-libs/libpng-1.2:0=
+	x11-libs/libX11
+	curl? ( net-misc/curl )
+	exif? ( media-libs/libexif )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${COMMON_DEPEND}
+	virtual/jpeg:0"
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+	x11-libs/libXt
+	test? (
+		>=dev-lang/perl-5.10
+		dev-perl/Test-Command
+		media-libs/imlib2[gif,jpeg,png]
+	)"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.2-debug-cflags.patch )
+
+pkg_setup() {
+	use_feh() { usex $1 1 0; }
+
+	fehopts=(
+		PREFIX="${EPREFIX}"/usr
+		doc_dir='${main_dir}'/share/doc/${PF}
+		example_dir='${main_dir}'/share/doc/${PF}/examples
+		curl=$(use_feh curl)
+		debug=$(use_feh debug)
+		xinerama=$(use_feh xinerama)
+		exif=$(use_feh exif)
+		inotify=$(use_feh inotify)
+	)
+}
+
+src_compile() {
+	tc-export CC
+	emake "${fehopts[@]}"
+}
+
+src_install() {
+	emake "${fehopts[@]}" DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 581f8b5de639..dae69a77f22c 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,4 @@
 AUX fontforge-doc-no-warn-error.patch 834 BLAKE2B c8bd1cfcf320b7831cc64d67d8de52b37e2f37bbac91d5df709d23e144ae33ec02907606348185eac7030f5151719e0023c0d9fda5395334a15c56f7174151c4 SHA512 6055f1696f1910e81ab1b84b48d336c1a097b53618a3a960e8ce2aeb57e05ad364848d48082b792cd4d5cc85fc95947cddd2e04e7a98c5ceb6f9ced14bd4e674
 DIST fontforge-20201107.tar.xz 14163424 BLAKE2B 8ce9148eef6e5b7206ab5c70310ff36fac67c392117e3c0b28060803a54306bf21c179b62b98734e11253739eac29e2ea8bcf3014c09432bb3a0b2b0f3ec631a SHA512 cf9666395405ab02943f0160959f04251bd2a80e279a8f60431089ad19a4c5a232efd42097050ed9f6c1fb39d01488176262949fd81f5f0960fe853b497437dc
-EBUILD fontforge-20201107.ebuild 2857 BLAKE2B 67a11f7c1544d54ac4e7afaf17eefa768fd9f4f281980330fa67dfeb60d66881cc8c5d2ade1482df452c8b46bf062e81207ff613a8394c5fc2d3124b8065d42a SHA512 c7c60fee29aa677ef934ce39c37fefee838ac31bc08b32a55338cb74df45ec341ebdf08c20f63a1917aa7254705a619f00be28aa9a0e7294910a652ae8a3e505
+EBUILD fontforge-20201107.ebuild 2863 BLAKE2B dfb1c94fa6923acd6a09efce18244982b5973171e8a24d863aad057292428145c64005bd67622c01c1044a57f3303011328299f4825faafc4d4663448e073f07 SHA512 bc8dac5e321f635416127154805c3b8d86c823f4e1f611477744f553fd9063dddb04ddb2dd9ebf85eef3ea99ba381953f6a83428adedb7dc265540f4f5efa7f9
 MISC metadata.xml 862 BLAKE2B bc7359c628af9d645b87f43a50a2f0f0d6ab1d80e3dbb0134f4b0d668990202276e4c66da640b7b63baa53d7ef7bdca90ad097566a995a02ab90efac88553884 SHA512 a6a55768f8e0a81591a44547ca0a135ad24833c0fec1f402348cb17512b8354c6c254f12a4fe62a615f955427a6893e12c9dc34d808e04a9d7065fbcf854a276
diff --git a/media-gfx/fontforge/fontforge-20201107.ebuild b/media-gfx/fontforge/fontforge-20201107.ebuild
index f7295ecb2741..abdcda4d71ed 100644
--- a/media-gfx/fontforge/fontforge-20201107.ebuild
+++ b/media-gfx/fontforge/fontforge-20201107.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforg
 
 LICENSE="BSD GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode woff2 X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index 27cd1020dfa7..c683aeffd467 100644
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,3 +1,3 @@
 DIST kphotoalbum-5.8.1.tar.xz 11792320 BLAKE2B 0f9404bdb0713f824c1e8a448eee48255c1649281a720dac36d46065a8f65bae7eef9fe4057686d25df837411930b03ddc479082c433039f47d3af7539bdbf27 SHA512 3a9eec3a12cd95c7bb0806185d7937346acd68ff29858f3cbbe5d4c0c350ff84f55282231dd3800fc5393d72d5563aa7207ec68122057079ba20e82239c6181c
-EBUILD kphotoalbum-5.8.1.ebuild 1596 BLAKE2B 42fc45d378e6e858fa9554d44e870c8f00fed9d1911f5ada226fe1fe292edd7c4024fdc8d14afe3169c88e84140233fefde42019b798d83bf3f9b9c55052f014 SHA512 754d98971d89fbb3b8d9c8b1c54d7122a18d4b02d4004839b14ea43d1564f07c65bde5e07e9671be301d129c265a69911ef844d4aed96fd06691d7827756b530
+EBUILD kphotoalbum-5.8.1.ebuild 1621 BLAKE2B 319b7eca13c524566236b7691d36d1710a55d43e55a108563ad62e5b319d0b64854b5a5981eb3bdd358d79739cb60e0e5ed790f97f28ba742d0c9d12fc5d52be SHA512 14f99f6d63622c1211e465abded6ea0723a19d8a2458f6dabd6cd2c8a7caa7a9098c0d89ef44012764b973265b8e702ff04245c185957e0f4246dc441d2703c3
 MISC metadata.xml 519 BLAKE2B cc5874959364018bdcb98942049ce40c07459d9c719d041d1b394d4f13b5e265e076b737e1522817344ddcc65307bac2518679770c34d620edd62be22d96462c SHA512 fde456bf1b2d4917b619c4f3da5875163652cb482df55d11f9f88e20c90f6071609a1a52728a1aa299a3f5d2f29c25a3ffb2de8c19ea778dbfd2f4beff9f0b1a
diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
index 877ed523e72b..495d19aff9cb 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-5.8.1.ebuild
@@ -7,6 +7,7 @@ ECM_HANDBOOK="forceoptional"
 ECM_TEST="forceoptional"
 KFMIN=5.74.0
 QTMIN=5.15.2
+VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Tool for indexing, searching, and viewing images"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 05270a77b59f..54eff415e007 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -6,5 +6,5 @@ DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 EBUILD krita-4.4.5-r1.ebuild 3566 BLAKE2B 2ed6de5f9a8cf257d63397647621c51b716a1be2e5147ab1e22d4b698acc026b1ed1b5b09ba4ca45a6deaa7e53de87bb28b9ef1ae92a5c5c6f052d5f5863fa41 SHA512 004b3e83eb730b8212c9c50134e378e36cbf60cabfa7672a29c139b512daf2f73ab214cf8685f73e257b2dd0aec7d8b0f69c6a5db78f0ce08329a0098af10c7e
-EBUILD krita-4.4.8.ebuild 3515 BLAKE2B 2d28bebd5f455e0d6dab6da45f1733ed982574cc9ee1d1befeb3d9be1508c2bdac441b1a2e206140ed2c7be1178011db9c4a2a74258db22f42467ecf33d25ca7 SHA512 b249fdda5db441a3b5224f503610db1d2873671289e34926c0e59e3fec6509e6d3d78c10ba50472d353ba0e3576a378ebd5ba247318cbf5209391a68db72d449
+EBUILD krita-4.4.8-r1.ebuild 3539 BLAKE2B afba0345d206e6120d92239a702219b790214d256f25a091ff30eb20b411ae2e9ecebfae32a8fe9bcd932355442cd1e4e683a69d855df211b6a6155d110d18e0 SHA512 976de9866a3f765d7365342455103de59b4ad4f80bfb3ae2f18917a9fd0c67caf544bf6987688f694ee02903ce7b8c4fee45b6890d177138a63327bf0e33c239
 MISC metadata.xml 765 BLAKE2B 9e75410b77b00e7f45ff2bd1a730396c51302380f7c372084975bc763745d7e3c8bb65e8e94bb211872ea398e806f8f423d5ee2dc9c17db9ab7257dbb9e5cf44 SHA512 78524fb64544cefcec05bbf9a8fcf3b175f1aa6ca8377600470096bd2f4b6afae3c00dad4e2c58610cc84501515167e400050bc90de30c11c9fcf3d4b4668579
diff --git a/media-gfx/krita/krita-4.4.8.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild
index b54ea50988e2..866a9e4645e4 100644
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
 	dev-libs/quazip:0=
 	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
 		dev-python/sip:=[${PYTHON_USEDEP}]
 	')
 	>=dev-qt/qtconcurrent-${QTMIN}:5
diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest
index cd96b512991e..3be6611ff826 100644
--- a/media-gfx/lximage-qt/Manifest
+++ b/media-gfx/lximage-qt/Manifest
@@ -1,5 +1,3 @@
-DIST lximage-qt-0.16.0.tar.xz 100920 BLAKE2B 17a41013b7d7e599662a698fa24b6b15a550b2211dd818fbfda19b0fb9439bf77b63b2d8248ad8a65605fee8fc73c78d294ae86401d5660f6d798aa775273709 SHA512 2da46d23567cff7044a884e14b30de36b3a19d802768585b7c3332897b0af2fc42993ed9bb9d062db7988a0526cc7357a09fbac5f283a615b109ea8dfbf474b5
 DIST lximage-qt-0.17.0.tar.xz 109772 BLAKE2B e49c6fb2b3db9b5ff829f7003862ab8124773d82a540019f2ba64c48fa4fffff0eb5f317b8222be95b1b030b5d64a961d4c96298275a835f56816dc857cc6e27 SHA512 fb7867f5589fa45f3e2d37dcd0733c49fb5439206b11d2a43020305c5c7d222796aa0cf2dbf19d5fc7829a34d3877241cb4bb36ea2883a41503eadd39deaf8e0
-EBUILD lximage-qt-0.16.0.ebuild 959 BLAKE2B 3a34d5641750e187e535301f03c17e1658c05e8601eae6d29f3b93be0767cc5961a8880a8653a90ecd90ee92947169bc42687f2c5c3acf8c92dd064dd86ff5eb SHA512 d3bf56b433b6a1350d6c721dad015a336f6f3c5614f5c9b86e4856fd131e45592d744beaa9266c5b84e1e16da3655076ee51cb20b4734600fcacc09ad2566763
 EBUILD lximage-qt-0.17.0.ebuild 943 BLAKE2B 7df4a44f76b273986f3dedcd7ddc9dee2cbbd04d337cb87611336dcb1b9e2991220446b589fb33caf4e4abeb6defb172c16a342a43f5c1e247a68acc55e23bcc SHA512 f2bd743477b7fac27d2224bec1c37e20c7733367a0b3a9ab09ae60efda553feb867a7cf5fd64225690963fbeab9703701b8141c3c300f130f500290061361ea6
 MISC metadata.xml 317 BLAKE2B f63e3e91e5dc9fcc6113bf1ae9c9bb5680d2b7cf40359eaa058dcbc247f3b2f43f540ffa6525935220d52c3e8b94ee3629ce237c788c8e4f0946dddbf610680e SHA512 74c882b00f38c28d8546d31c59636252b2627053143a1bea3551c4bc507a63361c88bc555ea15760395f995c6d20dd6fe6adf65f11d42cc90ffd8378aae03f1f
diff --git a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild b/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
deleted file mode 100644
index 8bd658c7b2f6..000000000000
--- a/media-gfx/lximage-qt/lximage-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Image Viewer"
-HOMEPAGE="https://lxqt.github.io/"
-
-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 x86"
-fi
-
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	>=dev-util/lxqt-build-tools-0.8.0
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/libexif
-	>=x11-libs/libfm-qt-0.16.0:=
-	x11-libs/libX11
-	x11-libs/libXfixes
-"
-RDEPEND="${DEPEND}
-	!lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest
index a14b787bb143..d54e67a1504e 100644
--- a/media-gfx/simple-scan/Manifest
+++ b/media-gfx/simple-scan/Manifest
@@ -1,4 +1,6 @@
 AUX 40.0-add-control-optional-deps.patch 2713 BLAKE2B 594f076b9515697322711033a206eb6aa7ab8940c6d4ef5711af4bdaaa126b82738b2d300d97843a9c889c314d16873ea05ecb07e0c566e8a273289fc799f8aa SHA512 60bdf1653292f5e2b3ef435c35c81a5eb2963142ea14e2095c5c5673d776979053c65ef0e54f80b503489dcc6e93d1a2ab8d29711059c469ecebcb83ece5e42c
 DIST simple-scan-40.1.tar.xz 1471116 BLAKE2B 4e9071c497cf47600cef7dcbf4c47dff6f8cd8cbd8a72ae45e4ac68b749f5fc89d0e97912e174cab02959efe2e30451403ab0336221ead44fc87747dbe4e29e1 SHA512 1ccd512ce84ed0d2f97f4e2e5220a2e8a850e575cb9dac58ef446f8cc37575a72a2e80ffa240874532433667225b632cd1dd4e68f66dae3dd26be118f3ec21cf
+DIST simple-scan-40.5.tar.xz 1476536 BLAKE2B f386b2765b2479f1a41a7618a3f9f72c85d003c3ba1495012d59902059f348edb2897821a8ceaa631c2b9043a292ffceaf5bd4fc2f4442931120f3e9ff336f4b SHA512 cf87a0dbaea09ee0aa0333d487179dc1ab661a7c13321ff92cd7c7de62f6f9cdcf4a858e1fb24df07fe4b0cb01694bea915c61e2c7ce6e44ecf549613ccbfa6f
 EBUILD simple-scan-40.1.ebuild 1446 BLAKE2B d337303876bb8b236326f29bf4324f34c8a9e59bb6f0bafd8bb2ead1797484d6de9a5dc6525120afdaca61cb6a0d0ebfd630f36274596c2592f22cc972ed3fd2 SHA512 80bf6ab5a88eeb60094495f151e1155b96c426c41eea747ead16a6afdb7b1299a75c6a293941162d140b9572fb32ed6c36ec1ee0e21ec06be2455c13618b30b5
+EBUILD simple-scan-40.5.ebuild 1451 BLAKE2B 7fb4fdd28d38cacc4ca03c4e3ab57930c5b4fe58aa61d60f2f0dccd3669c9fa5c02c141b7e555fc3f166da8e4866ff9ce9135484122fca78c7a53d23644f5cca SHA512 92491ae8c1424e0abd5a0b035069f5a6f5f23aae234d7cd66ee405958f55597afd774cc7550e4055b1a8a2f5d9f2b7bcf243c8bc9ee0c1b3422724481c1b1ad2
 MISC metadata.xml 617 BLAKE2B 41b65f58d578371b4219664b11bf04f081e9a4dd6d146d977689708bdc4d847f85ef86cb4391eb45d24c21185889ff9e5122fd3b6658a24965d231f75ea5b8da SHA512 fb3e56709421b416cb42f1f025308404117c5cf0dfe37419c2d9fa5a18a7397e7f6f9117143df4fff1e2347fd65cfcb9e7007c6c9be56df79641b024d21c1db5
diff --git a/media-gfx/simple-scan/simple-scan-40.5.ebuild b/media-gfx/simple-scan/simple-scan-40.5.ebuild
new file mode 100644
index 000000000000..9389dd00888b
--- /dev/null
+++ b/media-gfx/simple-scan/simple-scan-40.5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+VALA_MIN_API_VERSION="0.34"
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Simple document scanning utility"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="colord webp"
+
+DEPEND="
+	>=dev-libs/glib-2.38:2
+	>=x11-libs/gtk+-3.22:3
+	>=gui-libs/libhandy-1.1.90:1=
+	>=sys-libs/zlib-1.2.3.1:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	>=dev-libs/libgusb-0.2.7
+	colord? ( >=x11-misc/colord-0.1.24:=[udev] )
+	webp? ( media-libs/libwebp )
+	>=media-gfx/sane-backends-1.0.20:=
+
+	virtual/jpeg:0=
+"
+# packagekit? ( >=app-admin/packagekit-base-1.1.5 )
+RDEPEND="${DEPEND}
+	x11-misc/xdg-utils
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	gui-libs/libhandy:1[vala]
+	dev-libs/libgusb[vala]
+	colord? ( x11-misc/colord[vala] )
+"
+
+PATCHES=(
+	# Add control for optional dependencies
+	"${FILESDIR}"/40.0-add-control-optional-deps.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use colord)
+		-Dpackagekit=false
+		$(meson_use webp)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}