gentoo resync : 22.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-22 07:31:18 +0100
commit: 908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree: c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /media-gfx
parent: 185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)
52 files changed, 150 insertions, 2334 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index a5f3b0396e80..ac44e19a5bbe 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/brscan4/Manifest b/media-gfx/brscan4/Manifest
index 06dc3c8a520a..eec488f40942 100644
--- a/media-gfx/brscan4/Manifest
+++ b/media-gfx/brscan4/Manifest
@@ -1,4 +1,4 @@
 DIST brscan4-0.4.10-1.i386.rpm 100151 BLAKE2B 94fd7daa5682b294740a6e1345c4ab8d488589896c3fa34eafc131b1cdc2ef2e022e11795ebc261538c6107583602a9622946ea049a3cfbbeb547e7e9c8825ad SHA512 5daeb9a1304f3aeb0a2e17823887a546ff872dfb42bf08ab403539815553da597504ac7afcbb2a34fbcfd8d973c03c8ca2c62617f8c499b9fc44b1719e4f2611
 DIST brscan4-0.4.10-1.x86_64.rpm 118863 BLAKE2B 1e518122b049a6cd594e4603311d37f289aef4ad3973cbe846700c2a5c0c8f0ec994f6608817a1c12d6494c3ae78178b43f4ba8450ab00153e27f533ec1957c8 SHA512 c648db8d8543dec9e1cd556f2e0415c170c06935febd1373d783191b159ed9ed67043644ef81fb18027de89270e10a5cedcee11ea66ee262df1a2d4f006e4875
-EBUILD brscan4-0.4.10.1.ebuild 2000 BLAKE2B f5c827106cb0d556308239d846fcbeeaa276589b77370a63945df99c091c8c531ea7fd3ed85cb8c9ffcf2dabb616f716334dd98fc77bebafe3b4d4c3b0b2ba4a SHA512 799d059557810a9ecd686d242629a552380c5f14896b43985d4e089533fd78880da0b7d60bb8cfdb4067748c971716b8d3c18374eccc7ffc1b4251bc4b3490a3
+EBUILD brscan4-0.4.10.1.ebuild 1999 BLAKE2B b8b5f6ffbd1957599c4e1dc97ca3c6f71408cbe1dd7ba7fb59771a7a7320509f682836f4aca3e929c975c54f1e41626bafe397e0408c3ff489b9494ae94741a2 SHA512 206279557c150d4a0bf9fc6906f4f2fd560623b1dcfbf315abceadc2ad9ec3b648ac8ec6b0c042c13881d3f84f41bb6fcbd52e03d7ea71a25c171cb89b7a64ac
 MISC metadata.xml 290 BLAKE2B 7b33307843dfe1ad587233554236500ada8d39e8d22f41d491a09201c502583456267c40332cfc3b0be3d5f703c6dc9be3dd41d325a60aa0c231b0fd2794f623 SHA512 c5fc92f0260d536d70d042d043c3925e7b207efa8c53b5a76f642ed42228df8e957837bb2bd7b735b4067ea779fa679212ff782a0391cdeb518b6b45247658f8
diff --git a/media-gfx/brscan4/brscan4-0.4.10.1.ebuild b/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
index 7a1df035f4c1..ef415a9e04c5 100644
--- a/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
+++ b/media-gfx/brscan4/brscan4-0.4.10.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="media-gfx/sane-backends
 	virtual/libusb:0
 	zeroconf? ( net-dns/avahi )"
 
-QA_PREBUILT="/opt/brother/*"
+QA_PREBUILT="opt/brother/*"
 
 src_install() {
 	local dest=/opt/brother/scanner/${PN}
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index 65c45fa8472b..55c07fe679ef 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -4,6 +4,6 @@ AUX flameshot-0.9.0-dont-force-ccache.patch 385 BLAKE2B 2acfd1410e247c6aec3dc2c9
 AUX flameshot-0.9.0-unbundle-qtsingleapplication.patch 3613 BLAKE2B cc5681081eeb48d3db2e2ab031fbfe4d96d6a52f5078b73b1e6af45b0aa98d078d75e4b4d5f3f50e0d93e7e3be0f8ae515ab096c7513e0f4974f674fc5f16395 SHA512 ce7014b932193650405852957b27c779c567285d46a85e3d3bb89c05449491d15b154efc213bd8f8370660ecadf048adfbf3ce3ade0fcd209fb9e2be9805e8f5
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 DIST flameshot-0.9.0.tar.gz 7659641 BLAKE2B 38151bf333802ccbaa6c2292799958fe4c75f5a978eea9b2314c5eb264fb569cfcce73afac79b80423686d3a10ec54300ad4cacd3be9a6c6e58c72f59c23fb46 SHA512 888422cd66b7c90cd6da0e824a2c12c0ca7e3cfdfd0a0499868acf9609e6c3a0977f816c656690fa101971b98a3f560cf7849b93079c091b25155360cb20ea11
-EBUILD flameshot-0.6.0.ebuild 1167 BLAKE2B 04249a8ba0efb3bfbdd9435dac5a80d9418d01c1c811e9111ce96ddf70c7869f458432e36bc50956cfd9d1a7cd83996b6d1043da442cce0237c370c27748b1e0 SHA512 1be8a46785eff93665ec860d080ecf43afbeee9b4879d583065d87ee3b7ea9ed5662e01e295408acd1a6366f8761ed4973802e282c1bbcb20481bfdf5414da49
-EBUILD flameshot-0.9.0.ebuild 1036 BLAKE2B 9b7ca625827cc886934098444d9361d3433c8809a764987080901c1f4f0785468677cd5309e65e1bf1f3def0b5814770036980d91299db70b6d2163d08d5aae8 SHA512 6a5e5083cc0c78d15935fb4804313b2c24452d21321e12e99fdab62204bcf0328b42534a371b9b195df822a2cce7386e9071d604ed670b65874ad9ec828ef4c4
+EBUILD flameshot-0.6.0-r1.ebuild 1173 BLAKE2B fe5f8d46a1293784a3ea53ea25dabd50945d541858df36779c05f05d985b14c829ad48bb1233f05864105dd9081373628e779592c8a60740fb2cc4d2ac838dd6 SHA512 eb2061def767077f861bbb00d4ca532e7b5f4b1282c15368fb471b325a1355ad61e0d584c209bd437b9dc947134266636a87b4babcbb75cd1740bebdb1643ca0
+EBUILD flameshot-0.9.0-r1.ebuild 1042 BLAKE2B a8ee64f229fc8c78ef88f35f8a3ce3aba82cebde8598ada39cb7f850d95f155c8b4c30eaec8ec1fb6953826b862d4af8f4e3888e21437c084b59d774cb531253 SHA512 f651b282bd68997f7e31a4b8d0a21fefd443a38a36bce136f1a9a11c80c1eb7c903e09aa22c74a4a2d372d0d2a92cd1605b133e6a61227820f285bc71403bb19
 MISC metadata.xml 396 BLAKE2B aa67921bf3b8f848824726187c8645c3d48e4a4b3e629ac32fea19e9764408871beddb474e10b9f8f106ff9caa9d0b0fbd87441f14275383c95c3062d47e071f SHA512 7b9df389d3add92f56cc7fcd95fd4986883860e088d678c20d9ca3d47c80faa45a2242bc74b8d54b54999279a8be1d7d04fac5f741db5876e45577c6df8413aa
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
index 1944a2858d7c..a83757d63d11 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
 SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="FreeArt GPL-3 Apache-2.0"
+LICENSE="Free-Art-1.3 GPL-3+ Apache-2.0"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/media-gfx/flameshot/flameshot-0.9.0.ebuild b/media-gfx/flameshot/flameshot-0.9.0-r1.ebuild
index 0b3b2178cb12..040dac744bad 100644
--- a/media-gfx/flameshot/flameshot-0.9.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.9.0-r1.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful yet simple to use screenshot software"
 HOMEPAGE="https://flameshot.org https://github.com/flameshot-org/flameshot"
 SRC_URI="https://github.com/flameshot-org/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0 FreeArt GPL-3"
+LICENSE="Apache-2.0 Free-Art-1.3 GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest
index 62375eabab90..786cb595239e 100644
--- a/media-gfx/fotoxx/Manifest
+++ b/media-gfx/fotoxx/Manifest
@@ -1,8 +1,4 @@
-AUX fotoxx-15.05-docdir.patch 395 BLAKE2B b0fb1bdd0e56f29569b49ca6b6d2acd205a1272924ab955d5778ffb7150400193ee12052a169ee9a2e0e07dd6b40c0ccb0f62e84463c651577447d32109fa273 SHA512 9204f4712ced994b22137b8f5fc80976120835ea5bde14b5caaa5db604b10de7a7b6ea743333603a1887a8012d806a5af8cf0ffea26f8ea8eb74d228fb822c1e
-AUX fotoxx-15.05-gcc-11.patch 925 BLAKE2B ac27fa95bc877b66607f5aca75c44462c0a8c39ee3acc117c9f6949a9d4975728156470dc04dce9b8a95582c72e5c236b68e4d2f01508246bdef0ac23b087621 SHA512 19801bf47e796953d148a12cdeb1eb5dbac23f4d54b41782923c61096f9dabf791b6d7afbc529f2c4214f940d83ba6807816afb0f8303b3ab514330bc01dfb63
 AUX fotoxx-21.40-documentation.patch 1511 BLAKE2B da0443a6b1ff8684e43005239f0184c742cd59727e3c55460713680b14b5d39ba528b7a17a87b893a9585824f1e402b5f46bbe45451dd8888b62d1752524db44 SHA512 d0f79f986b605c3f981de99c533f57a60aac47844d1434482e507a7e7e4d2be2b581419e211f034213c7c23db0e56f4fe5d789f39624a33aee283c8b8a489509
-DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e
 DIST fotoxx-21.40.tar.gz 8583921 BLAKE2B 63e49768c6d5941fe4259f83aef4ce8d0e19498c1090e4eb5017337f184edb0c60939323cc6481efcf72d0544347e046c94e37619e1f466b6dde0ab0919c3792 SHA512 05db14fafd8187bcb1de1576ca445fe525e895089fe670a80f890b2c525f5424fabd751ea422a5cc266cc7e8175ecaf7800b97a5ad686ea3e4e482de78190f3b
-EBUILD fotoxx-15.05.ebuild 1199 BLAKE2B deaad80fe616d8691961775ca86ac57c93fad6920a5f7bd46b97163ec83f7d8450bb7d3d5b925b26402c9817be6d8c94b7ab365bb649093a5db6a3f34c30615b SHA512 cb0117567b401365354eb10b3554363afa48400f6b4412468897fca144921c849be45d7839eb47dcdae25dd4488fac212b1ba1370fa31fde88f25c2859dbd57d
-EBUILD fotoxx-21.40.ebuild 2262 BLAKE2B 5716c0160390c9ca7efb4b12208249d96ffb6751220d4153bbb428927e279842d1a8cacef93524ab46b326a64193c248966711fa0bbda551d836bbde85c624ac SHA512 7fb41c1418894314bbc8e5b06101ed27d3231d245cbfa8366bdb3bcd28a310e673c2cfdfca4be2c3900e6ae6a3bdc42359f383e619f03d54e529c7cf9dc14918
+EBUILD fotoxx-21.40.ebuild 2260 BLAKE2B 5d3fecfa601f41c29f00474e810b928dc9bd12218be8d4acaa886640062b00966385884afb449b9fb15c804b1f3df11bda98bc4b2e70a68805411acec56163fc SHA512 342230c7481c9134b8ee93f774f9433c8ac4121714413cc518a2db1bfd3798e6a3a88c880bb035e4c55ca2e325f772ec04f4bbec3ce441894bed75e657ba0159
 MISC metadata.xml 850 BLAKE2B 463cae7d8df56ad93adaf7fbb4cf31f2838452e1349e61175c9981db4e95cc506b992cba2876885f8e949061808300752ef5806e9a096647f769bca654cca8e9 SHA512 e5c38d8602a52ae25bf90990136a98b57f69701cea70d4762f6102dc791f97b134853f7321894d1fbbbfdd353cebad7afa27cb56373f256d9497c3600d66d19e
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch b/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
deleted file mode 100644
index 8cab49ff51ea..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-docdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- fotoxx-14.10.2.orig/Makefile	2014-10-09 15:17:09.000000000 +0700
-+++ fotoxx-14.10.2/Makefile	2014-10-13 20:44:55.061728475 +0700
-@@ -16,3 +16,3 @@
- LOCALESDIR = $(SHAREDIR)/locales
--DOCDIR = $(PREFIX)/share/doc/fotoxx
-+DOCDIR = $(PREFIX)/share/doc/$(PF)
- MANDIR = $(PREFIX)/share/man/man1
-@@ -90,4 +90,2 @@
- 	rm -f fotoxx.1.gz
--	# menu (desktop) file
--	cp -f desktop $(DESTDIR)$(MENUFILE)
- 
diff --git a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch b/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
deleted file mode 100644
index 5d84e687d397..000000000000
--- a/media-gfx/fotoxx/files/fotoxx-15.05-gcc-11.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Fix 'smart_erase_blur' declaration and definition mismatch.
-
-https://bugs.gentoo.org/768207
---- a/f.repair.cc
-+++ b/f.repair.cc
-@@ -2265,7 +2265,7 @@ void smart_erase_func(int mode)
- 
- //  add blur to the erased area to help mask the side-effects
- 
--int smart_erase_blur(float radius)
-+void smart_erase_blur(float radius)
- {
-    int         ii, px, py, dx, dy, adx, ady;
-    float       blur_weight[12][12];                                        //  up to blur radius = 10
-@@ -2274,7 +2274,7 @@ int smart_erase_blur(float radius)
-    float       red, green, blue;
-    float       *pix9, *pix3, *pixN;
- 
--   if (sa_stat != 3) return 0;
-+   if (sa_stat != 3) return;
- 
-    rad = radius - 0.2;
-    rad2 = rad * rad;
-@@ -2342,7 +2342,6 @@ int smart_erase_blur(float radius)
-    CEF->Fmods++;
-    CEF->Fsaved = 0;
-    Fpaint2();                                                              //  update window
--   return 0;
- }
- 
- 
diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild
deleted file mode 100644
index b15710b39828..000000000000
--- a/media-gfx/fotoxx/fotoxx-15.05.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop toolchain-funcs xdg-utils
-
-DESCRIPTION="Program for improving image files made with a digital camera"
-HOMEPAGE="https://www.kornelix.net/fotoxx/fotoxx.html"
-SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng
-	media-libs/tiff
-	media-libs/lcms:2
-	x11-libs/gtk+:3"
-RDEPEND="${DEPEND}
-	media-gfx/ufraw[gtk]
-	media-gfx/dcraw
-	media-libs/exiftool
-	x11-misc/xdg-utils"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docdir.patch
-	"${FILESDIR}"/${P}-gcc-11.patch
-)
-
-src_compile() {
-	tc-export CXX
-	emake
-}
-
-src_install() {
-	# For the Help menu items to work, *.html must be in /usr/share/doc/${PF},
-	# and README, changelog, translations, edit-menus, KB-shortcuts must not be compressed
-	emake DESTDIR="${D}" install
-	newmenu desktop ${PN}.desktop
-	rm -f "${D}"/usr/share/doc/${PF}/*.man || die
-	docompress -x /usr/share/doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/fotoxx/fotoxx-21.40.ebuild b/media-gfx/fotoxx/fotoxx-21.40.ebuild
index 12a78336fe75..d9e91deab328 100644
--- a/media-gfx/fotoxx/fotoxx-21.40.ebuild
+++ b/media-gfx/fotoxx/fotoxx-21.40.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kornelix.net/downloads/downloads/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 # For required dependencies read doc/README, for required tools read
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 81cce9710ac6..3f2dfc379e2d 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,9 +2,9 @@ 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.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
+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.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6
+EBUILD gimp-2.99.6.ebuild 6837 BLAKE2B 451ec9116fdbfb48ff788495e50827ce4a353c1bbed8d4c70b5fab6dfa91cb2689d127492ac4f65a49b1cadff0c95d4d513fe9932ad9b9b81d01ef89291987c0 SHA512 56bbda601c4e6763605db989de30842f6af3f1fe166f09afe2b2d93a638a7f75c0e7f5744e05c18d1f8771bd4400283c5579ec6faa6260dd0f281825b06578fb
 EBUILD gimp-9999.ebuild 7011 BLAKE2B 5c9703b19e17a0e95e88d27c8a37cd316decf0d721c55243bc456b0a6467c6d952bbefaf79938358c03b2bb17b2c984375c837f992670640e180fe9e33e232f9 SHA512 c4c6e9ad7f32b76db12469398d7a49001de4e6043c536b09803fcfced310d1166b6877a72ed67e628ccfa8e06effd723bbeb3c4ba68e30de9815c98df206405f
 MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/gimp-2.99.4.ebuild b/media-gfx/gimp/gimp-2.99.6.ebuild
index 9d731708d3a4..d2c37000187a 100644
--- a/media-gfx/gimp/gimp-2.99.4.ebuild
+++ b/media-gfx/gimp/gimp-2.99.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 LUA_COMPAT=( luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.40"
+VALA_MIN_API_VERSION="0.44"
 VALA_USE_DEPEND=vapigen
 
 inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
@@ -18,9 +18,11 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="0/3"
 KEYWORDS=""
 
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="aalib alsa aqua doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
+REQUIRED_USE="
+	lua? ( ${LUA_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RESTRICT="!test? ( test )"
 
@@ -36,10 +38,10 @@ COMMON_DEPEND="
 	dev-libs/libxslt
 	>=gnome-base/librsvg-2.40.21:2
 	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.84[introspection,lcms,vala?]
+	>=media-libs/babl-0.1.86[introspection,lcms,vala?]
 	>=media-libs/fontconfig-2.12.6
 	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.28:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gegl-0.4.30:0.4[cairo,introspection,lcms,vala?]
 	>=media-libs/gexiv2-0.10.10
 	>=media-libs/harfbuzz-2.6.5
 	>=media-libs/lcms-2.9:2
@@ -57,7 +59,7 @@ COMMON_DEPEND="
 	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.7.0:= )
+	heif? ( >=media-libs/libheif-1.9.1:= )
 	javascript? ( dev-libs/gjs )
 	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
 	lua? (
@@ -101,6 +103,8 @@ DEPEND="
 	>=sys-devel/gettext-0.21
 	>=sys-devel/libtool-2.4.6
 	doc? (
+		app-text/yelp-tools
+		dev-libs/gobject-introspection[doctool]
 		>=dev-util/gtk-doc-1.32
 		dev-util/gtk-doc-am
 	)
@@ -176,6 +180,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_mmx mmx)
 		$(use_enable cpu_flags_x86_sse sse)
 		$(use_enable doc gtk_doc)
+		$(use_enable doc g-ir-doc)
 		$(use_enable vector-icons)
 		$(use_with aalib aa)
 		$(use_with alsa)
@@ -243,6 +248,11 @@ src_install() {
 	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
 
 	_rename_plugins || die
+
+	if use doc; then
+		mkdir "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs" || die
+		cp -r "${S}/devel-docs/g-ir-docs/html/"{gjs,python} "${ED}/usr/share/gtk-doc/html/gimp3_g-ir-docs/" || die
+	fi
 }
 
 pkg_postinst() {
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 7f0b822c55ad..2be9484afc93 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,5 @@
 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.44.1.tar.gz 34079677 BLAKE2B 90183afa6affedb097eab237fae148a9c085c3a724fb74d370f7c042b53d09b44ba0cb755a2ac74175d89d3a45687b60f0e210bdd404fc72da98bdf61b9eaa8d SHA512 42e6137c7cce18daf6f17e6fcbbdfe8e0a531de1bdd3ac7b8751445214aa0d85713b65ba896a234a02670827b0d608bd64b758ef60a4d0384ffa3355ee0dbc42
 DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
-EBUILD graphviz-2.44.1-r1.ebuild 7818 BLAKE2B dffb6585f3d02af75a32ee80c497432344ad9f4c1508807d9eee3f9eee437872ab120e4e2e6cef679cc93620697c38540a3ee9cb642bfdb16b648def86484483 SHA512 eea967b85b9f22fd3826cf21b0441acefd6350cd5670975602e4d435731731b210b9eb38dbebc0b5740ee92238737f14e71063329c2bed72ebfa1f2ac50073e7
-EBUILD graphviz-2.47.1.ebuild 7692 BLAKE2B 008e7900b9f154a076626f376f4ee4baae269faf42fa5c838a4843e8d8b366ceb327ee941c5192d5f03f7f3b5ca7d84c01247ea55bb5acca14d10757a58159aa SHA512 11abc87e40bf7a605305d29b6a8920dad489cacf0610964861504646ae238c6a6029116160c245736ff79d792b9c9fea54e39d95abb0b2b35e049170151dfd86
+EBUILD graphviz-2.47.1.ebuild 7690 BLAKE2B ef57052dca6e7f18d76eddbfa5370eba27402c0f9df1b0bf132c48ebd139d634583f7c46def6ba268565e64dcdc5a13373cbf03baa4cd0058666b2a46bd36e30 SHA512 43166e913b51ff7b47c5583207b0500ccc4f36e00038ab6e733501f89c00a1d2b27959a4587af76d3a940c2a4f8925df4d357f815ceda6f28f6dc028ba96c170
 MISC metadata.xml 2244 BLAKE2B 61cc818a6f736cee316c026bef8f02dc03ffa3c63f620832fd063f00111178b07be4c5224f5d4fc0f1cddbfc3180e31ac277d493107e0d716d0d2f05c7272633 SHA512 e8c8d5b2abf9c21c6fe8dd7e3489210275065a2f0f64023f5aa52fac2b2646b974fc36c60aa189be022728384ff223aae5856095846dc5ea85638d1b882ad7e0
diff --git a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
deleted file mode 100644
index 6cf05d68b56f..000000000000
--- a/media-gfx/graphviz/graphviz-2.44.1-r1.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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/"
-SRC_URI="https://www2.graphviz.org/Packages/stable/portable_source/${P}.tar.gz"
-
-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 static-libs svg tcl X elibc_FreeBSD"
-
-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
-	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 )
-	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= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)
-"
-DEPEND="${RDEPEND}
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.5
-	)
-"
-
-# 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 )
-
-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
-
-	# This is an old version of libtool
-	# use the ./configure option to exclude its use, and
-	# delete the dir since we don't need to eautoreconf it
-	rm -r libltdl || die
-
-	# 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
-
-	# workaround for http://www.graphviz.org/mantisbt/view.php?id=1895
-	use elibc_FreeBSD && append-flags $(test-flags -fno-builtin-sincos)
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--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_enable static-libs static)
-		$(use_with svg rsvg)
-		$(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
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}$(python_get_sitedir)" \
-		"${D}/usr/$(get_libdir)/graphviz/python2" \
-		"${D}/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/graphviz-2.47.1.ebuild b/media-gfx/graphviz/graphviz-2.47.1.ebuild
index 17d8c281d0e1..2c8ab4b79137 100644
--- a/media-gfx/graphviz/graphviz-2.47.1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.47.1.ebuild
@@ -14,7 +14,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"
+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"
 
 REQUIRED_USE="
diff --git a/media-gfx/icc-examin/Manifest b/media-gfx/icc-examin/Manifest
deleted file mode 100644
index 4aa833563660..000000000000
--- a/media-gfx/icc-examin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX icc-examin-0.56-fltk.patch 754 BLAKE2B 277178b84aaeb5b06daa63d2c167ff7a93f8dd53e34801af672a4cd9d0a07b2985810bc365995f7eac2e49b9e8211a25506f73ca4835d388c54320190220b93a SHA512 ae8bb21951107f9424abafe81015fba13556b2eaaf49f16a6694ce68e7f86ea4cff1d977364dd7c3c3fd5c7163739860a0f0ec74b28200c7d0f0ad2c43711f0c
-DIST icc-examin-0.56_p20171007.tar.gz 724698 BLAKE2B 291edcb81a931a9e7659ff0605d9e8c5c54e36a68dc51a6609cc2cd19e134c782158fcfb89dc10d2b8be953e0c0efff69d5187d5812f9cd5a3302061d1e79aa8 SHA512 79d4e42c0ae389128ee6514892d0019b0cec17466e8d8e47efbc0a5114c0d365732e26a9abb442a3bca3c2e83ede4dca407cad3bf250492a36832f8bdebeb2b6
-EBUILD icc-examin-0.56_p20171007.ebuild 1078 BLAKE2B f72b3c362808ca1f0f6e1922d6d83f77aaa92f8fb699eb6f9bd4cde12842f1aa412fda81910f9d1803c616a324c208124a0e8f3e42c92eb6e5600b1e6a914e3e SHA512 7da32bff96d2287e040cbfbc0c779c570d4763a281408cf18f3a1218cd41bcb2a8ce2e35c536aee8f1414dea71b4df1d226662ffd0ef4dc91ef42b6a3c216933
-EBUILD icc-examin-9999.ebuild 990 BLAKE2B 30a150e8183820e63892dbfc4f7acca8697671a2f9aa42ba6e62187f193a51663d70a6478bed95347645012fc84bccda32b8dd9c7d40afae693aac17e3064e71 SHA512 d57ddb8dce6093c84e3eb00d429d773c678425d87189e9abb3a8050e1a999e0218c1e044e5f5c258a4974d376eedbae6fc7972d33d585a8c4e4a4e1834d958dd
-MISC metadata.xml 306 BLAKE2B 504a3d1b41ad6e24126018e4f9f5d9b43ffbed2dad6c5d0ccb3b3fd0483916992dda6f0d3e590d77f5e1503fa69a71625e44042e07bdc7a987dbc30dc18e94b5 SHA512 2abf907350ae10a05019fa4732b8581bbc3a383e25cb880541fc49ad5c4f303b8ca101bd795f40ac31579c1b5a7e7d3ebf031a09721f2eafcfd153f6e2a13ae9
diff --git a/media-gfx/icc-examin/files/icc-examin-0.56-fltk.patch b/media-gfx/icc-examin/files/icc-examin-0.56-fltk.patch
deleted file mode 100644
index 5e4645a8b0ef..000000000000
--- a/media-gfx/icc-examin/files/icc-examin-0.56-fltk.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 172889b358d0801da8d2c15196129cd911e3afc1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sat, 14 Oct 2017 18:59:20 +0200
-Subject: [PATCH] Fix FLTK include and libs
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 60ee08a..41f7c61 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -103,8 +103,8 @@ IF(FLTK_FOUND)
-     SET( FLTK_ADD_LIBS "fltk_jpeg" )
-   ENDIF( NOT JPEG_FOUND )
- ENDIF(FLTK_FOUND)
--INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIRS} )
--LINK_DIRECTORIES( ${FLTK_LIBRARY_DIRS} )
-+INCLUDE_DIRECTORIES( ${FLTK_INCLUDE_DIR} )
-+LINK_DIRECTORIES( ${FLTK_LIBRARIES} )
- 
- FIND_PACKAGE( OpenGL )
- IF(OPENGL_FOUND)
--- 
-2.14.2
-
diff --git a/media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild b/media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild
deleted file mode 100644
index 065e372da875..000000000000
--- a/media-gfx/icc-examin/icc-examin-0.56_p20171007.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-COMMIT=ee9e8cd013766b0df2c5e3b4416f985322b22966
-inherit cmake-utils flag-o-matic vcs-snapshot xdg-utils
-
-DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="https://www.oyranos.org/icc-examin/"
-SRC_URI="https://github.com/oyranos-cms/${PN}/tarball/${COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-admin/elektra
-	media-libs/freetype
-	media-libs/ftgl
-	media-libs/libXcm[X]
-	media-libs/oyranos
-	media-libs/tiff:0
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/fltk[opengl]
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.56-fltk.patch" )
-
-src_configure() {
-	append-cxxflags -fpermissive
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/icc-examin/icc-examin-9999.ebuild b/media-gfx/icc-examin/icc-examin-9999.ebuild
deleted file mode 100644
index 4201a5e2c0e3..000000000000
--- a/media-gfx/icc-examin/icc-examin-9999.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils flag-o-matic git-r3 xdg-utils
-
-DESCRIPTION="Viewer for ICC and CGATS, argyll gamut vrml visualisations and GPU gamma tables"
-HOMEPAGE="https://www.oyranos.org/icc-examin/"
-EGIT_REPO_URI="https://github.com/oyranos-cms/${PN}.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	app-admin/elektra
-	media-libs/freetype
-	media-libs/ftgl
-	media-libs/libXcm[X]
-	media-libs/oyranos
-	media-libs/tiff:0
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/fltk[opengl]
-	x11-libs/libX11
-	x11-libs/libXinerama
-	x11-libs/libXpm
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/libintl
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-0.56-fltk.patch" )
-
-src_configure() {
-	append-cxxflags -fpermissive
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/icc-examin/metadata.xml b/media-gfx/icc-examin/metadata.xml
deleted file mode 100644
index 322fc08818ee..000000000000
--- a/media-gfx/icc-examin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">oyranos-cms/icc-examin</remote-id>
-		<remote-id type="sourceforge">oyranos</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 25f8e9968b80..b95caa30962b 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,24 +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-10.tar.xz 9154060 BLAKE2B 23f9ba449970190a8fee14b161ff893199188f93d9a29e188325448b97a68b61ba70a92289c096371e2988db3d599b52d0d8df06105d06f5dcc4f7d3c6ef4ea5 SHA512 75f3450cfbf779af22efc02733f99ac62ed92ad869ae28a279805ffe38adb515507592e7111ba881ac5b781972841942f7f8e5ecc8ab6f773aef8de454a80b35
 DIST ImageMagick-6.9.12-12.tar.xz 9141288 BLAKE2B 95ec30e77fc3f963bb0cae5280ad8e72ba9b6e0c8419fdf41f1899371ecbf5f64bbb70cc6193e751da0c3365551bdb2442e9f4746284ecff92ca351fc906fa4c SHA512 7e680809954326d32439c922cbcb65c9076823c50bd56ba2a230ec4a6d46f00a03a032d2ff153fe9b7651a9f6bac9625fe2aea7acccba56e15b6dce96e477c8d
-DIST ImageMagick-6.9.12-7.tar.xz 9156816 BLAKE2B 56a13ff744b15fb987232b70d9ea2a14b10de709011375da2b970e408d91079be38ccc5a301308734293c18c81d78a2e68ecee56b7d8478c6222cd7745b847ab SHA512 cfb261c60c07bc52cd491173a17040b33b0fa95f396d933fe9e14767cb5d009a8ebe7194949c2387c723d3a0492bc7b7a078ed89ce8a0024dd8ed73b40748d4c
-DIST ImageMagick-6.9.12-8.tar.xz 9159788 BLAKE2B ceb383d93cd70a2d5755a982a47a7f996b4e9cd4eaa7cfcb14d01fdc84904ccac9d897337616116f0fbf1bed7640ba93bcf5426552a83b45d2de455cbf0bda42 SHA512 e248aab0490eaf382a7be36679c23c0a84386302d5a1cd0d054af79fa95d8f6f03a5ad0f628cd818d453284f9b353168491ed58047338ec8eec15983d3007fed
-DIST ImageMagick-6.9.12-9.tar.xz 9161440 BLAKE2B 05c7e3290060fe83aaf1f88761fa2afe63b720fe397ab2f22264d1c4b28cc92c33a2f94782994dce33f8f4528df7cc60503460b23183f815cc43e169cf38c73c SHA512 90848fa3381c69c6526fe6473b9b847cfa81e500aa7ad2be32c4030de1fb84432d83c1dee75a90914e6a18d6aa747aa58696adec43ff61e797f92d0dbcfde01a
-DIST ImageMagick-7.0.11-10.tar.xz 10280304 BLAKE2B 9db1c26eb80dfb929bfced2ac0d6adc29e4e68c759611723812edfb4bf8132d1e39e053506c43179d468ac4027ddea8a85bd5f34d0d738778b7b92546bbbeef8 SHA512 a92a8a65ab7503edada45da9c34488deb79c00d005afcc85a17365fd76c83a174a7213bea4bd072f1125f2342722cb067ffa1513f6530db9608cb6dcff4f68d1
+DIST ImageMagick-6.9.12-13.tar.xz 9172456 BLAKE2B cc931e49f152945a0022f6e57e49db08dc45169d5913b884cdf47d18d1f3d7a453f02b3ade56395e985cbe3f996584b8ad1686d947b6b4c04cc85475ca4f65c4 SHA512 4273e6cc864e759c55b5612475c268095948bb0ebabc1188637df87ac8595a97ce94ef7307687f0abd1325646ba23a8bf1219081655307b17ec96b335a01de6c
 DIST ImageMagick-7.0.11-12.tar.xz 10284100 BLAKE2B 2b664106152f764948f34fe766552cb48e7ff2a5c83f3f8b7e0a83861ed218bbda278f487678704d42aee900f1ef4be4252d94ccafda2192f39d9a3701115520 SHA512 f5faf124a1923d8b3d362ae59c594dff4d92cf097b42995f6631812bbb320830cee71ca10a15b3894cecf1a286b4fa10e874d213c7438356d194d3ebff778cbe
-DIST ImageMagick-7.0.11-7.tar.xz 10280524 BLAKE2B a4d0cb3e157bff25245d6c3bf3eba55d6f3693ba66d8c5efbc757b31077b1bac0753dca095f853455793355e92e8376a8e41acf3809115c6dbae47977190c42d SHA512 5c36aa566892f0e473ccec0058d7113779704cdf8f4d747132434216c9c0f304de5aafbbbcacc4b21d7e6224e3b9c9439fe6b446e28e821f614c2d1026a280e7
-DIST ImageMagick-7.0.11-8.tar.xz 10280632 BLAKE2B 99c41f09b740f4222b17efa41c8b54445ccb3cfd23aa16d6ae16433952e6c94a02c8db0ffaa3b51e432a2bddb39060b1789b4778f1d9f756b0b992d706a3884d SHA512 e4aa87b30bb75fba815cd4f617a7c0dba29523c03ad6670c7514842587678553d0b45100ccd6e041d59628cf30fe047243d440af78b39d0f82cd405ff0ea0f96
-DIST ImageMagick-7.0.11-9.tar.xz 10266692 BLAKE2B 18e2b7d5e8f93af68cd7a7379968279a1119d25a06bc131465c9ebb500f923664b4332c02828d0837fd1f15395de99b1bdacaf016f1a4a021d71dbe7d0878f46 SHA512 73ecb116fd8885f2ec88a12ae8b36c51b37de3e7e2aa2f9fbbd24a90bc0d78d7603663ec8003abea8af0f200a6176fb26998963a9bb90ce80ebc7feb2dd8921a
-EBUILD imagemagick-6.9.12.10.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-6.9.12.12.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-6.9.12.7.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
-EBUILD imagemagick-6.9.12.8.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-6.9.12.9.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
-EBUILD imagemagick-7.0.11.10.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
-EBUILD imagemagick-7.0.11.12.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
-EBUILD imagemagick-7.0.11.7.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50
-EBUILD imagemagick-7.0.11.8.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
-EBUILD imagemagick-7.0.11.9.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
+DIST ImageMagick-7.0.11-13.tar.xz 10305476 BLAKE2B 464ea44f8e31148bdcbdf2e66410e5eb9fe0526d06b2b1376311018f7e4897648601d5f4d541469e9f8a72ecbc279695f23288e90725e564a917f68df92f8aed SHA512 8b5fe1ad06ca3af752454f67f53a066842668832bbd4efede35c515449cd2b970e6f7f23e716928ba598f89a7ec020bd988cc392196c89117586fb97a48e1d9e
+EBUILD imagemagick-6.9.12.12.ebuild 7182 BLAKE2B d971cfc66508d794a3409e00c6165f9e78c7dfa40ca8e631499368be50efaa8d12ed08d2712c8bd0fc392245c22471bff5f2662c6abe89b301badeb9dc82de42 SHA512 8ebf8dd67a2efe586495f245bad587616a746bb8d161217d9680adbc714bb461403a171d3be4ff843c20e45f090de81fb5cb50ae5b128a5813d8199bee88fa12
+EBUILD imagemagick-6.9.12.13.ebuild 7190 BLAKE2B dd19343291540d9b16a9788d9f2f6b15066d4266bccd43007223c87aef52bb26d5525a54bba2e5d1db7dff888ab39aa8b9c254bf90933e272b648336ba1981d5 SHA512 9eafa9a51938be0e0b8ec28fb147cb71b9f0fc81f97ddc2b9d48bbeb45a21a39331ab22644fb8739feecf7d0b4130d1b2c9be006db9b5b623bbeadf8473a0c20
+EBUILD imagemagick-7.0.11.12.ebuild 7340 BLAKE2B ecd38b0e0d7ed63543c514bdbf3f232ac2ca908891f2cab24a93fced4a08586eb207e3d236c8f1ee35361d743995f129e96e4f693eca30973f3c9320a7cd5a45 SHA512 258513e90922bb80e11c9a148d9d04a28ade01c6187281f6741ea2f384180aaf3ba81f25394bb58b7d6e28bc2379a41aad01a1b7c669b52efd5c5dc5bacc6d50
+EBUILD imagemagick-7.0.11.13.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
 EBUILD imagemagick-9999.ebuild 7348 BLAKE2B 42e9b6cd1b6878fd985dc3b445dfa7f034ddaab981c59b8cedba865d349204a6cd046fbf3901c71ed1125f51ef5dcca35b4473a7803e790c35887cf0798c1b00 SHA512 85e4cb868711c678ddea99bd2442faf52a10c9dc5ba28a5b5dbc80a575073ac48eba4c9f1384b65911bd190fe5e7ffa7000d695086677d07c2d296e9eaa7db9b
 MISC metadata.xml 1226 BLAKE2B 09876ac633363817b503a307e2cc0a500cfdcc1256cbb3b3e595600a0c913aa7ad252eb4dbe18b911bfcc9f06ec7b8046e0c2e3882eec305e471080bd76de906 SHA512 da1bb41d877614a237ea14379614a509fb58d58f4e93e56500e6aa0007c0515e6d90731c5df9e387f36632a210276a6983784cede64119453c965a9fc7e2ea4d
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
index d17773f5081b..69de151f32bc 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.12.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.12.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.10.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.13.ebuild
index d17773f5081b..d17773f5081b 100644
--- a/media-gfx/imagemagick/imagemagick-6.9.12.10.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.9.12.13.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
deleted file mode 100644
index 69de151f32bc..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.7.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
deleted file mode 100644
index d17773f5081b..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.8.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild b/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
deleted file mode 100644
index d17773f5081b..000000000000
--- a/media-gfx/imagemagick/imagemagick-6.9.12.9.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick6.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/6.9.11-60"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
index 769cb4c0e00a..53b6fa068e7a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.12.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.12.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.0.11.10.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.13.ebuild
index 769cb4c0e00a..769cb4c0e00a 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.11.10.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.13.ebuild
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
deleted file mode 100644
index 53b6fa068e7a..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.7.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
deleted file mode 100644
index 769cb4c0e00a..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.8.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
deleted file mode 100644
index 769cb4c0e00a..000000000000
--- a/media-gfx/imagemagick/imagemagick-7.0.11.9.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
-	inherit git-r3
-	MY_P="imagemagick-9999"
-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"
-fi
-
-DESCRIPTION="A collection of tools and libraries for many image formats"
-HOMEPAGE="https://www.imagemagick.org/"
-
-LICENSE="imagemagick"
-SLOT="0/7.0.11-0"
-IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
-
-REQUIRED_USE="corefonts? ( truetype )
-	svg? ( xml )
-	test? ( corefonts )"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-RDEPEND="
-	dev-libs/libltdl:0
-	bzip2? ( app-arch/bzip2 )
-	corefonts? ( media-fonts/corefonts )
-	djvu? ( app-text/djvu )
-	fftw? ( sci-libs/fftw:3.0 )
-	fontconfig? ( media-libs/fontconfig )
-	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
-	graphviz? ( media-gfx/graphviz )
-	heif? ( media-libs/libheif:= )
-	jbig? ( >=media-libs/jbigkit-2:= )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
-	lcms? ( media-libs/lcms:2= )
-	lqr? ( media-libs/liblqr )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	pango? ( x11-libs/pango )
-	perl? ( >=dev-lang/perl-5.8.8:0= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( app-text/ghostscript-gpl )
-	raw? ( media-libs/libraw:= )
-	svg? (
-		gnome-base/librsvg
-		media-gfx/potrace
-		)
-	tiff? ( media-libs/tiff:0= )
-	truetype? (
-		media-fonts/urw-fonts
-		>=media-libs/freetype-2
-		)
-	webp? ( media-libs/libwebp:0= )
-	wmf? ( media-libs/libwmf )
-	X? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXext
-		x11-libs/libXt
-		)
-	xml? ( dev-libs/libxml2:= )
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib:= )"
-
-DEPEND="${RDEPEND}
-	!media-gfx/graphicsmagick[imagemagick]
-	X? ( x11-base/xorg-proto )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Apply hardening #664236
-	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
-	sed -i -e '/^<policymap>$/ {
-			r policy-hardening.snippet
-			d
-		}' \
-		config/policy.xml || \
-		die "Failed to apply hardening of policy.xml"
-	einfo "policy.xml hardened"
-
-	elibtoolize # for Darwin modules
-
-	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
-	local ati_cards mesa_cards nvidia_cards render_cards
-	shopt -s nullglob
-	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
-	if test -n "${ati_cards}"; then
-		addpredict "${ati_cards}"
-	fi
-	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
-	if test -n "${mesa_cards}"; then
-		addpredict "${mesa_cards}"
-	fi
-	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
-	if test -n "${nvidia_cards}"; then
-		addpredict "${nvidia_cards}"
-	fi
-	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
-	if test -n "${render_cards}"; then
-		addpredict "${render_cards}"
-	fi
-	shopt -u nullglob
-	addpredict /dev/nvidiactl
-}
-
-src_configure() {
-	local depth=16
-	use q8 && depth=8
-	use q32 && depth=32
-
-	local openmp=disable
-	use openmp && { tc-has-openmp && openmp=enable; }
-
-	use perl && perl_check_env
-
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable hdri)
-		$(use_enable opencl)
-		--with-threads
-		--with-modules
-		--with-quantum-depth=${depth}
-		$(use_with cxx magick-plus-plus)
-		$(use_with perl)
-		--with-perl-options='INSTALLDIRS=vendor'
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		$(use_with bzip2 bzlib)
-		$(use_with X x)
-		$(use_with zlib)
-		--without-autotrace
-		$(use_with postscript dps)
-		$(use_with djvu)
-		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
-		$(use_with fftw)
-		$(use_with fpx)
-		$(use_with fontconfig)
-		$(use_with truetype freetype)
-		$(use_with postscript gslib)
-		$(use_with graphviz gvc)
-		$(use_with heif heic)
-		$(use_with jbig)
-		$(use_with jpeg)
-		$(use_with jpeg2k openjp2)
-		--without-jxl
-		$(use_with lcms)
-		$(use_with lqr)
-		$(use_with lzma)
-		$(use_with openexr)
-		$(use_with pango)
-		$(use_with png)
-		$(use_with raw)
-		$(use_with svg rsvg)
-		$(use_with tiff)
-		$(use_with webp)
-		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
-		$(use_with wmf)
-		$(use_with xml)
-		--${openmp}-openmp
-		--with-gcc-arch=no-automagic
-	)
-	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	# Install default (unrestricted) policy in $HOME for test suite #664238
-	local _im_local_config_home="${HOME}/.config/ImageMagick"
-	mkdir -p "${_im_local_config_home}" || \
-		die "Failed to create IM config dir in '${_im_local_config_home}'"
-	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
-		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
-
-	local im_command= IM_COMMANDS=()
-	if [[ ${PV} == "9999" ]] ; then
-		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
-	else
-		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
-	fi
-	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
-	IM_COMMANDS+=( "emake check" ) # Run tests
-
-	for im_command in "${IM_COMMANDS[@]}"; do
-		eval "${S}"/magick.sh \
-			${im_command} || \
-			die "Failed to run \"${im_command}\""
-	done
-}
-
-src_install() {
-	# Ensure documentation installation files and paths with each release!
-	emake \
-		DESTDIR="${D}" \
-		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
-	dodoc {AUTHORS,README}.txt ChangeLog
-
-	if use perl; then
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-	# .la files in parent are not needed, keep plugin .la files
-	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
-
-	if use opencl; then
-		cat <<-EOF > "${T}"/99${PN}
-		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
-		EOF
-
-		insinto /etc/sandbox.d
-		doins "${T}"/99${PN} #472766
-	fi
-
-	insinto /usr/share/${PN}
-	doins config/*icm
-}
-
-pkg_postinst() {
-	local _show_policy_xml_notice=
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		_show_policy_xml_notice=yes
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
-				# This is an upgrade
-				_show_policy_xml_notice=yes
-
-				# Show this elog only once
-				break
-			fi
-		done
-	fi
-
-	if [[ -n "${_show_policy_xml_notice}" ]]; then
-		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
-		elog "which will prevent the usage of the following coders by default:"
-		elog ""
-		elog "  - PS"
-		elog "  - PS2"
-		elog "  - PS3"
-		elog "  - EPS"
-		elog "  - PDF"
-		elog "  - XPS"
-	fi
-}
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6e1a28672215..2f35855c0790 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -4,5 +4,5 @@ DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613
 DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
 DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689 SHA512 44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
 EBUILD krita-4.4.2.ebuild 3422 BLAKE2B 24bccfde1e16491f69fe31dc97f73274784d61ef6d99d5b9e8ecc94fd9138dfed8a63c070bbe598f3eb10c2243c4ae3ec9e090bf8c3843fda22f6e245e8b8354 SHA512 feb195f53e9fbf9a9a29e79811b327091d3fc6aa5e5071b0ffcd1c86bee8dbeb0848e0d03d9db89359fab55309f6e4fd9a95454b2895a6ca335b14a240bdba93
-EBUILD krita-4.4.3.ebuild 3430 BLAKE2B b2ad1f66c14b6cbc70eb63ee688c885c7e5ed4eb3203cd100fcf1375915eff8771043e2e6ec40f668778b391c263f04bf13069f3880adc2cddf04b4a23be26e6 SHA512 56c142d4971d025c157e5b8218c123b46f0f2c168f114abc439920d0d529eddb9fca7951b451f332dffa7727fcef4d2f72775447f7d1c1985c842cce2affbe14
+EBUILD krita-4.4.3.ebuild 3428 BLAKE2B 466af7e75db2ed303c1ebed3a23966953863971a4f6205428df29229d6340b97583fff53198cd1cffeed32696ae0071df05236da2ca0908f96d34af82fc7ca04 SHA512 dc85ea1f82ca6932abaf283c9f8f771a9b794ebd4367b4fd3bc9511091658e64633693fad763e523f90a391aa783afc786217314cf1f4c2cdbd8a5f2af4247d7
 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
index b82ee9f73995..6186e7e98ba1 100644
--- a/media-gfx/krita/krita-4.4.3.ebuild
+++ b/media-gfx/krita/krita-4.4.3.ebuild
@@ -17,7 +17,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
+HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
 
 LICENSE="GPL-3"
 SLOT="5"
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 57f23a25c7a7..75db4c0a8c81 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,3 +1,4 @@
+AUX kuickshow-0.10.1-kwindowsystem-5.82.patch 1012 BLAKE2B de7f74de219e1f31f8ed9b67c724c81f0fdb0a7735cd74e8fdd76035e17adee55156e912ae13ca3366ff8465c95aaacd7283c668ef7c97c6c4d99865a3f09aca SHA512 9bd270286ae0822403665f9308b50004e867cfc84b02cf062018347cfa6fed10f0c439d2d1f1f5c9aa37b7577f6200d6cc951b5ce89cba92f79f522277460cbc
 DIST kuickshow-0.10.1.tar.xz 896900 BLAKE2B 50e6bf055a76d0668fe6f92d411610908e9098b5cb14df89403d7e6462941e137390e14a6828c790c1b7067b9f596e70c40d40e2a64c6a0887b1f11251911219 SHA512 c2d812a0e97be1b5b0db1f6c90dc1347be2ffccd48403b46e637549b608a395cdcdb6b36e842b1c5039d18861cfbafd4dc7283bb69f530548a3b5193a586d4dc
-EBUILD kuickshow-0.10.1.ebuild 1093 BLAKE2B 8e348ee2bdacc91715665889986074da4ecdb5ddc3174c39f7dce247e8d6d0d389a41b4fca8688c9c08e39b09913a9c0fd27d67d119f294a0b5a423f1384f89e SHA512 7f4d1d4d32edb2859786c777872ed3e9126d991b4ad2c1240c21cb9a474777aa7cd9f57b2bd1e3252615523fa97995d84ad2da309e71f48030589a5607bd4de5
+EBUILD kuickshow-0.10.1.ebuild 1163 BLAKE2B 8e80c8ea207559afba44eee60688535f5298388e1760348eee96291bfbd91ae640ebd24c71b1b09b9ab96113fc76157d8a3ef2b5143cdc4a1d7ffc3b5b3172d7 SHA512 bc022001f2757a5bddb82e44666c1d4beb3f0d1c20515d9623e5855d30626422aea8ec060f721f46c9ce61e0919bd4df32b9b539cb03a7368b4a8366c2b93f1e
 MISC metadata.xml 398 BLAKE2B aed31745382f12d6c97f524780103c48078a618501d3ed4ea2845e6e4d7fa74090d46a043527162cf3183e2d1ddcde9f500729f2efccb958ffc03c7250d5da62 SHA512 cc4d87aea5776c4bd51fe4f86366acba9cb96a1657651ea5ba4610d361804acbb8046bff4dc75c2b72f98e69b3fb7be468119d1d760e2d75861cbf7e35e0a54d
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch b/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..84883fc64156
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.10.1-kwindowsystem-5.82.patch
@@ -0,0 +1,29 @@
+From 52e30eb18b9b6becbd58e8c1333f9f81afbeb8d6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 14 May 2021 18:31:23 +0200
+Subject: [PATCH] Port away from deprecated API (NET::StaysOnTop ->
+ NET::KeepAbove)
+
+Deprecated since 5.0.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/aboutwidget.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/aboutwidget.cpp b/src/aboutwidget.cpp
+index 79cb942..5ec75b2 100644
+--- a/src/aboutwidget.cpp
++++ b/src/aboutwidget.cpp
+@@ -41,7 +41,7 @@ AboutWidget::AboutWidget( QWidget *parent )
+ 
+     // KDE specific settings for "window" display (it's just a frame, not a real window)
+     KWindowSystem::setType(winId(), NET::Override);
+-    KWindowSystem::setState(winId(), NET::StaysOnTop | NET::SkipTaskbar);
++    KWindowSystem::setState(winId(), NET::KeepAbove | NET::SkipTaskbar);
+ 
+     // these settings are difficult to set in designer
+     QPalette whitePalette((QColor(Qt::white)));
+-- 
+2.31.1
+
diff --git a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
index 9e8a35b597b5..fd2850a1a6f9 100644
--- a/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
+++ b/media-gfx/kuickshow/kuickshow-0.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,3 +40,5 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!media-gfx/kuickshow:4
 "
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # bug 790200
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index 9de4f1609f60..ac2c59786b43 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,3 +1,3 @@
 DIST kxstitch-2.2.0.tar.xz 1784360 BLAKE2B 6d06090bb33ccd4db7e8b8a3521b0e1377f253b472cc500862b1b8b0da1abf0d759a85a870b50a1a1f55f385274cdc94761e612a838d93aaffb76191df725150 SHA512 bf09130a35bc605db2bbd6e5e129ac494e8f02b920d4a8d6705b5030a9339306b3b302bd988839e1684da3e5e15e91d655dadf916eb4bf2dc9c1322fd435281d
-EBUILD kxstitch-2.2.0.ebuild 1068 BLAKE2B 6a1150e38075510bb315d9b81d1b363bf97b55d23e991a31cc97887140286db9b1103e8420691d8b8d5e5b6f4fe93c10237673c5c4c1ea3c6ec918687a23a90d SHA512 a10a1cb13711fb96f082eb202d62f9c3ae38b5766caccad9aadf759428540910bb9c7a764c3b2b418c4431622f41331e2fbcf1f98955178346065bd8d5d7109d
+EBUILD kxstitch-2.2.0.ebuild 1066 BLAKE2B 8c7ca9a2c6904499d44543bed0c6816a6a7ab6df986d3d5692274dedaff540a2652652c55ad9654d8cb392e6fa5fe173b2e61f510a041401691d46e84f5cef96 SHA512 183b1fe99c50a499f4da78b0444239fd4ce450757951d6aa2efd5c040717317f2b5b73004c504ef6c1d940508f4c6f7a184faf46a54e879481ff57e2c9e46b7d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
index 7fa99b755bd0..d2ea26577868 100644
--- a/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
+++ b/media-gfx/kxstitch/kxstitch-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Program to create cross stitch patterns"
-HOMEPAGE="https://apps.kde.org/en/kxstitch https://userbase.kde.org/KXStitch"
+HOMEPAGE="https://apps.kde.org/kxstitch/ https://userbase.kde.org/KXStitch"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2+"
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 31ff7daa05ca..a9438a3be2ee 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,10 +1,11 @@
-AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
+AUX libimagequant-2.12.2-fix-pkgconfig.patch 698 BLAKE2B e3e80b1904f7c683d12df2197a343df16f67eacda9941526622fe32623313f8e5ac6da8ed508a378f1e6002ebc03c96b87672b0dc70f00514b51f9afadebf82c SHA512 c49d32ce790d4771aa98f75e0fa4c729020b7bea388c7ee15534cca4c575a60934ce56e68fbbfd48e53b2702bfa843c0be9f2ce2e39a5ebeafa374408b0694c7
 AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1070f90d4c59584a2b9dac062febb7bdeb1efbbd1cb4f39f8fd1aa94f81ac4318bd0413bdde44f75d418f69b916a70883220d9ef031 SHA512 68c2bf917d60da653abff4fc20c44a9f692213aed87a220a3ffb03ec308107eda7be1a6e135393658ef54d2d63bb0675f5e2a95bdf4b02628fcf5d367c0ce9ef
-AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1209 BLAKE2B 9a6ea44db62524b454c37abd236d9a7186e3dc5cbda4b0d55a4f96216bd74db13e6bcf8d9d06a490e7ba1a717f7ec8de320780ee3699e10e1c700f441a4d18a5 SHA512 fad1505e2037b87f031838643443d0e2f728855d4a1929b1cae3f37b3d2d22c2408f11461b81818d4c68f52c99d981a134ad8c0ae738fe9240b41e4a460155fc
+AUX libimagequant-2.14.0-fix-openmp-pragma.patch 1051 BLAKE2B 5790e6ee46239fe3df00c6d8add3ca5b7e08818890443ca54e786d7dec6f7bbcdb557f65e6b6ebdfdb14bb072e274d8b05024c327150314e1add561d50cfc6a7 SHA512 3274ff5d3a461160e4f5e8f9e64dbad1ec1c68d22a7c3a13b380c05b808470c541531227768a77cb6b4bae9a8864296ecedf68d7b1c1f4c687ba5307e46f4ac8
+AUX libimagequant-2.15.1-fix-pkgconfig.patch 708 BLAKE2B e282ff891cee6f9a7ec16302932680d918564be3752beadbbf60ca9d14662836226715cc37d508646e8979a62183522307544e53d2f64b62de9e84095fc66ac7 SHA512 395af8861add7df7d9e81dc55046840c06c02fc0033faf072594320c9bf0ea994a4744bae20fe583954bdfde3a6eb044bf813bd55ec17c7d29484b53eefd6b20
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
-DIST libimagequant-2.15.0.tar.gz 98668 BLAKE2B 916bb32ad848c5076502be7f471bd693396e8a7bd36878ec928f294776bd3343e76c2323372e577d58f5bb5c4f4e6aa3a32d5103901b190b0a036684cbf5cf56 SHA512 b856daaf79dd748ed3bb4cdc432dcffebf6678f8dffd6b4b0e79b96ec9c64ebf19597de35cf56ed47d3202947f3f5f208745c2c2c92fadf6c5b62f17e61b3f13
+DIST libimagequant-2.15.1.tar.gz 98668 BLAKE2B cfa223f0ce8fdaac5d55b951507c040c064759756a5595719d02c0ec6983a70b08ad9d5df0176adb03269a9a1b7d39e9f0f7da884df214bd7994f4647e08a9c1 SHA512 56bc8b73859908774ce0a218cfbec81bfb8432c02ddce83880990b5f5ac89ac253ae64ecde43a9664aab3ac69d309bb9ef8ba2201be6c93aacb731b3214ff4b8
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1240 BLAKE2B e14f9e27f965c6dcb30f1e33e9e849e184a88d1478539f4d9379649f11644a34cf9884a2f85e7f2fbe78d432f1e88fa2cd3342a72b13e3d7bf309e37570ff00b SHA512 20e69a655b9c8b5d9ed787298d1646bc71ae995006cd04ea727219af76a0e4008f31252708e4b5a0e8095100b8593f53015d634f4a942b5f371a410d4982a3fd
-EBUILD libimagequant-2.15.0.ebuild 1158 BLAKE2B cc58a7fe5e2d4e5b18b2064ebe25e644520586b3a3eb0e3b3d4e4f6f81ebb5dff744c41becb74bf6acbc9c6d36e7891b6aceab874b45727a617277abacb0cb27 SHA512 51c3c8a5b695fd899dbcdf458a590d7e7126d63da32d30e388588871b50688e92f122fae830bad895894397a7d3000354a2fe0dffbe1a6a350df12b319f328a4
+EBUILD libimagequant-2.15.1.ebuild 1292 BLAKE2B 1d56a55b0f8d42ab7fae6a9282740299563d09897a9ffadb9f1b15b3e22d4495432331bbc3c7f2ec0966d6d83aace8358029ef1db480bbf74e34a04ec4fd58bd SHA512 923f18cefd479cd53e466911b011916c22c548b53ad8c2358a93d1d15a4fb70377f35ec10df9079bdf21e3d58e17b0040518b88cb227b8496c5bad45d1e76216
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
index 0b058fbecc23..ce9cc2b8c99f 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.12.2-fix-pkgconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2666b3d..ba58cf1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -133,7 +133,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
@@ -11,8 +9,6 @@ index 2666b3d..ba58cf1 100644
  
  .PHONY: all static shared clean dist distclean dll java cargo
  .DELETE_ON_ERROR:
-diff --git a/imagequant.pc.in b/imagequant.pc.in
-index 980da8c..6c6569d 100644
 --- a/imagequant.pc.in
 +++ b/imagequant.pc.in
 @@ -1,6 +1,6 @@
diff --git a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
index 7e2d58619618..f355453ece6c 100644
--- a/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
+++ b/media-gfx/libimagequant/files/libimagequant-2.14.0-fix-openmp-pragma.patch
@@ -2,13 +2,6 @@ From 44525d34b738f733a81037286ece603ca0fdcf10 Mon Sep 17 00:00:00 2001
 From: Kornel <kornel@geekhood.net>
 Date: Wed, 27 Jan 2021 17:36:33 +0000
 Subject: [PATCH] Update OMP pragma
-
----
- libimagequant.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/libimagequant.c b/libimagequant.c
-index 4f0b48f..828f768 100644
 --- a/libimagequant.c
 +++ b/libimagequant.c
 @@ -1279,10 +1279,7 @@ LIQ_NONNULL static float remap_to_palette(liq_image *const input_image, unsigned
diff --git a/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
new file mode 100644
index 000000000000..fbf3bc735579
--- /dev/null
+++ b/media-gfx/libimagequant/files/libimagequant-2.15.1-fix-pkgconfig.patch
@@ -0,0 +1,21 @@
+--- a/Makefile
++++ b/Makefile
+@@ -134,7 +134,7 @@ ifeq ($(filter %clean %distclean, $(MAKECMDGOALS)), )
+ endif
+ 
+ $(PKGCONFIG): config.mk
+-	sed 's|@PREFIX@|$(PREFIX)|;s|@VERSION@|$(VERSION)|' < imagequant.pc.in > $(PKGCONFIG)
++	sed 's|@PREFIX@|$(PREFIX)|;s|@VERSION@|$(VERSION)|;s|LIBDIR|$(LIBDIR)|' < imagequant.pc.in > $(PKGCONFIG)
+ 
+ .PHONY: all static shared clean dist distclean dll java cargo
+ .DELETE_ON_ERROR:
+--- a/imagequant.pc.in
++++ b/imagequant.pc.in
+@@ -1,6 +1,6 @@
+ prefix=@PREFIX@
+ includedir=${prefix}/include
+-libdir=${prefix}/lib
++libdir=LIBDIR
+ 
+ Name: imagequant
+ Description: Small, portable C library for high-quality conversion of RGBA images to 8-bit indexed-color (palette) images.
diff --git a/media-gfx/libimagequant/libimagequant-2.15.0.ebuild b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
index e0d9b920c44d..2eb73642deb8 100644
--- a/media-gfx/libimagequant/libimagequant-2.15.0.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.15.1.ebuild
@@ -15,8 +15,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-l
 IUSE="cpu_flags_x86_sse2 openmp"
 
 PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
+	"${FILESDIR}"/${PN}-2.12.2-respect-CFLAGS.patch
+	"${FILESDIR}"/${PN}-2.15.1-fix-pkgconfig.patch
 )
 
 pkg_pretend() {
@@ -25,7 +25,13 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-	sed -i '/install.*STATICLIB/d' Makefile || die
+
+	# Avoid always building static library
+	# (Fixes side-effect of compiling in src_install too)
+	sed -i \
+		-e '/install.*STATICLIB/d' \
+		-e 's/all: static shared/all: shared/' \
+		Makefile || die
 }
 
 src_configure() {
diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest
index 9f1b2d599759..fd7357b95c9e 100644
--- a/media-gfx/plantuml/Manifest
+++ b/media-gfx/plantuml/Manifest
@@ -1,3 +1,5 @@
 DIST plantuml-1.2020.0.tar.gz 4552164 BLAKE2B c78da31cffbeb0cf1a8852e53d07126c9b0dc80bf12f36f1039c806651c6802dd63456610307836207158bc871c4e2a8d9cf12a80bafa9dbde3b2be29b02f2e8 SHA512 1c3a7f735a197e5fd044547a6c48f21c2ee774d553d3de82d4931b2684a56dc4ef8af5f524e6aa4eebcb16f214620f6c99c038101d6703f03642a5b94f124fa8
+DIST plantuml-1.2021.5.tar.gz 4632326 BLAKE2B 356830c8e8be3866fc8f7512d2fe07656cc21a01c6bad2dd5a01f990cc34e234be213a4402743359f528a2f018b2fa990addc25dbce9e096ccc34551d25d82e4 SHA512 b8d9868a05d79fe75671190a3a7f51a9ff018e5c659bd1144c02d5c860f96fb2a067cb802d40c2d0db7cb2268b291efc49337280154b8a43563696735be1caeb
 EBUILD plantuml-1.2020.0.ebuild 753 BLAKE2B 8f364621800c0eec170569351134912dfb9a1f9f9d1bc4ee80f520f0f57c0361ebaef3e28c900770489d95e282b9ec756f8d7b16e0899e5b3d6273a586898945 SHA512 637ea579deef346114c2c60f80c263496f8e28168e3010861f3e3faf58a15234dc17911973251c19450b70851169f592df3211fa100f6c4ec6401d2fa71252ec
+EBUILD plantuml-1.2021.5.ebuild 751 BLAKE2B 893f8f933be06f96283feb2fa5ed98ec01db76209ad246710d48b83e60de122e6d1e2b32879ff20de051b5789562621b9dff77a27bf1b327410129dfbc150cc4 SHA512 d0f8074c7588849c330c9c5259092348ba4df4ca5d0de4d122ae1123e183b63893d8754419a7fa74faf6ecc42ce66a73ecbdbda307559c0f9d1f94bdeafcdeb7
 MISC metadata.xml 821 BLAKE2B dd2177671848872c7a33108b012327639d40e2664ae85619bd94810e99a385dfa39111a95922a59e451ee4be7c9eebdc288934ef7a79ef33ce0683c09c13cb51 SHA512 8b2400bb96cbac0403ef0865bdb3d72a00dfad45f1c3807ca1a1ba0d98aa3f7777bc8d65089d82c6132ffb75a7395312b374ffaa88f67866512978be1eae9b98
diff --git a/media-gfx/plantuml/plantuml-1.2021.5.ebuild b/media-gfx/plantuml/plantuml-1.2021.5.ebuild
new file mode 100644
index 000000000000..6ff07a08c731
--- /dev/null
+++ b/media-gfx/plantuml/plantuml-1.2021.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="source"
+inherit java-pkg-2 java-ant-2 desktop xdg
+
+DESCRIPTION="Draw UML diagrams using a simple and human readable text description"
+HOMEPAGE="https://plantuml.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	dev-java/ant-core:0
+	media-gfx/graphviz"
+
+EANT_BUILD_TARGET="dist"
+EANT_GENTOO_CLASSPATH="ant-core"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+	use source && java-pkg_dosrc src/*
+
+	make_desktop_entry plantuml PlantUML
+}
diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest
index 8b758f6e4cbb..6457ef40de15 100644
--- a/media-gfx/symboleditor/Manifest
+++ b/media-gfx/symboleditor/Manifest
@@ -1,3 +1,3 @@
 DIST symboleditor-2.1.0.tar.xz 495416 BLAKE2B 5f5d5a60806ebf0dacce5dcff538ac0f2c4966b2f2bda79450f66515d8572dd61a67db5e4d0f91b548a62c14e4e14aea283b710dc2a7c84770eb35dd22e20699 SHA512 dc83f3f80b12d8217a230d8c951e90bcc6246c4460d987efb140c54c1e88a8f5d607ac7ebfe706399cd0917e22a2089df6742afadd28305d39ceeff0c55da535
-EBUILD symboleditor-2.1.0.ebuild 1008 BLAKE2B 93518cb75dc6ea88254f5f8d2364b8ecb355eace0644fc2fd41343166e4b07914cd4cea95874ad61d47a24ff21fe6795c75bf05dac2ab7bab238cd462e877dad SHA512 3d1d9650ad766eacac0706d1afbbfacfc0eb735a8d372290cf14157936d40368ca1f9cb8ff4701825f7eeb600d393f0390440275845a0524ed865909bc06be2c
+EBUILD symboleditor-2.1.0.ebuild 1006 BLAKE2B de0dd124a9d0d79bf610865bcfcf8fa5e9abbefa53ae8b9a9255b3b3b6ebdcd372669d6d033d671418105ea9d294156b1243b585012e110ad612ce46773bdeec SHA512 64f01adcf3e445717ff36f04137c9c0a91f09749dc47e020248c57a2bfcc271f0baf0f23510f748207e184f90da459e95958c2915dca91de5061e9a9c38b97aa
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
index 5d69fe765308..07db10af3334 100644
--- a/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
+++ b/media-gfx/symboleditor/symboleditor-2.1.0.ebuild
@@ -9,7 +9,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints"
-HOMEPAGE="https://apps.kde.org/en/SymbolEditor
+HOMEPAGE="https://apps.kde.org/symboleditor/
 https://userbase.kde.org/SymbolEditor"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
diff --git a/media-gfx/synnefo/Manifest b/media-gfx/synnefo/Manifest
deleted file mode 100644
index 94cf4215ed2a..000000000000
--- a/media-gfx/synnefo/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX synnefo-1.1.0-cxx11.patch 5387 BLAKE2B 64280de77601f7a44e03138fa7af59c8e5466621e8f3735babf830c4b0a917e5c6b1147de6f7078cbc503d2a71755e11143d4e8993502ba6bc23bb40edc6cbbb SHA512 7c9e99ddf56758caaca004e33707372f1df7ad21269cefa59c04a3e1f733408abb83ae7e60f13499e8a185cfc7b8b1dfe62a506863fd289f78b1e71fa311ea6c
-DIST synnefo-1.1.0.tar.gz 161822 BLAKE2B 1d1981ae815e692cd9230690214bff039c2b523f78faab34d35ad8f25cefbc656ace2ba2ca240baa7d305417f17ea0c4d0cad5d300a638b15cc81d315fdf474c SHA512 f4c50e6e018b0dcf91715c379cd5b79452886fb7fda189ad47a22b9d5f47b3ca710b959b773a1e0a42564e881d09da088a88eef505719b1b1fbfbb5e21fb26ef
-EBUILD synnefo-1.1.0.ebuild 769 BLAKE2B 3bea272c73df737d3f4ed0b6fdd89d68c265c1afdd858f206c51406d5dea219a6668ca966ee19467ca0757bf919f163857ef5921d4fd90e94cabe19e6061c8af SHA512 80bf16de85f329ce9e4602b864331e08ff74d53729d4a85ce114ba5757da1e7e5184ed5a3eee7d9cac10e790947f15a6e591f5a812e4cb6b2017e79c19edd471
-MISC metadata.xml 333 BLAKE2B ae4c40964873b751ece7a62f6f8c4cbc7d6d6cb9d4008e958a243f8a6c5ba3461156a5032097997b3d90a5b9dde516bd5351f4e7cde27f83cbaf82224c7ee1d0 SHA512 49d4f64a95ddf7b75f0e3efe44bc03e8df9f565aec70c52838dea32badc5809d0b3945f87a4de3bc6704f0a3e1732e683412d4ffd480e5ef40bf763c958b7936
diff --git a/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch b/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch
deleted file mode 100644
index fdc438f09d26..000000000000
--- a/media-gfx/synnefo/files/synnefo-1.1.0-cxx11.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 30691bdb98566482e1c29ee440cfc8531fac2616 Mon Sep 17 00:00:00 2001
-From: Kai-Uwe Behrmann <ku.b@gmx.de>
-Date: Thu, 22 Dec 2016 13:02:05 +0100
-Subject: [PATCH] fix some compiler warnings about string macro usage
-
----
- src/modules/devices/sy_devices.cpp   | 12 ++++++------
- src/modules/information/sy_info.cpp  |  4 ++--
- src/modules/settings/sy_settings.cpp |  2 +-
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/modules/devices/sy_devices.cpp b/src/modules/devices/sy_devices.cpp
-index b477fd7..f60c4a2 100644
---- a/src/modules/devices/sy_devices.cpp
-+++ b/src/modules/devices/sy_devices.cpp
-@@ -146,10 +146,10 @@ int syDeviceGetProfile( oyConfig_s * device, uint32_t icc_profile_flags, oyProfi
- {
-     oyOptions_s * options = 0;
-     oyOptions_SetFromText( &options,
--                     "//"OY_TYPE_STD"/config/command",
-+                     "//" OY_TYPE_STD "/config/command",
-                            "list", OY_CREATE_NEW );
-     oyOptions_SetFromText( &options,
--                     "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
-+                     "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
-                            "yes", OY_CREATE_NEW );
-     oyOptions_SetFromInt( &options, "///icc_profile_flags", icc_profile_flags, 0, OY_CREATE_NEW );
-     int error = oyDeviceAskProfile2( device, options, profile );
-@@ -595,7 +595,7 @@ int SyDevicesModule::installTaxiProfile(oyConfig_s * device)
-                             "//" OY_TYPE_STD "/icc_profile_flags",
-                             icc_profile_flags, 0, OY_CREATE_NEW );
-       oyOptions_SetFromText( &options,
--+                            "//"OY_TYPE_STD"/config/skip_ask_for_profile",
-++                            "//" OY_TYPE_STD "/config/skip_ask_for_profile",
-                              "yes", OY_CREATE_NEW );
-       error = oyDeviceSetup(device, options);
-       oyOptions_Release( &options );
-@@ -803,7 +803,7 @@ void SyDevicesModule::populateDeviceListing()
-     char ** texts = 0;
- 
-     // get all configuration filters
--    oyConfigDomainList( "//"OY_TYPE_STD"/device/config.icc_profile",
-+    oyConfigDomainList( "//" OY_TYPE_STD "/device/config.icc_profile",
-                         &texts, &count, &rank_list ,0 );
- 
-     for (i = 0; i < count; i++)
-@@ -960,7 +960,7 @@ oyConfig_s * SyDevicesModule::getCurrentDevice( void )
-     oyOptions_SetFromText( &options, "//" OY_TYPE_STD "/config/command", 
-                            "properties", OY_CREATE_NEW );
-     oyOptions_SetFromText( &options,
--                     "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
-+                     "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
-                            "yes", OY_CREATE_NEW );
-     if(current_device_class && current_device_name)
-       error = oyDeviceGet( OY_TYPE_STD, current_device_class, current_device_name,
-@@ -1003,7 +1003,7 @@ void SyDevicesModule::assignProfile( QString profile_name, oySCOPE_e scope )
-                                "//" OY_TYPE_STD "/icc_profile_flags",
-                                icc_profile_flags, 0, OY_CREATE_NEW );
-          oyOptions_SetFromText( &options,
--+                               "//"OY_TYPE_STD"/config/skip_ask_for_profile",
-++                               "//" OY_TYPE_STD "/config/skip_ask_for_profile",
-                                 "yes", OY_CREATE_NEW );
-          oyDeviceSetup( device, options ); /* reinitialise */
-          oyOptions_Release( &options );
-diff --git a/src/modules/information/sy_info.cpp b/src/modules/information/sy_info.cpp
-index 9d194cf..3b4909c 100644
---- a/src/modules/information/sy_info.cpp
-+++ b/src/modules/information/sy_info.cpp
-@@ -231,7 +231,7 @@ void SyInfoModule::populateDeviceProfiles( QTreeWidgetItem * deviceListTree )
-     oyConfDomain_s * d = 0;
- 
-     // get all configuration filters
--    oyConfigDomainList( "//"OY_TYPE_STD"/device/config.icc_profile",
-+    oyConfigDomainList( "//" OY_TYPE_STD "/device/config.icc_profile",
-                         &texts, &count, &rank_list ,0 );
- 
-     for(i = count - 1; i >= 0; --i)
-@@ -266,7 +266,7 @@ void SyInfoModule::populateDeviceProfiles( QTreeWidgetItem * deviceListTree )
-         oyConfig_s * device = oyConfigs_Get( devices, j );
-         char * device_info = 0;
-         oyOptions_s * options = 0;
--        oyOptions_SetFromText( &options, "//"OY_TYPE_STD"/config/icc_profile.x_color_region_target",
-+        oyOptions_SetFromText( &options, "//" OY_TYPE_STD "/config/icc_profile.x_color_region_target",
-                                          "yes", OY_CREATE_NEW );
-         oyOptions_SetFromInt( &options, "///icc_profile_flags", icc_profile_flags, 0, OY_CREATE_NEW );
- 
-diff --git a/src/modules/settings/sy_settings.cpp b/src/modules/settings/sy_settings.cpp
-index a1c54ee..3f74c1d 100644
---- a/src/modules/settings/sy_settings.cpp
-+++ b/src/modules/settings/sy_settings.cpp
-@@ -213,7 +213,7 @@ void SySendNativeUpdate(const char * func)
- {
-     // e.g. send native (e.g. X11) reload event
-     oyOptions_s * opts = oyOptions_New(NULL), * results = 0;
--    int error = oyOptions_Handle( "//"OY_TYPE_STD"/send_native_update_event",
-+    int error = oyOptions_Handle( "//" OY_TYPE_STD "/send_native_update_event",
-                       opts,"send_native_update_event",
-                       &results );
-     oyOptions_Release( &opts );
diff --git a/media-gfx/synnefo/metadata.xml b/media-gfx/synnefo/metadata.xml
deleted file mode 100644
index d85e5ec3d7c1..000000000000
--- a/media-gfx/synnefo/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">oyranos-cms/Synnefo</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/media-gfx/synnefo/synnefo-1.1.0.ebuild b/media-gfx/synnefo/synnefo-1.1.0.ebuild
deleted file mode 100644
index 3ac8c9b7578d..000000000000
--- a/media-gfx/synnefo/synnefo-1.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/oyranos-cms/Synnefo/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/Synnefo-${PV}"
-fi
-
-DESCRIPTION="Qt front end for the Oyranos Color Management System"
-HOMEPAGE="https://github.com/oyranos-cms/Synnefo"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	>=media-libs/oyranos-0.9.6
-"
-RDEPEND="${DEPEND}
-	x11-misc/xcalib
-"
-
-DOCS=( AUTHORS.md README.md )
-
-PATCHES=( "${FILESDIR}/${P}-cxx11.patch" ) # bug 739982
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-22 07:31:18 +0100
commit	908778078736bd36f7a60a2d576d415cb8e000fa (patch)
tree	c6a4796c48b608c14dc7e9674cdbd38f905e3c15 /media-gfx
parent	185fa19bbf68a4d4dca534d2b46729207a177f16 (diff)