gentoo resync : 10.09.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-09-10 04:21:55 +0100
commit: 677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree: 6c418a1546fff5becab5d8b9ed6803323e7f316e /media-gfx
parent: fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)
30 files changed, 783 insertions, 165 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 62a4116402ae..f1d5f6b8f7b0 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index f3b52dd8b8fa..dfd21923b685 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -7,5 +7,5 @@ DIST darktable-3.6.0.tar.xz 4691608 BLAKE2B ecbb6b4b4aba1f499f8d459304f174f348c1
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
 DIST darktable-usermanual-3.6.pdf 34290182 BLAKE2B 407223f6dfc25e53e2de31a05b0468a3d50ec5ccf836fa4cca61b16d43e91827c0276027ea73dd543750f240889b7325538eb474e19df86eeff4d380bf0b8829 SHA512 62c2723e5fc0434703f21bc4f5efdb997db1c0cfb800a9df217d6682325949ce18ab458a179bd20a888b73a7bd384bbbb2ea8888cba26278510abaab1e0cc335
 EBUILD darktable-3.4.1.ebuild 4458 BLAKE2B 232c71684688619c4f6248325b4805f2fec2840fd3198651c871eb9c73f0ef82e85ed0a985a89c5de3133939b469e40bd40091d72a612172b775a2d3c6217e4a SHA512 0264c756bc1dee91a6d6a447975fb0bad98995cd4974cde9686a0cdea3858b8a01498f3619286bd9d7651f4ded636e6236493605735a4394d300c4927536eb4b
-EBUILD darktable-3.6.0.ebuild 4430 BLAKE2B 9cc005fedc325eafd135d0e3fd5fdbbf008608ad2f58f6ee80224f6069b912b7dd2b7b6878c74ab4311e97e1f28436f9571b8ae92b1d97963d0029d675d635a4 SHA512 f4dec0bb0e167b79aca7aad13908ce2483ae14b8f4aa2e5f4b578ab5fae1ee793c0ce72b954cfce0c9b94b970614839ed942b80cf396dd95b92822b515186a9a
+EBUILD darktable-3.6.0.ebuild 4429 BLAKE2B 7050dd4ed9f6d822c0f37a39fbc03bc092708c49a6529407cc9aac514e3691cb3f11145dfe4d8793f8901126b99ab40ba92aa9a6b18ea3e859657de0bc9957b1 SHA512 1a7ee2c8ebe3de019e4bb1962b76fa1a2df3c7c20891d1c8d217b0c9ceba30668415951ab7e3c85c39e8790a0af1620e9b67a1b103d50171d9ca52cf59957650
 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
index 383ae12c1b1e..08c0e892bb98 100644
--- a/media-gfx/darktable/darktable-3.6.0.ebuild
+++ b/media-gfx/darktable/darktable-3.6.0.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://www.darktable.org/usermanual/${DOC_PV}/en/${PN}_user_manual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="amd64 ~arm64 -x86"
+	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" af de eo es fr he hu it nl pt-BR ru sl uk"
 fi
 
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index ae7e9276f6ea..c3a7ecb931a9 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -5,6 +5,6 @@ AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1
 AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737
 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec
 DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3
-EBUILD fbida-2.14-r2.ebuild 2503 BLAKE2B a234de029f42c658501d7745e08fe5972ff237a9d83dd491b62758c1895684da41262e417fb0a3b929e3389d0fe711ad4552d95902abb16cd203291e8e859a2a SHA512 de7bb3bf09313c66fa5616d451cea3f4d37feb3ce86111886baed2cb575437526d3d9ee1906d00c2694aba1008a14abc299633aee2b3512f11966f11951d6314
+EBUILD fbida-2.14-r2.ebuild 2502 BLAKE2B 2793d432ba4ee989a163ead1571387cf17e42078c6fb05732504332785e3b6c039997deaf912fda3b882fb8d2539e185b9c12e6d20d0680c056297ffdb4558d2 SHA512 e30e1f5e4f8aae0265662dc52f2fac9ff1815b1a197a1937c44a4858177aa4bfa14efb35410d0dc0c076c7aecc4965b66f2da47b6dee114f33ebe78e2020941a
 EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0
 MISC metadata.xml 395 BLAKE2B c51bbf0a7dc30596e65875c667f819332a547600b256f8ce75defd435677a36a0a3b0ede7cc4f9abf983890e34116ad11fa202f2b491b95605432a9f934e9fd7 SHA512 a8408235a641c85cb2c3e0fe141b7a590d52b5000888e1f753f6155257f669219cab6ddedf690a66ac5fc11d500fe8d270cdde36bbae31e2637e0c6ae413728a
diff --git a/media-gfx/fbida/fbida-2.14-r2.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild
index 89a36b7d618f..9c979c1b17e7 100644
--- a/media-gfx/fbida/fbida-2.14-r2.ebuild
+++ b/media-gfx/fbida/fbida-2.14-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
 REQUIRED_USE="
 	ghostscript? ( tiff )
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index cdbb85ed49ac..b850e9477319 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.41.tar.gz 8619224 BLAKE2B 28ec5fef8780001a023527c0859b58e1b3347b91b607269add3e0152fa6dff1347caf12f8e36a528100d5c6f538dce388bb4cbd22d03e2d15ff6904d5fdff626 SHA512 df7b3f424c9a1e2773171f9c036b30c34bd902dad41d3ce51eee5a20e86ce6afe5bcae4147baf40ea35bb9755900d9efcca20e026e12a1f540884b113011bce8
 DIST fotoxx-21.44.tar.gz 8670703 BLAKE2B e3c1a0d68ab530345048833c5c33ababa1f3ef27e99379888c748297a2d69a248eb64b6881b53bcdde759f53aea75292d3c205ca11d9ed291465514bf294d323 SHA512 06446fbd0c44a632d5525acec155f8d51ee9ffd66dc9ba97a01bb30f4a8e4b9355650ea50967a537cbf077062898def227c46b07dd7d6d2c6ab8af3f4654c490
 DIST fotoxx-21.50.tar.gz 8693590 BLAKE2B d3bed82c3e856d6ce2433e0357955f32d462d0dfcf8de673a7c0fbe8aeeea766711c2617730c6a83501b07bd5f5ab60c9d56caeacd6ea938428758a39b5a75b3 SHA512 018735ff4b1fc99a64eccb05af05e9858f9dfce3c6925704f1739c22a49d3209f66d668b21cb6030d971bbe116c978c5d491aaba033683d5ed5268ee0e46ff9e
+DIST fotoxx-21.52.tar.gz 8666385 BLAKE2B 3d994cdc7ca80029df00b661409d9ce64de6f568e90840d92576ffeee9f305175875a5b506a91ab9be394850817d64541c96d8e2cf10fac5a9b0afa3ebd4855f SHA512 da73c176456ff904093c648565cc69d270e5282df5687a8302614624ceac565b3131f035190ef7b6d84f937b84409cdc02a650bfbe7d9051200d19b22bf0d0f6
 EBUILD fotoxx-21.41.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 EBUILD fotoxx-21.44.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 EBUILD fotoxx-21.50.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.52.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/fotoxx-21.52.ebuild b/media-gfx/fotoxx/fotoxx-21.52.ebuild
new file mode 100644
index 000000000000..12a78336fe75
--- /dev/null
+++ b/media-gfx/fotoxx/fotoxx-21.52.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/gimp/Manifest b/media-gfx/gimp/Manifest
index dbf8a519e422..4e7b8bfcf180 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,9 +2,11 @@ AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b984
 AUX gimp-2.99.2_fix_autoconf-2.70.patch 1913 BLAKE2B 779ce5a54150ee2a89507420931f255c09602af36ab8176f7ae9f18a7c1feb12451e817d2a89251d0366af6db90f602a107108227c98ac99b73e16ddb7b1fd05 SHA512 efa8882896335d3ac4ae7fb8874b5bd568472ccdcaeaf1d771f6c6b815b138186016f39f5f2f30fa01c1018ad583649fcf564cc5a8bcece741092f7dbc22f5fa
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
 DIST gimp-2.10.24.tar.bz2 31546295 BLAKE2B e2b873313b41799cb9461f6cd2ec45dcb0d3f51fe3e2710e47be99be868fba962cb75afb47bc2f12e2d6090993d70f560f4d58d2614939a0d36cadc9191fa2a7 SHA512 828350ad5c53b8409463c24693821d78a1940f18c221249ae7b864ad9db5cf01ab41d6ec5bbefd96115f0e91809ecdc61451d71881b56b07920c442f4a514936
+DIST gimp-2.10.26.tar.bz2 31665981 BLAKE2B 150ae935a84aadea98d58d61e8c5ed3ec3d0083202085c8b75cfcd6de34f3b30bc402baa49111c208af2144e3006f162072cd2fd8027404e64c23d54d84d5daa SHA512 d99f4f3ff23faa9bd7e6a40123d22af7620e51dc7d01c4605b8fbd44fe9069f0753e69adceb0bdb24d93537e2fbdf83f9cac46aa9afe1d234a6cb679335ef966
 DIST gimp-2.99.6.tar.bz2 30663040 BLAKE2B ccbdc2baa9e99a94e85345ce90bcba6ca56c0f264d3248d198009b730a5c810997b76c7d7a3cf131374316298d719a3e70c81ee7bc0a5e34beda1b112921807a SHA512 51ada696693ac51624ba222d1fff54d39bdc72a06de54f7c244b89740b77f7205aab44f1cec90785ca4196cab32f817e7390b4287a30f5024606163f24222961
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.10.24.ebuild 5581 BLAKE2B 7639817275bc53b7e08b8f190aa11b2be6d62f2c12f46474fe67c74409fdbb0a4cc2bcaa8c7bdd04721f111ea52d3c8a950efb9d85ee1d22cbaab687207fcbe7 SHA512 c22ff9efa6044e6f0fba4094b0bd9debfb9752464357dbbe7c760ba9901ad36d479c1bbecfcae8c7c6b0bfecb8084cab970d8ee1d458122b2eb9f0b40a0b8054
-EBUILD gimp-2.99.6.ebuild 6837 BLAKE2B b2ee57e4aa815251a2b94a33b7b89b7ad50a04e059442192d7afb77f7abc7dc695b8d9af562b01a5048bdcd34140026e8f4bccde9a513cebbb863ad09c194084 SHA512 698d06b3fd74ad9cac9347e1c6ece9f1e32f9427716ec2b860e07332d56e3618fbd059e98137804b7a134c493364949133918e37458b014d75566457f714ced0
-EBUILD gimp-9999.ebuild 7005 BLAKE2B fe9ced0b17ab49bc548e8164ca79725d436b85a34b0200bcba5e35c94ff0999119190b24291869821cb6a6c4350c1db12e6f04c50f224ba5b843cb4974a4e9ba SHA512 88a9a45a3486c7e578de7fde22a300248f8f8658c3c01ad13e5b5f7c3f9d356900cd12c3485fd98b21c60d7e8b76c06cc5efd40ca8a449dbbfc46efe5fad697a
+EBUILD gimp-2.10.26.ebuild 5581 BLAKE2B 6d8eaf4a6ecb37437f48b9d8648d50fc673d1f16b0660b9e948b323832501f6ea925cb52f33dda150d911c7a526a8a8b4322ed00be1c051fc155ee92fd56051b SHA512 b9a71feb722a970668561225c82c15a31728f93ceb63c6a6503a57e769af05fc1e28ac6c15fee65a4a38257c76a4ca3ca76ed31f14f79c9c468c6aacd83ad8ed
+EBUILD gimp-2.99.6.ebuild 6827 BLAKE2B 9ea9ca8d05654e6e569e42930e3f65c23629ad0218aa26d7368963cf3675237ac7b85c61c745c1d8d97f77ab824f676289c4508618366d4e12084a7b8e021129 SHA512 feb1d24d9ff9a72e0f400a6215254ff780df2c4660b3b4f4e31ea56bbc8da4bed9b6dbe2b518eae91d2963ff9ee7df832a50336e2713c7576ac399f8c9bbc5cc
+EBUILD gimp-9999.ebuild 6995 BLAKE2B 77775a32a461e6147afe35b5e43c540101810dcfe437ff68783d05ce282992eebc9cf7af948bd87a9f1f7b7a73ced2e6ce603e89b4d55a8881c6228a9a5bbdbe SHA512 61a0c945a463f4885cff848d523d17fa1c6ca5b885687244e0d54a7babea76427d67e39c6275788a2ddfc0aeedc8db9dea6d72c0ffd97ec1e33036dc1aeb7fdd
 MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/gimp-2.10.26.ebuild b/media-gfx/gimp/gimp-2.10.26.ebuild
new file mode 100644
index 000000000000..09172d13d44c
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.10.26.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME2_EAUTORECONF=yes
+WANT_AUTOMAKE=
+
+inherit autotools gnome2 toolchain-funcs virtualx
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
+LICENSE="GPL-3 LGPL-3"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	>=app-text/poppler-0.50[cairo]
+	>=app-text/poppler-data-0.4.7
+	>=dev-libs/atk-2.2.0
+	>=dev-libs/glib-2.56.2:2
+	>=dev-libs/json-glib-1.2.6
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.40.6:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.88
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.1.7
+	>=media-libs/gegl-0.4.32:0.4[cairo]
+	>=media-libs/gexiv2-0.10.6
+	>=media-libs/harfbuzz-0.9.19
+	>=media-libs/lcms-2.8:2
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.25:0=
+	>=media-libs/tiff-3.5.7:0
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	virtual/jpeg
+	>=x11-libs/cairo-1.12.2
+	>=x11-libs/gdk-pixbuf-2.31:2
+	>=x11-libs/gtk+-2.24.32:2
+	x11-libs/libXcursor
+	>=x11-libs/pango-1.29.4
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
+	heif? ( >=media-libs/libheif-1.9.1:= )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-1.6.1:= )
+	postscript? ( app-text/ghostscript-gpl )
+	udev? ( dev-libs/libgudev:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8 )
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-lang/perl-5.10.0
+	dev-libs/appstream-glib
+	dev-util/gtk-update-icon-cache
+	>=dev-util/intltool-0.40.1
+	sys-apps/findutils
+	>=sys-devel/gettext-0.19
+	>=sys-devel/libtool-2.2
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
+
+# Bugs 685210 (and duplicate 691070)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
+)
+
+src_prepare() {
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
+
+	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
+	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
+
+	gnome2_src_prepare  # calls eautoreconf
+
+	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
+	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
+
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	local myconf=(
+		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
+		GDBUS_CODEGEN="${EPREFIX}"/bin/false
+
+		--enable-default-binary
+
+		--disable-check-update
+		--disable-python
+		--enable-mp
+		--with-appdata-test
+		--with-bug-report-url=https://bugs.gentoo.org/
+		--with-xmc
+		--without-libbacktrace
+		--without-webkit
+		--without-xvfb-run
+		$(use_enable cpu_flags_ppc_altivec altivec)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable debug)
+		$(use_enable vector-icons)
+		$(use_with aalib aa)
+		$(use_with alsa)
+		$(use_with !aqua x)
+		$(use_with heif libheif)
+		$(use_with jpeg2k jpeg2000)
+		$(use_with mng libmng)
+		$(use_with openexr)
+		$(use_with postscript gs)
+		$(use_with udev gudev)
+		$(use_with unwind libunwind)
+		$(use_with webp)
+		$(use_with wmf)
+		$(use_with xpm libxpm)
+	)
+
+	gnome2_src_configure "${myconf[@]}"
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	gnome2_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prepend=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
+		for plugin_slash in $(ls -d1 */); do
+		    plugin=${plugin_slash%/}
+		    if [[ -f ${plugin}/${plugin} ]]; then
+			# NOTE: Folder and file name need to match for Gimp to load that plug-in
+			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
+			mv ${plugin}/{,${prepend}}${plugin} || die
+			mv {,${prepend}}${plugin} || die
+		    fi
+		done
+	)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
+	local gimp_app_version=$(ver_cut 1-2)
+	mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
+
+	# Remove gimp devel-docs html files if user doesn't need it
+	if ! use doc; then
+		rm -r "${ED}"/usr/share/gtk-doc || die
+	fi
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-2.99.6.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild
index 6dfba5b7d0c9..f44f9dad70b0 100644
--- a/media-gfx/gimp/gimp-2.99.6.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6.ebuild
@@ -9,7 +9,7 @@ GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.44"
 VALA_USE_DEPEND=vapigen
 
-inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+inherit gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 9e548653f6ee..4dd4eac9daa1 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -9,7 +9,7 @@ GNOME2_EAUTORECONF=yes
 VALA_MIN_API_VERSION="0.40"
 VALA_USE_DEPEND=vapigen
 
-inherit autotools git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
+inherit git-r3 gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
 
 DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="https://www.gimp.org/"
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index dd88ebb4ab05..410888be7456 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,4 +1,6 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.8.tar.gz 7311372 BLAKE2B 6438198cbaefe1de712ccd85179887b858ec1f7e039a080f0070e5ed454fd52b9414ecbd7c93dce740261df501f086634ab0bd291b70bb18778979faf2331486 SHA512 588362de60d51b1814cbe08f7402b143b656712bf2b4dc33830196068d7464394fe314d1c0dcee608a7408c7b7507596e88dee588a54f0eff1cad9e826b19bb3
+DIST gmic_2.9.9.tar.gz 7325061 BLAKE2B 256b4f1180edfc8ebb3a3e7f7666c7b44d95cd36a52c1b5539a355f022471eeef776c77b820864ca05b2ccc4a58a2e85970994cfdbce9e55aff31112af4e6000 SHA512 fcc129f5acfb32a3154d4c987f574c18ad68dd35e9e357fdc391166211747f5d7eed63a2fcde29c110a79e8665f2a6d1e70b68c81e19bb02be43a84ec7f1cc64
 EBUILD gmic-2.9.8.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
+EBUILD gmic-2.9.9.ebuild 4262 BLAKE2B d078b537729da8b811057929f6bd42059a856149a411bbccce306dc43ddf627bac38a9c32be5d5f5ce86c4b15ebbe94e9529afb7c6e20a518ec1c926d6378ecf SHA512 d3a88e07b665108c4618b2b7841d639c070ed2340869f9da9fd7558a9bb0b9d965a5960948fd5b3b3d46611cd6ede7bc6730759fd829a89cd0351af054c7f888
 MISC metadata.xml 533 BLAKE2B 29dc054d7e7f718782ad0bb914bd8ce7b2dc6519826c4fe21be1cc20c4ddd21b99355c565106123de39bec8dadb08c1ca1fcb10989cc6fe984e6a6ea7e611c5f SHA512 2eb6d59dfa0d092625b755e952dbddf6c6dda811ae19768811ea7dc8a07771cfd3e4d074e8e996ec2de5e74243721c8b82d7cb8fc86300246096e18b782b5a2c
diff --git a/media-gfx/gmic/gmic-2.9.9.ebuild b/media-gfx/gmic/gmic-2.9.9.ebuild
new file mode 100644
index 000000000000..b58559de3751
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.9.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 32a7086a818c..3dbf3b82733b 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -3,7 +3,9 @@ AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1b
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
 DIST graphviz-2.47.3.tar.xz 23199524 BLAKE2B 450601995da7ea543c951a6abbdd08878b4698cc2b59105d16255950acaf4585e56102ab952e79dc422efcdcc86bc28eaa3e62731626b1a3ede97480f9aeb24b SHA512 3fd43e91471e4a55212a9fc48775e208aaf64d59b40613b964e7020753b23358ec06bca0d6901d616cbe7c031a2760e9783ddc03070e05bc138b5f1dcad28bc1
 DIST graphviz-2.48.0.tar.xz 23082516 BLAKE2B 07cf4e2d84d6f49ae10dca90ef22c9cc18efdb6b0e2527795db639b2b851cf1b5179d796ed982d2518ea797c9b657c1f5ab379db30d5e37feba4f4628ef5be51 SHA512 9aa4983c9c56e2e2b485fb44d6381fa8769fe836a8e7673a9211cd67171f81c3c534ea6627cfee6b9d9b1127b538ffacdd16ba74401ad531a0e47ec107000265
+DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
 EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
 EBUILD graphviz-2.47.3.ebuild 7951 BLAKE2B ada464b9d2de919aa94e14183ef41939e25f55901d2a0ecd72312ab4efb2973f125280f96f348b8bbcc9571a0c280546916d3aca7ac9ee04e84a15c500726bd9 SHA512 7bfa0a63a185548c5c2ed5689b572fa8bdf32c5fb5ff14e15e5f234abd86dfdf6ac3c078de480c77ff7632f28ffe88742498bbcfdaae71f569031dc161b76fb3
 EBUILD graphviz-2.48.0.ebuild 7723 BLAKE2B ef50d78f842cb9eca2b22a2fd014952a80fed033df693261bc1a2fa2b7b19de3e5b10e2713267c8305041f446ccfd2326dc8dd1559ae02bb974474e61d5dcec1 SHA512 f6f75eff167ea686fd0e8ea733545766c5f79611b289874573d4bb383aa343d33fb6f4417ad562edd04fe7ea7eed14380c1170fa34d9e5e98258087b913a4237
-MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
+EBUILD graphviz-2.49.0.ebuild 7683 BLAKE2B 7c028bb1dbf62b75d5c8dd5fd7142203ffda95064e9a817bdf11f6f60dac2df5d1de1b81ddea39c855fd4c0456914789ab9ae5d45c5d07742f13b09abdce104f SHA512 e18a42b95f787a50e249f0f305648506c720afbd05db110383e299fd1d2ae602743283b2ee87dc53e072055fa9a729cb9cf4292da22fb959cceec3b7684d75db
+MISC metadata.xml 2380 BLAKE2B 47ced94d6b72abfbf5523281e94c30de7ac65306fa4ebfbca321f3ae4e3a2affa08abcb7a68129b57f035e4c999afa247788d6e2dced75a6e75c71c4380ffa51 SHA512 69558ebdb742c44638bf8fe41f77327f8c58736eed0ced8c5e935240c22811b6e8184574951982ce4a31c6068ca5efcfc7beca7b839c4963ea30084efb1d84a9
diff --git a/media-gfx/graphviz/graphviz-2.49.0.ebuild b/media-gfx/graphviz/graphviz-2.49.0.ebuild
new file mode 100644
index 000000000000..39fe556e8152
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-2.49.0.ebuild
@@ -0,0 +1,273 @@
+# 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 lefty 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"
+
+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 )
+	lefty? (
+		x11-libs/libXaw
+		x11-libs/libXmu
+	)
+	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 )"
+DEPEND="${RDEPEND}
+	lefty? ( x11-base/xorg-proto )
+	X? ( x11-base/xorg-proto )"
+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 )"
+
+# 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
+
+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_enable 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
+
+	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/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 0e17a85326a1..aa9dccb4891f 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -39,6 +39,7 @@
 		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
 		<flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
 		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
-		<flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
+		<flag name="lefty">Builds lefty front-end, requires <pkg>x11-libs/libXmu</pkg> and <pkg>x11-libs/libXaw</pkg></flag>
+		<flag name="X">Builds dotty, lneato, unflatten, vimdot, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-gfx/hydrus/Manifest b/media-gfx/hydrus/Manifest
index ad8f5735dfd5..a518a6d8bf9a 100644
--- a/media-gfx/hydrus/Manifest
+++ b/media-gfx/hydrus/Manifest
@@ -1,13 +1,13 @@
 AUX hydrus-client 98 BLAKE2B c08af22c2ee9ea3d5c95ed3196ceb9b74b9c886bfa9b91141584f7ea884830fbdd300c948af199ac82a016e1a9dd7314e9c7fdfa8f47f07a9336eff9e2bd2ce1 SHA512 453ac6f9685325b6510c7f833b658491f01e92be213ae26da0d86490033951d3a825f9b15fd33d8a0727992cd83bf7ed491b88f0808674d6fdc23af90c7911a5
 AUX hydrus-server 62 BLAKE2B dac100012fb03c2a14438b67a1c68daa1673eb23dfe7725a941325eb67149064c1276f462732e62db294acce75d111f948599698615e9fa15be43fe74ce444cd SHA512 5b7f9ca4b364ff529e5f4feb6fb11c91aff9cf1ad3ae6c12ff301915fa1d7b9920d51028b820000635d071a049a4e98a0e4e815ffa6ca31d2e67bec5a78afdea
 AUX userpath-in-local-share.patch 443 BLAKE2B 2562bdb6207a35a872a7c1b22ee378504ec4f53ee7b64bdce31649d62780cae00b42be7297aa82e069a9df5e01f76c508d97c47a25a9dffec8cbf8829e7ff674 SHA512 f96cf0040a663c534bd539e40413c95928ea45238f765f741db3c251b7c141fe99989b092d4033695a99e7267fec7fac74641fdc4a0887e74d23d3695f8ce467
-DIST hydrus-448.tar.gz 38851906 BLAKE2B 2b60174ffea3dd0c3816afef12378546582dfc39f80406534fa8b868c33052dc8497fa750ed724388467fd9ed4f1a7245b7ef91745750b9ede834a94e2da9638 SHA512 a16879dfd3417a784ca900b6cdab5fb4079d8ca4179224ac69e37321e165f35483d476b40994f2445c846998b2f154498da3cbd9c695a9d96b71f187e788b7b3
 DIST hydrus-450.tar.gz 38861101 BLAKE2B fd7993a4d9f82da43b4a6ae83426452b8bb79bcc32a9038ff129c4673c618b89db4a79301d06d2cc7c244053904cd201e88d496e05f7fcf723874e929275af08 SHA512 1c55a173863f7fee90288e1bc85203d12aaf812ab4afb506bc72c24d9b25dfea8ef1785043d801c2bea6302c65d4342ec2f58f47927fbb2d274ba433d29d8230
 DIST hydrus-451.tar.gz 38867387 BLAKE2B 80a7139ebcc1447b8eb35754dd65b54127a2b5107bbb8bdb371476f9db984bcd5b9ff388ec726ed5fca31acf69a180c288e1c6cdfabfdef1c72772402d22f3f0 SHA512 482095c03d44979e99e4f3027fa9b6f5c9b90692e29a28246f1e0b4c6fa20c6ed3b1d9e421d3b9bb723a094c1f0aea6aa7468247e23b54570ee99e26dce41654
 DIST hydrus-452.tar.gz 38873698 BLAKE2B 3c9c5fc63533f9c94ff3425b8767bffacb20c435f7a904de1229ec3cb079d86009c971515461d55f947743c705b12eee798160cbae04f0c3af283666a82ac482 SHA512 5c0280ae80b9af32629f6a2bcab3466abd01eea502034ac2354e3efabfd7bbe5ae5582950a19d9f28019b993f847000aa194a0b810f4d32b143b24e589de9f66
-EBUILD hydrus-448-r1.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
-EBUILD hydrus-450.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
-EBUILD hydrus-451.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
-EBUILD hydrus-452.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
-EBUILD hydrus-9999.ebuild 4099 BLAKE2B 93540a9bae12018d900d173f98c7a1cc1ecd857ae9a8cdfac60f6549903b85d90159339c40a7afdc08fb2b3f933887490a85f80b7d452046e3c728b5bf9bba06 SHA512 fbcab2b8a2c1a61eadb4c1eb3d711a0832603b1372f5fde8c48aa9c6c428a1a893ddd0cb2e6d0d4df6745c3434ad9d782e51cbd81aaacf70b0b68dfc6da69848
+DIST hydrus-453.tar.gz 38880317 BLAKE2B 93b29d3c973aa583cb6dd32abf94df199aefa9c49137b8137e144a891fbdf9db1cdfb0ec4d378d35e0a07d488a94828bb261c26de3b61b5460d208921c56d194 SHA512 6da364c6f9de9f838d9b3dcc02107bd3d089fde420f4e04086f094e47246e6949c27791a816dc99659db77acad3ca8f7578dc16749eb8b13cfafd7b6c044f5a1
+EBUILD hydrus-450.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-451.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-452.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-453.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
+EBUILD hydrus-9999.ebuild 4098 BLAKE2B a6fba68fa020b2b9d65a8601380eecae7442f0ff1867e9e3abd449a5835df87bc32d14b54e74c67d1eb31bf05e148634f746cb2f9d1144231c0b135f77214bc3 SHA512 803296b7d486194903bc3e89c71e418c9e66f069871eb63feb7fccda9f0a4376f25111fd407ff70b4b1cc3c16b441210b77eb1f664abc18a45d66b9b98de2b5e
 MISC metadata.xml 750 BLAKE2B cd037e9ecd9d7ff2a50d3b306a8394ddab3cfdfc74e67940e6f1cff8f90c5ba20bae42118b2c0df9309d4d13ea55fa6e39a9fc6615e2b0d4fca9f568392b0a10 SHA512 5838ad0aaab213af703b44749dd36159b828226a2399f1366783084e918506de5e79c953358403e976bb8f4f2dced8cac6e05d3c91210f002a5a697b828a3f97
diff --git a/media-gfx/hydrus/hydrus-450.ebuild b/media-gfx/hydrus/hydrus-450.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-450.ebuild
+++ b/media-gfx/hydrus/hydrus-450.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-451.ebuild b/media-gfx/hydrus/hydrus-451.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-451.ebuild
+++ b/media-gfx/hydrus/hydrus-451.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-452.ebuild b/media-gfx/hydrus/hydrus-452.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-452.ebuild
+++ b/media-gfx/hydrus/hydrus-452.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-448-r1.ebuild b/media-gfx/hydrus/hydrus-453.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-448-r1.ebuild
+++ b/media-gfx/hydrus/hydrus-453.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild
index d52bbf98e3b2..0915a2ae5436 100644
--- a/media-gfx/hydrus/hydrus-9999.ebuild
+++ b/media-gfx/hydrus/hydrus-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 		media-video/mpv[libmpv,${PYTHON_USEDEP}]
 
 		>=dev-python/QtPy-1.9.0-r4[pyside2,${PYTHON_USEDEP}]
-		dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
 	')
 "
 BDEPEND="
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 748f1070431c..e82017555e2a 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,12 +1,12 @@
 AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d
 AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57
-DIST ImageMagick-6.9.12-19.tar.xz 9183520 BLAKE2B 144a31c9f5a0e3489d362bf42a0ba5b3835f3d3e6b85d8573a9ca5188f04e0c5e6c16bd59510621805b2941331df412d845a0650d19a05bc97dac1e0c06b8e1b SHA512 1175d6330cd9c4dc8f4b7c1dc178a4654a9fcb17e209c10dc8eb776cb64233a8fa1c512d72ded50f0588ec35a13979d30e37e966ddce27fbd175f48698946b88
 DIST ImageMagick-6.9.12-20.tar.xz 9174816 BLAKE2B ccdb4775867224d08871b7147fa20e6b09305f6501a07de85ad53b862c47921c5b6b39eaf62fa86258c1a6fea1abe417817b4a4887a981a6f5a786636fa57946 SHA512 2ba849ef7212b0255f1db6509b718f7dd3825d16e45ea115a77ecf6b8afc41cb823ba0ddddc124aa0afe5605f1aa5e2865daa00da88568bf5874225de6620fe3
-DIST ImageMagick-7.1.0-4.tar.xz 10310828 BLAKE2B f7504d47e95be57b5b2f02f0ac8ea526c0b6f60cd0e3ace3445e6d52cc7cf9d4287e1cb24d4451587807809e671f459c107b1dfcb3a99436d112591a32fa5365 SHA512 21bd565227eef40bf967a23061e799dc0cb767c226717a66135ecc07a812495fe62c0d36c38b5c801356c63a9e4bf5a48b04fc56fcf6c0f5e37c2ccf52fce855
+DIST ImageMagick-6.9.12-21.tar.xz 9173096 BLAKE2B 0d8e0a414f2026539be16873ada2d097ce11beb0becf1e132eb6f7d9e4a69063a46eef4834c55268f5af5abbb87e17bb79c5f1182291d144e5155e5f68393070 SHA512 1ec038d555f0e72b79f830602047019819e36ffeb9053317685ac13a84e83d8d694980ff7203139e222568adab812d7f7b113793031e87cafb94aa75737b0b5d
 DIST ImageMagick-7.1.0-5.tar.xz 10308228 BLAKE2B c65f0bb04133a6390770cb06ed4a102fef58647b6d03c09ad840a0b0abf18a5875c244c5d8fb10492f5ccc62d976c170659ead93ad7b8a8178c88fe3778dfa20 SHA512 1fc66c57e4dbe01c2730508c42cd8a8e94be087751b3ad460318e1d4a7aa2c1af95d22b2f432037590af5e7f4a8e3cdeb276278423ed30d485267a907c7006d6
-EBUILD imagemagick-6.9.12.19.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
-EBUILD imagemagick-6.9.12.20.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-7.1.0.4.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
-EBUILD imagemagick-7.1.0.5.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
+DIST ImageMagick-7.1.0-6.tar.xz 10316740 BLAKE2B a0b6591300d48b648004c9701d2cb21afbb652760230384b4711a8d741875ba28d31b0c1b468f93c33338278a01aeef94eed0dbe14a3670ae7207704bb0eda1a SHA512 951541ad24095a2ac03fa26bfb38363795d7e86f1cae90ede9ab5991b28090dd05cc6c5bec62a0c3d664fa5191021fa01b760cfa7ccd94c80d93f24484afa5d3
+EBUILD imagemagick-6.9.12.20.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-6.9.12.21.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
+EBUILD imagemagick-7.1.0.5.ebuild 7396 BLAKE2B e824e8d1c9b1b1561bcfe59e6bfa2fd6770508453c1a4246b88cdd671470f35a5576d0c0a76803501d76bb31768d87c5066c92f1f9f786ed6d01e77e5792f96e SHA512 bdfeb146f22e581bcab707407229a31debf6623b7861141d8fec50cea8d134232fe83066a9898a2136553edf946bf727d7a8e5724a7f979c0bac39868356b191
+EBUILD imagemagick-7.1.0.6.ebuild 7404 BLAKE2B 2a92a400e6b41a28bd9ff356ad4a40656c61df367ec298c685b663a22463cbc090fb368f12aae33a75dda7ade766464822d0293bc302ad11db790b7b3c7a4a8d SHA512 758697ee60c9d674ea02c32d1e997466809f515bd7ea361aaa5ef77528b9705eccb16d906cc548c0df9a3d0054e8a7615be665797cb6d9cb3eab6d06510c5dcf
 EBUILD imagemagick-9999.ebuild 7397 BLAKE2B 9845d38817e2dbcfbc3c970d6ed508588caf22adc844178de2c2fae9f12c12cee60e7c97db29b99393720675a9401d1175e2114b8f5c3bee664335bdd4703823 SHA512 8832088aa61e5c7f6293d970f4460dbc629c2a7a0a9b70a44b8e7de9473823b7ee156e0f40981eb327eb222a9b604e21f3bbffb41ffff580b036c67d7da996b8
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild
index d17773f5081b..69de151f32bc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.20.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.21.ebuild
index 69de151f32bc..d17773f5081b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.19.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.21.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild
index 42e594451118..aee829b4dd8d 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.5.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	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 ~x86-solaris"
+	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 ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild b/media-gfx/imagemagick/imagemagick-7.1.0.6.ebuild
index aee829b4dd8d..42e594451118 100644
--- a/media-gfx/imagemagick/imagemagick-7.1.0.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.1.0.6.ebuild
@@ -13,7 +13,7 @@ else
 	MY_PV="$(ver_rs 3 '-')"
 	MY_P="ImageMagick-${MY_PV}"
 	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
-	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 ~x86-solaris"
+	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 ~x86-solaris"
 fi
 
 DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d4a31b30ab09..58a92cba533c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -4,9 +4,7 @@ AUX krita-4.4.5-pykrita-crash-on-exit.patch 1197 BLAKE2B bebb54df49f02056acc4323
 AUX krita-4.4.7-pykrita-crash-on-exit.patch 1583 BLAKE2B 077ebf5108badd615d9bc1086f2890a8f45506ca8cf0b5abf089b68e469200513f9be0a5516bad17b131e4afecc9560c8903ed6b1aaecd7c245a432ac8a2cd02 SHA512 44f023f49a0c5bfd895f65a013787bf2870b06fbba6fe292fb97c791b05965de176184d6a669225748848bc0ae1c7984d0c8dfaf3fd3ccf5ae0dbee953a08f92
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc SHA512 9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
-DIST krita-4.4.7.tar.gz 254871508 BLAKE2B c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695 SHA512 b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
 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.7.ebuild 3511 BLAKE2B 26a779a209dfc361e5f80b44b266eadca7af2f9c2f6f0b9ef6db88f87e40afdc9fbca812bd9029bf9f192cd2962ef45eef96659d950f6771311454af84ef5293 SHA512 3618ebb0d61ed181ddb11b7ea614e7f0721d63c50c7fe674c3aa2517cd8fadfd30bca6a63b1c056e6bdc6dbe6c2651e57f86e80dc64be8413ec03fe4294166c0
-EBUILD krita-4.4.8.ebuild 3517 BLAKE2B 142433d0bed8e43f1c232405b49d7c85d43af4fdc66bfab975fca89e3c532c0e1ae817f0303548ac2ea467b111c076445b7a40ad0a3201397dcdd62978e7fd5c SHA512 ac33a66f5f4dc6c6b0fc0b56e3f23897e6d2ec6355b0fefb944bc2fe2d8f41a4427715034fb212fac4af9aa16bc08a761370f1445e6f19ee55357cc9d94b7ac8
+EBUILD krita-4.4.8.ebuild 3515 BLAKE2B 2d28bebd5f455e0d6dab6da45f1733ed982574cc9ee1d1befeb3d9be1508c2bdac441b1a2e206140ed2c7be1178011db9c4a2a74258db22f42467ecf33d25ca7 SHA512 b249fdda5db441a3b5224f503610db1d2873671289e34926c0e59e3fec6509e6d3d78c10ba50472d353ba0e3576a378ebd5ba247318cbf5209391a68db72d449
 MISC metadata.xml 764 BLAKE2B b54f93efa3355522788dd1434ae168eb53ec402784307cdc8fde54e9855b4c5133a3e56f019f2f4812bf3963f51c43be2b5735ed745c2cc6bfec7500d45b527f SHA512 8c123214add6f8bb8a79827a6c7d070a5a6057be04493156a5ce2ce2f40fa1b0a17ef6eb503a3f79c41be29d3a6b939ff7ea777c43da3b20521e14083a3cfede
diff --git a/media-gfx/krita/krita-4.4.7.ebuild b/media-gfx/krita/krita-4.4.7.ebuild
deleted file mode 100644
index c80ed32f9980..000000000000
--- a/media-gfx/krita/krita-4.4.7.ebuild
+++ /dev/null
@@ -1,129 +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_{8,9,10} )
-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"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_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-1* )
-	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-3.0.0:0=
-	)
-	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 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-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
-	"${FILESDIR}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
-)
-
-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.8.ebuild b/media-gfx/krita/krita-4.4.8.ebuild
index 30ca71bc92a8..b54ea50988e2 100644
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ b/media-gfx/krita/krita-4.4.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -25,7 +25,7 @@ IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
author	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-09-10 04:21:55 +0100
commit	677b7ba5c317778df2ad7e70df94b9b7eec4adbc (patch)
tree	6c418a1546fff5becab5d8b9ed6803323e7f316e /media-gfx
parent	fbda87924e6faa7a1919f1a2b4182490bde5ec5c (diff)