gentoo resync : 08.07.2021

17 files changed, 549 insertions, 144 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 8ca7f62a19dc..a09971bc658a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 5d16283cfc4b..9ae1c3f275eb 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -2,7 +2,9 @@ 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-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
+DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c19304c0efb898260d3037bfb9c82ea51a92e3dd98c8b0d2dc525276a91419b41b3c610f4a18b905cda7ccd1bfc554 SHA512 8e458406c3004a52cde096039358eb044d370e8b9d5cb70a6457fc1ad165f062af073b3f0c8da92b463db5a4df37e7a4ee32eb5ce9dfbfeec3e0c13c70ec5f8a
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 EBUILD darktable-3.4.1.ebuild 4412 BLAKE2B 402c0e8f4cc2c299e8a2a7b425002993eda544735302c4482c4f4d9fe6b605eaa6c14671e41674c8d64312c1406ff2d59a53a762e28bcfbc40f954c12fcd34e5 SHA512 bd292ddf983f2b23e3f0140e2f7d8d0ce84ce2b1e6dd41945ff9f6657f00e583eafdd60da5e6bb34c23d1d8eaadfa279fc0b0b7a38c5e11600abc2bd189a5e11
+EBUILD darktable-3.6.0.ebuild 4411 BLAKE2B a46950b519750c9bd080f19a26bee46456146f0dce7f0b08d7fb55e78785f59f5efd30a28937d3dd3b6ec7f0363d724386f9aa14885ade31f54a395865582cd3 SHA512 2be99339f1aaa5cfb7628611e1f41536279661a88528b12d313597d3bf58fd5a6dcc7179559e452ea2011afa1d8591a914e4b7b6e612b0b7943695b2baa7687f
 EBUILD darktable-9999.ebuild 4407 BLAKE2B 41e9636ef86761982a80ddd449ee45ef28a7904f751061cafdd68b91fcac28242e581adfc3873ddb86ac534127a2b49611db3560956e4126ef574233cef34f44 SHA512 46111450051510f2de6ce1694978ab36268d9680e82de016feddd40fff0bff470ae5572415493982e6fb68ee62e63ba82655c315244b0a578144e7186e72426d
 MISC metadata.xml 1151 BLAKE2B 45fdf41338969512b2790e0dc3fb75b1633244c398c8f2eb67b9264ceba3b41c64d19713bc6727870465d03ebc37714c464a537c5ef4c7b1b7f52711a8e8c268 SHA512 784be9b2454a021f7547894cafb4e2e0fdbda8e30dbfbf78a0d234f596ab8321a5e5a0b8944af8f55d0ce7b466139837d4f0f5139152e2fc691ae528c0e3eef8
diff --git a/media-gfx/darktable/darktable-3.6.0.ebuild b/media-gfx/darktable/darktable-3.6.0.ebuild
new file mode 100644
index 000000000000..5f7bb83e38d4
--- /dev/null
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-3 )
+
+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="3.4.0"
+	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://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
+
+	KEYWORDS="~amd64 ~arm64 -x86"
+	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
+fi
+
+IUSE="avif colord cups cpu_flags_x86_sse3 doc flickr geolocation gmic gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
+	lto lua nls opencl openmp openexr test tools webp
+	${LANGS// / l10n_}"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="dev-util/intltool
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? ( >=dev-python/jsonschema-3.2.0 )"
+DEPEND="dev-db/sqlite:3
+	dev-libs/json-glib
+	dev-libs/libxml2:2
+	>=dev-libs/pugixml-1.8:0=
+	gnome-base/librsvg:2
+	>=media-gfx/exiv2-0.25-r2:0=[xmp]
+	media-libs/lcms:2
+	>=media-libs/lensfun-0.2.3:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0
+	net-libs/libsoup:2.4
+	net-misc/curl
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	x11-libs/cairo
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/pango
+	avif? ( >=media-libs/libavif-0.8.2 )
+	colord? ( x11-libs/colord-gtk:0= )
+	cups? ( net-print/cups )
+	flickr? ( media-libs/flickcurl )
+	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 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lua? ( ${LUA_DEPS} )
+	opencl? ( virtual/opencl )
+	openexr? ( <media-libs/openexr-3.0.0:0= )
+	webp? ( media-libs/libwebp:0= )"
+RDEPEND="${DEPEND}
+	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-find-opencl-header.patch
+	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
+	"${FILESDIR}"/${PN}-3.4.0_jsonschema-automagic.patch
+)
+
+S="${WORKDIR}/${P/_/~}"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug #695658
+		if tc-is-gcc; then
+			test-flags-CC -floop-block &> /dev/null || \
+				die "Please switch to a gcc version built with USE=graphite"
+		fi
+
+		if use openmp ; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	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_WEBP=$(usex webp)
+		-DWANT_JSON_VALIDATION=$(usex test)
+	)
+	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
+	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/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 181b0fb27f84..35c388ffd5ef 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -2,7 +2,9 @@ AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184
 DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
 DIST fotoxx-21.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b91b607269add3e0152fa6dff1347caf12f8e36a528100d5c6f538dce388bb4cbd22d03e2d15ff6904d5fdff626 SHA512 df7b3f424c9a1e2773171f9c036b30c34bd902dad41d3ce51eee5a20e86ce6afe5bcae4147baf40ea35bb9755900d9efcca20e026e12a1f540884b113011bce8
 DIST fotoxx-21.42.tar.gz 8617093 BLAKE2B bccb36c43636fe6811f5fda7df3e81a3ca8ecce0e1df6b4d3a761c31674e32796d42d5b305d391dcd1fa22fadef3224c9ec71f2bf2619091a592f5e8f0acb00a SHA512 cf5cb91cd061e18ac059b93326ff17c406d6a595c6793be55ca74f4e66dbe0172baf48910bc0813263caed9c0fd8571039131b3d5635d9451a14cdaa7efab520
+DIST fotoxx-21.44.tar.gz 8670703 BLAKE2B e3c1a0d68ab530345048833c5c33ababa1f3ef27e99379888c748297a2d69a248eb64b6881b53bcdde759f53aea75292d3c205ca11d9ed291465514bf294d323 SHA512 06446fbd0c44a632d5525acec155f8d51ee9ffd66dc9ba97a01bb30f4a8e4b9355650ea50967a537cbf077062898def227c46b07dd7d6d2c6ab8af3f4654c490
 EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.41.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 EBUILD fotoxx-21.42.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/fotoxx-21.44.ebuild b/media-gfx/fotoxx/fotoxx-21.44.ebuild
new file mode 100644
index 000000000000..12a78336fe75
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-21.44.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature xdg-utils
+
+DESCRIPTION="Program for improving image files made with a digital camera"
+HOMEPAGE="https://kornelix.net/fotoxx/fotoxx.html"
+SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+# For required dependencies read doc/README, for required tools read
+# data/userguide [INSTALLATION]. xdg-open (x11-misc/xdg-utils) is an
+# alternative to firefox and chromium-browser. `grep '"which ' * -R`
+# is helpful to report some required tools run via the shell.
+
+DEPEND="
+	media-libs/clutter
+	media-libs/clutter-gtk
+	media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	media-libs/libchamplain[gtk]
+	virtual/jpeg
+	x11-libs/gtk+:3"
+RDEPEND="
+	${DEPEND}
+	media-gfx/dcraw
+	media-libs/exiftool
+	x11-misc/xdg-utils
+"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}/${PN}-21.40-documentation.patch" )
+
+DOCS=()
+HTML_DOCS=()
+
+src_prepare() {
+	sed -i -e "/^DOCDIR/ s/${PN}$/${PF}/" Makefile || die
+	default
+}
+
+src_install() {
+	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
+	# and README, changelog, copyright, license, etc. must not be compressed.
+	emake DESTDIR="${D}" install
+	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
+	docompress -x /usr/share/doc
+}
+
+pkg_postinst() {
+	optfeature "HEIC file support" media-libs/libheif
+	optfeature "additional RAW file support" media-gfx/rawtherapee
+	optfeature "additional RAW file support" media-gfx/darktable
+	optfeature "video thumbnails & playback" media-video/ffmpeg
+	optfeature "copying images to optical media" app-cdr/dvd+rw-tools
+	optfeature "additional panorama support" media-gfx/hugin
+	optfeature "WEBP file support" media-libs/libwebp
+
+	elog
+	elog "Please read the Help > User Guide for details. The source location is"
+	elog "/usr/share/fotoxx/data/userguide and after running fotoxx a copy will"
+	elog "be placed at /home/<user>/.fotoxx/userguide."
+	elog
+	elog "To play videos, in Tools > Preferences set 'Video File Play Command'."
+	elog
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 2be9484afc93..42e5a6ea024d 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,7 @@
 AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
 AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1bf632a1a10e18a62a47c238fef3a63aca9fe60c5a8749d63004b5a6a442b55870de201a546dfc8b40e43dd4f47e9aeae SHA512 035312d4910bd063bcffdfa3b921c6398614625381747611603fbeed4e1332e687ba7b12b86e18ffe6ae826ebb99a9916c3ee058a86a240126a230b6cd14242e
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
-EBUILD graphviz-2.47.1.ebuild 7690 BLAKE2B ef57052dca6e7f18d76eddbfa5370eba27402c0f9df1b0bf132c48ebd139d634583f7c46def6ba268565e64dcdc5a13373cbf03baa4cd0058666b2a46bd36e30 SHA512 43166e913b51ff7b47c5583207b0500ccc4f36e00038ab6e733501f89c00a1d2b27959a4587af76d3a940c2a4f8925df4d357f815ceda6f28f6dc028ba96c170
+DIST graphviz-2.47.3.tar.xz 23199524 BLAKE2B 450601995da7ea543c951a6abbdd08878b4698cc2b59105d16255950acaf4585e56102ab952e79dc422efcdcc86bc28eaa3e62731626b1a3ede97480f9aeb24b SHA512 3fd43e91471e4a55212a9fc48775e208aaf64d59b40613b964e7020753b23358ec06bca0d6901d616cbe7c031a2760e9783ddc03070e05bc138b5f1dcad28bc1
+EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
+EBUILD graphviz-2.47.3.ebuild 7951 BLAKE2B ada464b9d2de919aa94e14183ef41939e25f55901d2a0ecd72312ab4efb2973f125280f96f348b8bbcc9571a0c280546916d3aca7ac9ee04e84a15c500726bd9 SHA512 7bfa0a63a185548c5c2ed5689b572fa8bdf32c5fb5ff14e15e5f234abd86dfdf6ac3c078de480c77ff7632f28ffe88742498bbcfdaae71f569031dc161b76fb3
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild
index 2c8ab4b79137..130d70d2a5f1 100644
--- a/media-gfx/graphviz/graphviz-2.47.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download -
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl X"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk !postscript !lasi )
@@ -81,6 +81,7 @@ RDEPEND="
 	ruby? ( dev-lang/ruby:* )
 	svg? ( gnome-base/librsvg )
 	tcl? ( >=dev-lang/tcl-8.3:0= )
+	webp? ( media-libs/libwebp:= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXaw
@@ -202,6 +203,7 @@ src_configure() {
 		$(use_with pdf poppler)
 		$(use_with postscript ghostscript)
 		$(use_with svg rsvg)
+		$(use_with webp)
 		$(use_with X x)
 		$(use_with X xaw)
 		$(use_with X lefty)
diff --git a/media-gfx/graphviz/graphviz-2.47.3.ebuild b/media-gfx/graphviz/graphviz-2.47.3.ebuild
new file mode 100644
index 000000000000..cf00d300d517
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.47.3.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+
+DESCRIPTION="Open Source Graph Visualization Software"
+HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
+# unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
+
+REQUIRED_USE="
+	!cairo? ( !X !gtk !postscript !lasi )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	x11-libs/gdk-pixbuf:2
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	java? (
+		dev-lang/swig
+		>=virtual/jdk-1.8:*
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl:0
+	>=media-libs/fontconfig-2.3.95
+	>=media-libs/freetype-2.1.10
+	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
+	>=media-libs/libpng-1.2:0=
+	sys-libs/zlib
+	virtual/jpeg:0
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk? ( x11-libs/gtk+:2 )
+	gts? ( sci-libs/gts )
+	guile? ( dev-scheme/guile )
+	java? ( >=virtual/jre-1.8:* )
+	lasi? ( media-libs/lasi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl:= )
+	postscript? ( app-text/ghostscript-gpl )
+	python? ( ${PYTHON_DEPS} )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+	)
+	ruby? ( dev-lang/ruby:* )
+	svg? ( gnome-base/librsvg )
+	tcl? ( >=dev-lang/tcl-8.3:0= )
+	webp? ( media-libs/libwebp:= )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXmu
+		x11-libs/libXpm
+		x11-libs/libXt
+	)"
+DEPEND="${RDEPEND}"
+
+# Dependency description / Maintainer-Info:
+
+# Rendering is done via the following plugins (/plugins):
+# - core, dot_layout, neato_layout, gd , dot
+#   the ones which are always compiled in, depend on zlib, gd
+# - gtk
+#   Directly depends on gtk-2.
+#   needs 'pangocairo' enabled in graphviz configuration
+#   gtk-2 depends on pango, cairo and libX11 directly.
+# - gdk-pixbuf
+#   Disabled, GTK-1 junk.
+# - glitz
+#   Disabled, no particular reason
+#   needs 'pangocairo' enabled in graphviz configuration
+# - ming
+#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
+#   incomplete.
+# - cairo/pango:
+#   Needs pango for text layout, uses cairo methods to draw stuff
+# - xlib:
+#   needs cairo+pango,
+#   can make use of gnomeui and inotify support (??? unsure),
+#   needs libXaw for UI
+#   UI also links directly against libX11, libXmu, and libXt
+#   and uses libXpm if available so we make sure it always is
+
+# There can be swig-generated bindings for the following languages (/tclpkg/gv):
+# - c-sharp (disabled)
+# - scheme (enabled via guile) ... no longer broken on ~x86
+# - go (disabled)
+# - io (disabled)
+# - java (enabled via java) *2
+# - lua (enabled via lua)
+# - ocaml (enabled via ocaml)
+# - perl (enabled via perl) *1
+# - php (enabled via php) *2
+# - python (enabled via python) *1
+# - ruby (enabled via ruby) *1
+# - tcl (enabled via tcl)
+# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
+# *2 = Those bindings don't build because the paths for the headers/libs aren't
+#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
+
+# There are several other tools in /tclpkg:
+# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
+# tkspline, tkstubs ; enabled with: --with-tk
+
+# And the commands (/cmd):
+# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - lefty:
+#   needs Xaw and X to build
+# - gvedit (via 'qt5'):
+#   based on ./configure it needs qt-core and qt-gui only
+# - smyrna : experimental opengl front-end (via 'smyrna')
+#   currently disabled -- it segfaults a lot
+#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
+#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
+#   with flags enabled at configure time
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
+	"${FILESDIR}"/${PN}-2.47.1-bashisms.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# ToDo: Do the same thing for examples and/or
+	#       write a patch for a configuration-option
+	#       and send it to upstream
+	# note - the longer sed expression removes multi-line assignments that are extended via '\'
+	if ! use doc ; then
+		find . -iname Makefile.am \
+			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
+				-e '/^\(html\|pdf\)_DATA/d' || die
+	fi
+
+	# Nuke the dead symlinks for the bindings
+	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
+
+	# replace the whitespace with tabs
+	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
+
+	# use correct version of qmake. bug #567236
+	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
+
+	use java && append-cppflags $(java-pkg_get-jni-cflags)
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		--enable-ltdl
+		--enable-gdk-pixbuf
+		$(use_with cairo pangocairo)
+		$(use_with devil)
+		$(use_with gtk)
+		$(use_with gts)
+		$(use_with qt5 qt)
+		$(use_with lasi)
+		$(use_with pdf poppler)
+		$(use_with postscript ghostscript)
+		$(use_with svg rsvg)
+		$(use_with webp)
+		$(use_with X x)
+		$(use_with X xaw)
+		$(use_with X lefty)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# new/experimental features, to be tested, disable for now
+		--with-cgraph
+		--without-glitz
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+		# Bindings:
+		$(use_enable guile)
+		$(use_enable java)
+		$(use_enable perl)
+		$(use_enable python python2)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
+		--disable-lua
+		--disable-ocaml
+		--disable-php
+		--disable-python
+		--disable-r
+		--disable-sharp
+		# libtool file collision, bug #276609
+		--without-included-ltdl
+		--disable-ltdl-install
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
+
+	emake DESTDIR="${D}" \
+		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
+		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
+		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
+		install
+
+	if ! use examples; then
+		rm -rf "${ED}"/usr/share/graphviz/demo || die
+	fi
+
+	# useless test binary, because upstream uses
+	# bin_PROGRAMS and not check_PROGRAMS, creates
+	# a spurious dependency on dev-libs/criterion
+	rm -f "${ED}"/usr/bin/command_line || die
+
+	find "${ED}" -name '*.la' -delete || die
+
+	einstalldocs
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# This actually works if --enable-ltdl is passed
+	# to configure
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index 2f0560367592..1b5c2b655319 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -7,9 +7,9 @@ DIST hydrus-442.tar.gz 38818985 BLAKE2B 955f5d9969bd46184fbf5fb11b1bc17257d184ac
 DIST hydrus-443.tar.gz 38823767 BLAKE2B 100b2c0650d3230b1c18e58417b731bd661fecde50ac43010bcffe3f8f5be5e0416156523a2c3b5bcc4d739a54f3c6cf21559a2be2ba1dd6fe38131d91d00bee SHA512 d18f32c2cb05ab73dcff83d1a7bad63519b84640cce2991f00623da86197ecf72ac4f3c1e064515980a56d2c415dcb90e19edeb35646701bca0f3fc0d149be1d
 DIST hydrus-444.tar.gz 38817103 BLAKE2B f9eb3dc346a1a7b8d45558ee69b0b9d2a7dbbb7018734680e9953f20ebd56209cc1874213ecf5515835f1022bf571a99543154843f7dc2b9375116db8ba080a0 SHA512 f5bc28e43a5218fce15bc9d197ebcc1f4eb47856a741ad79f59d1da2413a3e7e220381a4d8208fe880fa507e023f9c03050e46ab5214ef310d105df0d85a9682
 DIST hydrus-445.tar.gz 38823389 BLAKE2B 3cd07a3e30e60bd8507fd58c027e5c5a96745163bd5982198448a65b957ff8f4308c9bc0ee73b883fa275689c900dff07f497634c07f4b2f7fe579e1e3d6f378 SHA512 6735468bd531786fef9a861a81ee1e34595c362450027a0c011593465ed77dc85a304a314dcb7031e30b2e90548b2497bb4f01932dc1f04e814b7dd5ae70617c
-EBUILD hydrus-442.ebuild 4177 BLAKE2B e9cd3c47b98d404239d2ea9095c99ab29ff71f4ef6b40c524e4168001b88b189d6a0d18c25362227dc179db005b2259284cadf34bbff7e4b62ef074cda9ef1ea SHA512 e39f3fb27da87c77685fc6123f7280ae7cc911c8b725d51aa2bcd78832b7ad979ff3b441d43b58dcfe39f2a8aec08fa0ddb9d9279a0e06f1c1115a0b3dbe3ec7
-EBUILD hydrus-443.ebuild 4300 BLAKE2B 8ff4f1287b487a1681df742f1b6ce60c9ab618a875c2b3f6cff9dbf72952c1b2ce3fcb182bc4ec082a545e17cebd74cbd3acbe53f769d2db87bd1623fc6e530b SHA512 250345b2a58b942179a2cf0dd1b2b4dab3ad1d30e73bc10eccbc33902045e5763a3cc431b49093f9e3132805058105a8458fd4020899c7b68e7a14df7687ada2
-EBUILD hydrus-444.ebuild 4300 BLAKE2B 8ff4f1287b487a1681df742f1b6ce60c9ab618a875c2b3f6cff9dbf72952c1b2ce3fcb182bc4ec082a545e17cebd74cbd3acbe53f769d2db87bd1623fc6e530b SHA512 250345b2a58b942179a2cf0dd1b2b4dab3ad1d30e73bc10eccbc33902045e5763a3cc431b49093f9e3132805058105a8458fd4020899c7b68e7a14df7687ada2
-EBUILD hydrus-445.ebuild 4238 BLAKE2B 8cd83c2af95d034e27ea5a40fad4f6d3b40d1843927642dc32df81df271ef1ba8f6383603b1ab42b21a8f9492f83837170a581838960188dd4d838ac65a28cae SHA512 e8b9f40e0069fcfa03704b6bc58091e6d2a544d009f93c2e7c5f11486a6b6ee578d5f5b058688f7c18c58338ff93e5463c8c68bc8a99aa8d7dc6d0ed0e2224f2
-EBUILD hydrus-9999.ebuild 4238 BLAKE2B 8cd83c2af95d034e27ea5a40fad4f6d3b40d1843927642dc32df81df271ef1ba8f6383603b1ab42b21a8f9492f83837170a581838960188dd4d838ac65a28cae SHA512 e8b9f40e0069fcfa03704b6bc58091e6d2a544d009f93c2e7c5f11486a6b6ee578d5f5b058688f7c18c58338ff93e5463c8c68bc8a99aa8d7dc6d0ed0e2224f2
+EBUILD hydrus-442.ebuild 4129 BLAKE2B 0a4a97af179a51b9b5999147a90de8bce5913c6642a28add749cbfeb2f498c41dfc6535bb8c389a7c9452d489a5f86f08da47251988279a478fc19a58479b291 SHA512 c7484f0438a60d20b2e919d5c9978e15704e3a97043313b79c25afbf6dc919d7cf9cea93f3e5a254f9bbb80bf2f8240f838607eb6507190c4a5779769e570116
+EBUILD hydrus-443.ebuild 4252 BLAKE2B bb031dd280b128b04f98aa6df27cc1a59bcdb0b51033ad00a26d8b7d8a4224522d31174c1d26bfe373c16f969657e10d84bda3d8e9bce5aaa09004bc2f39d035 SHA512 911ff6ec48800793805fab7adb765952c36ceda93f5e7cadf9ad0cff5a73d997dee28c563493823a6c543553fde3baad5617d6bf39f7d46a8441368fb3610482
+EBUILD hydrus-444.ebuild 4252 BLAKE2B bb031dd280b128b04f98aa6df27cc1a59bcdb0b51033ad00a26d8b7d8a4224522d31174c1d26bfe373c16f969657e10d84bda3d8e9bce5aaa09004bc2f39d035 SHA512 911ff6ec48800793805fab7adb765952c36ceda93f5e7cadf9ad0cff5a73d997dee28c563493823a6c543553fde3baad5617d6bf39f7d46a8441368fb3610482
+EBUILD hydrus-445.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
+EBUILD hydrus-9999.ebuild 4190 BLAKE2B 4046a68b8f099dfc101e789e5b9f1de78c092a21d3d76caa0c281a1c0d8335695075cc0e2ea383f04404cb97d6908054f4ddf9bac28f1f1b49019221b6e888ea SHA512 8432db8586cf20fac1ae7fba67874d74a165c1234e8aabd17a19abc45a85418ada2bfd9a3b21cbe41ff2d9da6de5f88ef1c590695b1e4a15cac38df9dd34e648
 MISC metadata.xml 1168 BLAKE2B 6480f7938566059342a4b8eef89ee26e4f3843faab9b8c937f74e71a1a27b63630bc6e64482b7ff5ebc647c1247a030e62635a4c3a5bc42d6df87209e35ffb53 SHA512 9bb31694a8d1ce56741340431e82b0e7f35866d90dd1359062703809be331192e5ba4acca94b8c0fc146cbb6199335e724345924687c904795c3c2d0d917acb3
diff --git a/media-gfx/hydrus/hydrus-442.ebuild b/media-gfx/hydrus/hydrus-442.ebuild
index 5ce5c4bdf642..3133d5282a53 100644
--- a/media-gfx/hydrus/hydrus-442.ebuild
+++ b/media-gfx/hydrus/hydrus-442.ebuild
@@ -64,7 +64,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-443.ebuild b/media-gfx/hydrus/hydrus-443.ebuild
index 3ea6657aaeae..fb12102cde91 100644
--- a/media-gfx/hydrus/hydrus-443.ebuild
+++ b/media-gfx/hydrus/hydrus-443.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-444.ebuild b/media-gfx/hydrus/hydrus-444.ebuild
index 3ea6657aaeae..fb12102cde91 100644
--- a/media-gfx/hydrus/hydrus-444.ebuild
+++ b/media-gfx/hydrus/hydrus-444.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-445.ebuild b/media-gfx/hydrus/hydrus-445.ebuild
index 2c52c2dc47e1..abe83ba38720 100644
--- a/media-gfx/hydrus/hydrus-445.ebuild
+++ b/media-gfx/hydrus/hydrus-445.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index 2c52c2dc47e1..abe83ba38720 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -72,7 +72,6 @@ BDEPEND="
 			dev-python/httmock[${PYTHON_MULTI_USEDEP}]
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/nose[${PYTHON_MULTI_USEDEP}]
-			dev-python/unittest2[${PYTHON_MULTI_USEDEP}]
 		)
 	')
 "
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d1de3719d446..baba09d6792f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,8 +2,6 @@ AUX krita-4.3.1-tests-optional.patch 2583 BLAKE2B 0b5e577bc17ef6b6487ce82ff4b4bc
 AUX krita-4.4.2-quazip1.patch 1422 BLAKE2B 917bf30f1dc702276b524713b1ec01a4807f967bc974c0c9896e6972fc56554a4da954c690a0743a4d92d86e57d32028c809418cbf10b30294bf1412a1a08beb SHA512 7c55e371f4c6a5e6d3d275298bf22810b58cb845bf4abcdd3cecdd84cb228499c59e8f7e9902319009dc52ea4dde575de77668ab2d1e9cf076e8ffa6fba582b5
 AUX krita-4.4.5-pykrita-crash-on-exit.patch 2029 BLAKE2B 82b5146f25165416ac6e3f2ea46315e87bf53f5b34a3c3820bddd2e975f782e945db6f985a5fa347a8a2f644e15ea7f60854ea0874f1a71e213819aaea70c454 SHA512 9848301759c51724c3bd2f9c67f38073e6043d3bbeb8c557fe7ab6261c9664f97215ab602808f6c495cf7a23c6e91f19823b3d3cdac8f135ff878dc0fd63a653
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
-EBUILD krita-4.4.3.ebuild 3427 BLAKE2B b02c9502a4ed0989d99d1514fbee3564fed36b6c79f92c6d2d6fc6a9eb8e487f9b718290e03aa230836f6c23a9f783bf52b4bc5e7a8489f4aa8d33e138d7d0ea SHA512 c4d69ca2b75531c84f4769049d2cc3148fec6536f11e51bbbdb8a8f1fa24a140af0a17bc01d70f4d0af13686ddbaee004592c84a4342852481ee2b439180de73
-EBUILD krita-4.4.5.ebuild 3501 BLAKE2B 002c26ccbc6553d491b9e5d37a1e69bd5cee13ea445c6af977f4cbf7880e07dc23a16d575a132e2e678e70d30ad56b4135e2689cf07f87f27382adba4f5c3cfc SHA512 e518f87e8e1afb990fb0b3602bd156c55daf54316a88ead052525a94c9cf44df7f850dada5fd99b90c05ab6e306c5c4d61e6abc04cdcc7b0610b941447dbf52b
+EBUILD krita-4.4.5.ebuild 3500 BLAKE2B a13200741bc0d18fe32a7224371e3c2acc1d22d3581d6661ffba931ed9044c886a4047f9aac280719979159f5d45a2b17b3a921858dab6bd80beee0b6a1a023d SHA512 fe1ffbebd161cd2dc6c83f34d96dfa007b1dcbab9f8a8ce10310ff3a0a31b5861eaa7217fe8e9a129f068e50e310df4257a29e06f3c87f299a0378959ee9cff1
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/krita-4.4.3.ebuild b/media-gfx/krita/krita-4.4.3.ebuild
deleted file mode 100644
index f96ef5a942f0..000000000000
--- a/media-gfx/krita/krita-4.4.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT+=" test"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.4.5.ebuild b/media-gfx/krita/krita-4.4.5.ebuild
index 9b1b2c73a5e0..24eb620839d2 100644
--- a/media-gfx/krita/krita-4.4.5.ebuild
+++ b/media-gfx/krita/krita-4.4.5.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
 		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"