gentoo resync : 20.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-20 14:27:17 +0000
commit: 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree: 66e860a5099bcad013f1cf667255dc372a7c11b3 /media-gfx
parent: 7218e1b46bceac05841e90472501742d905fb3fc (diff)
138 files changed, 743 insertions, 2288 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 182669cae4c8..f16c55e2d910 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/aaphoto/Manifest b/media-gfx/aaphoto/Manifest
index ece575aa15c5..ba58289d0bce 100644
--- a/media-gfx/aaphoto/Manifest
+++ b/media-gfx/aaphoto/Manifest
@@ -1,3 +1,3 @@
 DIST aaphoto_sources_0.45.tar.gz 134057 BLAKE2B 95a55a1f612a9e30967083ad5d59c6be0f815e2dfc55531660ae20eef9bfe7411aa2c852d0b016e04506ba4956b65674efe3797a66831c39a473ea49c8e8ecbe SHA512 203343a51a64a0422f4af2f80523bb7cb90aa04c10b64bd3aa3091460cf5de1bb86d677c564809813703a2c65f15736bc8d4e3c9273b3f3a72ca7c89f3311599
 EBUILD aaphoto-0.45.ebuild 771 BLAKE2B 1b339448bdc243a51cb2f80e119cd8db9f2b5753e9bb749d7ccbeb4b1e388164bd15c4690a93ee92d7100223d89c2fc8a93f1a01ab6dfaf1e0e69a46a2952699 SHA512 a0101bc5546fdef9720fbdf046afb37ed527a055ecc4579d94c0c7475d734714dcf5ad28be9227e4c7d2a930280c8e3a2afbbc40ef9f06be3c732b70a0490235
-MISC metadata.xml 442 BLAKE2B 99ddebd8a8796f5939503bbc98e678dc24106ab658846bbb598dae2fb5db2d7f4c8e53167441c97c4974a9bdac755b466f7129cc814237b206fb727f17b34312 SHA512 1eace312288be3ac4aef3dea8cff7c119a61c9f97ef8ea7de3b2fd6afada044a2ee3f6a189164333c4eec7cffab87eb869dd004ba7cceb82fb8aa87559b3d8fe
+MISC metadata.xml 472 BLAKE2B e125bdd1cfeaeecd9326993e2721d69c0f73226edd4e1b1a90579e1443e0e548a2675657b864f18e741b879734451b7cc21cb6e268b77e3a59e35759abdfa1d3 SHA512 9e7bc56c43f66289d7928bd8211a1d27413e00178ece3b0f1bee4255fa336cb1cd5b1215bd448d455363580dc461ad0710c7ffb32792e620baff7cc8bea442bb
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index 63c0cc7c9a30..7b748a28a767 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>erkiferenc@gmail.com</email>
 		<name>Ferenc Erki</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/alembic/Manifest b/media-gfx/alembic/Manifest
index 6c2acdb8b370..9f15d0f4c0e3 100644
--- a/media-gfx/alembic/Manifest
+++ b/media-gfx/alembic/Manifest
@@ -1,4 +1,4 @@
 AUX alembic-1.7.11-0005-Fix-install-locations.patch 8305 BLAKE2B 25688ca368f4d58a32d5c7afbbd4b1a738d3a69644034d18d487f2d48348ca4de32e3e691a8c5ec137c4829079cb0fedbdd9c5cfc98ff38144097845f07e0065 SHA512 b025cc77c21c57b43d9536e488ac5d68037cfa186c561399409ba863c722fca20f75b939aa7d5166d302b92e636deba05e0db4747d614f3420b4e76d30a8cbb2
 DIST alembic-1.7.16.tar.gz 855709 BLAKE2B 8009ed199b7dca190e40f56969d7c446e65bd78f58cee75dda4883ecf02b6c7ee422db76c4f523a76a4b2d42ef1547ededf5de0055cdb5d801c5cd4918a0b5f4 SHA512 bd4777dc4abf15bfb8307b00fd2d67671e89944d0dd8a74a657f4aee49e6a1cd0ab1fe5bb7f9afc63abcce2123466bb8a9a3886d41724ed2c242bc61d7d5b3a1
 EBUILD alembic-1.7.16.ebuild 1252 BLAKE2B e05bd0776543434d0375db0574660f939b9e8a30da1066b4399775554dadce0e9cfe06abc571357c373bb3176b6d07dd8d0566ab2558fc9456686e7e678fbf58 SHA512 4c24d13e574f8ff4572e61bf6de62eccdf07a3cfa7f5887b18a170c55fde542a9dac3dea9bdab733ca0ddd1f53961e971c18a2d4e52e5ed30c7f5472b6597c0a
-MISC metadata.xml 865 BLAKE2B a70a3ad887cc4a8247ac1c275c6a3dfd8db13371473c7f5548d629983ac521b53df0fb0fccebeb6505ef424f5c6080682552bbf825b8b2457731e91ad223b5ed SHA512 be0126102a7a6321349b5a680ba600dbef3f8bd757fcf35518672c39525633c3862bf4d795dddbf5d2ffbbc4ae639e20162656a482e916a808ff5af970e7aaaa
+MISC metadata.xml 895 BLAKE2B 4529e89d7ecc7b70e768104a6200fffbbcb42786f15c963aba54a3697d78cfe7006d7d2e7063a1efe2958ac651c5c2175b1aae2e2c3f6cb29c7eaba7de9d6b1c SHA512 5677c55df82cabd36468d0dc458dda3684304168bbe5eb9d229bba98e58e17e4f24db12ae56a8844f4dce87fe38bf42159d73e96c3e62a96f77f3ead15db851d
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index cbe5fd8cc576..3c7f24c84661 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index fe3caa775187..14d2498164ae 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -10,4 +10,4 @@ EBUILD blender-2.83.4-r1.ebuild 8590 BLAKE2B d1f5765922114878d629e653248491878f1
 EBUILD blender-2.90.1-r1.ebuild 8628 BLAKE2B 6f432315a7bf13dc3635ab915e9c72668aef526358f74b324067ebe4d5a34c5fa6daa207fdb753adaa756be9d53617896ec5545071755459ed0799a56618d18b SHA512 1b4bc3de4447577cd062283fde8ef091c0800968a0129a833b4d3c9acf8992e143a204bbc32b887254cdf4977ea083cb262e47242b5b2f1d581cf183339374a7
 EBUILD blender-2.91.0.ebuild 9056 BLAKE2B 8d797eebeba043fe2b1d8d74b6d5aa7ef8483efc9b9ea748766d95ddb89e805daa129b2c0515945b4ee89648119812bd2b7dec4a86398c905d2f085ddcbed8f8 SHA512 84ff05f097fdeaa37c795ac11aaf01ecca1063f126b08ada97063a15f5de1f14e9823dc6431c94a4497e09eab7b2932fcdbf661f0a1866fac2fafd24a8a0bd83
 EBUILD blender-2.91.2.ebuild 9062 BLAKE2B bd6a1673c0530c363808b102b53cc66266cdfba9d35897ecf1e2a43368f3428d3244cfa12c6f8006d8a59c1b7bed03b138fee29f2c7ca8da8278ff3651a18b5f SHA512 53e707329532bb29acd6436a1096f7dc65d9315cdd562c78fb05da171eedb087e09a8cc4c92849de30a9b834cd4b2393f1271789dc6bae2c8bc49e851268fca7
-MISC metadata.xml 2733 BLAKE2B bd7234217670288e926c4c71dac113fe478dbaf3f13a5e75ba1147a72b636baa8a7f6ccaaac6cc40e5710342dba4d49e35af8e0ebc439528cf3335cbf7f2560a SHA512 c955e7ffacb639e9bc5d5582bce129bc282f3838a113a5ead9ee2db13448b608b38e77c112036bcb57932302da15a537e2d1f9f82a8393444113340fdb7c8e51
+MISC metadata.xml 2763 BLAKE2B 233d1caced71f79aef161db337bc02ce80089d9eff96a0dff058660a01557dd91877d1a99e10ce20bd1a2637cee4cd43fb3f87868d2fb20aff751830b8d1bfef SHA512 13e4a08f83744aec7de708f0c4d1c8f9c7b96823ec5ab14600e16bef48fa682b565605d52701d1ca60b07329653e42da6b5a42fea0e13e68c4af707fe9390527
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 18a7b03a8de1..6fc1b5f9fa50 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index fe04006e9428..1974d3ce5b7a 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1,5 +1,5 @@
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
 DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
 EBUILD chafa-1.4.1.ebuild 866 BLAKE2B 24e4c50c2a29e9f3d5451f7b4ec9f4cc176dec6a2b5d4636e8de26e72f514b358957f78946ba0cd9cd9bde26d3c73c6677cac957d8db82733c45ba51e34c7165 SHA512 179ac5f28de859623651bfc30539d2242c2aeb949fd6398dd809a65ca7d4df80430dc1af7d2004f1a8852231d4666da29ed2ea3b404a9e43eb87a3055fd359a3
-EBUILD chafa-1.6.0.ebuild 767 BLAKE2B eb2c4aa4a41b02c12696ef877208c45c338e3b4c9076cb0dade84e0a04cab6c1f1bbabd67d825e546b911ffc657ccd1794144012abb3ab74871a7276804e8c2f SHA512 57b78dbd02a6b49a757cff05e869f8526b07412a837e6056a86b35cb99ec2084ca5711126d9b970ee83c5c04e99403de5c21bcf1eeb17a915318dd87397a95e6
-MISC metadata.xml 516 BLAKE2B ef0a2e140a6d37d3ace556ac5a6d299caa1fae8e37d93fe8aa43104a2f02d14fd4b5ed1bd218b2298616bcbc3c571868cc7e04d0a5f3ac2b091fa5588d833cbb SHA512 57bebde0a948ed0269c4decdf2b6ac8064f90dde344c547a67cbb40191eb3fb444b147ed8122ad79ba1acb487fc93ca1fb33afb5df80a41c7128e314ac4640ac
+EBUILD chafa-1.6.0.ebuild 764 BLAKE2B ce21bd3bc7e46e99b53e6f9ae564cc1171a1a270dee7069e86fb680ccecedfbeba030611f485b68e7c1761d7eb9d90bad7fd9d753bd37e31279be2c9d2952aa7 SHA512 ce16aca3d3019961a6cbee7b2f78661dfdfc58218839ac5992a66bc9b2649c62d7d0bb5d5c3a0d3507d050f77c8a56203cef16403ee6140023614e91a21b5123
+MISC metadata.xml 546 BLAKE2B 9a2ccaaa61addeef86ae9c684d1030c1396c36a87b45df6e0af8b5e70ed4c25cfe808cf854758882e0fc5e265624f4e86b0ddeb1a7e495f8a2fb353b054e9978 SHA512 8ca7185a73da0bcaf78cfbc33bdb7546832877829e5ec6ac227c76b037623915e862e661ea14bfe5cae31deefd3af70698c8a4d8b34c7764652d0b7f4dec4541
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
index 2c7e6798a528..9f4b4afc62fb 100644
--- a/media-gfx/chafa/chafa-1.6.0.ebuild
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+tools"
 
 RDEPEND="
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 715490a53a10..6a8df65e8958 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jakov.smolic@sartura.hr</email>
 		<name>Jakov Smolic</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/cropgui/Manifest b/media-gfx/cropgui/Manifest
index 7afd3a85a493..81bbe345b220 100644
--- a/media-gfx/cropgui/Manifest
+++ b/media-gfx/cropgui/Manifest
@@ -2,4 +2,4 @@ DIST cropgui-0.4.1.tar.gz 852958 BLAKE2B dcc6ba775e49af9a9fe1054fe5246e87e044f47
 DIST cropgui-0.5.tar.gz 853934 BLAKE2B ac7cf32495e3ac728223994f79252fd98a0a5cf7da79a9c6796ce3d7b213c797b16250be5d23a1bc6bed492f142a95411d6cbd42fe34242016c4e0181bfd90c4 SHA512 2babea9ea6089c74637c9023ea08c2ae4f666fbf44bb73d7a301de6fee6848e65a86fab312e765f7bd05e8e03bf3e92942d718ea84a950412385a8e0b6aa0630
 EBUILD cropgui-0.4.1.ebuild 1096 BLAKE2B 2005691ab239e023ca2a4d864744f9bae1348e3c7d6fe43925359fd119a53ea5562e3daade2c9d929296c7b61cd6e46a8ed978d8defd1c928e568ac36e8e6eea SHA512 59a123bd2e8d6c69bbf8aaf3f4f1cbe67de5834dda7439f76a3ca31da46048aaf5e78c32c3b438400fc128bfa42a295b10f468e507349c7f2cae66c6a9b0df9d
 EBUILD cropgui-0.5.ebuild 1098 BLAKE2B 3318e877827c04f942ce5963567524659b6db686d7f27be34f7a9da79af855213aa065d42f1741a769a42cb027a7019197eb42da18b0c1253a7bf633d5246de0 SHA512 89c2284f236870bfcfa46e1b2842cc9b4fa56447e318fdbab67c7160ce6146668d74ef7431d621969523b905345e63f68faf6bab38f61d7ce38be12b414e7e89
-MISC metadata.xml 322 BLAKE2B 90aa45b1eb0991ece5ae99458d976775a725221c0a472dc7f7667ad8b72c322f549aa33099669d5122807d5965348950edfd2c0bfa811435d11149e4577a230c SHA512 05b261ca819100fadde1548385d1632b157bfe6ddf1c7a876703f51d04a8aaa68f2d0aa18b188878c07fa27ed54cd65ec5ec4c4c042788fbbb525271ccda07e3
+MISC metadata.xml 322 BLAKE2B 41e38e0e03bc0006be2c8f4218b27e8345ddf0bd634c36cff282d8c6156978007be555a64a867fb6c5fa99f9f95e7cc92981cdd456aadb8e3b478ab91f796818 SHA512 c94b0036ea0f2844fd78173a55c788208bb84229990a4c5f55ab0eadea54ad5ac7889543b380b2586bae4f2af5505e282ae60ebb6586641ca01519f79f4aba69
diff --git a/media-gfx/cropgui/metadata.xml b/media-gfx/cropgui/metadata.xml
index 27aa4f80ba4c..204c8fb5b8d5 100644
--- a/media-gfx/cropgui/metadata.xml
+++ b/media-gfx/cropgui/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/cura/Manifest b/media-gfx/cura/Manifest
index ad6f49aee482..c3d161830065 100644
--- a/media-gfx/cura/Manifest
+++ b/media-gfx/cura/Manifest
@@ -1,3 +1,3 @@
 DIST cura-4.8.0.tar.gz 31930258 BLAKE2B 0a10a03f5fa34ec0279b9476063f71d8ae904e05485b84fac011fa5061812cd74f4be6df7e6d93046365799fc2fb1bcf4d10d89c69d2c8455080f99c12cec153 SHA512 0a34438299908021242e47e74418e56fe61c41cff5c29df938b4705b5d23ceb6e1bd17b9eb8110f8ec75c7a08afe8928857d4f2fd5befa00c187bce717105711
 EBUILD cura-4.8.0.ebuild 1966 BLAKE2B fb232dbe948e892b71ae184225b8c0a36feb34375dafd510332aa950bc0490512983a1ae15378f94beb863c3c4c012e7c5f6fd06c5f181558ad17c569c4ab73e SHA512 05d22e7c757079fa99eeeacd2f398526ff64373b450f46f058d627e85660a59b9d9ae8eb59222b07f364a381a0d9e8e16cbb16c112c69c7f4a46b2150332bcfe
-MISC metadata.xml 1038 BLAKE2B 888ad9975a914f5af17e3e43582eb8b2d2cd032cd157fd043271c2c17d098d24a8d8390a70c05587b180a3ff973c854f073fea60f2edfc8c89ffea40c914decb SHA512 100ef5e05d7585bbaaea67d0e91026dfad180d4d007dc4b833dd995cc1726706d53b7b67aa6576a91a7924be9280eec706221556cdcff1176c839c81423d09cc
+MISC metadata.xml 1082 BLAKE2B afade1233826e2557117dbeb80c2ade8e4f7541597d5bc071acf564d3dbd399206143346e520bba58f6ec17afe2f1c706a89372034d7ca2adabc2e7b3adb83aa SHA512 eeb78698a502dff0913b523dd6d2bd9bdb2ba3bd5eadef5b060de9a2d3323a35b9e7ee710744ec0dd141819c08be75df0b0f598b61f14c04575cc47c1d254026
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 615b4b60345e..40586c7e4f41 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/curaengine/Manifest b/media-gfx/curaengine/Manifest
index c6fa039d313c..b049d183c4f5 100644
--- a/media-gfx/curaengine/Manifest
+++ b/media-gfx/curaengine/Manifest
@@ -1,3 +1,3 @@
 DIST curaengine-4.8.0.tar.gz 1690082 BLAKE2B 7c582ad0743a937ad4efa2a224e052383b90632c8f33f666a4139a74954a7243e17107ac39b35c1a5e41df89e303d618e4407d7e9a75efc5d96913aaaf498273 SHA512 be0d12cfe61932bf03dde61df8fb7f31cbd0aef6a44292130a7a67e318891f37db685722ba5d3cf66e88d4ff1de64ac86be5e494b750f8f7ff4b52d7976cb670
 EBUILD curaengine-4.8.0.ebuild 2233 BLAKE2B a4454674fbfc4c81334a21090a10fa324a1a594db66302105ba2fb8d448154dfdc6334ccf27984b210ed93ac9ccf67f7d846cab36b4c0af147603ab63ba6b724 SHA512 dbb6cb64ab13d53deff7f34d9acf9d7ceb0ea847ff0870255cb956fa3f5c7adf02009da850d404f3cdfb69ea9e5b8664d6cf561cbf62e1eab3aa90c1fb34b604
-MISC metadata.xml 1536 BLAKE2B c2dc9d4c9e4027fac86acdeed68d620bcb97c5d5e458c2e11b03ac78cb1f7dcf7946d8ba3b84a071b8bb6f5fbcfac4e736ac25dd73f63d28e7f13abe9e3a6597 SHA512 b47c97c4ab56a5274f0308d7e4e168cd426f2c2c801a156e0eb8b5a12ed06f4b33fe7eedfd7f8c7f9e0c377be40655fc30b0dcb98f4ddebc4ecedabb47aafb74
+MISC metadata.xml 1580 BLAKE2B 4d90722e13b98fb9bace7319edfabb1e1d6257052247b6f449f990b64e2d67db1255de37d9a325a0b69175654fc8726505ace4c2101aa686032b6d0d430e81a4 SHA512 00cc2ff186f099513736c535c8731e21f945a82d2762d2a79a0950e9a96aa2bed57a0ed9de3866dadcab2f1ad25f0e8a8400059e744f104d2bb9a02af34ec27e
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 9bb6b008a456..c4a0df226df9 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest
index 1da8e94491ae..a9fb45d90c7a 100644
--- a/media-gfx/dmtx-utils/Manifest
+++ b/media-gfx/dmtx-utils/Manifest
@@ -2,4 +2,4 @@ DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2
 DIST dmtx-utils-0.7.6.tar.gz 54888 BLAKE2B 721d67f85e73d245595d189acf1f974b518b079d02b7c57fa786b15ed075bd08219a2720b5152341449d517eb93e238274b440388557a64056de6cf6db9fc392 SHA512 201f8f5bbe5a1edd23104883d03e09842252ad7d07dd416b67c11740275ebe32c26b7fde904fad8bf2b18f1b3f574dedde1cc85f0e987f93d293d030e4f8a79e
 EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820
 EBUILD dmtx-utils-0.7.6.ebuild 588 BLAKE2B 0c2de7fe60aacd6af505a21a55e0fb7aa6766c04a0cc8d89af73a440d2478b93ee3b7919a442dbd29be5f0e0e2d32f85ebf01813f729b11143c0489b7e4a0630 SHA512 1a98592502070d1f3e4f808f47a2abcaab8fa1b1f235c2451f7b11f224d65ebb7169628067755963d734c0f30fcbe34ee819383f9ad7a05c411a579ad12141ae
-MISC metadata.xml 784 BLAKE2B 6d400f2933a256e39be8ef48286af7273c78d5ea67be927703c82471e0ad19720adc05dcc71e200cb0f373bec626690b38e4021a5d8f0f7509949001f84b87d4 SHA512 3ae4b194dffdc41978674a602861fabe327c9c9955583bb1ceda7910c4fb24563d2c5045c9f5e37a0d0b4f94951aa3b3c9dc7e5fec69a927f30cc180accabedf
+MISC metadata.xml 814 BLAKE2B f0fa37f0d673f117190e7009d52e4a7374cfda01db1f14f345231359c7c2413729e0e0b33409fe480aac2c0b9598c773051815547ae1b6e535576d572a10a9e8 SHA512 9a4f521b124852d9610d8a84862b1daaff3b5d8fe3f16a36ad048526b53430ccab3246d45cb2d3c2ec76ae1b0d78e73fe6dfde246d7fb9d82fbce53157e2206f
diff --git a/media-gfx/dmtx-utils/metadata.xml b/media-gfx/dmtx-utils/metadata.xml
index 3971294e52ef..b3e87979920e 100644
--- a/media-gfx/dmtx-utils/metadata.xml
+++ b/media-gfx/dmtx-utils/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ahippo@yandex.ru</email>
         <name>Andrey Mazo</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/media-gfx/engauge/Manifest b/media-gfx/engauge/Manifest
index 8429c8bd6468..55d3a93f21a7 100644
--- a/media-gfx/engauge/Manifest
+++ b/media-gfx/engauge/Manifest
@@ -1,4 +1,4 @@
 AUX engauge-10.6-qt-5.11.patch 662 BLAKE2B 7f287da70c06f71bd115541f636e4b5803149c9a6a8855dad388be234ba6f2981f63dc6ad97f89a890d796f4138f4d1318be1d7994b31a23232071a5999a5527 SHA512 9056af93efa32bb8619820ae990abc4ab172b2ceecc262b1f41c2e33a4b08417a4793a201a7cb7c79c648688c6366b10cb1849e1f03f4c3b5407dc2544cd12ce
 DIST engauge-digitizer-10.6.tar.gz 68463313 BLAKE2B 2f939b383d2b2ca7d3ac73196ae6c9f4cd3380f7cb1bc7703d23ffe2554bfd6dfb6f206d3b9c33953757791855c908c7899f078c1c1472549859258d406e5796 SHA512 f571978298f0646f338ee786aae692800bd73242f68a4f35509023d3ea0daaa16ede6a1d45cbc28a31efc277697315c63fe3d2cce1f0cf80334bdeea11599a67
-EBUILD engauge-10.6.ebuild 2116 BLAKE2B d7879884824581dd5f3d481b2a8760659986708ad802cb6841380ca55164fe63e9899c8fc8a774260a9f01646d3b9f971113b36583da59300feb92b363d19b82 SHA512 51840f63f8f56984d549051b88dde704f150d122f316cda1277900d4f18da8b1da45b0ed5bca4c9dfd7cf6ddc9efd5926b8e84dbf4e234971275db17bb4a555c
-MISC metadata.xml 251 BLAKE2B 278d9c0c00f53a3c9ce230c748c38f879e6e6ef6cd3a7e8979be3202bf047c790c94ed94875d24c1b4c2726a199ba50fd6a93b6f7b7d7cddbac47b6a9f261f83 SHA512 a8f496154037503d0368c14170261e70e348512612f133e3323a73c450e27af0cf266db2d2d76f61db30e1dcd979823b9ff730cb7ac43a28e24ccbf2c6768b07
+EBUILD engauge-10.6.ebuild 2115 BLAKE2B 5d48548a59aa3b9fa06ed4d02b31c719ef8d41af8632cfa5c081846b41f3a91fe9f7044118fbcbd20b5e6e23c1bc6af2757282f47effd89d3123b767894ca63a SHA512 b5754a3d46e86bb4dd4aee9dbffb08b166fae2af089d1630d0d34d9a2fd0a10c8ee2be6a4580fde792d05bf3efe2df0f81334da4c46b7fb70696bcc1a1055a5f
+MISC metadata.xml 343 BLAKE2B cf936a8340fd4266de9732db4288c7ef99b9f54d004da63e13e22dfe07b9a55124844760a46f7b4609c14cbd443e1575be2e2d705220197bda8b4eeb838c52b7 SHA512 ec67be582e6b1a4fb6d9aa401f265c25823f0c9be3671052f602dfbeafa1c2bb307139e47ead3736ddc58b453143246e6830da99d04fc2412802f649f83cfb1e
diff --git a/media-gfx/engauge/engauge-10.6.ebuild b/media-gfx/engauge/engauge-10.6.ebuild
index e1145ca2e153..57437e9947cc 100644
--- a/media-gfx/engauge/engauge-10.6.ebuild
+++ b/media-gfx/engauge/engauge-10.6.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/markummitchell/engauge-digitizer/archive/v$PV.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples jpeg2k pdf"
 
 RDEPEND="dev-qt/qtcore:5
diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index fa3fced03f31..339348097beb 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">digitizer</remote-id>
   </upstream>
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index e0843179de12..5bee1378c560 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,7 +1,9 @@
 DIST eog-3.36.3.tar.xz 3651556 BLAKE2B 6224b21342b24bed8cfed5702c440547423a7c0db36278c082f336f274ebabea401700c418eafced814fb33043362963055acbcacc81edff8b0f202898c09542 SHA512 90205561dbc49aa42e60f636ce23d04dcd05513d28176ffa4c1dd6602889c4b2c920bd299086d3d7bfee72fcc6a029e2d34e14eb80ba5f91573161fbd1b85aea
 DIST eog-3.36.4.tar.xz 3651632 BLAKE2B f971ab236422a875ea8d91a661c6c653ba2ef4834b282dcce7d5c53e9c23bedf49610c0a8ff1bedb2af1821610ab29de8476a2b13b6cb1b82e58c3309b56b7dd SHA512 d1f4aa2e225a8147507cbed74a74bd435887884a2431f3ea0d1c569217a291f93c1440bede1c6abf03660ad8df46530e8b2195399ac8faaac36b1e31e8e93daf
 DIST eog-3.38.1.tar.xz 3655616 BLAKE2B 1e0265dc798413e9b2588c36879a526069bc3d8788339e97470d8d0b738e01cd2fc00bc3db118721fd45a40e5829e225d9451d4cf868e0c9a7bfd74cdc90c06d SHA512 26317413271001b4edcd30438e81a2bb1d2e10edd639c054ffdc08743a5274b27afb51186a660e29022be5e9ecf10043b94e7d409194589d2bba6906ede2cff9
+DIST eog-3.38.2.tar.xz 3614956 BLAKE2B ab442006b2eca1550d072c57af989e748f130b07088e724ccf8e2d6e6b2cf132e06ff2ff89d9333f6fa3cd701c27cdb616dabf125f14dc5a4d1b92d14a85be56 SHA512 f9af91a76b85b8e1250f3ecf04cfc30ae35892282fe65c810358d27cc7e0aac3cafe50dcf815c54c6056c24eb1107d6f5ecf8131f78559095cda5024d255ebe6
 EBUILD eog-3.36.3.ebuild 1556 BLAKE2B 6ba5e5184a6916dcc56b4879ca3abf4e5eff4711fcdc97c3a56a415f3564d1b02ec74dbf270b0586e9496ba421b9bae052591a40aeebb789e22867b1d6443dba SHA512 c59d6e36cec5e04be93567fe493f62885effd1a828240aed0e4d5afe04d31a1615d237294814eef7c774ac009cccf0cadea8c86881908df08a1a312a774f9e06
 EBUILD eog-3.36.4.ebuild 1558 BLAKE2B fc7954cbc8763a3d4037bfc445576b8a1e0b7f5db72e59e5d5f35879a59c12a0ce96d1ae68fd2af8eeb4218082c0af2bd9f9d47f8ea68a8080ee1b317de636f9 SHA512 f2527c036b67ff6cd1d9047014117f65b6497ecf4fe09398301d32ae97b9ff8ae21665138e4565cec2d747e83815f9312ca08a50546dcf7ca3144f9321c37dfd
 EBUILD eog-3.38.1.ebuild 1592 BLAKE2B 948a363a67e2e8996650fe2838cd5aa1d786159a9a7ab7cc6bcd087c98bec57926a99bd65b72fe52c88c1ad55a42e8e670ac823fc3f014aa17331dde8ab4f438 SHA512 e7e942076a528403b3b3419bd1f0855276cf5509bf30a5ad63d4f176a44bb58e15ab749f47ddbd865e9e80c4dd2b78c9e1e0f6e1e41316a3fb8cff7000081556
+EBUILD eog-3.38.2.ebuild 1593 BLAKE2B e40e84edd2b76c87e8fa42b84fa255d470c13fed651263c0237a8c645df7affd497b72394f79c143ceb1067c7aa871855a3331e1a2f1800904e2092356938907 SHA512 ff4b3988b9d508c1df713d2f720b36084c23dc50f57f20ddba970f543ac3ae45831553e46a2586c073d6af1cd4fde0816c40efffd67904f6546a5bc75e2c1d64
 MISC metadata.xml 481 BLAKE2B 2c12b594b9a5b1e4ce3983131d1911f62026c5186d8f5c5af13842cfedfa4d20abdc5ee82e11db3a2e1b45e2b8d4d95fa1a62e668936956e8453b166daff00b4 SHA512 141ec1d6923697f744de806804279b602120ce3d5494257de36b8c8b71185d101692f2e438d7ba0e4a4c946d0aaba068117f16c8344abe891e0ddd4f768ded26
diff --git a/media-gfx/eog/eog-3.38.2.ebuild b/media-gfx/eog/eog-3.38.2.ebuild
new file mode 100644
index 000000000000..e0fd2241d634
--- /dev/null
+++ b/media-gfx/eog/eog-3.38.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="The Eye of GNOME image viewer"
+HOMEPAGE="https://wiki.gnome.org/Apps/EyeOfGnome"
+
+LICENSE="GPL-2+"
+SLOT="1"
+
+IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
+REQUIRED_USE="exif? ( jpeg )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=dev-libs/libpeas-0.7.4:=[gtk]
+	>=gnome-base/gnome-desktop-2.91.2:3=
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
+	>=x11-misc/shared-mime-info-0.20
+	>=x11-libs/gdk-pixbuf-2.36.5:2[jpeg?,tiff?]
+	>=x11-libs/gtk+-3.22.0:3[introspection,X]
+	sys-libs/zlib
+
+	exif? ( >=media-libs/libexif-0.6.14 )
+	lcms? ( media-libs/lcms:2 )
+	xmp? ( media-libs/exempi:2 )
+	jpeg? ( virtual/jpeg:0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+	svg? ( >=gnome-base/librsvg-2.44.0:2 )
+
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.16
+		app-text/docbook-xml-dtd:4.1.2 )
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use exif libexif)
+		$(meson_use lcms cms)
+		$(meson_use xmp)
+		$(meson_use jpeg libjpeg)
+		$(meson_use svg librsvg)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		-Dinstalled_tests=false
+		-Dlibportal=false # Not packaged
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/media-gfx/fdm-materials/Manifest b/media-gfx/fdm-materials/Manifest
index d29099f1ef9f..830362417ec3 100644
--- a/media-gfx/fdm-materials/Manifest
+++ b/media-gfx/fdm-materials/Manifest
@@ -1,3 +1,3 @@
 DIST fdm-materials-4.8.0.tar.gz 43850 BLAKE2B d9fa025eeb4f11c027fd64a2615d214a47024df62d53ee6b43391ac5383812581ae2ca075804277b6f7094639238646211cb5b978580edf91d004e83ef7ce405 SHA512 6e2812dc61ad00437d4c7943c3746cd915e1e49edef49f89ea2c4ca4cf023d67c400d1ae1e3c40923928d20ac09b184fc0632b828900b6236f9dfd346f19036d
 EBUILD fdm-materials-4.8.0.ebuild 544 BLAKE2B 62876b85725d6065e9ecf53c100ab9787c5147b1b4428e641a89837b9e01a38bc5c7a17ba0c55b6e25a8863f6e17bf0b732922c1f99298d3b8e8fac5579b3801 SHA512 a9d88895a40efca25e88c795a357cca743dab6d89c0366eeff6081ae73ae129ddbe3575469d9ff76f571ca882db868ed02c9e9a01f2332cb807b91f896130ab3
-MISC metadata.xml 949 BLAKE2B d84bebe6a29c4eb2a6e644347492fe06a60e758efcaba9158d2395d2e3714565f805d01ed029bf8906c54ed286e49902adf6b4e8cef9870219cf3fd13912f5e7 SHA512 d7f04589e2e66b471a721aafa2d2be2d531211f2e5003ed7ffed918e770e6980cf891bc5728a0d1a27c3bcaebf2706ac9dd6d9dac847c412e1b7adde091a7594
+MISC metadata.xml 993 BLAKE2B 77d82ae5e13ff1d4de7936ea4c79348286208b7294a21e85e40254a0eb7268cf3fc042bfab96ed4356dd01735932fb17e27416140da74b51844fa2c689d7ca5e SHA512 b78c7d7de99992f28771a13d3d1f7addcaef1216ffaf235cc5d2f997bff917f0e788ed07e2a97acfb79a188af080e9c3debd6c2ef06d5f07d288ebc763a4a6d4
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
index f29b491fa4de..d9038453ff8e 100644
--- a/media-gfx/fdm-materials/metadata.xml
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -9,15 +9,15 @@
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>mathy@vanvoorden.be</email>
 		<name>Mathy Vanvoorden</name>
 	</maintainer>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>perlovka@gmail.com</email>
 		<name>Michael Perlov</name>
 	</maintainer>
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index e0d59cb71df5..22376c33e137 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -2,4 +2,4 @@ AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
 EBUILD flameshot-0.6.0.ebuild 1126 BLAKE2B dc0f3b785a508b06a24f6427c661f0cf3b4b3dd4cac145da7930336abcb717f66cbe2650fd40f8cba7e1b9d3c0af30cb70f5bdeab09848ec32a1d10d5a86d81d SHA512 307f2d58679069fa4047abf3b154499d30790a1b8a38757939dab11cce03e83218ffaecdd8f7e889ea1058740fbccf289a017b2bff5bf7894cbac5817cf99ab2
-MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
+MISC metadata.xml 396 BLAKE2B aa67921bf3b8f848824726187c8645c3d48e4a4b3e629ac32fea19e9764408871beddb474e10b9f8f106ff9caa9d0b0fbd87441f14275383c95c3062d47e071f SHA512 7b9df389d3add92f56cc7fcd95fd4986883860e088d678c20d9ca3d47c80faa45a2242bc74b8d54b54999279a8be1d7d04fac5f741db5876e45577c6df8413aa
diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
index 49f9e82790bb..b0d56d9d0268 100644
--- a/media-gfx/flameshot/metadata.xml
+++ b/media-gfx/flameshot/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>paul.kalug@gmail.com</email>
 		<name>Pavel Kalugin</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index ae5a6846c67f..df8491dd9d05 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,7 +1,7 @@
+AUX freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch 797 BLAKE2B 1bd09caaa265e370b70efe9dd23171a61a98920d659c2f19bb3ec07bf77b1d59712c135f421bbc3164bec6c2b19ac0886185bb6200c45cefaaaea94d5cf54222 SHA512 b449fc466a22300c8a4b0a5b223d68b0ef4437512abcdf875580efc364570b157a55e283faa0ddaad5fd4ce98585bf6dd043b4e7a2a7aa86e98bdb9e8a846a30
 AUX freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch 861 BLAKE2B 305d1e7110e72c0b7e1f4398283816ca8ca01e1fe8460fee9fc002401c5937414d11ee46f0875d0859e57c94b03a67ccb7b4bed1b4935b1032e6db41b9e64a85 SHA512 0eaa8b23a92237648e128304bcb84a227cfb081826266efad9b3afd8a63444a61930dfba465b2d1e205cb43fc616e0a63c1f8bbb1618a462d8a0cff04e764ea0
-AUX freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch 1054 BLAKE2B 8665cad381ba62a792d706acf8bec0d2801435249d9004be8df5a01e4de34c0a5dcd85722d77284fe57b2c341d2d4fcc5b70e3f2380c7de59adb323466498bf6 SHA512 efbd53039803d301a5f76984d6e23a43563d888511cd569cc1a656a7900cc4bd93f8bef6e658f7acb42894501ecf50b941ff4c08a89e5063524813300f503b50
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
-DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34
-EBUILD freecad-0.19_pre20201231.ebuild 9028 BLAKE2B 0d1394446de1d57f8072c802ab552feca50f216e72cd2fce0c068bcaa4055ef12dd0a4492c4fb774c6169c684b2a5b42fb79bae4ad68ca251555c0635b25ba4c SHA512 0ff3a13ece5feddc1f4af871ec7c1817e8620d49551b9465e12771d3af719f17729dc3d7b563e7f93e7bd36cd2399ef1dd20c26e967c8f33eea36894daf8c173
-EBUILD freecad-9999.ebuild 9001 BLAKE2B f575d610bf27b8e77ef37f20b9500220d101e4badb0a7998895581efd6088b6587a1852ea231273d71f450cc44d113191add1c602958f69f79881bfb3d4773dd SHA512 037497da3425242b3094d4cd51e21a767260960a3781b642f5cb5735220a4b4758071403f8403107ea177c84bccd4d11b47800911b5358a25be8e62bb4400d15
-MISC metadata.xml 3801 BLAKE2B 45881fcae09c1c9c41c413915c6db4454f72067c798f05e1cfb6ee6342c01834b090c84f5eb350d4b1a7cee58fa06ba03398d45956f9869f45c044140c68b318 SHA512 f1c7100c60a3e82aab72c2dac17b1fbff50a50587db562a7032a62732c1412bf97544015986926d5b3abef0ab966d145001785b714051a887206c30d526470b2
+DIST freecad-0.19.1.tar.gz 296983463 BLAKE2B de6592474c34c5643ba7f63d6223bf7b2fcee87ebf226727e242ff3f56f363562dd0bae8cb6b3203d978d998b70985777ca93b938c0fc01822e8927cd79f6118 SHA512 5134fba99448c509f0761d62b07f1bbd3183108761f41178b38f24d5ba26558608d7d7b00009d03ba097a50cc6fe047bbd57872b32a1d55b3526d18c19ae6393
+EBUILD freecad-0.19.1.ebuild 9049 BLAKE2B 3b63090e5fb618d45171eb616c77657ee9f398e5459cb38664b95cca80486e6697aca645652cfba38ac4a5f20c750bcb06c8840565a295e8079a59763e49ba20 SHA512 34ba9e577377f9e5f687813a4a5629bfdacdca1a62c82bb4d71a7ceb726afd7de9ccbf1041f83fadaf3a6394ed7aa32c7d4f08d695523842cc56b72b0450e064
+EBUILD freecad-9999.ebuild 9091 BLAKE2B f56e1e6230b94b06e73b6a57d8d38d1096924969dd553b18f14c11760bd5de0602d2bc33a9264e8ba201ea70b53a2122b64f82448216d769ce57d5cff1cbdd22 SHA512 9dbef04ebc1448d6f32525d19205f05ff2eb55253acc7c7551030f02e29e384b87627c4e81da3a6bf0df84cc3c65178d82a7c2c2d6a46ca03281663e55990d28
+MISC metadata.xml 3728 BLAKE2B dfe01a38234955bbea4ebc4d561fa15d06548f80338ace10091b8c8e5ab485532e462ad8ea35d52552fb87d18be05bc10953d100389cd4302e07adbb2cbc8a9a SHA512 c1c6693f824aaf9ace443bd5001a581187a4dbbb134a18454ef96d5dbd674b98284136d021f04316de0e0d8400bdb3e7f0dab5722e1ed0d45b33f0263c8ae6d3
diff --git a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
new file mode 100644
index 000000000000..c8772febdee8
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -0,0 +1,29 @@
+From 74664bf8c9142320be335ab91dca53cb1a1187a2 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 12 Mar 2021 23:55:09 +0100
+Subject: [PATCH] [Gentoo specific] Remove ccache usage
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b17736..38e482a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,11 +8,6 @@ if (POLICY CMP0072)
+     cmake_policy(SET CMP0072 OLD)
+ endif(POLICY CMP0072)
+ 
+-find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
+-if(CCACHE_PROGRAM)
+-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+-endif()
+-
+ project(FreeCAD)
+ 
+ set(PACKAGE_VERSION_NAME "Vulcan")
+-- 
+2.30.1
+
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
deleted file mode 100644
index 26bb4421077b..000000000000
--- a/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From bce02c4804d14ae2257ad5f5e7fae4e2baa74503 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Thu, 31 Dec 2020 13:31:47 +0100
-Subject: [PATCH 2/2] CMakeLists.txt: add option for ccache
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f4dabf7..17b9fad 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,9 +8,12 @@ if (POLICY CMP0072)
-     cmake_policy(SET CMP0072 OLD)
- endif(POLICY CMP0072)
- 
--find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
--if(CCACHE_PROGRAM)
--    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+option(FREECAD_USE_CCACHE "Use ccache to build FreeCAD" OFF)
-+if(FREECAD_USE_CCACHE)
-+    find_program(CCACHE_PROGRAM ccache)  #This check should occur before project()
-+    if(CCACHE_PROGRAM)
-+        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-+    endif()
- endif()
- 
- project(FreeCAD)
--- 
-2.30.0
-
diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19.1.ebuild
index 9d1447e685a1..4a113baa2293 100644
--- a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
+++ b/media-gfx/freecad/freecad-0.19.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # vtk needs updating to use 3.9
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -16,17 +16,18 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${COMMIT}"
+	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
 # code is licensed LGPL-2
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="ccache debug headless pcl test"
+IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
@@ -91,10 +92,7 @@ RDEPEND="
 	')
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	ccache? ( dev-util/ccache )
-"
+BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -120,14 +118,14 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${P}-0002-CMakeLists.txt-add-option-for-ccache.patch
-	"${FILESDIR}"/${P}-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${P}-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="7G"
+CHECKREQS_DISK_BUILD="3G"
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -205,7 +203,7 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_CCACHE=OFF
 		-DFREECAD_USE_EXTERNAL_KDL=ON
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
@@ -243,12 +241,12 @@ src_install() {
 	cmake_src_install
 
 	if ! use headless; then
-		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 }
 
 pkg_postinst() {
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e2cb13d51fc2..47d3587ffec5 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # vtk needs updating to use 3.9
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -16,17 +16,18 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${COMMIT}"
+	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
 # code is licensed LGPL-2
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="ccache debug headless pcl test"
+IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
@@ -91,10 +92,7 @@ RDEPEND="
 	')
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	ccache? ( dev-util/ccache )
-"
+BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -121,12 +119,13 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="7G"
+CHECKREQS_DISK_BUILD="3G"
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -204,7 +203,7 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_CCACHE=OFF
 		-DFREECAD_USE_EXTERNAL_KDL=ON
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
@@ -215,6 +214,8 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		-DPython3_EXECUTABLE=${PYTHON}
+
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
@@ -242,12 +243,12 @@ src_install() {
 	cmake_src_install
 
 	if ! use headless; then
-		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 }
 
 pkg_postinst() {
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 599d1643a221..57211691f591 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
-		<description>Gentoo Proxy Maintainers</description>
+		<name>Gentoo Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="addonmgr">
@@ -18,9 +18,6 @@
 			Build the architecture workbench for working with architectural 
 			elements
 		</flag>
-		<flag name="ccache">
-			Use <pkg>dev-util/ccache</pkg> to build the package.
-		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).
diff --git a/media-gfx/frogr/Manifest b/media-gfx/frogr/Manifest
index 125f349b1ccd..a35719e37637 100644
--- a/media-gfx/frogr/Manifest
+++ b/media-gfx/frogr/Manifest
@@ -1,5 +1,5 @@
 DIST frogr-1.3.tar.xz 2552456 BLAKE2B 562f88898fec153c50696dce59b5396b6f9e88bc68cbf264e7954c2d2f402cb44cb2e6bf3c1c786d50285532c66167678f0fde053c317a0d23b6f4b210e69fa1 SHA512 82ca3ff1e97e7ff45bce1915f629809cc9efa6d33735b0e41b17bb8f69a31a2b035dd53045a3e56e7769d379b534a2468e37a684505438cfea70cc141103d1cb
 DIST frogr-1.5.tar.xz 2233600 BLAKE2B aeb04db0d5d57f470d377986f2e857ee63b47df85e9c3251cdfac8585efa19491650ecede0bfa95c157c2584298dc02173afec624bc439dcd8b52d101c465d54 SHA512 f4af5ec82ad1771e71387c40467fc697c7e3edff9f76ecd0f762e446d136a293477867cb7b6bc6d10bc0fdd95210b25f515eb56bf2d456f79009884019c44dd4
 EBUILD frogr-1.3.ebuild 626 BLAKE2B 9e17e2f7206f357020256d796ffc92b2f3bb63d3b5f8b52209289628d8ee76cf6ac18e84d5982ddd4828437275f2cefd039025d9104ce0d0f3ab958b9bf2cb96 SHA512 8b2eaa44c95a0266e1568becdc8fccca0dec6de3e31d9cd71a228fa068a361ea223efdc39b318459abb68c285efb9ef688cf5b44eed79f1d79e4db76b6d7427d
-EBUILD frogr-1.5.ebuild 891 BLAKE2B 444fd6ab77b7bd9015785d6c4eeefcfef3990d83b314f11119e91621e84646d633664bc2527150052252b40b39edfddf1213f051c3ff90d3942cbc689881aff4 SHA512 22e34ccd09564056a188cf2486b1c47edad79e231f27f909b2b38184a0067df1f9762eec4b35d65e15096d37bb67b6eaaa3fe48640f6b783a8cf9aec2a83948f
+EBUILD frogr-1.5.ebuild 926 BLAKE2B d2922cb892bbb39075cd5bd0639ee5fd9884e7147376fe51854f2fa3db7a2d7908e813c5e2988afc017f1fe1c0c52bb13de6259e707cc1b99550956ec24b171b SHA512 e48d0ce41802dc1f3b44e5b3ad829097fdbecc407ac1e5e2d22b12b23c700cd09f5e6095a587c81eec2c29100f87664a479c8bb6472ac8fb22f4e0acf3c0bb70
 MISC metadata.xml 386 BLAKE2B 5b6c13b6c0a981e0e1fd0c7092204999a4849c2339bb35de15b69bd04e736f8f5d1ea905f429f036852e34a7c729e744518f0171ef29c6cf016fc047332b2838 SHA512 660c88d236b1c2ba2ea1e20d0d2ea9a3acc5a9f8d0306b3ed98bfec2d616e67b9e8aceb137438e6b0a6517588252a676c715f6177b9e369d09019064254c8f53
diff --git a/media-gfx/frogr/frogr-1.5.ebuild b/media-gfx/frogr/frogr-1.5.ebuild
index 2cb753483f16..c10fdc5a79c7 100644
--- a/media-gfx/frogr/frogr-1.5.ebuild
+++ b/media-gfx/frogr/frogr-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -30,7 +30,10 @@ DEPEND="${RDEPEND}
 # TODO add a useflag for enable-video or header-bar???
 
 src_configure() {
-	local emesonargs=()
+	local emesonargs=(
+		# bug #714132
+		-Dwerror=false
+	)
 	meson_src_configure
 }
 
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 56566d613ff7..373e1bfd3db5 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,8 +1,3 @@
-AUX gif2png-2.5.12-makefile.patch 1049 BLAKE2B bbf558d2fbfeea6ea5c4b8bc863541f2118d93994b78d80390cbad4179d739e2a547a06359a13d0e2a0c2b9dd056a62e0a7a954043e69ea35a57e6082c1bba9e SHA512 1c0278626ead4640eeae69408020007fcc96fd6078fe6abcc5ab81c1fec2a89eb8ccdf134bd22c8b4e26abfe390aded4fda3a9d9ccf600e2128bcf1ebcaef735
-DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8
 DIST gif2png-2.5.14.tar.gz 221609 BLAKE2B de1e66a0880579a2d4d3681ec8cbbe3ef37da1cd05e40336b398266f386d629645f9d45738098c9e3f9528cb5dbdd5c37ed00f5d5c8bcd85e0a31fd375f38a76 SHA512 a1ea3b64da64274a3363089beee748605eb24d3e05bcace29d26618a9ab3580f5ac85da893af16975c91d571866625e0883f0a4b375e82c468754f84f8982f03
-DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
-EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1
 EBUILD gif2png-2.5.14.ebuild 671 BLAKE2B 3a90983d055427448a29149199dccd410939ceb0c8ccc69b9a82557876f32453e06967398f385853b5a76c8e2575a5ea083722a31bebb188e21e1044f7baddda SHA512 02aff990a2e72dfcc2e992a4556ed9798e948297695b95ab6540bac398f28193ab84c21069e5382b023f744f45f57e68b80caaca7b5fe400e8d5c9fd8b5024fd
-EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
deleted file mode 100644
index e99180f8686e..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests.
-
---- gif2png-2.5.12/Makefile
-+++ gif2png-2.5.12/Makefile
-@@ -2,8 +2,7 @@
- 
- VERSION = $(shell sed -n <NEWS '/::/s/^\([^:]*\).*/\1/p' | head -1)
- 
--CFLAGS = -DVERSION=\"$(VERSION)\" -O2
--LDFLAGS = -s
-+CFLAGS = -DVERSION=\"$(VERSION)\"
- 
- SOURCES = 437_l1.c gif2png.c gifread.c memory.c version.c
- OBJECTS = $(SOURCES:.c=.o)
-@@ -28,22 +27,19 @@
- web2png.1: web2png.xml
- 	xmlto man web2png.xml
- 
--check:
--	cd test; make --quiet test
--
- clean:
- 	rm -f gif2png *.o gif2png.1 web2png.1
- 
- version:
- 	@echo $(VERSION)
- 
--prefix?=/usr
-+prefix ?= /usr
- 
- install: gif2png gif2png.1 web2png.1
--	mkdir -p $(prefix)/bin
--	mkdir -p $(prefix)/share/man/man1
--	cp gif2png web2png $(prefix)/bin/
--	cp gif2png.1 web2png.1 $(prefix)/share/man/man1/
-+	mkdir -p $(DESTDIR)$(prefix)/bin
-+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-+	cp gif2png web2png $(DESTDIR)$(prefix)/bin/
-+	cp gif2png.1 web2png.1 $(DESTDIR)$(prefix)/share/man/man1/
- 
- uninstall:
- 	rm $(prefix)/bin/gif2png $(prefix)/bin/web2png
diff --git a/media-gfx/gif2png/gif2png-2.5.12.ebuild b/media-gfx/gif2png/gif2png-2.5.12.ebuild
deleted file mode 100644
index 937a694a8ebb..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-RDEPEND=">=media-libs/libpng-1.2:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.12-makefile.patch
-)
-
-src_prepare() {
-	default
-
-	# this release lacks the NEWS file that is being used to
-	# query the release version
-	# https://gitlab.com/esr/gif2png/issues/4
-	sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.9.ebuild b/media-gfx/gif2png/gif2png-2.5.9.ebuild
deleted file mode 100644
index d0cd0123f513..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 3baa790257ed..642fd41afbef 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -5,4 +5,4 @@ DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00
 EBUILD gimp-2.10.22-r2.ebuild 5636 BLAKE2B ab208d7b8c28b52eee77ed8ba150264e7939308474a6adffa7372589f5b4d1347b1d25145d1f91aae4a05731d1a050e99cfe7700ae2ff455a67eca1cb61dfe8d SHA512 d9646bd07e014e6efa79782665b0d095b95476ede9ce15222428c53c91609b5837d925923aae8f3cad92b20043f0db98993a4b037e6bd866cd467753c49f20be
 EBUILD gimp-2.99.4.ebuild 6553 BLAKE2B d57881c19a9f742024773bf6ce2ace5612fada66e047abb4f121cd14326af8314fb3d9ca19ef47317e6908bb567a8207aabb6916208621a1e13870e2e4b2136e SHA512 f4f03298670b734e1ff69d6ee2c57e9f01f79a57236fd6b9518b67cc7f4672c0486b3e63182913826f08fc0c5e0e5d86ee844e435f5c598c86d24e0af6c15aa6
 EBUILD gimp-9999.ebuild 6990 BLAKE2B a24f11b76b68054be80cb854083aac1894049fd7a0d63b22ac0159032423c6f31295e767030a4bb48c5a63073d8a50dcde1ca43f345323c538e46a1c2344265c SHA512 f645dcdd4118822cc7149f36fd0c2e51dd40620375c72de9dbc0b6abf49916bc9fca907793ee5a97197bac7ce87561809e12364b42dd2c4ea9bd7683674c34cb
-MISC metadata.xml 546 BLAKE2B 2d5b9a68c47a72325199586a142f1d8344bef770d24738169c80958f3def3a0f1ad0b4d23774d3c458d80f17a394033813e01fc5e24b8b62146d2c55b5f8c9b0 SHA512 f654d93c738c942605ae61fe0d76972a1b81bffaf4edc23a1f55bb65e71022df7f14e769a71c41e5c5c7307eef9618a667ae418dc9bc77d5ac1299bbe0c58834
+MISC metadata.xml 576 BLAKE2B cf4bbbe0b8610a1e1b0190c58bb578cb5c0d2bc7b1350ce98b1ce091af2e6052554bad53a96e729f4de30acb231cebc5ba3bc10b92302405bb2a791bbe897024 SHA512 82fcdb57a699ab887f9b0d0a9edb33d7e7d26e3aaa88727986820cf6053a9f9d275e1227ce82bd5e0291fc9c0d9362e014c08ca0822229d717ee851970dc6c8a
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 88724f7e8aab..14bac946e354 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>torokhov-s-a@yandex.ru</email>
 		<name>Sergey Torokhov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index c8dc5d1a9588..42405e53e159 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,8 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
+DIST gmic_2.9.6.tar.gz 7304588 BLAKE2B 50afbc4d84e180a02bb920b0302dff800284c4f7bc2f11ecfcf74f4a505a3173317b670656c03c5e29149886deb238b0be17f192c019f29d43652072790e56fb SHA512 231bae405ad66e28488468d9cc0ff2d4ca7dad289b75c51d2e2984086c5b2cbe646432992be1185e533e3a8c13aa51e0a330253dbf21ec530f93d3ae83bdaaf2
 EBUILD gmic-2.9.4.ebuild 4845 BLAKE2B 998961857815fc1d5c993c96dd2ad74bdcde8353cd561bd5306e7808e2d07db73da4dbe1b020d23b85784a0cc4b0dd57e7e05ae9e530328355a32b699a90d2a7 SHA512 2cbb56d2a4433d63983b494cb5c7047054e2d320fca46b6db32c21c8abc4f389287e67f0ed522ca58a2c2e8c78013adf9df4914fb7a85335f4415284cd307d12
-EBUILD gmic-2.9.5.ebuild 4260 BLAKE2B 96fd28e34efc81a51e21aad3b89a913e4d4a5a427a6913da38f5bce4d559d995b8cbbdd08701880a61572a6f9e8c5d63ed6538a1af0aff7fb03f6ae86f5b6336 SHA512 4d908e35ad53b771bbd6373b74218480dcdc48ae94dd389e525bfa239d9faedff4ae78b151da44123a5777efad51be81743383e7b57d80412d958f50231e21f4
+EBUILD gmic-2.9.5.ebuild 4259 BLAKE2B 7596e851d7ad3b53e29c21a8e65c7f893d30bea57889237b844befe1124c8cdf9d5bf5d8fe8c71f90adbcb44d3809473214e0117877f53b2b2b85218b9756b0a SHA512 a124e2cbc12aa50bdb444114afc9b22ed85cb269c315370f75a5aeeeabb29cb11bbf17bbb8e2104fbca4c67f7b7a9e68324b455fe627c42d9cd6ede70c79b142
+EBUILD gmic-2.9.6.ebuild 4262 BLAKE2B ea9fdfb207a5a28d1d04136a916d806bab9906e0d4495dd37b29ecae0296a57d5c9f2fdfd6485ac7bfda9b7d5f104b976c4fb9232910839256c3727a115532ad SHA512 2402560d48ea661dabcb9b727d3dcb6669f71fe7270bf3986db57aa5a8f51366133d3950d748e0e631dec77c346ca9057bdd8540aef93c4d5d9bf8a20fd33bbd
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.5.ebuild b/media-gfx/gmic/gmic-2.9.5.ebuild
index cd2efec6e1b2..5e85c6f688ac 100644
--- a/media-gfx/gmic/gmic-2.9.5.ebuild
+++ b/media-gfx/gmic/gmic-2.9.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
 DESCRIPTION="GREYC's Magic Image Converter"
diff --git a/media-gfx/gmic/gmic-2.9.6.ebuild b/media-gfx/gmic/gmic-2.9.6.ebuild
new file mode 100644
index 000000000000..20cad100504d
--- /dev/null
+++ b/media-gfx/gmic/gmic-2.9.6.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_BUILD_TYPE=Release
+
+inherit cmake bash-completion-r1 toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/dtschump/gmic.git"
+	inherit git-r3
+else
+	SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic"
+
+LICENSE="CeCILL-2 GPL-3"
+SLOT="0"
+IUSE="cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
+REQUIRED_USE="
+	gimp? ( png zlib fftw X )
+	krita? ( png zlib fftw X )
+	qt5? ( png zlib fftw X )
+"
+
+MIN_QT_VER="5.2.0"
+QT_DEPEND="
+	>=dev-qt/qtcore-${MIN_QT_VER}:5=
+	>=dev-qt/qtgui-${MIN_QT_VER}:5=
+	>=dev-qt/qtnetwork-${MIN_QT_VER}:5=
+	>=dev-qt/qtwidgets-${MIN_QT_VER}:5=
+"
+COMMON_DEPEND="
+	curl? ( net-misc/curl )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	gimp? (
+		media-gfx/gimp:0/2
+		${QT_DEPEND}
+	)
+	graphicsmagick? ( media-gfx/graphicsmagick:0= )
+	jpeg? ( virtual/jpeg:0 )
+	krita? ( ${QT_DEPEND} )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1:0= )
+	openexr? (
+		media-libs/ilmbase:0=
+		media-libs/openexr:0=
+	)
+	png? ( media-libs/libpng:0= )
+	qt5? ( ${QT_DEPEND} )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${COMMON_DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0= )
+"
+DEPEND="${COMMON_DEPEND}
+	gimp? ( dev-qt/linguist-tools )
+	krita? ( dev-qt/linguist-tools )
+	qt5? ( dev-qt/linguist-tools )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.2_ipa-sra.patch
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if use openmp; then
+			tc-has-openmp || die "Please switch to an openmp compatible compiler"
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+	sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die
+
+	if use gimp || use krita || use qt5; then
+		# respect user flags
+		sed -e '/CMAKE_CXX_FLAGS_RELEASE/d' \
+			-e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \
+			-i gmic-qt/CMakeLists.txt || die
+		local S="${S}/gmic-qt"
+		# Bug #753377
+		local PATCHES=()
+		cmake_src_prepare
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_LIB=ON
+		-DBUILD_LIB_STATIC=$(usex static-libs)
+		-DBUILD_CLI=$(usex cli)
+		-DBUILD_MAN=$(usex cli)
+		-DBUILD_BASH_COMPLETION=$(usex cli)
+		-DCUSTOM_CFLAGS=ON
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_X=$(usex X)
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_FFTW=$(usex fftw)
+		-DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick)
+		-DENABLE_JPEG=$(usex jpeg)
+		-DENABLE_OPENCV=$(usex opencv)
+		-DENABLE_OPENEXR=$(usex openexr)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_PNG=$(usex png)
+		-DENABLE_TIFF=$(usex tiff)
+		-DENABLE_ZLIB=$(usex zlib)
+		-DENABLE_DYNAMIC_LINKING=ON
+	)
+
+	cmake_src_configure
+
+	# configure gmic-qt frontends
+	local CMAKE_USE_DIR="${S}/gmic-qt"
+	mycmakeargs=(
+		-DENABLE_DYNAMIC_LINKING=ON
+		-DENABLE_CURL=$(usex curl)
+		-DGMIC_LIB_PATH="${BUILD_DIR}"
+		-DGMIC_PATH="${S}/src"
+	)
+
+	if use gimp; then
+		mycmakeargs+=( -DGMIC_QT_HOST=gimp )
+		BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_configure
+	fi
+
+	if use krita; then
+		mycmakeargs+=( -DGMIC_QT_HOST=krita )
+		BUILD_DIR="${BUILD_DIR}"/krita cmake_src_configure
+	fi
+
+	if use qt5; then
+		mycmakeargs+=( -DGMIC_QT_HOST=none )
+		BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_configure
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	# build gmic-qt frontends
+	local S="${S}/gmic-qt"
+	use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake_src_compile || die "failed building gimp plugin" ; }
+	use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake_src_compile || die "failed building krita plugin" ; }
+	use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake_src_compile || die "failed building qt5 GUI" ; }
+}
+
+src_install() {
+	cmake_src_install
+	dodoc README
+	use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN}
+
+	local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins"
+	insinto "${PLUGINDIR}"
+	doins resources/gmic_cluts.gmz
+
+	# install gmic-qt frontends
+	if use gimp; then
+		exeinto "${PLUGINDIR}"
+		doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt
+	fi
+	use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt
+	use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt
+}
diff --git a/media-gfx/gnofract4d/Manifest b/media-gfx/gnofract4d/Manifest
index e2731758d2f2..a15f37527210 100644
--- a/media-gfx/gnofract4d/Manifest
+++ b/media-gfx/gnofract4d/Manifest
@@ -1,5 +1,3 @@
-DIST gnofract4d-4.0.1_p1.tar.gz 7638038 BLAKE2B c12bade5f219d2d41dc50569c0df315273b0c2a0a6a40543f48f3e4cb766512ed18b979463574db65ac443b1a8dffbcc1f3c9dc04d7c6b89881fdfcfce95c41c SHA512 d7f3a081b3681866d2da911eedab6ec74f22f36d5175a85f93751519e96971cf147b99ddcda32c597283b39e9da4f0fc6a8843331334a18efa3bf459cfd00af5
 DIST gnofract4d-4.3_p20201029.tar.gz 18270417 BLAKE2B 82d9f9528c33cf73478fa48d8692617237029944e68d9626d0c39e088b1b6aebc02a8c32a1a0e14c8d115cf3f0434940ec8a8c3d915fc9967b22f7e51353dd6b SHA512 f5844a88c41941429379efe99d1e0593a994a42d600e6e05f722c01c4ced48ceff730bf6bc797e083bd558931d39a31ffe86021eac0f0c6ec0f3047569962e3f
-EBUILD gnofract4d-4.0.1_p1-r1.ebuild 1692 BLAKE2B 3d0166786e13eec846261a767964d0d33c51fdce2f14d38e8a53bfd674cf4c8bb9fb5a782c2cfee72beb8dc95802f153ce991204f771f02b8aee8777e11efefb SHA512 54816af22aca7b54eb212f16fd208eca5dd8ef1ac2f66a811127395bcef896d344589f22112f9e74878568e58dca9b49cd5cac85768159542eb8c846d9a372cb
 EBUILD gnofract4d-4.3_p20201029.ebuild 1475 BLAKE2B f15026f582a54433bdee4b1f3dd30088b7b21b1760b905d8b20e205bc5301cd33aea19eb32d24e65787cd438cece03936abfe9618bf8d77dd15e8a7a9643250d SHA512 df41fc77faec92e3ad3e4ec4323b561471ee7affbf463851a46decec2f3a46e7a963481e1c5721942f9ffca62788d29c6e5edcc9e91af7656e5e0ad4f2e81031
-MISC metadata.xml 504 BLAKE2B b5087f6e8de7658fdb35b694f16dff28b7ecd6c600c787299df812174613a71ef605595531cb97df0e098bfcb10664c40e9e091b76a62078626d944387b2cadd SHA512 03e3638abe60e3a4350eb1770d5fdeb287e3eb83418d266b65ef839031e6eb6d82d5fb2546611038819c1fb302a69a047c9283b922bdb055110722cb4fb2f20f
+MISC metadata.xml 473 BLAKE2B 00f94873b48e2f38dd5c5098722a32628a2e71907f5aa84aaad9e5ed42b3513fcb6d9e1ca580b009bbab2583e8bd0c18adf78f1d61c48f745694d872222a503a SHA512 9a8841fd4b12d5ba954014f6218eddc4a3742de5e0306befe9b463b538d89fb55653fc883675ce267bc3fe2ded3e12a0be2834c02ff0b79b054f5a84b2a94375
diff --git a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild b/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
deleted file mode 100644
index ddede64604e6..000000000000
--- a/media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1 optfeature virtualx xdg
-
-COMMIT=bd600c20921afff7b02fc0a76ab79242ebd0896d
-
-DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
-HOMEPAGE="https://github.com/fract4d/gnofract4d"
-SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+doc"
-REQUIRED_USE="test? ( doc )"
-
-COMMON_DEPEND="
-	media-libs/libpng:0=
-	virtual/jpeg:0"
-RDEPEND="${COMMON_DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	x11-libs/gtk+:3[introspection]"
-BDEPEND="virtual/pkgconfig"
-DEPEND="${COMMON_DEPEND}
-	doc? (
-		app-text/docbook-xsl-stylesheets
-		$(python_gen_cond_dep '
-			dev-python/pygobject[${PYTHON_MULTI_USEDEP}]
-		')
-		dev-libs/libxslt
-		x11-libs/gtk+:3[introspection]
-	)"
-
-distutils_enable_tests pytest
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	virtx pytest fract4d fract4dgui test.py
-}
-
-python_compile_all() {
-	if use doc; then
-		ln -s "${BUILD_DIR}"/lib/fract4d/*.so fract4d/ || die
-		"${EPYTHON}" createdocs.py || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	if ! use doc; then
-		rm -r "${ED}"/usr/share/gnome/help/${PN} || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "Optional missing features:"
-	optfeature "creating videos" media-video/ffmpeg[vpx,zlib]
-}
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index d11e338560d8..dbb54e8308e2 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">edyoung/gnofract4d</remote-id>
 	</upstream>
-	<use>
-		<flag name="doc">Install user manual</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-gfx/gnuclad/Manifest b/media-gfx/gnuclad/Manifest
index f65b0c633738..a5596140c7a2 100644
--- a/media-gfx/gnuclad/Manifest
+++ b/media-gfx/gnuclad/Manifest
@@ -1,4 +1,4 @@
 AUX gnuclad-0.2.4-werror.patch 391 BLAKE2B 976bcc89bf56580acf13de66f1b540f06be7b0b6176c23cb9ff18bb3549737a417c26754286ec18593ba5c12e2d2ae87f4b02d08a94c7ee802bac2caa7b1914f SHA512 fc3680bec6a41d5f6b948d59990916add09654fca38e2193e34174838a24a439d9d8123f15dc2b2aa30a1cbc763bdc2025e1bfcdf3b1a1a112b6f8d8d5454b26
 DIST gnuclad-0.2.4.tar.gz 287763 BLAKE2B e70a16b6e2d032cfc0d79b7ec68386e1e70c98d4c30cd046157d4bac42fd9f91ad56fe18bc78a2380055ff952227572016381a5a6bbb88a74f6eb9e187d5d39e SHA512 881b1feab8cb7458223987c5a36359e31e7e00e94d60cd0002c289930b99236947aadbea40f96aaa6aa4b5d7953278bf581edbd6df3cb660bca1505950e66b67
 EBUILD gnuclad-0.2.4.ebuild 594 BLAKE2B ec2072f392436c07d1f2cca4c8aeb4aa8c61d5f62c9426d95d21df35fc3ad78c3250a782240607007af071d248fe5ba3b6d9e78876ed72e5cb07b01c7b355db1 SHA512 080ffef8684b3147e9977bcd0a192515cca30b9779b9d0bd4f7893caf7c14f2ef2510d1f01c2f62c7cb14d72ce7a8fef2e1f074e06db883f830a339d0a6badab
-MISC metadata.xml 339 BLAKE2B 289743dbfe86bb16fbf2b479b1c5c2767b99019f2f43da5d0ceae35cb561dc33fabb728ceb4d709ab8965a1f6b0b51fe63c5dacc68166e8fab41b3b89a458af0 SHA512 a7b03367e25abd644a51dd72a7d21f3cfd571662233afc1094434373865ed01e2865b16f7e02f313448be372306be2ec842ea03e5015d68657b2c926fa365628
+MISC metadata.xml 339 BLAKE2B 3f8e3ba5bb3fc795ea8f1fca8ab94889f38398260984b1a54b26916dd5c31d3af028867e33735eaa586165e9b952b449bad8d7e27578335b5422f6eaaa987de7 SHA512 15e8a8f12066f1f44e7ecc9c3c61fbadc9dc499ff2b6be34c26b256406129ea8fda121b7b429c1ff86741583faec24b73f8e3b139c2b84baebb2e7e3933047c2
diff --git a/media-gfx/gnuclad/metadata.xml b/media-gfx/gnuclad/metadata.xml
index df2c9cb19525..2cf5bd315939 100644
--- a/media-gfx/gnuclad/metadata.xml
+++ b/media-gfx/gnuclad/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/media-gfx/gpicview/Manifest b/media-gfx/gpicview/Manifest
index 184a7383ebd1..c70d288759fe 100644
--- a/media-gfx/gpicview/Manifest
+++ b/media-gfx/gpicview/Manifest
@@ -1,4 +1,6 @@
+AUX Fix-displaying-images-with-GTK3.patch 6119 BLAKE2B 84733027ba1740eb78e4d62e67b6ca0dbae58dfac1c3bf44b1dd07a7b33248a255728e2b9c6b87f534ef1463b20d2f5df8f2e07bb619b97b428fc14e9f8939e4 SHA512 6eb044a143acc0decd64f90578b98a41a82c05a0bbf90e35646af1007e685d0d37a08ad3e90674bc6b5fedf460695b27f771a2776bfb391af03f6c1674592060
 DIST gpicview-0.2.5.tar.xz 349536 BLAKE2B c215e812693a30d55d3e606b9958d308b5d7f564ba0c3fc60e7606c492ec3ddd9997ae63f0865a6bebdf79c0a18e6a8b26a1e2c8d5dd7e2174d211130dbbe817 SHA512 afc7e67c7ae1252f9c1816ee46fe69e96ea7be9a60e03406a539f17b2e4f0e4b93a028c6f3f1c455f5433d6d7d78a58dcee2cb0ac91ea53093a21935bf454afd
 EBUILD gpicview-0.2.5-r1.ebuild 652 BLAKE2B 543b90065074488e91faa5ae0f310d10a0bcd84913c3a0143f9fce8c367c8a6b1659c69c2b824c012b889163a5afce282d5b49f38fa7c7352ebcda245fb448d8 SHA512 5b7a0856bb9cfa2296c4d588bb4e2232204c50955928a10f6c94507aba495452937b89ba5d49bb32fcbdeb7a92ad938aa70ba638e14ddf41396972f0e47b053c
+EBUILD gpicview-0.2.5-r2.ebuild 580 BLAKE2B d3637083f6dc2f4e0b5b83ab113089470f6095b6aeaf52e06909ca30cf63c9b95a5532ddcdb575573f9794603d296d5e146b115e4ad82c47990712d3e472bee9 SHA512 b3a64073f6fa8fad7c1c21077c6f2b0f4da2884e5cd8954e390a661a3c8ec4bbdcd7e06272a922522d102114e7acd88495502887b1e8aa10d0be36380ff6bc24
 EBUILD gpicview-0.2.5.ebuild 548 BLAKE2B 7402a49ee6252fdc380528d96b8fb251da0f2f10c21c87867f8376630bceeaf025c26a2cf9b926be879184849c5786d752a4f42570e7f9b1a5de6feffd86ed5d SHA512 c65d2217ad28d00169b53997497ed000d0fd90d42c121071a69e7c7ff5d4305d8169c3b749409afa0aaa1fd3a3bea76a2ab33ad5e92e45940a7f93d24f6e00b0
 MISC metadata.xml 326 BLAKE2B dbbd9ecc73f5ec8f23b39346f657c68efd9b673e1faee5930e503a9a5694cc9f8931a97083e282006a931a30bdb577d1b347b6c2a8dd3cc959011e4837dab9be SHA512 0a80530a6a1e3884352fb68ea8e4f0cd0fbf685201ef28de590233fd43b111c23f6f5a2a3eccc450c0bc9f08d58c565c90e80f04418cbf8880b101f93ca1aa3b
diff --git a/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch b/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch
new file mode 100644
index 000000000000..b832d364b3ed
--- /dev/null
+++ b/media-gfx/gpicview/files/Fix-displaying-images-with-GTK3.patch
@@ -0,0 +1,172 @@
+From 2a497a06d9297712778b9bfde3f21a2bd867967c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com>
+Date: Tue, 21 Feb 2017 01:06:06 +0100
+Subject: [PATCH] Fix displaying images with GTK3
+
+We have to use the cairo context provided by the draw event, otherwise the scrolling does not work properly.
+
+Don't paint the whole image when scale == 1, it's unneeded and slow.
+---
+ src/image-view.c | 86 +++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 44 insertions(+), 42 deletions(-)
+
+diff --git a/src/image-view.c b/src/image-view.c
+index b367f2a..820b843 100644
+--- a/src/image-view.c
++++ b/src/image-view.c
+@@ -24,11 +24,10 @@
+ static void image_view_finalize(GObject *iv);
+ 
+ static void image_view_clear( ImageView* iv );
+-static gboolean on_idle( ImageView* iv );
+ static void calc_image_area( ImageView* iv );
+-static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type );
+ 
+ #if GTK_CHECK_VERSION(3, 0, 0)
++static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type, cairo_t* cr );
+ 
+ static void image_view_paint(  ImageView* iv, cairo_t* cr );
+ 
+@@ -37,6 +36,8 @@ static void on_get_preferred_height( GtkWidget* widget, gint* minimal_height, gi
+ static gboolean on_draw_event(GtkWidget* widget, cairo_t* cr);
+ 
+ #else // GTK2
++static gboolean on_idle( ImageView* iv );
++static void paint(  ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type );
+ 
+ static void image_view_paint(  ImageView* iv, GdkEventExpose* evt );
+ 
+@@ -268,16 +269,13 @@ void image_view_paint( ImageView* iv, cairo_t *cr )
+         {
+             cairo_rectangle_int_t rectangle;
+             cairo_region_get_rectangle(region, i, &rectangle);
+-            paint( iv, &rectangle, GDK_INTERP_NEAREST );
++            paint( iv, &rectangle, GDK_INTERP_NEAREST, cr );
+         }
+ 
+         cairo_region_destroy (region);
+-
+-        if( 0 == iv->idle_handler )
+-            iv->idle_handler = g_idle_add( (GSourceFunc)on_idle, iv );
+     }
+ }
+-#else
++#else // GTK2
+ 
+ gboolean on_expose_event( GtkWidget* widget, GdkEventExpose* evt )
+ {
+@@ -390,6 +388,8 @@ void image_view_set_scale( ImageView* iv, gdouble new_scale, GdkInterpType type
+     }
+ }
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+ gboolean on_idle( ImageView* iv )
+ {
+     GDK_THREADS_ENTER();
+@@ -435,6 +435,7 @@ gboolean on_idle( ImageView* iv )
+     iv->idle_handler = 0;
+     return FALSE;
+ }
++#endif
+ 
+ void calc_image_area( ImageView* iv )
+ {
+@@ -460,7 +461,11 @@ void calc_image_area( ImageView* iv )
+     }
+ }
+ 
++#if GTK_CHECK_VERSION(3, 0, 0)
++void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type, cairo_t* cr )
++#else // GTK2
+ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
++#endif
+ {
+     GdkRectangle rect;
+     if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) )
+@@ -470,51 +475,48 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type )
+     int dest_y;
+ 
+     GdkPixbuf* src_pix = NULL;
+-    if( iv->scale == 1.0 )  // original size
+-    {
+-        src_pix = (GdkPixbuf*)g_object_ref( iv->pix );
+-        dest_x = iv->img_area.x;
+-        dest_y = iv->img_area.y;
+-    }
+-    else    // scaling is needed
++    GdkPixbuf* scaled_pix = NULL;
++
++    dest_x = rect.x;
++    dest_y = rect.y;
++
++    rect.x -= iv->img_area.x;
++    rect.y -= iv->img_area.y;
++
++    int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
++    int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
++    int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
++    int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
++    if( src_y > gdk_pixbuf_get_height( iv->pix ) )
++        src_y = gdk_pixbuf_get_height( iv->pix );
++    if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
++        src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
++    if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
++        src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
++    //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
++    //        src_x, src_y, src_w, src_h );
++
++    if ((src_w > 0) && (src_h > 0))
+     {
+-        dest_x = rect.x;
+-        dest_y = rect.y;
+-
+-        rect.x -= iv->img_area.x;
+-        rect.y -= iv->img_area.y;
+-
+-        GdkPixbuf* scaled_pix = NULL;
+-        int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 );
+-        int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 );
+-        int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 );
+-        int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 );
+-        if( src_y > gdk_pixbuf_get_height( iv->pix ) )
+-            src_y = gdk_pixbuf_get_height( iv->pix );
+-        if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) )
+-            src_w = gdk_pixbuf_get_width( iv->pix ) - src_x;
+-        if( src_y + src_h > gdk_pixbuf_get_height( iv->pix ) )
+-            src_h = gdk_pixbuf_get_height( iv->pix ) - src_y;
+-        //g_debug("orig src: x=%d, y=%d, w=%d, h=%d",
+-        //        src_x, src_y, src_w, src_h );
+-
+-        if ((src_w > 0) && (src_h > 0))
+-        {
+-            src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,  src_w, src_h );
+-            scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, type );
+-            g_object_unref( src_pix );
+-            src_pix = scaled_pix;
+-        }
+-
++        src_pix = gdk_pixbuf_new_subpixbuf( iv->pix, src_x, src_y,  src_w, src_h );
++        scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, type );
++        g_object_unref( src_pix );
++        src_pix = scaled_pix;
+     }
+ 
+     if( G_LIKELY(src_pix) )
+     {
+         GtkWidget* widget = (GtkWidget*)iv;
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+         cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget));
++#endif
+         gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y);
+         cairo_paint (cr);
++#if GTK_CHECK_VERSION(3, 0, 0)
++#else // GTK2
+         cairo_destroy (cr);
++#endif
+ 
+         g_object_unref( src_pix );
+     }
+-- 
+2.11.1
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
new file mode 100644
index 000000000000..5b657769e158
--- /dev/null
+++ b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg
+
+DESCRIPTION="A Simple and Fast Image Viewer for X"
+HOMEPAGE="http://lxde.sourceforge.net/gpicview"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+
+RDEPEND="virtual/jpeg:0
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/Fix-displaying-images-with-GTK3.patch" )
+
+src_configure() {
+	econf --enable-gtk3
+}
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 1a02dd3781b5..ac6e0560b5ca 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -3,4 +3,4 @@ AUX graphicsmagick-1.3.36-flags.patch 2009 BLAKE2B 1d58f03cfeac9be92e2e85a2b6274
 DIST GraphicsMagick-1.3.36.tar.xz 5600712 BLAKE2B 069ab4f9bb5beea3321860bf8e43c8a1b51ab102054e92486375209a86fd3c1c1fb44d4b2c43a65c78f36e9f37e09316fe77b4f261bfb0af3b2c2a86ff8b5aa5 SHA512 27ed5fcbfb0303436bdcb0f11d18257a967d471251b51e633e2c655b0a7e5ed01f61a61f9702cc7d4c02714e005ac18ca9ba0f690c0580e41d07947a03c5cbb4
 EBUILD graphicsmagick-1.3.36.ebuild 3164 BLAKE2B cae9c965cfac059d0c065866f117f49761e0b0f49c0cd1d718d5cbf195f30f0eabea216f9cfaafe549ea4ab437ec97c5ab21d5cc0afdca17ea9952b9334668e0 SHA512 caea74a3f09a26518841fffa306ecd62ca50f6be8de25014ae649cbfa3465c8742b11c69109a5335b544670865ea7592639ffd2f69064ba4016c97b65fd2e80c
 EBUILD graphicsmagick-9999.ebuild 3171 BLAKE2B 7ec34831b9d3297e7fe1acf566f735fb733874da436d0a5346b40021e7a6485c08fd8b112ed149a26d8c8276ffdf2eaa75c34c8f19dc9198904b239c0213197e SHA512 a931780d798844c966fdf35afe2698da6085cee5bec3882349947d7c29c08770272918fe47e615ac68267f916f5ef626db0383400977fe6bf33e07bfcae84109
-MISC metadata.xml 1071 BLAKE2B 899c521ae7916dc5702bada0b782b3020084f84397f0ab62aa4ac15d14d74045ee3dca8b9c9c98591481502694a59e33fcfd8467b7da836a8ee16fb16fbd4727 SHA512 50d6c48e7459d3772d0b804785f5b40cce16bc7a1ac6602a1d5475cd5616e725aa111385eab50a5347418073f1c7afc03f66aa4fd8959474835d899b22c9bca8
+MISC metadata.xml 1276 BLAKE2B 4784c9dbeb0760b1b0b8f83672a85dc318d2829dcfbe547b0e25da66128194db0662efc77bdced2c12e0219df3f6a660273d7966c8b2f320b320cbb3c210b814 SHA512 17efe89b6dcc8e93b7b4849af215210faf64e95ec34f39accf58bc2c9397818389126fe7de7ea0f2091a9e24cf282dc33b4c65b69545e8a8c19b2de57280325f
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 8e4554b3141f..c298b7684be2 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+      <email>sam@gentoo.org</email>
+      <name>Sam James</name>
+  </maintainer>
+  <maintainer type="project">
+      <email>codec@gentoo.org</email>
+      <name>Gentoo Codec Project</name>
+  </maintainer>
   <longdescription lang="en">
   This is a port of GraphicsMagick(TM), the "swiss army knife" of
   image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/gscan2pdf/Manifest b/media-gfx/gscan2pdf/Manifest
index 4837af683b30..1077e72e5d9d 100644
--- a/media-gfx/gscan2pdf/Manifest
+++ b/media-gfx/gscan2pdf/Manifest
@@ -1,7 +1,5 @@
-DIST gscan2pdf-1.8.11.tar.xz 409212 BLAKE2B 37cb716f13818eaffc39c210b810b845368cc5e323569e8f9d5603b5b412c4182520798321358e4c21339fdbd5f15026a0acd6421a49e7db79ecca86633c3ab0 SHA512 1ea09b8768771be4a1700cb8a6523d5f74fcbf0ebe459d97796032b56f896fd0c50e5ca1ed4c96aedef7e61f6952a92986153cc70173dd5ad91ccfb72461c565
-DIST gscan2pdf-2.10.2.tar.xz 489484 BLAKE2B d699b471bcf701a83e87d982b7faebeac4a420083df35d875405483ea05fb4b28c9626c7b662629130801852a1602d6a90ea9627fdeebfd42ec25cf57a4e7835 SHA512 807af9af9c1451f761e1f64a0ebe132fc98252100202c0af0dea53210cd30bed5f4c293a8f5f52b03b493422053420c1506ca32a34515c90b7a5290837bc686a
+DIST gscan2pdf-2.11.1.tar.xz 494704 BLAKE2B c6773b3fadd7765074c5401ee22b46c7056a51a77b10bb769149428b6dbf4503c4fb8df96d9820c8f24a49b20e28c5e0796e835dfbd64272b364a83e64fd0ff1 SHA512 79ce0a3e032286bc1365e4355fdde57e321645a375a6310c1c59588a0d2cca0a9ea9a1e0462a2df3936e96a69fc0a6e32eb09f0c4207fca102d0f06cd5e50ac7
 DIST gscan2pdf-2.9.1.tar.xz 484740 BLAKE2B e75ac6a5296ba2f89838ae9c95dc0ceb592ea8ffaf8d89a0635043e07fedbdcf97df26ac810556da7d0e0306eb7aaff76dc18162c6a5f89cb1953bd623a594a3 SHA512 4fc3107c871a7915ebdc023476b1159c0fe03934f1a52a417a5bc285be46f7db0ed38ec4cf015b15953c728ef19d1f4f30207d418b655c950bfb64ddc5d23237
-EBUILD gscan2pdf-1.8.11.ebuild 1732 BLAKE2B 6f1e069c628d5d3abbb137c7e248783881122eed602420b0d43461b54fb8c7395cf1f40f30b42bbd8577121305b3405f486666fb76e64bb20fab381037bb079a SHA512 6bc6808d5c18b208a2b1a0ffb8778c2a4db0b99b531ea7e861a9739adaf42d5a1aaa8fd95e95ee2c930e1b435113c247f1ecca143b9fcb7fb98d78d7db10fcc0
-EBUILD gscan2pdf-2.10.2.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94
+EBUILD gscan2pdf-2.11.1.ebuild 2953 BLAKE2B 8d00bdc4e43d93e79702322277b82d951c2ccf63a9a6fa43614c9e3a218af3661f22665ae442e3996a84388df98817084355225642ef5bc5c8b11f44d85cc47f SHA512 0d3e90cc07b9ace473ae6758236ac867a562be3e6092342d8abcc97c61781a7cc1f1ab70ae3f21c1adfacc1925a43342ce2aa8b137e3eaf65bad1736e9bf0c94
 EBUILD gscan2pdf-2.9.1.ebuild 2801 BLAKE2B 5ec319fceae00a20a15caae9cf019691523680bfa734bae36c8cac7117455438beed4c56fc79a570e87b2d4860b12a62c0fe6fdb49e1e26b24c7a58b493cfa91 SHA512 9f7b98317da72d4abeb6cd64719ddb9de39fa5505d955c6543b7ab76ba0db18c0a7e20261c6c0b7e025272d336c98126bc87c2a32f84a811d6d11649a7dd0aec
-MISC metadata.xml 439 BLAKE2B 835480b0d68a079941e94f2646d0136dfb8a8e750e0279f8a5a2e23e6690242582ffe660798f5e80ebfb4378a576aa5715332b53230555866391a99ec28f54ff SHA512 af1cc05ac693899586df81036d2fa11af187edbb3c9449862298ba05efd0dbd0c4c5b008a1a21328c1f9a27a690671bd7a9967d2e457efb31561044e45984401
+MISC metadata.xml 469 BLAKE2B 6d8cb7adfd43d79b53f341b8e2082d595e0bd3558f16d392f5ed1c3f546a35d756b50e5703d86bc4fddd3be76ed4155e6d67136102cdfafb987e43f85d370808 SHA512 63a285046bafa848d3bd50327266afcc8eec08d9c2130c6b07faee85457878e1348f9d1b22c4ef7c4578a759eda024315005051827af57266adfb8b5cb9c3492
diff --git a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild b/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
deleted file mode 100644
index 4052a9af56cc..000000000000
--- a/media-gfx/gscan2pdf/gscan2pdf-1.8.11.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit optfeature perl-module
-
-DESCRIPTION="Scan documents, perform OCR, produce PDFs and DjVus"
-HOMEPAGE="http://gscan2pdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# OCR tests fail with tesseract[opencl], not fixed by addpredict
-# and others on Wayland and the console
-RESTRICT="test"
-
-RDEPEND="
-	dev-perl/Config-General
-	dev-perl/Date-Calc
-	dev-perl/Data-UUID
-	dev-perl/Filesys-Df
-	dev-perl/glib-perl
-	dev-perl/Goo-Canvas
-	dev-perl/Gtk2-Ex-PodViewer
-	dev-perl/Gtk2-Ex-Simple-List
-	dev-perl/Gtk2-ImageView
-	dev-perl/Gtk2
-	dev-perl/HTML-Parser
-	dev-perl/Image-Sane
-	dev-perl/Locale-gettext
-	dev-perl/List-MoreUtils
-	dev-perl/Log-Log4perl
-	dev-perl/PDF-API2
-	dev-perl/Proc-ProcessTable
-	dev-perl/Readonly
-	dev-perl/Set-IntSpan
-	dev-perl/Try-Tiny
-	virtual/perl-Archive-Tar
-	virtual/perl-Carp
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long
-	virtual/perl-threads
-	virtual/perl-threads-shared
-	media-gfx/gtkimageview
-	media-gfx/imagemagick[png,tiff,perl]
-	media-gfx/sane-backends
-	media-libs/tiff"
-
-mydoc="History"
-
-pkg_postinst() {
-	optfeature "DjVu file support" "app-text/djvu[tiff] media-gfx/imagemagick[djvu]"
-	optfeature "creating PostScript files from PDFs" app-text/poppler[utils]
-	optfeature "adding to an existing PDF" app-text/poppler[utils]
-	optfeature "Optical Character Recognition" app-text/tesseract[osd,tiff]
-	optfeature "scan post-processing" app-text/unpaper
-	optfeature "automatic document feeder support" media-gfx/sane-frontends
-	optfeature "sending PDFs as email attachments" x11-misc/xdg-utils
-}
diff --git a/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild b/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild
index 412081e98a73..412081e98a73 100644
--- a/media-gfx/gscan2pdf/gscan2pdf-2.10.2.ebuild
+++ b/media-gfx/gscan2pdf/gscan2pdf-2.11.1.ebuild
diff --git a/media-gfx/gscan2pdf/metadata.xml b/media-gfx/gscan2pdf/metadata.xml
index 79c9ea23cc9f..7b38aaacf797 100644
--- a/media-gfx/gscan2pdf/metadata.xml
+++ b/media-gfx/gscan2pdf/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>aklhfex@gmail.com</email>
 		<name>Chris Mayo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/img2pdf/Manifest b/media-gfx/img2pdf/Manifest
index 734118adfedb..f074a2f9b843 100644
--- a/media-gfx/img2pdf/Manifest
+++ b/media-gfx/img2pdf/Manifest
@@ -2,4 +2,4 @@ DIST img2pdf-0.3.6.tar.gz 91006 BLAKE2B ad89b42be4613c30383770f336b07773bf13e870
 DIST img2pdf-0.4.0.tar.gz 107027 BLAKE2B 0bf13e2d4a5aff68779130bc14100a5c6d1ac4eaca9da28ceb50104550b6e4331f6a2202514bcdac0480c0148794d18e9f2dd46ded68bbaa301a207460f91c85 SHA512 bab9ee6ef5273a686cb10e52bdeb62b6df3c0da99d0f0558677e07dc7ad776c2d62829a2f5e9c5639acfb9fc6e9c5e3a81aed42dc288c2a39d245775f1d4391b
 EBUILD img2pdf-0.3.6.ebuild 561 BLAKE2B 2a2400caf780866c957a7f102bf587eab18fe4f3906b585d24b173b07ccb8f40e9c29844e5e40a58d8555707e0943fea7ae098f2e186133a08cbafb1e14f9621 SHA512 6d03d49992770664c2cd3cbd25e6416d07bce3b084c5ea8ef45863b6f0beb5d8d0f9d07e03ab10f2c56f373fbda308d02a98927cebae89e0d5fe9132662e6429
 EBUILD img2pdf-0.4.0.ebuild 1234 BLAKE2B 121a5c328b846954b7b10ecc4f0561677f260fdd109b672ca3d76f547cd0362cd34794f8d5b599e1d39ef226b64beb5d54669cbb4777794d112b79f9402d6df8 SHA512 4a0e069457d40140e05e4a8caca931d8da22fa0885d16f5b2ee9279ce8654ee0c1b4a77db1cdb615b1b415dae52d33f79897ead0e324379cb2a1c89206d468a2
-MISC metadata.xml 1120 BLAKE2B df864ac9c560f0e55a889701014713ecc210b15b094ad729b94bfbe29fcadbf6d31f37d4b2761a538fa6e4a9617a0b030f487b2e2d5c3b347d834a2c287f07ec SHA512 825a15bf571a32a1b458a4d731fdc578ac024f8a067ff61e9cdd85066fcae5f92bb48a3fcb4bf0e78c5b01f5d4550b6a3b7bd6c1951f7e7264fb4c8078c216e2
+MISC metadata.xml 1150 BLAKE2B c2965f6da972330edd169a1503dcd77cfab0b870a5a6a3cf5727e80692088ceac35b559bb52580e50a70c1298eaa3484cecb380b912636fe5262f7c95e2dd19f SHA512 bab59fd09cd1eee4fb3f3896f9c0553a89ab878f9cb34a87efd324467712958bf5213c8e9d3d5de84b7a39d09c6e4d5dc0bc15281896c09da2858446761217d3
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index ca964c7924b5..892d1db997b8 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sir.suriv@gmail.com</email>
 		<name>Diogo Pereira</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index d8bbe22472e0..71ea7c5ae0ae 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -5,4 +5,4 @@ DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d
 EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd
 EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5
 EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d
-MISC metadata.xml 662 BLAKE2B a0da452f9b0ae95ba99c7b3b05ad2a4b3530c25f1ed833bc3d394e409d80d44310d58684735eccfe522aa452d94c6a362bc3210dca7790960a571c0425cdd2c0 SHA512 3a7c33c7fc5cf71e874546212bc90e8969d112b3b2bb2b15564fa42e980ba18be42ddb14f57db508a45ea62640b625d0d84a2274617de08150058c86e6bbb266
+MISC metadata.xml 692 BLAKE2B 075c4adcd3f302d2aa23e6e67213baf23ebf4665b1fb40b6e3de390715bbbde163ff3e596785b74840db74f3cdf24324c2e718de19d4ea5f280130320fe586d9 SHA512 65f74a9aac990f9977534b2ea39fbdf1499f5b5645bda71ea26cb78efa3cd92f22ba38261b272bd64176e1d8528a8639aedc24e96e4a1444d00ca6c6936e24b3
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 196a224f7464..f403e4f5cf5f 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>sudinave@gmail.com</email>
 		<name>Ionen Wolkens</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 46cf19366bdf..5be319b67b55 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -23,4 +23,4 @@ DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f
 EBUILD iscan-2.30.4.2-r1.ebuild 4000 BLAKE2B 9d315f3c51ba848fda0feea5a22d004cb6010112cba8dda3372bac5a9b9ecb6ee7aec3d9cee254ba0e77305eee99be1bb342180c71a6a8048c0625cbe1b10aa6 SHA512 b42e39b888418f016a2a147aba40a3241a75d7930132a8290163d2ea4e57ee7bf57125d6382229440cf3078482f3a7f2158575d28353ae1d7d9a69bb5f389043
 EBUILD iscan-3.63.0.ebuild 2899 BLAKE2B fa560b7857120e9180165b2d72161cdd3705fa8002b93022ef675a2df1ed22852453a72199e67e2bbe3ec08402860700eff9c76f6d0bd406441dfd64a57ea150 SHA512 72991e80c75e6d86362adedf76c63827b0752da2815ccdbbe72ecd84c621a5f733f3a8491b07a0452ac09f236fd24c866f52a03d46dca5b72e200c29bfe3ed30
 EBUILD iscan-3.65.0.ebuild 2899 BLAKE2B cd559e4c31210618297d7a70f4713a8b9d806f80eb20f508b1af1e27a4abb03755edc9654fbf8b0c835f5f41b72a4ce3e3d4a2592d1c7c1d5ce08200793b21b1 SHA512 b5a93e50d29d8a3ed3d85377affc23a3710a0e7392a7e15025ecde99969f544699a6d35a1efcc4f7515e59b51444010289a7a0f85e4a834fb48a4c43968d218d
-MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
+MISC metadata.xml 960 BLAKE2B 7389b413fcd67894c73c6f0bee48fdb999a2020516a4cd892c02852ed72d07c436c46fd29541701da59859a6528aa110fcd08cd1c250f2017a9407c05b0cc1e9 SHA512 65955c2c44b37e2cdd62266e46b4343cc22dd16e9d40f08f1611e7e42448677030945ad4e0ffc663c3f5b3bce8532040bff4c055cdc7c458fefb9b5f95bad902
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 650852b4e4f6..38f698177cb2 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>marcin.deranek@slonko.net</email>
 		<name>Marcin Deranek</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 95ba5775c52e..57f23a25c7a7 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,3 +1,3 @@
 DIST kuickshow-0.10.1.tar.xz 896900 BLAKE2B 50e6bf055a76d0668fe6f92d411610908e9098b5cb14df89403d7e6462941e137390e14a6828c790c1b7067b9f596e70c40d40e2a64c6a0887b1f11251911219 SHA512 c2d812a0e97be1b5b0db1f6c90dc1347be2ffccd48403b46e637549b608a395cdcdb6b36e842b1c5039d18861cfbafd4dc7283bb69f530548a3b5193a586d4dc
 EBUILD kuickshow-0.10.1.ebuild 1093 BLAKE2B 8e348ee2bdacc91715665889986074da4ecdb5ddc3174c39f7dce247e8d6d0d389a41b4fca8688c9c08e39b09913a9c0fd27d67d119f294a0b5a423f1384f89e SHA512 7f4d1d4d32edb2859786c777872ed3e9126d991b4ad2c1240c21cb9a474777aa7cd9f57b2bd1e3252615523fa97995d84ad2da309e71f48030589a5607bd4de5
-MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
+MISC metadata.xml 398 BLAKE2B aed31745382f12d6c97f524780103c48078a618501d3ed4ea2845e6e4d7fa74090d46a043527162cf3183e2d1ddcde9f500729f2efccb958ffc03c7250d5da62 SHA512 cc4d87aea5776c4bd51fe4f86366acba9cb96a1657651ea5ba4610d361804acbb8046bff4dc75c2b72f98e69b3fb7be468119d1d760e2d75861cbf7e35e0a54d
diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
index dacb6f1032b2..6a59662bba65 100644
--- a/media-gfx/kuickshow/metadata.xml
+++ b/media-gfx/kuickshow/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>chrgerloff@gmx.net</email>
 		<name>Christian Gerloff</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 101075428227..c5152e08b152 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,10 +1,8 @@
 AUX libimagequant-2.12.2-fix-pkgconfig.patch 840 BLAKE2B 6b16c3b0a7b916c60814817b69a9d653802e67da5d3431dd0bd00bea21cea7eb60a6d046ec380fc68ca25182c1863a81336f0c76259bb8fcdeeb30644eca06cd SHA512 bb0b1a502dee7126cf64e48628469729a12abafd9a9f58cb76b18d250cb578a49e38c1b05009173ebb4acfbf54e2696f0fa5f7f660248653a8bb8600843fa157
 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
-DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
 DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
-EBUILD libimagequant-2.12.2.ebuild 1403 BLAKE2B 40d79a5387b2091818a33cf3c5620558fa9543f9e75a76a7ed310ac751bd2a8b5f592340f591a831f68604873365b6141c7d388552d31162e1b259df8e7bfa57 SHA512 268b848f7d11fe9568b13a2b90b57e5f6369cad1f8043d47ef06c8ddd05909e9da83844b2ef6367125bf2c7e86a158fd82ab99ec257b5a290e90fbb9bdf5fb58
 EBUILD libimagequant-2.12.3.ebuild 1409 BLAKE2B 6a922a5bf768f0736c5aa8b22ae53255e6ea54ff577f66503e954ed2601cb26576f125200c922d940663a69dbc6335f6a4c5d372f0deda449e181a50311eb497 SHA512 2c5fa9f2d558d640adb39f3569a4f3b230210d5e18c0cada7a2bfdd56a3d98680b8d2d286c0aa17c06eb2dbf3c648281d13f887a9174de96a287f76da7907d77
 EBUILD libimagequant-2.14.0.ebuild 1247 BLAKE2B 92006ddcdecbd884658c8c95014efb3e0213762c6af664dcaf3785dda29637f1515e68bbbc9398aba926ecb17460ec4eff80e82c3d32cee6c66c4cd162f91abe SHA512 630037675eada9f300fc5db6fac53e626ee92f3374e507298c195d0c887af8321ba4b68debc35e4c21bd8cd07ab34ffd5e452d002a95c44b50cc71792f42d940
 MISC metadata.xml 430 BLAKE2B 026b07580a573d4221658d920a91ef9a48b74b1b3314250413e16027fb45ae30589ae800f064f8caaf3117b6e9439202554f04394fa3d30d419c61e8a60dd588 SHA512 968098402f9783f65232dda56e60013050eca50176347beb3f40814509f9540879480ce9dd5480c62f1ae9ec9e3059414b620314bff611830d4148974cbb1e5f
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
deleted file mode 100644
index 5ecbf05fe927..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
-	"${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-	tc-export AR CC
-	# Hand rolled configure script, so not all flags are supported.
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(use debug && echo --enable-debug) \
-		$(use_enable cpu_flags_x86_sse2 sse) \
-		$(use_with openmp) \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	emake shared imagequant.pc
-	use static-libs && emake static
-}
-
-src_install() {
-	dolib.so libimagequant.so
-	dolib.so libimagequant.so.*
-	use static-libs && dolib.a libimagequant.a
-	doheader libimagequant.h
-	einstalldocs
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins imagequant.pc
-}
diff --git a/media-gfx/metadata.xml b/media-gfx/metadata.xml
index 3e62cd89181c..368e59219497 100644
--- a/media-gfx/metadata.xml
+++ b/media-gfx/metadata.xml
@@ -29,4 +29,3 @@
 		Kategoria media-gfx zawiera programy graficzne.
 	</longdescription>
 </catmetadata>
-
diff --git a/media-gfx/monica/Manifest b/media-gfx/monica/Manifest
index 86280a884b1c..0753de2717b0 100644
--- a/media-gfx/monica/Manifest
+++ b/media-gfx/monica/Manifest
@@ -2,4 +2,4 @@ AUX monica-3.6-makefile-cleanup.patch 907 BLAKE2B 13cf4d1a4950074f8909045fc0acd3
 AUX monica-3.7-gcc44.patch 341 BLAKE2B c534884cca357cbc37a0092bb42faa9a3f29165e0e5622d811d08f4238a2d716f91a8ce731438a33323dd350e3b9da79e743b7d3f46fc5ba9eb084b14f359bd4 SHA512 837f3fc2c77d415067460f1aae80807daa9882b814494f2305be711db920a750ae183ec7b456527956b60ca3cf022729524990cd0febafeaab41bd1dbb080bfb
 DIST monica-3.7.tar.bz2 18330 BLAKE2B 26c5539d00867fd6ee80255a41fa363ee8cd3a720637b1b83546bfe9bf877f5b521ea47da456d965b65f57d7a351bc7c5dfe310ab9608b67a8db7b2b4d9cd1af SHA512 87565f33f3c3492b196905e5b8e17bd45a7eb8eb0a0281f02e23337eec888af82571ac6f2d229256ee97012d402b7f1b217cd56a8b87ff9c9296931bf63cb153
 EBUILD monica-3.7.ebuild 718 BLAKE2B 50a1d50df2df9ff18ff9735b542b85cd5e5748f3e4dad8dcb66e03f4f76684d74e7899e130820eabd46cb31a29707ecc3822c930700370a704336d5868d6466f SHA512 56aaedd0adea9b91c69162ef8837caa4a1ddb472cf6b1e5aba251f30f11e8f9926b18902f8c1cd9ed7ce8393dea363162f6837cb10a906e0daef0d42fd891d96
-MISC metadata.xml 629 BLAKE2B 90f781b587a61b126e78d8d7e11bb2aacc1db7c58d5891f4781bcca8d9531d5b1373ffd35b0771ea8dcfab81493807742598846919fd9b657270d46f8265c1c2 SHA512 30f91e05861aa50f5d0af624459ea92cd2649fbad374bed1b0dc30c2ab2532df8bd6b27f42f23bc7e77480141bcd5760a5804c46d121b3fa1170a90fd1d0acd0
+MISC metadata.xml 629 BLAKE2B 84cdd9e5e4859d5f70e0ef828ccc611e97fc313c7506d377ce58b395d3a35505c824f1190b916a0e170ce0ca5f4c06de473c2ed0b982c923858d54dfe3b53a36 SHA512 c88959c5f33a6fbbbf48ced0257d11409e58db48f3811801b47ad13c7c5e4bf40c3b5e11689dc47143f97dbcc880978ff202ffcc417d0d9699a26f8d3b0470ad
diff --git a/media-gfx/monica/metadata.xml b/media-gfx/monica/metadata.xml
index 272fc1e5253b..e3a51f20e210 100644
--- a/media-gfx/monica/metadata.xml
+++ b/media-gfx/monica/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/nomacs/Manifest b/media-gfx/nomacs/Manifest
index c1369af9ec23..4974d73d8a28 100644
--- a/media-gfx/nomacs/Manifest
+++ b/media-gfx/nomacs/Manifest
@@ -2,4 +2,4 @@ AUX nomacs-3.16.224-quazip1.patch 3844 BLAKE2B 5d92aa57971f137e5009db945f739eaff
 DIST nomacs-3.16.224.tar.gz 1932366 BLAKE2B 4a2dc6ef70b0ae5dc9c9397bd2c88ede0db2bb8660e1907d08b36c4a9cf5a9bd151180aa4b2d6b5f529c1786004a6621eff88fa4bc851d60835e8ba6d6269602 SHA512 7ca8e713eedd71bc3dd3804a9a09ece15badb74949b155ea4da72a0ea129be173c8d0951604a6139d4490525cd420da8635773c11f0d133f666a48dcd9064257
 DIST nomacs-plugins-3.16.tar.gz 561522 BLAKE2B 2bda4f36d56709653f6696af3404e416fd2d9fe7fa11de9636643c728028018ac769df3e2e519799322c5c42006cdc114d0e6406f9f60294234b07d9fd8d8409 SHA512 cd72f6ddbe3e07d7ed97f08405bac7574f4f3285c81e835f5630e011c8a9b105f23d892fed8084cb35ce521aca5524db071d0edb8bb04850dd2209d9ed019747
 EBUILD nomacs-3.16.224-r2.ebuild 1906 BLAKE2B 9832da7bd304ba68983a470c0a190cb25b9960ff168a2ef57e4859c24b0220834714788d3c122875504b4fa203a3c811582b2571541c97c100c0f7b39fd12740 SHA512 00271ea0a48a50396038dcca7f08442ebcb63676eaf8fbd5a5c54412a8b238d3f2d1bf4f2e11561f35576b25fe487a979004738aa5ad04edd97429f34d820fa2
-MISC metadata.xml 594 BLAKE2B 3e4f800e489a388987f8942f433fad19e378644cb2aecd66d7eacbca167fa12597967bc4bef21260d266aa5553c1b103cc4df8167fbba8655a346e25100e66a6 SHA512 2f3ee7d525fff3d6ca2793d96555dcfba34df5b15cd2879e640aa51b5ccd34e2f466c2a5cceab90050af8c3d668c2d57fd88c136d830343da7313c8eaea247c9
+MISC metadata.xml 594 BLAKE2B 47dc6a23191194cd7a1367145458781804269008667729b7815df23fb122f8f56e167cdaf3126c63b7da9109b8d0eda87ad28d772f2d60880bf541db211a51c6 SHA512 9769958ddcc86a53250908068a8388cd320277bcd8bda112a2deb0ab8fb9cf7ada2b177b7510ac6318c6b2b0d9fe3b6767088ab5426b5cd8a9143a07898ad9fc
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 5d40018fc73b..4962c2c5f92d 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-gfx/opencsg/Manifest b/media-gfx/opencsg/Manifest
index 10d5c2c0bf06..b98355eb6fd3 100644
--- a/media-gfx/opencsg/Manifest
+++ b/media-gfx/opencsg/Manifest
@@ -1,4 +1,4 @@
 AUX opencsg-1.4.2-includepath.patch 537 BLAKE2B c54c3ff9bc802f34a92a72620fd20277d90174a3d0e69ec7d34987b387da44e37d1a6487f6c6063b555bca8c40a2d827d91b3ab0d9c0b8adbab5648fce90a639 SHA512 7ccc4b75560682ad7c3c340b8d8824d1339a8a1859f459139ad84d9a06e25072eba84a78c6d30aa4dbd72cf82465a176550a7e89b2590ccd85e4129511ad3893
 DIST OpenCSG-1.4.2.tar.gz 933135 BLAKE2B 20882afaddf40cc4e0c43c3e70bad334aae3885241a3993ce7083de20f9b10d6e6c4eb3a55abba2b1eca64fdae784c491492543a5012b8b2d67eb63a16dd693b SHA512 fbe6f925982717ecca7bd0eacc4fc5b362c80c7663b1ff0d9a228f2b5e1d3625d3e6d324d9e634665c74e9c0fc37d10290ece293e59a3eba67035b6b700b7778
 EBUILD opencsg-1.4.2-r1.ebuild 1245 BLAKE2B 29b8ca3a2f400d4ac9296acda2fe7aa25ec9d2de8a3d9efb798279aa6da4c623c2f151e385a035fc84a7596a81c665b84df9427758337a913be8cbbd15b6b570 SHA512 f2a0114ff5f19beab0941af6b67895b8a94372637fe7256f79577980aafec1792d79c3c1529c0bae9050a059a1e5e606e61d47102da3543b18719eb21281a0b2
-MISC metadata.xml 1272 BLAKE2B 2821bf6650664d0effd47957979eedee7194b41ca4de6c1b0c2e248e8b5deb06cbe9a7b2c3bfb263f74c4cec4aa5ff7789698f943cbc59492d3ebf4637487489 SHA512 090bf25e68133962ded9a9f457ea404bd362118ff76988266b5f023a7a21236d932aa95267af4997298117585c9dd2ee71933892973d6b8055f3edf112ab3f4b
+MISC metadata.xml 1302 BLAKE2B ecfa92988aa0b2d51d3a3cb862bc8e211b192c9dcff2868338a6974fc1185adf79a111a7fe6c1826e5c96a550ce6ee2bc396be98c964d0c5d6efd99549d9047a SHA512 3aa225219dc2cb0346664dad3cf484b0d7467c8c254637d5619e78d3fe4d87f81d1fd835e36acd0cf825777cf712d2f9388aefe2c97610eb76ade642d46586bc
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index be0edabb6659..91aa6e1321f9 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest
index c1c304faf3e2..81c44b0192c4 100644
--- a/media-gfx/openscad/Manifest
+++ b/media-gfx/openscad/Manifest
@@ -11,4 +11,4 @@ DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a
 EBUILD openscad-2019.05-r5.ebuild 2370 BLAKE2B c467ccc9cc544545b780d915611f04e5db32bbd6eb106d140c45400bdc9979ee55459e1fcce1286c3b95b9b043b001fdbb40af24ad97684c1693f4cc7a7fbc46 SHA512 9b525433b12e4d125cb568032fca3d1b8a7ab699b4887e7b84172776973d965861046c6b1fa7c19439118220bd0cb585bf5f6ae81f51700cbe7d8c6aacab7b11
 EBUILD openscad-2021.01.ebuild 2314 BLAKE2B a9b9faf82fa7212da43685b7feec011d7cadf983a4da8141820ab06423d21734c377be62e426f86d090b39092f4976f03aaebcdf2d3669552f897065ef5fb73a SHA512 a9f2d5affe0d715fc22641c71f034383428012f0ec4f77711db20684e7dcce26c26f4609b050402e76a0e7e78a88c7c619bbfebe7036a99375d31fd62c442700
 EBUILD openscad-9999.ebuild 2711 BLAKE2B 8ffeccfc4b473f47f7d787ec8c942d91b483aa9ee73e104a40c117c5bd35304c810b397f46438c879e416739b8586c35ba5af76f6c4fea92e37fdaef47294aac SHA512 c74b01903711779da96d591b11ef346279b3f8958c96d2c71b17fc65094e42a3b1e684666cd30883d5ea5ec6dd50bea59550911f9a1460cb399f9ec101b3a8f4
-MISC metadata.xml 1402 BLAKE2B df38615dd73f29faad439e184a2cb6a85cc3ffddf17e3bc1d1bd82e6cb44c2a65c27ebc351d21dd7bd63448bdb5d9d4013eeb8a357b6d8a9ac7c8cac870e7bcd SHA512 bfe1861a4e2d50805f21eeb2ddec537a623175bb8fb4b782d54b0ec669000cc9ed0627fc1fdb5ecb7550396f3e3328a7c06b0def031d6ee70cb3bcb0b20d6763
+MISC metadata.xml 1432 BLAKE2B a3521113144173687a24d729db70bbdbfeaf312889ba7461b8440501992da1d457676fbf1cb233cda5affdc024ca932b891e5751785d100fcc0af4ee1da8521f SHA512 ea8b7a46e3de907858841b305e3c6815da5a0a77bd11499beac33de70cf11af72b1332225fa762a85626b6463a7e0a46b35b4140d23a3d25d8c6c60cd90d5b79
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 3ccb815587c6..56612a76fb96 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+<maintainer type="person" proxied="yes">
 	<email>waebbl-gentoo@posteo.net</email>
 	<name>Bernd Waibel</name>
 </maintainer>
-<maintainer type="project">
+<maintainer type="project" proxied="proxy">
 	<email>proxy-maint@gentoo.org</email>
 	<name>Proxy Maintainers</name>
 </maintainer>
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 3f5522fbebb6..459f2e52ac50 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,3 +1,3 @@
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
 EBUILD opentoonz-1.4.0.ebuild 1817 BLAKE2B 63407ff2f79ce44b991ca53ffa0d606f605f203cae9ce95749293afc29e25f9802061884d1425e82c5a43da4a6fd477087dff9da03faa53e11e92482ce74cf4a SHA512 66e8e879c11a5bd55a9125f786bf2bad513def93eb95113f79c1172202365bcad8a9f655a9fc39459d529427590e1182e0b636eb3bc1ef5187e4c2e6e0c265a3
-MISC metadata.xml 453 BLAKE2B 5bcdb89e0cab891a18531065af9dc5d65510905f8c21178d62125901d0d65d0522b8e4a5ab94f92d09ed0085a0cfae6701c04001dc29bc5e138b12b888cf71ec SHA512 227ed636186b559a5c4fe8728bc8ad2fa519177451f61c6cc67e20be3f8b071715fe38c274956cc987c3c2a49a25b7c7ca61280608871861c0007c558c016d6f
+MISC metadata.xml 483 BLAKE2B 1bf3e7b5b52878a5a985d77c599103b95c1216b49e5d0a1310f4733b077163bf7c2816e651f789e1feb71e2523c650f8dcd4c4fa5d0cd893b1794433c2eacaba SHA512 bb7db97672a8195197d42d1b8476699a0e3758c102c9d64bfd6b6193259d201465869faf7e84e22319707521e15c2a0e712f008339f75b97015683a019284bc0
diff --git a/media-gfx/opentoonz/metadata.xml b/media-gfx/opentoonz/metadata.xml
index 83ff81ea39b7..2075a63003c3 100644
--- a/media-gfx/opentoonz/metadata.xml
+++ b/media-gfx/opentoonz/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>otakuto.gentoo@gmail.com</email>
 		<name>Tact Yoshida</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index bc57e8b465d4..eeeeaf05c4e2 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -1,21 +1,7 @@
-AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e
-AUX openvdb-4.0.2-fix-build-docs.patch 1436 BLAKE2B 5093138c7d1dbc7177c7a956b0b9e82a7661253f29ef3d000664735190791028439b403680d220acb748d7dce063ad5781d91802444295ab32ce91685540178e SHA512 e8908dc4eeb6e4e6694c6ceabd8a5965f04d74a53ac733436e45d0e954e8732205daf149fa2d0dddbc3894c276b52ba3db20acc2c6d091d9b008c7d85ff8db23
-AUX openvdb-4.0.2-fix-const-correctness-for-unittest.patch 1654 BLAKE2B 339e70de004c4a5b626100d8db21c4bf23e20953cfadb0bd8becf64116c2f47e8f83566074df4748d1ad7642a557e18f6cb4889495dbfbc8c826dbfc023f39c5 SHA512 25098a15a014ea3e78cb61f4aebce9c217a6e1ffc650df4a372c5b0639cc08b48e24788671d885edc9ae3ed89a558a8896ece5c122d0e17f8267d6ee3bfb1ea8
-AUX openvdb-5.2.0-use-gnuinstalldirs.patch 10981 BLAKE2B 5ffdb1ec77280bc926d57fdccf9aa74db470e6031025a79e9503196bf4e4fa1984401eea8e5a7cb386545417014735a17bcf7dfc31aff79b8ef639ec82111255 SHA512 7ec960e07f1b1a81b32445e4cfc3769abb1d75d68076b825857fc12410525875bf50ba316da37d2a189d62162ad28c12530905d6c8696d1caa11b6d6752500a1
-AUX openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch 3343 BLAKE2B af20c099993e41a5d067146c166891ebe9bbde39ecf6329fc13d7830d6554388ca17721c44d598aa1d13db939dcdf5d1ea18a8ac9824d36c4899f3ba12ea7447 SHA512 7ffcc699342463bd79406c74b225e8c4033243f62c6d1ec6f8f0a94cc42e8d9262849dfaa1b3ed36a7818e576341ba90071a61350e7854a6993766a1fbd8f38f
-AUX openvdb-6.2.1-fix-multilib-header-source.patch 1536 BLAKE2B 8c08943217c457bf5137464f225db04aed64933f8b6e5257909d470193c5b64bce321b40029b30897967e17574514753e7787dbcb36d0e66396ecce674312f80 SHA512 331d47d2b0e41853ef6ce2d652e3ae3524f197188a0e1314b082e4c16eaffef7e34ebaf4b12e26cb519e6282bcf9747529f93ca9e85c32b4b26fe81efaa74749
-AUX openvdb-6.2.1-use-gnuinstalldirs.patch 1583 BLAKE2B 5ae011f52122231457e9dd0e3f93191d0965ae23f414459143cafb95c2b9b35d6672b095d4a94f2bb327173aa04456c7cb8248770895a8a0ca12513696ceb39f SHA512 b600367c0e431315436f142e1a4f1cffb780cedd9de16b215211109980132c60ee608c4b4f8b02605c0f55ed423f7e674bed6bea37687eb45c6f9112b54dcc1f
 AUX openvdb-7.1.0-0001-Fix-multilib-header-source.patch 2825 BLAKE2B 089bc79bbb8bd4544889c65d8bf064bf95869990778cb66595a19be402db85b569acb836b5918c902e6f6a10011a1480ef89e03636f951e30e5833eb667478cb SHA512 6968a60737b08bbec96beb8ec3796b7d99a713a798e37d8cd4015eacce7e7197b5befcd6721b310a4cdcfaca1781ab0cd7165958b14b487796a4159e9e214499
 AUX openvdb-7.1.0-0002-Fix-doc-install-dir.patch 1014 BLAKE2B 380c26e69da18479266201fd1233d19f3c39b13ee67d11cadca5bba900c470218a7563590f12a400a1f954155bfdfacc00862511ef05f3a61a54679924c57cae SHA512 21d4abf1cae31dfa8e59b6648a7c40f6f5f9572bdb87e6410144b427244ede488e059bf572344efc4e4cea91e7fb59b56364a7df6041f717db759002d09e8ee7
-DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d
-DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d
-DIST openvdb-5.2.0.tar.gz 1788969 BLAKE2B d146b78dd7db4936779ca214b1f7957d4868bf76aedb95c9a98e21d25983b750337a63bf4bc9ccb438b683988af7a3d708676dcf7b4662c84e4926e8000ceb68 SHA512 69e21190c27a055e476a319b0c2d961303fa2f3fec30bec93ed44072d01816ef89e5e8f0abfc3a22d1c73742aa31284c664596747b49cd985fea1a751776506e
-DIST openvdb-6.2.1.tar.gz 1935325 BLAKE2B 24ca340e513d2f22521994fbb2315a1c3f817bb35a7402ca481b12444e5ced58dfd773cc07b47a56d1ed9f6951e58cf1ef0b5c35917620b031383faed21c6557 SHA512 f5d830880316b5ca3921c77c75f3a254aba47d144ac6c0223fc2732d99cbd6b7ffb7f27049f8ab3760ad77b3658fc08a82728325ba753bc29932aa46336457de
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
-EBUILD openvdb-4.0.2-r4.ebuild 2619 BLAKE2B 33f31d97f1597c29d1186193ed501c07ed265770d191226abc6d2670fae8878ff8d4314b2b33788b9e638dc6a495aeb25304da2775179981a7916b03df68db47 SHA512 5af992b65fff0ecd20b38f1858b26252bf24c7595236cd9dd0434cc50af6994a88250d103c2708d80422a9a2b5435552a8a1d73c73a3772d2d4b94a058d844ca
-EBUILD openvdb-5.2.0-r2.ebuild 2417 BLAKE2B eeaa6be3d881283150098057b3f994b5380b64a51f99ed1aecde37c7e3c159e55089dce55eaad0eee735a29ca2206f1888977d4db667141311261ee0e1e5920d SHA512 0b7496c770dc053750d720e18cab541dca4f01171adbd4a6d47877645ea26195ac8cfca9816cede88c2c1187010541648a0333def582c31d4654ed5101834745
-EBUILD openvdb-6.2.1-r1.ebuild 2293 BLAKE2B 80218e96b43e30642a1cd47f11663ffb81d4383532a84f81c642ea5a6573bae1fce38d3a018c17d8b9a832dc0697e2d63ee1352e7030f09232149aa159b8c49c SHA512 40dc6ed45e3801eea4324da01828b7ea119e4e27888e5376cc249727a7fb07c03e1db90aeeca23964cfb39f47b098ac4b39941a1be20774dcde521e8d7d97ef3
 EBUILD openvdb-7.0.0-r1.ebuild 2805 BLAKE2B 077df7ddf81711bafc1021cd9255fa7e8413fd2d97c3a824f11145b1faafa5f6d2bb2c1e3731a6ed993b1a0b0603feed02a4d801c9d162a2fb2e53942549f3eb SHA512 a8917f92a8cd316a3dc49c784707ba63692251141aad32821465e5d46b8033c00906e426a54adba9402a56d946ebe8cbb5522625239c35cc16e0d2d7cde3338f
 EBUILD openvdb-7.1.0-r1.ebuild 2735 BLAKE2B 0e9347c59b0f1404db23e63635a4c3fdda3be0d34bda329de8b65507a3037692206a3d0573984bee7a9f937d5c9f425decd94b00214001e8792317af45f39b1b SHA512 2ce5ea094c66437efdd17279a3a2740cfab364775cede0986e9a65e35871cf90cb443c354b6590f82153b2d4acaadb0bfb44f8b2a72b632be64640e5094d7a15
-MISC metadata.xml 1660 BLAKE2B 56a7113ef4e645a3a508d025f36129c78be342117583f9cc8ba3ffda2518b04bba3d928ad1fa9e78a601a0f1d216bc1744795c170a6cd3421f22c8754f192a98 SHA512 f5e21ebf80b7179b6bd041bcdf5cc53c4aab3cf99f829d9e26e56f3eea40a9d67edf8ec09d63a39b5e1a231df9d2e57b40e008786d25ee00e8ff2ca0ab0c399d
+MISC metadata.xml 1406 BLAKE2B 0b9cf9b01f0728bca3f886372a83d983b8ce8aa6612109bf8422a4f21aeb87e6657751388597d74d1d54a57efdf7c9a97b386042f3b988e219cd59c157cf0f52 SHA512 2333d91681f215927b2b2680879066712b285b845e6fcf509681ada38a0212e37190bb06af2d53f419749d9afa89286b2690f03bf2ae662fd7e163bd9f98bd23
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
deleted file mode 100644
index fbb29883fe2f..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2017-07-31 19:16:32.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-11 12:37:40.179360277 +0100
-@@ -3,7 +3,7 @@
- 
- FIND_PACKAGE ( PythonInterp REQUIRED )
- FIND_PACKAGE ( PythonLibs REQUIRED )
--FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python )
-+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} )
- 
- 
- IF ( NOT OPENVDB_BUILD_CORE )
-@@ -92,7 +92,7 @@
-   ${GLFW_LINK_LIBRARY}
-   ${GLFW_DEPENDENT_LIBRARIES}
-   ${GLEW_GLEW_LIBRARY}
--  ${Boost_PYTHON_LIBRARY}
-+  ${Boost_LIBRARIES}
-   ${PYTHON_LIBRARY}
-   ${Ilmbase_HALF_LIBRARY}
-   )
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
deleted file mode 100644
index cdbb9440a1a4..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-build-docs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-When building with doc USE flag enabled, the doc target is not built by
-default and the missing docs cause an install failure.
-
-This patch ensures that when the doc target is defined, it will be
-built. Otherwise it might be possible to fix it using a separate step
-in src_compile to build the documentation specifically, prior to running
-install.
-
-This has been tested and is required on 4.0.2 and 5.2.0, but is not
-needed in >=openvdb-6
-
-To reproduce the bug, enable the doc USE flag and emerge openvdb 4 or 5
-without this patch. The install fails as the doc file is missing.
-
-To show it is fixed. enable the doc USE flag and this patch and emerge
-again. The install succeeds and the documentation can be found at
-/usr/share/doc/openvdb-X
-
-Patch by Adrian Grigo
-
-diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2020-08-18 12:17:15.261321103 +1000
-+++ b/openvdb/CMakeLists.txt	2020-08-18 12:17:37.101397373 +1000
-@@ -394,7 +394,7 @@
-   FILE ( WRITE ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config ${DOXYGEN_CONFIG_CONTENT} )
-   FILE ( APPEND ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config "OUTPUT_DIRECTORY=${CMAKE_CURRENT_BINARY_DIR}/doc\n" )
- 
--  ADD_CUSTOM_TARGET ( doc
-+  ADD_CUSTOM_TARGET ( doc ALL
-     ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/cmake-doxygen-config
-     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-     COMMENT "Generating API documentation with Doxygen" VERBATIM
diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch b/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
deleted file mode 100644
index cb2660329948..000000000000
--- a/media-gfx/openvdb/files/openvdb-4.0.2-fix-const-correctness-for-unittest.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Blosc changed the signature of blosc_compcode_to_compname in 1.15 so
-that the second parameter is now const char** not char **. This causes
-compile failures when using openvdb with earlier versions of blosc.
-
-The fix, which is backported from openvdb-7, is to check the blosc
-version and cast the char** to const char** for modern versions of
-blosc.
-
-The bug can be produced by emerging blosc 1.15+, and then openvdb.
-Without this patch, the compiler will fail with
-error: invalid conversion from ‘char**’ to ‘const char**’
-
-To test that the patch has been properly implemented, emerge modern
-blosc and then openvdb with this patch, and the compile will succeed.
-
-Fixes bug https://bugs.gentoo.org/734102
-Upstream commit https://github.com/AcademySoftwareFoundation/openvdb/commit/d2e8bd87a63d1e9f66a558ecbb6e6cbd54f7de13
-
-diff -Naur a/openvdb/unittest/TestFile.cc b/openvdb/unittest/TestFile.cc
---- a/openvdb/unittest/TestFile.cc	2020-08-19 02:11:48.945711312 +1000
-+++ b/openvdb/unittest/TestFile.cc	2020-08-19 02:13:31.106074899 +1000
-@@ -2666,7 +2666,12 @@
- 
-     for (int compcode = 0; compcode <= BLOSC_ZLIB; ++compcode) {
-         char* compname = nullptr;
--        if (0 > blosc_compcode_to_compname(compcode, &compname)) continue;
-+#if BLOSC_VERSION_MAJOR > 1 || (BLOSC_VERSION_MAJOR == 1 && BLOSC_VERSION_MINOR >= 15)
-+        if (0 > blosc_compcode_to_compname(compcode, const_cast<const char**>(&compname)))
-+#else
-+        if (0 > blosc_compcode_to_compname(compcode, &compname))
-+#endif
-+        continue;
-         /// @todo This changes the compressor setting globally.
-         if (blosc_set_compressor(compname) < 0) continue;
- 
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
deleted file mode 100644
index d72f835adaa4..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
---- a/cmake/FindBlosc.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindBlosc.cmake	2018-08-28 12:20:33.331930720 +0100
-@@ -37,7 +37,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( BLOSC_LOCATION include/blosc.h
-+FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h
-   "$ENV{BLOSC_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -49,7 +49,7 @@
- 
- IF ( BLOSC_FOUND )
- 
--  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib
-+  SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE STRING "Blosc library directories")
- 
-   SET ( _blosc_library_name "blosc" )
-@@ -75,6 +75,6 @@
-     SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} )
-   ENDIF()
- 
--  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" )
-+  SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" )
- 
- ENDIF ( BLOSC_FOUND )
-diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake
---- a/cmake/FindCPPUnit.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindCPPUnit.cmake	2018-08-28 12:20:33.333930718 +0100
-@@ -38,7 +38,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h
-+FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h
-   "$ENV{CPPUNIT_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -53,13 +53,13 @@
- 
- IF ( CPPUNIT_FOUND )
-   
--  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory")
-+  SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory")
-   IF (CPPUnit_USE_STATIC_LIBS)
- 	SET( CPPUNIT_LIBRARY_NAME libcppunit.a)
-   ELSE ()
- 	SET( CPPUNIT_LIBRARY_NAME cppunit)
-   ENDIF ()
-   FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME}
--	PATHS ${CPPUNIT_LOCATION}/lib )
-+	PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} )
-   
- ENDIF ( CPPUNIT_FOUND )
-diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake
---- a/cmake/FindGLEW.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLEW.cmake	2018-08-28 12:20:33.333930718 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLEW_LOCATION include/GL/glew.h
-+FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h
-   "$ENV{GLEW_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -51,7 +51,7 @@
- 
- IF ( GLEW_LOCATION )
- 
--  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path")
-+  SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path")
- 
-   SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-   IF (GLEW_USE_STATIC_LIBS)
-@@ -74,11 +74,11 @@
-       FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib )
- 	ELSE (APPLE)
-       SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-@@ -107,11 +107,11 @@
- 		)
- 	ELSE (APPLE)
- 	  # Unices
--      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
--      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib
-+      FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
- 		NO_DEFAULT_PATH
- 		NO_SYSTEM_ENVIRONMENT_PATH
- 		)
-diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake
---- a/cmake/FindGLFW3.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW3.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -39,7 +39,7 @@
- 
- FIND_PACKAGE ( PackageHandleStandardArgs )
- 
--FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h
-+FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h
-   "$ENV{GLFW3_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -50,11 +50,11 @@
-   )
- 
- IF (GLFW3_FOUND)
--  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path")
-+  SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path")
-   SET (GLFW3_PATH_SUFFIXES x86_64-linux-gnu)
-   IF (GLFW3_USE_STATIC_LIBS)
-     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw3
--      PATHS ${GLFW3_LOCATION}/lib
-+      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
-@@ -64,7 +64,7 @@
- 	  )
-   ELSE (GLFW3_USE_STATIC_LIBS)
-     FIND_LIBRARY ( GLFW3_glfw_LIBRARY  glfw
--      PATHS ${GLFW3_LOCATION}/lib
-+      PATHS ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       PATH_SUFFIXES ${GLFW3_PATH_SUFFIXES}
- 	  NO_DEFAULT_PATH
- 	  NO_CMAKE_ENVIRONMENT_PATH
-diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake
---- a/cmake/FindGLFW.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindGLFW.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -38,12 +38,12 @@
- 
- SET ( GLFW_FOUND FALSE )
- 
--FIND_PATH( GLFW_LOCATION include/GL/glfw.h
-+FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h
-   "$ENV{GLFW_ROOT}"
-   NO_SYSTEM_ENVIRONMENT_PATH
-   )
- 
--SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path")
-+SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path")
- 
- SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
- IF (GLFW_USE_STATIC_LIBS)
-@@ -61,7 +61,7 @@
-     FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib )
-   ELSE (APPLE)
-     SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_DEFAULT_PATH
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-@@ -84,7 +84,7 @@
-       )
-   ELSE (APPLE)
- 	# Unices
--    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64
-+    FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-       NO_SYSTEM_ENVIRONMENT_PATH
- 	  )
-   ENDIF (APPLE)
-diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
---- a/cmake/FindOpenVDB.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindOpenVDB.cmake	2018-08-28 12:20:33.334930718 +0100
-@@ -45,7 +45,7 @@
- 
- FIND_PACKAGE( PackageHandleStandardArgs )
- 
--FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h 
-+FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h 
-   "$ENV{OPENVDB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_SYSTEM_ENVIRONMENT_PATH
-@@ -56,10 +56,10 @@
-   )
- 
- IF( OpenVDB_FOUND )
--  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include
-+  SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}
-     CACHE PATH "OpenVDB include directory")
- 
--  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib
-+  SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR}
-     CACHE PATH "OpenVDB library directory" )
-   
-   FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb
-diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
---- a/cmake/FindTBB.cmake	2018-08-13 16:33:07.000000000 +0100
-+++ b/cmake/FindTBB.cmake	2018-08-28 12:20:33.335930717 +0100
-@@ -42,7 +42,7 @@
- 
- # SET ( TBB_FOUND FALSE )
- 
--FIND_PATH( TBB_LOCATION include/tbb/tbb.h
-+FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h
-   "$ENV{TBB_ROOT}"
-   NO_DEFAULT_PATH
-   NO_CMAKE_ENVIRONMENT_PATH
-@@ -57,7 +57,7 @@
- 
- IF ( TBB_FOUND )
- 
--  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory")
-+  SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory")
- 
-   IF (APPLE)
- 	IF (TBB_FOR_CLANG)
-@@ -86,7 +86,7 @@
- 	LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} )
-   ELSE (APPLE)
- 	# MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}")
--    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory")
-+    SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory")
- 	IF (${CMAKE_COMPILER_IS_GNUCXX})
- 	  IF ( TBB_MATCH_COMPILER_VERSION )
- 		STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION})
-diff -urN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
-@@ -32,6 +32,8 @@
- 
- ENABLE_TESTING()
- 
-+INCLUDE ( GNUInstallDirs )
-+
- find_program(CCACHE_FOUND ccache)
- if(CCACHE_FOUND)
-     set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-28 12:20:33.335930717 +0100
-@@ -414,7 +414,7 @@
-     )
- 
-   INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build  \"${PROJECT_BINARY_DIR}\" --target doc)")
--  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs)
-+  INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR})
- 
- ENDIF ()
- 
-@@ -423,37 +423,37 @@
-   INSTALL ( TARGETS
-     vdb_view
-     DESTINATION
--    bin
-+    ${CMAKE_INSTALL_BINDIR}
-     )
- ENDIF ()
- INSTALL ( TARGETS
-   vdb_print
-   vdb_render
-   DESTINATION
--  bin
-+  ${CMAKE_INSTALL_BINDIR}
-   )
- 
- INSTALL ( TARGETS
-   openvdb_static
-   DESTINATION
--  lib
-+  ${CMAKE_INSTALL_LIBDIR}
-   )
- 
- IF (WIN32)
-   INSTALL ( TARGETS
- 	openvdb_shared
--	RUNTIME DESTINATION bin COMPONENT Runtime
--	ARCHIVE DESTINATION lib COMPONENT Runtime
-+	RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
- 	)
- ELSE()
-   INSTALL ( TARGETS
- 	openvdb_shared
- 	DESTINATION
--	lib
-+	${CMAKE_INSTALL_LIBDIR}
- 	)
- ENDIF ()
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   PATTERN "python" EXCLUDE
-   PATTERN "cmd" EXCLUDE
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-13 16:33:07.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.336930716 +0100
-@@ -107,6 +107,6 @@
-   ${PYOPENVDB_INSTALL_DIRECTORY}
-   )       
- 
--INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include
-+INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-   FILES_MATCHING PATTERN "*.h"
-   )
diff --git a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
deleted file mode 100644
index dd0b83540aa3..000000000000
--- a/media-gfx/openvdb/files/openvdb-5.2.0-use-pkgconfig-for-ilmbase-and-openexr.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-This patch is an updated version of the patch created in dracwyrm's
-patchset for openvdb 4.0.2 which uses PkgConfig to ensure that the
-correct IlmBase and OpenEXR dependencies are found.
-
-In subsequent versions this functionality is taken over by
-altering the directory the header files are searched for in
-multilib-header-source patch by Bernd Waibel
-
-diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/CMakeLists.txt	2018-08-28 12:25:19.807755722 +0100
-@@ -83,11 +83,12 @@
-   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
- 
-+FIND_PACKAGE ( PkgConfig REQUIRED )
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
- FIND_PACKAGE ( ZLIB REQUIRED )
--FIND_PACKAGE ( ILMBase REQUIRED )
--FIND_PACKAGE ( OpenEXR REQUIRED )
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
- FIND_PACKAGE ( OpenGL REQUIRED )
- IF (OPENVDB_BUILD_DOCS)
-   FIND_PACKAGE ( Doxygen REQUIRED )
-@@ -111,8 +112,8 @@
-   INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} )
- ENDIF ()
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} )
- 
- IF (WIN32)
-@@ -184,7 +185,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -192,7 +193,7 @@
-   ${Boost_IOSTREAMS_LIBRARY}
-   ${Boost_SYSTEM_LIBRARY}
-   ${Tbb_TBB_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-   )
-@@ -246,9 +247,8 @@
-   openvdb_shared
-   ${CMAKE_THREAD_LIBS_INIT}
-   ${BLOSC_blosc_LIBRARY}
--  ${Openexr_ILMIMF_LIBRARY}
--  ${Ilmbase_ILMTHREAD_LIBRARY}
--  ${Ilmbase_IEX_LIBRARY}
-+  ${OPENEXR_LIBS_LDFLAGS}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   m
-   stdc++
-   )
-diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2018-08-28 12:20:33.000000000 +0100
-+++ b/openvdb/python/CMakeLists.txt	2018-08-28 12:25:19.808755721 +0100
-@@ -9,8 +9,8 @@
- IF ( NOT OPENVDB_BUILD_CORE )
-   FIND_PACKAGE ( OpenVDB REQUIRED )
- 
--  FIND_PACKAGE ( ILMBase REQUIRED )
--  FIND_PACKAGE ( OpenEXR REQUIRED )
-+  PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-+  PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR )
-   FIND_PACKAGE ( Blosc REQUIRED )
-   FIND_PACKAGE ( TBB REQUIRED )
-   FIND_PACKAGE ( ZLIB REQUIRED )
-@@ -29,8 +29,8 @@
-   SET ( OPENVDB_LIB openvdb_shared)
- ENDIF ( NOT OPENVDB_BUILD_CORE )
- 
--INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} )
--INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} )
- INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} )
-@@ -91,7 +91,7 @@
-   ${GLEW_GLEW_LIBRARY}
-   ${Boost_PYTHON_LIBRARY}
-   ${PYTHON_LIBRARY}
--  ${Ilmbase_HALF_LIBRARY}
-+  ${ILMBASE_LIBS_LDFLAGS}
-   )
- 
- SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch b/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
deleted file mode 100644
index e8cfac755d3e..000000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-fix-multilib-header-source.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-This patch changes the default location that the header files look for
-IlmBaseConfig.h as in Gentoo the version containg the ILMBASE_VERSION_MAJOR
-and ILMBASE_VERSION_MINOR is stored under /usr/include/chost.
-
-Without this patch, compilation fails as it is unable to identify the
-required IlmBase version.
-
-Based on the fix multilib header patch for 7.1.0 by Bernd Waibel
-
-diff -Naur a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
---- a/cmake/FindIlmBase.cmake	2020-02-02 01:03:55.000000000 +0800
-+++ b/cmake/FindIlmBase.cmake	2020-02-02 01:09:05.000000000 +0800
-@@ -168,9 +168,15 @@
-   PATH_SUFFIXES include/OpenEXR OpenEXR
- )
- 
-+if(EXISTS "/usr/include/${CHOST}/OpenEXR/IlmBaseConfig.h")
-+  set(_ILMBASE_HEADERS "/usr/include/${CHOST}/OpenEXR")
-+else()
-+  set(_ILMBASE_HEADERS ${IlmBase_INCLUDE_DIR})
-+endif()
-+
- if(EXISTS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h")
-   # Get the ILMBASE version information from the config header
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-     _ilmbase_version_major_string REGEX "#define ILMBASE_VERSION_MAJOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MAJOR" ""
-@@ -178,7 +184,7 @@
-   )
-   string(STRIP "${_ilmbase_version_major_string}" IlmBase_VERSION_MAJOR)
- 
--  file(STRINGS "${IlmBase_INCLUDE_DIR}/IlmBaseConfig.h"
-+  file(STRINGS "${_ILMBASE_HEADERS}/IlmBaseConfig.h"
-      _ilmbase_version_minor_string REGEX "#define ILMBASE_VERSION_MINOR "
-   )
-   string(REGEX REPLACE "#define ILMBASE_VERSION_MINOR" ""
diff --git a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
deleted file mode 100644
index ac73d82f9c34..000000000000
--- a/media-gfx/openvdb/files/openvdb-6.2.1-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -Naur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2020-01-08 22:16:00.493079361 +0800
-+++ b/CMakeLists.txt	2020-01-08 22:16:44.790285583 +0800
-@@ -252,6 +252,8 @@
- 
- enable_testing()
- 
-+INCLUDE ( GNUInstallDirs )
-+
- # Add our cmake modules
- 
- list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-diff -Naur a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt
---- a/openvdb/CMakeLists.txt	2020-01-08 22:16:07.362646127 +0800
-+++ b/openvdb/CMakeLists.txt	2020-01-08 22:19:54.638308684 +0800
-@@ -492,7 +492,7 @@
-   install(TARGETS
-     openvdb_static
-     DESTINATION
--    lib
-+    ${CMAKE_INSTALL_LIBDIR}
-   )
- endif()
- 
-@@ -500,14 +500,14 @@
-   if(WIN32)
-     install(TARGETS
-       openvdb_shared
--      RUNTIME DESTINATION bin COMPONENT Runtime
--      ARCHIVE DESTINATION lib COMPONENT Runtime
-+      RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
-+      ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
-     )
-   else()
-     install(TARGETS
-       openvdb_shared
-       DESTINATION
--      lib
-+      ${CMAKE_INSTALL_LIBDIR}
-     )
-   endif()
- endif()
-diff -Naur a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt
---- a/openvdb/python/CMakeLists.txt	2020-01-08 22:16:14.452199013 +0800
-+++ b/openvdb/python/CMakeLists.txt	2020-01-08 22:21:45.311324663 +0800
-@@ -232,7 +232,7 @@
-   ${PYOPENVDB_INSTALL_DIRECTORY}
- )
- 
--install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION include/openvdb/python)
-+install(FILES ${PYTHON_PUBLIC_INCLUDE_NAMES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/python)
- 
- # pytest
- 
diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index aac3bf03086b..4690483cd9cb 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>agrigo2001@yahoo.com.au</email>
 		<name>Adrian Grigo</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -18,12 +18,6 @@
 		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
 			Build pyopenvdb with support for <pkg>dev-python/numpy</pkg>
 		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-6.0.0" name="abi3-compat">
-			Disables newer features to maintain compatibility with ABI3.
-		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-7.0.0" name="abi4-compat">
-			Disables newer features to maintain compatibility with ABI4.
-		</flag>
 		<flag restrict="&lt;=media-gfx/openvdb-7.1.0" name="abi5-compat">
 			Disables newer features to maintain compatibility with ABI5.
 		</flag>
diff --git a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
deleted file mode 100644
index 841627eb807e..000000000000
--- a/media-gfx/openvdb/openvdb-4.0.2-r4.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="abi3-compat +abi4-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi3-compat abi4-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch"
-	"${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch"
-	"${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch"
-	"${FILESDIR}/${P}-findboost-fix.patch"
-	"${FILESDIR}/${P}-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${P}-fix-build-docs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	# To stay in sync with Boost
-	append-cxxflags -std=c++14
-
-	local version
-	if use abi3-compat; then
-		version=3
-	elif use abi4-compat; then
-		version=4
-	else
-		die "Openvdb abi version is not compatible"
-	fi
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild b/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
deleted file mode 100644
index 30a8f69cbd0d..000000000000
--- a/media-gfx/openvdb/openvdb-5.2.0-r2.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi3-compat abi4-compat +abi5-compat doc python test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi3-compat abi4-compat abi5-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)
-"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-build-docs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local version
-	if use abi3-compat; then
-		version=3
-	elif use abi4-compat; then
-		version=4
-	elif use abi5-compat; then
-		version=5
-	else
-		die "Openvdb ABI version not specified"
-	fi
-
-	local mycmakeargs=(
-		-DBLOSC_LOCATION="${myprefix}"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DGLFW3_LOCATION="${myprefix}"
-		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DTBB_LOCATION="${myprefix}"
-		-DUSE_GLFW3=ON
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild b/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
deleted file mode 100644
index 5179dddc6da3..000000000000
--- a/media-gfx/openvdb/openvdb-6.2.1-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="Library for the efficient manipulation of volumetric data"
-HOMEPAGE="https://www.openvdb.org"
-SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abi4-compat abi5-compat +abi6-compat doc python test"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	^^ ( abi4-compat abi5-compat abi6-compat )
-"
-
-RDEPEND="
-	dev-cpp/tbb
-	dev-libs/boost:=
-	dev-libs/c-blosc:=
-	dev-libs/jemalloc:=
-	dev-libs/log4cplus:=
-	media-libs/glfw
-	media-libs/glu
-	media-libs/ilmbase:=
-	media-libs/openexr:=
-	sys-libs/zlib:=
-	x11-libs/libXcursor
-	x11-libs/libXi
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-libs/boost:=[python?,${PYTHON_USEDEP}]
-			dev-python/numpy[${PYTHON_USEDEP}]
-		')
-	)"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	>=dev-util/cmake-3.16.2-r1
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-texlive/texlive-bibtexextra
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-fontutils
-		dev-texlive/texlive-latex
-		dev-texlive/texlive-latexextra
-	)
-	test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-multilib-header-source.patch"
-	"${FILESDIR}/${PN}-4.0.2-fix-const-correctness-for-unittest.patch"
-	"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myprefix="${EPREFIX}/usr/"
-
-	local version
-	if use abi4-compat; then
-		version=4
-	elif use abi5-compat; then
-		version=5
-	elif use abi6-compat; then
-		version=6
-	else
-		die "Openvdb ABI version not specified"
-	fi
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-		-DOPENVDB_ABI_VERSION_NUMBER="${version}"
-		-DOPENVDB_BUILD_DOCS=$(usex doc)
-		-DOPENVDB_BUILD_PYTHON_MODULE=$(usex python)
-		-DOPENVDB_BUILD_UNITTESTS=$(usex test)
-		-DOPENVDB_ENABLE_RPATH=OFF
-		-DCHOST="${CHOST}"
-	)
-
-	use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" )
-	use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" )
-
-	cmake_src_configure
-}
diff --git a/media-gfx/optipng/Manifest b/media-gfx/optipng/Manifest
index dc9686d47faa..f8de6d8cfaa1 100644
--- a/media-gfx/optipng/Manifest
+++ b/media-gfx/optipng/Manifest
@@ -1,4 +1,3 @@
 DIST optipng-0.7.7.tar.gz 2329555 BLAKE2B af3e1c806522282ccbf9325c0b49f61a30d24b8e2db2dd8ec316a312d0dea595cbb6e8b5b38ef5ea90f1efe14244b81f85f88e11e7334fdd4b91b43b6dae8e7d SHA512 c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280
-EBUILD optipng-0.7.7-r1.ebuild 1276 BLAKE2B eeb891d29b9c9d82e7c1c116d165fa2a25c2b9f33ff6f203f9ccb9d7b67ccef93479de68167dadbe759a4528a2cbdbebd5d53d5ff2a7e84e972d3b102c92ab64 SHA512 100d4f63355561d080ba04de7df9a1b8ad4e89145a458ac4363f1c94da78620df146206e5fefc7991f38ea3d355c69aa0cd4e7417b19be76d694034cf2df9bae
-EBUILD optipng-0.7.7.ebuild 1278 BLAKE2B 9a7a74a421262531b22ecc233ecb31a6aafe08594277f72c13d31397570f19d928b207be4badfd2b433c51f1f1cb5b66d99101369689156c620e02b6f07cc6a4 SHA512 592f16ca8af44761a574ae5dce71cc49f8bc05bb45fc815f1e74cc3105ab6fe428c151ecf9fd5fa1434e9a19b89816b64cef9e9c2742fb66c5deb0178a7b02e7
+EBUILD optipng-0.7.7-r1.ebuild 1271 BLAKE2B b6de3c8946621ad6a2bbeceeebf9162c63e65eb8689d6312447938efe8c025c56be5de8e518891c4a59c883aa6b4c71487d3eb29bfd821db3a239ef6c5b8d2e4 SHA512 d20427ac00acab76579f96fd120b0b27c7563949697effb6a61e891fb4e817fcd4a2d1dbec43bb2399f29e60f05b7363c3c7b1afd70b8aa3a541df3e6da9ef4a
 MISC metadata.xml 326 BLAKE2B aa1da3dfcfd0faa4d1bcc901659c15b3ce974eace4d7b1317c7fcfdac13939ca4e0ed9d58eb46e7921caefe63475fcffe3193ad138506c9e16b0d8d9abb73bb8 SHA512 57810d8957812cf02573aff451fb8248944bd100beaa06412deb4b5622161fca2ee466ad80050d68e94acf5e2e7963c6fa657416996c0503da6ac88f1f00efdb
diff --git a/media-gfx/optipng/optipng-0.7.7-r1.ebuild b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
index d09924d7eff8..7891be669fa5 100644
--- a/media-gfx/optipng/optipng-0.7.7-r1.ebuild
+++ b/media-gfx/optipng/optipng-0.7.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
diff --git a/media-gfx/optipng/optipng-0.7.7.ebuild b/media-gfx/optipng/optipng-0.7.7.ebuild
deleted file mode 100644
index 6afec58daccb..000000000000
--- a/media-gfx/optipng/optipng-0.7.7.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Compress PNG files without affecting image quality"
-HOMEPAGE="http://optipng.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	sys-apps/findutils"
-
-DOCS=( AUTHORS.txt README.txt )
-
-src_prepare() {
-	rm -R src/{libpng,zlib} || die
-	find . -type d -name build -exec rm -R {} + || die
-
-	# next release is almost a complete rewrite, so plug this compilation
-	# problem in anticipation of the much (c)leaner(?) rewrite
-	sed -i \
-		-e 's/^#if defined AT_FDCWD/#if (defined(AT_FDCWD) \&\& !(defined(__SVR4) \&\& defined(__sun)))/' \
-		src/optipng/ioutil.c || die
-
-	tc-export CC AR RANLIB
-	export LD=$(tc-getCC)
-
-	eapply_user
-}
-
-src_configure() {
-	./configure \
-		-with-system-libpng \
-		-with-system-zlib \
-		|| die "configure failed"
-}
-
-src_compile() {
-	emake -C src/optipng
-}
-
-src_install() {
-	einstalldocs
-
-	dodoc doc/*.txt
-	docinto html
-	dodoc doc/*.html
-	doman src/${PN}/man/${PN}.1
-
-	dobin src/${PN}/${PN}
-}
diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest
index cbb9aa68126a..cff8189822d3 100644
--- a/media-gfx/qimgv/Manifest
+++ b/media-gfx/qimgv/Manifest
@@ -1,3 +1,3 @@
 DIST qimgv-0.9.1.tar.gz 670033 BLAKE2B c1461791af4e6f73e36ec85968102e694f87acc904d270292ce8133206f9987f061ed02045d19058f76e448ce0410e9ffa38341253342b63b8a521183abaa1c5 SHA512 dbad56ebced421cafe6f5e03314fed5ed47e1c98405bac24a89f28f2684484af4f1fa6cc2b37f79e6afa7a1375f76881a8072646405691a47750a95032e02e2b
 EBUILD qimgv-0.9.1.ebuild 1200 BLAKE2B 07a1c8d6973b5057f6b35787dc80320b14e9cda3508e6fda87647ca317934a95713bbadcba240e98cc18c60ea0b24c823b1908ed1b12b2dd6da947df31a6dbcb SHA512 bb7846e169df31b8fec03c5ff3c3fb25f80728101b574635ac97f26af2560bf668ecc70f713b0cd54888bde2d00cbf6e7065828b8e0dd865b412d38a4a26863f
-MISC metadata.xml 533 BLAKE2B d0ca121069311bd9a2f996eec811bb5e2ad4c329d06a024f97d561b3d322e60c97fb40565c5d6de5b53f15f258a33f5e5ae98ac2ee3219bb05f7e61b68c29b00 SHA512 3f377ab27c3f1a18276eb86d05428f5414c28792270e51b61ecf25e8a89a086646988ab7cbb43a89b5ab8c8946daceb55ee5ca15ca1ee35e30fbfb2b1dff87ad
+MISC metadata.xml 563 BLAKE2B 1b8f06bbb82b2cdd850109cd43522f2ba1810064e9516abd1ea3bcc3d23f97d923bd8cbaf10a716e0ad031073d1947f7688d49a4b40b5fc85cd17d618bc14393 SHA512 21edcd7ebe4fe11c3bbb7e8ea7bdb0ca48b639775d6919c816d8d62998d56b377ea3aefee532505f79ed338e0604e536199f3a7098f1d1087561baf462d503c5
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index 09edd32618cc..67e6d0aaae86 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>jeff.no.zhao@gmail.com</email>
 		<name>Jiayi Zhao</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/qrencode/Manifest b/media-gfx/qrencode/Manifest
index fcd6a487ecd9..26a05192f0ab 100644
--- a/media-gfx/qrencode/Manifest
+++ b/media-gfx/qrencode/Manifest
@@ -1,3 +1,3 @@
 DIST qrencode-4.1.1.tar.bz2 461562 BLAKE2B ae3abb4a162518c0204d09c9df7434fb348e24c20e790a261841220b0a7165168137d5acbdbc53e40558724eac2e1e21786f11013f384b545d56a1c9caaff61d SHA512 981b3242c213e1b40ac88711912dd8c27ea11f3437d1a04b6b226499a6e991a8f0b3b10f818bcc104812192a1dac4ce05f16ecd847a50cb03d4859b84bad89b8
-EBUILD qrencode-4.1.1.ebuild 799 BLAKE2B 6aae652f09156896e9e746762f80df9e49b5433034f196aed56cfaf145289972806da4a899c7dee8eaeffd5a2e45fcb70c2d4ba344d37dc266d036096f3e593b SHA512 3227db2f0a07d5042be87a7c8e82d5516c6697df41312d78dec6a0c642cc02bd52b8685577c51f8b93173c7212bb8c7080bb057d687ab04ff729359683e3c280
+EBUILD qrencode-4.1.1.ebuild 810 BLAKE2B fa910f059cc13a5c29c9a0cacb514b41951342f447f94a2475ca2dd1d3e7696e101e4d4bba128fa65bec3b945f6e06ce257d39d5839bb724d69525513c0c50c8 SHA512 9dae35f9d8d47ea645eae4e5d39eb940181dc17da2b117d1344566e45178b5e4205e3cad23c8289e3b2bf128763d7e48939a983fd393deb03798c1492740e017
 MISC metadata.xml 370 BLAKE2B af379243b15cc55c2e2c14bd20ec8b9bb41d4fbb6a87938aae5cbc39e17c78ac45b322d946eadec59fc48c13354fd9dfdffea8c2572301d8d4cb86f162d49bdc SHA512 f5987a8aab3b861bbe4961c69d0c72b07826c43320fd383075036ad63a070204c6ed41297b2490b4a14224f5c4269c37c40e5abc9bce4d1c5857e68e98d6428c
diff --git a/media-gfx/qrencode/qrencode-4.1.1.ebuild b/media-gfx/qrencode/qrencode-4.1.1.ebuild
index 94c2c12fd48b..e30ccba4b199 100644
--- a/media-gfx/qrencode/qrencode-4.1.1.ebuild
+++ b/media-gfx/qrencode/qrencode-4.1.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://fukuchi.org/works/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/rawtherapee/Manifest b/media-gfx/rawtherapee/Manifest
index c256627dcbd1..d8cda2007479 100644
--- a/media-gfx/rawtherapee/Manifest
+++ b/media-gfx/rawtherapee/Manifest
@@ -1,7 +1,3 @@
-DIST rawtherapee-5.6.tar.xz 12083264 BLAKE2B a0eb09e98e1041b393ad3aa671641a2a4855379cef6245ca3cca2588ff5f50fedf8becd88bad1ab70f63dfb575f5f22c141040defa10b47268947415999d8e79 SHA512 2c751c7631ea2ef65c334fa0baab16d4c3161fae66487870c476f07f1ea3604a5e28a251fd98d9688cafc088302af7aa6e28e9b27a37f916715708ed5e731f0f
-DIST rawtherapee-5.7.tar.xz 12092496 BLAKE2B 40d97d09106d7d2b843376b4c58daac87f99315604bd8e704e1f231c17d01896cd732da2449f84a59ed221fbf6a929a5db8e728977431fdcc07f3d30120b633a SHA512 8101ec66d9be4cab0c0b91336a3f83a32a6220a2f342f1c74d604c15686ee08bc7dbc090232916f13d5436957d800b64b284a8a9d3352f2f721266b07e005162
 DIST rawtherapee-5.8.tar.xz 12653148 BLAKE2B f6d4b9b177ad3b6a32b460ecfc7caf5d42a01b5dd4f24da29739f5a2e5936a8d36f9857c0e24bca11f077ab0626f08bbad59ef756792d12f93ef9516427cd2c4 SHA512 bc79586cd937dcaefc053e65faa2162de887d514e44980956d937c157c6d55c4f6e6a7a9b8f91f2d657ed2054814737b96d5d741674c1e5a961d7177433efe4e
-EBUILD rawtherapee-5.6.ebuild 1609 BLAKE2B 44239bb8e54a9149b70d36a1ff582b6f0708c0747f9ee4c021c01438092cec1cb9a64bc64b5fd165ddfc338bbfe533506a14d07c695f5bfba57d6848f6a3b719 SHA512 a1dd100d0f59c2a7642e2f85a34773d37c6c7f1e4d95e865d38c9463dc58151347004860dd320acbe944701c0a8170df89ca0180e915cee93cf7581756a9d51a
-EBUILD rawtherapee-5.7.ebuild 1611 BLAKE2B 098b45f91d7944f5b932b583b39579a217c31538d9816c8942efe683d5f0602919e22b7308cf10eb2e6581b4804ac611c336312722abbf66deea4777f59a9e50 SHA512 dcf827bbf5ba0b7ff77a03f1a7558317164355b8acff4596ae27b88f0ef5a6a17245343f7de349c9486cb471d19345b5ebf966c32776bd6728c96210ded9f4d1
 EBUILD rawtherapee-5.8.ebuild 1697 BLAKE2B f2eb2c24f9cfdf7444026bf750c0fe68e13054f4d2926addbc8d41a02d0e6277a9099f28eae53ad35087e1ca7351225a8cd20005996e6464b9162fe516b92d56 SHA512 181b057cf7a23818a0756416e67cbb8ecc5d4c5951342237a8e5f13d7f72b1488b42ed9c2ae20dd76c77a62347a5220b68394fbe5b0726e19994629a0be14158
-MISC metadata.xml 365 BLAKE2B 7f954a20d61ad3c5f034099555edf9141e5d24b3dca5b47f8c9f53ef9f7e9422d10dc458dc3b4693288d182f579173a58b85708920a4b1d52576f07567397306 SHA512 ca26a61740ecd1b5ed7197bbc06c91f48e2955db05e2c7952edac28f99dc394504140672148214d202d61d673e4294ecc037457dc0f77bf4b790fc36e668eee7
+MISC metadata.xml 395 BLAKE2B e0084b1d83ad44a411b1d9e8af1502f1e316bb54de76b4bfd985320b701bec7a25ee0edee70da14f4e5aace94ec437c8a8918ebadb1b79e6c77658924d270f96 SHA512 3a80a8d6a966d11806f07eddb29cdc1407c1925addb7952a6f1734c446818c79acfcb0777db6e114b5765d39cbb4d380907a4c4cf477ae77217452bb2c75994f
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index db7bb13ec0ef..ead2b4f098fa 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>vivo75@gmail.com</email>
 		<name>Francesco Riosa</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild b/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
deleted file mode 100644
index 8af21b12f820..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.6.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_rc/-rc}
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	dev-cpp/gtkmm:3.0
-	gnome-base/librsvg"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild b/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
deleted file mode 100644
index b51ffe1ca52a..000000000000
--- a/media-gfx/rawtherapee/rawtherapee-5.7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P=${P/_rc/-rc}
-inherit cmake flag-o-matic toolchain-funcs xdg-utils
-
-DESCRIPTION="A powerful cross-platform raw image processing program"
-HOMEPAGE="https://www.rawtherapee.com/"
-SRC_URI="https://rawtherapee.com/shared/source/${MY_P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="openmp"
-
-RDEPEND="
-	dev-libs/expat
-	dev-libs/libsigc++:2
-	media-libs/lcms:2
-	media-libs/lensfun
-	media-libs/libcanberra[gtk3]
-	media-libs/libiptcdata
-	media-libs/libpng:0
-	media-libs/tiff:0
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	virtual/jpeg:0
-	x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	dev-cpp/gtkmm:3.0
-	gnome-base/librsvg"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_pretend() {
-	if use openmp ; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_configure() {
-	# upstream tested that "fast-math" give wrong results, so filter it
-	# https://bugs.gentoo.org/show_bug.cgi?id=606896#c2
-	filter-flags -ffast-math
-	# -Ofast enable "fast-math" both in gcc and clang
-	replace-flags -Ofast -O3
-	# In case we add an ebuild for klt we can (i)use that one,
-	# see http://cecas.clemson.edu/~stb/klt/
-	local mycmakeargs=(
-		-DOPTION_OMP=$(usex openmp)
-		-DDOCDIR=/usr/share/doc/${PF}
-		-DCREDITSDIR=/usr/share/${PN}
-		-DLICENCEDIR=/usr/share/${PN}
-		-DCACHE_NAME_SUFFIX=""
-		-DWITH_SYSTEM_KLT="off"
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/sam2p/Manifest b/media-gfx/sam2p/Manifest
index 9e0cc60f9f0b..490843dc9753 100644
--- a/media-gfx/sam2p/Manifest
+++ b/media-gfx/sam2p/Manifest
@@ -1,4 +1,4 @@
 AUX sam2p-build-fixes.patch 1803 BLAKE2B d9c805da6c46f5457cc6006941a1331f0e46ed8fcadf7c73b9a11debfaa7e2f040beeae42aa9cf316a2df71ffe9d136808a1e9ebeea5c146851057a8addb7bf6 SHA512 fa32011db37a74f746542df82f29e7869412cf8ad93d0b4c3c6e100dda06c254f204671199db0d1abd6134975325cb939f65f0a22457a84a78b6b277411ea2f5
 DIST sam2p-0.49.4_p20190718.tar.gz 1816309 BLAKE2B 3d97e00c2bd6b6c292c051d4eb6b73549d1c82a5bd7be3d6b718d8e9d2e96b47657c184af43fa57c0ca4b2b8c26904fb42508d17f7dda715def7d2082affa8b6 SHA512 1c6074fabca6146e51fe0d5a10c912ec679cf122e10aab7bead9e35e3d007e79773aedb1f627572b1b88cacefe0e7edf72efd71d32c47731723b910667220c51
 EBUILD sam2p-0.49.4_p20190718-r1.ebuild 1218 BLAKE2B 8ff23f43d569456c80b70b3e8b3296903f4feb7eb4837ffd16fa8033e6fb63306e02a7053d193877f6dae06eeffcff0a2690ed6a260f1e8fa2c07060281faff3 SHA512 200ab229ffbbdb64de5196a5e0e3c36ad0790bbfb95e42c8779f0697b6be67b01d2750d13dfbd22a5da09b2293a979ede57e12e6d68a2a21d5b5c19dc5642ed0
-MISC metadata.xml 373 BLAKE2B a0a62fca7fbcd916d83a6d7fa8f020c333b529ed06492cd8f52a8e04d228714bd53d1283e0b43f5a0c399aafdaf99b5caa5534a0ba54e1bff4958b4f28e899f7 SHA512 2bac0bb931232d7b994f24551d0fedccfcaf69932e4900264857e9ba09a9c32495ab743c1fe930e63adca3b7bc11efdea526982e6e27869033bc17731fa5c7fa
+MISC metadata.xml 373 BLAKE2B dae0358240c22b0e32527d07c38c88b46d48e7e2d54993484bdbb50fccbc6c45e9ef9ef0ec03740ac0d1bb00a4080183be59cc791076fd69ddb067b858e6e721 SHA512 90aee2eb26b919c8e6dd18874a65b6e22994a1d8bb3058ca4fe1df604f7dd6e0cac1b22bbf3d5410c97b6604a913f7327deeef43cf0ecccf46d8df1fc25d974e
diff --git a/media-gfx/sam2p/metadata.xml b/media-gfx/sam2p/metadata.xml
index 7dab55141c22..8675e7e5772f 100644
--- a/media-gfx/sam2p/metadata.xml
+++ b/media-gfx/sam2p/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index 017d291da88f..1e7fed71fda6 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -14,5 +14,5 @@ AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71
 DIST backends-1.0.30.tar.gz 5721262 BLAKE2B 139d3ca908d54b94d14ef4145d44a89b939807c15870be03c3c028cf95351bf9a4abd3ea115b84396366bb054f37ade883f429467dceb0663c2855b92e0a4fa5 SHA512 19127c8109c1587d60d8cba713f73b1a24242df44fa49c3e59320f48022783f05d26d3242a3f87478e583a807d88b446ef7a51afb33b674be29656496c435d7b
 DIST backends-1.0.31.tar.gz 5731445 BLAKE2B d70691acbd3f5788a26bab6b35eeb243801b435272b57e3fa568127562ff57797452e396e6e5f058c33d3bce0f99b672542fb89bc8eb4d36cbe82ccc20b8f298 SHA512 d8ef05cc3aa9c4fa42c9241e1e61fc93e7959df3746a3a2cfaa6e4fb26dfd0911b4d3227b2da28852f8630fa17ad3432a1230a6f4425340e79a3b82ec5eaa9eb
 EBUILD sane-backends-1.0.30-r2.ebuild 8229 BLAKE2B d7f2e41ea54e06aaabd9a0abd47210c45ecc891e34f9563aabf19b11df0e3d250741f1a557465d5fb2f1e5de99f18d292212b160bc52224c5026544f7bd17f0f SHA512 08ba6b7bd2b5a28a8be809794b5b720075d1b3ba383d2b8bdbb763322f9b01838374ac3c152feafe9d49edd9d135cf184e8ccd8f5adfc4b7a4b546f5a1e194ea
-EBUILD sane-backends-1.0.31.ebuild 8666 BLAKE2B deaca6c649ab0a01ade4679512460a9242faca1b9027a4c373566fa3d7f5962491a71570c93beae98ff87850faf1c278a2b3d0fca90fc60396f1149355676394 SHA512 d151baf548ae59b4488919b0b1f696f4320c853b709adf011f58d58b10f342f780bddda39fa7c16490792c65c101e35af5dc6e1711e96c2aed6215f3f9605761
+EBUILD sane-backends-1.0.31.ebuild 8660 BLAKE2B da356bb6b7aed6bfca528df6db8b49e6451d2b31443003f0187d2b56882ff2d3eff17b3b8f0cb8ca7703a5e4871d6586165e54832cbcda4d923ace23732f264c SHA512 d8b0c1627dc073ac557e6986fa37404825bbf958ea1dea967d13281a349ffa57bc67a67bf4b1bf506138cc58f23fb2e9b15e324a871d6eb49922a20c3f8c97d5
 MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index f222da2527c5..621a5997d9bb 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
 
 LICENSE="GPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
 
 # For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
 RDEPEND="
diff --git a/media-gfx/slic3r/Manifest b/media-gfx/slic3r/Manifest
index 5f92dc2f18dc..7ceae0241b3e 100644
--- a/media-gfx/slic3r/Manifest
+++ b/media-gfx/slic3r/Manifest
@@ -8,4 +8,4 @@ DIST slic3r-1.3.1_pre20200824.tar.gz 2432288 BLAKE2B 37e767b6cb12909ea3a64115321
 EBUILD slic3r-1.3.0-r3.ebuild 2748 BLAKE2B 823f3341684d705f34faa66ee361c91f0ca1b8916ca9773e5dd6817d06d5b0a4b048abd60f747670531969ca63a673ff228156f6e05f1a1b2c9d85d7e21fb7d3 SHA512 6937adaab0083e646c74fbf4b1c0a7daab521c37c160d5220ef6fb7cdaff44815388a7e449460bd56ab05b80c3714cb0f69e7452fe2ee1460344f4b58f69ecc5
 EBUILD slic3r-1.3.1_pre20200824.ebuild 2784 BLAKE2B d3bee26847f0640e90e5df95c8c0f56976e220a3c5fc2c92b94eaf401da28ba14c0c19e04e68509b6e352b6aa6884061ac56feb0c9f42cd82c8d7030d69438cc SHA512 726a2f7f87652a160fbdfa437ab42001c13ea27361cc8818a5a725e2af8bef2a3099f836fa4cd4679eed6c0c0487f9781501b8433d3bd24b980165b44e77d139
 EBUILD slic3r-9999.ebuild 2758 BLAKE2B 2c49616aff2a3964f43d00f74aa014adfb364ee100b4f1dc6c7f86fe4469fa80e9f7eb311f4d9f27fe66a3de84d13c95a966acd7e29e7833a7a72882831f0a41 SHA512 0a77983538340eebcc19d9c3054104a8b4cfae18ac6f3eebe478b9ae99297b8ca5207b16699048b861f0f812892877850224f7b55f343c79ad683040cfd33920
-MISC metadata.xml 911 BLAKE2B 39abbf46851ded99736fe0541b9d11d05a198e1b9d66e66b1ecd7ff0eb1b1f03c45a7de0439f634ae35954db60bd96b9587bd2014a4f3f2ad561c293d2b0db8e SHA512 9898d7e38439bc5f7ab4ca91ed8dcddd073bc5e4da2c05aa6003f6550b90355d98725765b625e9ffaab40245ec86800908a8300843e05ca092b6e97a8ef3495d
+MISC metadata.xml 910 BLAKE2B 037c38babeaf484e00175fa577897939965d4b0c9246ae43cea6099eb9c80c64b150b58598bd4d9b6b4cea3c3d660d50d75a83a4dcc75c23bc52619ea42d2e35 SHA512 60ddcbb15c781478becc5779ff884d92b735d87b7c97f8305641b3a98db3f07a35d02c86c2b1e032fd05fa351a6f343e7c4f09aff31c5d2844bf34930dbcc316
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index 41ad86d64fad..f2a29f739d2e 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -12,7 +12,7 @@
     <longdescription lang="en">
         Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
     </longdescription>
-    <upstream >
+    <upstream>
         <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
         <doc>https://manual.slic3r.org/</doc>
         <remote-id type="github">slic3r/Slic3r</remote-id>
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 60990c38872d..aead3c5e5148 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,4 +1,4 @@
 DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
 DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
 EBUILD solvespace-2.3.ebuild 1561 BLAKE2B 0e50f33d7fa511cacdc39bee095e87627afa0f981638fb83fd4e938576f7339536fa9ca7b8cd722327f40376cf269aadd64c939ab755e272dc760e3964f8115e SHA512 3b6801f393df905510f5e5b967a05c825219e2fce973787e46fe9a2af87931ecea38e412d3690ab601225180413b3bda63aa0156d4bad698f5c749106b0eb476
-MISC metadata.xml 1255 BLAKE2B ad5bd3d58bac3c5a6c8542944163431deeec3b219e89302db02b180c3d13af43d41f116243b8ae789af5eeb642b71e8c825241bcd42ee78ab1bd8a0baed24efe SHA512 06429b78540c7a12f28718908e3b5af16e2e99eeab4ae8ba37450dc9e7c87281ae0e2bc20e15da6796451f01f0aef9b544f03d5ac14692f349f7bbfb60d0965b
+MISC metadata.xml 1285 BLAKE2B 334458d57d900cc6ceff7f5f45452eed1a501ca0b4349f6b12a9b3ffcead7e82ba7af35e5afaf262858f95deaafce6d011f6e94e8848a5d9a82ada0699643d11 SHA512 eabafc95662dfc2f842ed84b909fcb547630ddb5cbcb3fca12cc73a3eaa120e6292c105c7aff7a7d32fc2582161f39b11070122cd83f9296d211f02e389ad4e1
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index e63161bebc65..eae5c0980215 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
+    <maintainer type="person" proxied="yes">
         <email>ktrace@yandex.ru</email>
         <name>Victor Kustov</name>
     </maintainer>
-    <maintainer type="project">
+    <maintainer type="project" proxied="proxy">
         <email>proxy-maint@gentoo.org</email>
         <name>Proxy Maintainers</name>
     </maintainer>
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index f95d9142dd06..b57f94911534 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
 EBUILD svg2rlg-0.4.0.ebuild 936 BLAKE2B 2e0aebff38e5ab9c797c26f160d1ddf7d1cab3521d496d5b8c6cb87c9b9ffcf6c09b094fd242f9530a1c1fddd164d232be121a7addba7ffa0ea1b43e549ab734 SHA512 6023cae7de3ef7faa5755a763cb5c51b2d7e0664b873cd9091cb0532101e2dee3a297d286316b3b6b688e8a6dad4f13758e57fc2d7852db458a2269647afb423
-MISC metadata.xml 326 BLAKE2B d96665aae9ade2c5c20694df4c2b415d4d2932d5c00ae1eccb1282d29bab978e84a04ed8e55e1afe48b5880b6bc4d77553501e32251236b94201bb127b16f8d6 SHA512 e8eea3a85411a27856a2b6e5cf6386cc12cb452783c9efb707be3a7b801dfe2fe7d1a1081c61dc24980186551cc50a21f161a7202ff7d9f1f052c8310730ab1b
+MISC metadata.xml 326 BLAKE2B 21a97dc9ff57665d8fa9b2f1b65c837ec87ea45b49ae280126a6d779c905439e0e8871157f19d22f36c391d870e3babf0950e81547506dc88d6466bbd000bb53 SHA512 a8767f2f5ffc953f77a37787428abbff8ffe135a77b2fec796e1a7b0f70c9392a3a0ff2dda9fca6af1651159f31ade73c7f982662fcb23a40ab6c3d91be9c226
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index fd173a687384..a931df149d7e 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 5d3fffa3beaf..51eabb043070 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,9 +1,3 @@
-AUX tuxpaint-0.9.20-gentoo.patch 6029 BLAKE2B 21b038c0fa9f9f643db9ae5782c57bcc0b5adcd89a3fdc33fb80843932bc6ecf036de69c7040a395bc684a81bccea23ea900d262deb23e57837f0fa8c4de2bca SHA512 c9a0c58aba35d93016b1ad63607df132ceb4ed597c398dced8394a536ac668adb2ef0758d4620cf8ba9b22ca874e491615eb9386fff19d7291eb006e62397c42
-AUX tuxpaint-0.9.21-LDFLAGS.patch 853 BLAKE2B 2f68ff92e99697342b1046848b489c7281fa034fa66ae53e512d4eff2889cf32c659eec3ac5ad6ce121e55d871cd76d9cb20839ddd7efb9311cac68b99bc8865 SHA512 d2012c76d2d666d58a89a18f110f6cb136f4ed6819a3d169e4ccdb95ca1cb55469d80aa965f2c1bf222e1957218e4bd64bad47c67b0e6994a47c6ff0e690c812
-AUX tuxpaint-0.9.21-libpng1.5.patch 838 BLAKE2B bbc335be723205a673896279fdbe21c1b817214e54a470b06170c45e9e0ec78563a600b9251675063ba37a5d97fb63e2f13f37f3e50b0ffa3038e7027c0c0599 SHA512 c860141816023bf0d36d7aac33134e213d0dfb111d9e123c4e1470753eb2a34c6e93046def09ee2a566de1f7b6a9aeb1638f408f935ddbf9c62285129bee7d0a
-AUX tuxpaint-0.9.21-underlinking.patch 592 BLAKE2B 1af0a14e4512b748fb2294e9ebe7ce0f72fa7b9df269ff1ac6c7756327f7fa3728ffd2808e888ab035d6f56ddeae20b269a75ef76e1560b4ce391c60372ea02d SHA512 66f0cea73c2e89353bd0085ae9de280ccf197dd3e253e00b05f4c0aeac2e2489ec94e21ad26a41ca09cce717533bd0010c655498cf9267bba6019bf78e2a836f
-DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
-EBUILD tuxpaint-0.9.21-r2.ebuild 1701 BLAKE2B 8d08863971b633e62022a4264bc3cb22bc20bd9469c35378960f07a0eb606481715ac6924d360648e75f27109283c4fb93de44ab504ee533a2ad6fa9bf06b737 SHA512 53ba744c47ab39730e6db19fea50e44818ed0fee483aa1e4e3a7e1d6cd8b679e1dfd453523956b0cbd447d92808c6c861dcb5109af2470a14fd228eb85d6b945
 EBUILD tuxpaint-0.9.24.ebuild 1674 BLAKE2B 5ba887bd2e613c42def2cfcd2ef6bc2b37ca5dcabbdbc4dece2255301299532b2d3fb203443e47d9e771758354cac65bf582c465e80d6d662ca384be5856383a SHA512 26c1c718f70a796cd0950c6f8abd82665a2230e5dac9d92b43540003cee6c18dd3044895d1d74a85a95afe196edcdcacc72ae3f8f9aa8f5edbdb8656d724d667
 MISC metadata.xml 618 BLAKE2B 41214f92d2223b2791c7f79b8add3c494549a9f7e4048d17ec74aa13a56c460d3c83df08bd2f93358e8aa4eb6b497a6f3b9e49cd422a6a17a211341bd44e4bdd SHA512 e1be803667ac0a7a2a364f05f08e0514826292f11b3ff261a215864cfa50d61538f4535a83b0903e85c942098155231725db6e664aee4cfca812a36d670c0f72
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
deleted file mode 100644
index 00af3cb2a867..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ru tuxpaint-0.9.20.orig/Makefile tuxpaint-0.9.20/Makefile
---- tuxpaint-0.9.20.orig/Makefile	2008-12-21 15:04:36.000000000 +0100
-+++ tuxpaint-0.9.20/Makefile	2008-12-21 15:42:24.000000000 +0100
-@@ -137,9 +137,12 @@
- # Icons and launchers:
- ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
- X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
--GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
--KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
--KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
-+GNOME_PREFIX:=
-+KDE_PREFIX:=
-+KDE_ICON_PREFIX:=
-+DESKTOP_ICON_PREFIX:=$(PREFIX)/share/icons
-+
-+ENABLE_GETTEXT:=0
- 
- # Maemo flag
- MAEMOFLAG:=
-@@ -200,7 +203,7 @@
- 
- #-ffast-math
- OPTFLAGS:=-O2
--CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+CFLAGS:=$(CPPFLAGS) -W -Wall -fno-common -ffloat-store \
- 	$(call comptest,-fvisibility=hidden,) \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
-@@ -232,7 +235,10 @@
- # "make" with no arguments builds the program and man page from sources:
- #
- .PHONY: all
--all:	tuxpaint translations magic-plugins tp-magic-config
-+all:	tuxpaint magic-plugins tp-magic-config
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make translations; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -390,7 +396,7 @@
- windows_ARCH_INSTALL:=
- osx_ARCH_INSTALL:=
- beos_ARCH_INSTALL:=
--linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
-+linux_ARCH_INSTALL:=install-desktop-data
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
- 
- # "make install" installs all of the various parts
-@@ -400,10 +406,13 @@
- install:	install-bin install-data install-man install-doc \
- 		install-magic-plugins \
- 		install-magic-plugin-dev \
--		install-icon install-gettext install-im install-importscript \
-+		install-icon install-im install-importscript \
- 		install-default-config install-example-stamps \
- 		install-example-starters \
- 		$(ARCH_INSTALL)
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext ; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -581,17 +590,50 @@
- 
- # Install a launcher icon in the Gnome menu
- .PHONY: install-gnome
--install-gnome:
-+install-desktop-data:
- 	@echo
--	@echo "...Installing launcher icon into GNOME..."
--	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
--	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
--	 cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
--	 install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
--	 cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
--	 chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
--	fi
-+	@echo "...Installing launcher entry..."
-+	@if [ "x$(PREFIX)" != "x" ]; then \
-+		install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
-+		cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
-+		chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
-+		install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
-+		cp data/images/tuxpaint-icon.svg \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+		cp data/images/icon192x192.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+		cp data/images/icon128x128.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+		cp data/images/icon96x96.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+		cp data/images/icon64x64.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+		cp data/images/icon48x48.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+		cp data/images/icon32x32.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+		cp data/images/icon22x22.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+		cp data/images/icon16x16.png \
-+		       $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+		chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+        fi
- 
- 
- # Install a launcher icon for the Nokia 770.
-@@ -684,9 +726,6 @@
- 	@install -d $(ICON_PREFIX)
- 	@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
- 	@chmod 644 $(ICON_PREFIX)/tuxpaint.png
--	@install -d $(X11_ICON_PREFIX)
--	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
--	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
- 
- 
- # Install the program:
-Only in tuxpaint-0.9.20: Makefile.bak
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
deleted file mode 100644
index f864a8382f09..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Makefile'
---- a/Makefile	2011-08-09 15:19:01 +0000
-+++ b/Makefile	2011-08-09 15:19:43 +0000
-@@ -871,7 +871,7 @@
- 		$(ARCH_LIBS)
- 	@echo
- 	@echo "...Linking Tux Paint..."
--	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
- 		-o tuxpaint $^ \
- 		$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
- 	@$(RSRC_CMD)
-@@ -1043,7 +1043,7 @@
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
- 
- $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c  
--	$(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
-+	$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
- # Probably should separate the various flags like the following:
- #	$(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
- 
-
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 2970eac15516..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- a/src/tuxpaint.c	2011/07/29 21:27:39	1.828
-+++ b/src/tuxpaint.c	2011/08/08 17:59:12	1.829
-@@ -13425,12 +13425,7 @@
-       {
- 	png_init_io(png_ptr, fi);
- 
--	info_ptr->width = surf->w;
--	info_ptr->height = surf->h;
--	info_ptr->bit_depth = 8;
--	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
--	info_ptr->interlace_type = 1;
--	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
-+        png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
- 
- 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- 				   PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
deleted file mode 100644
index 295684918f50..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 26 19:16:54 UTC 2013
-Subject: fix underlinking
-
-https://bugs.gentoo.org/show_bug.cgi?id=484434
-
---- tuxpaint-0.9.21/Makefile
-+++ tuxpaint-0.9.21/Makefile
-@@ -80,7 +80,7 @@
- windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
- osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
- beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)"
--linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
-+linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB)
- ARCH_LINKS:=$($(OS)_ARCH_LINKS)
- 
- # Install a launcher icon for the Nokia 770.
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
deleted file mode 100644
index 6c8458138345..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="
-	app-text/libpaper
-	dev-libs/fribidi
-	gnome-base/librsvg:2
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/freetype-2:2
-	media-libs/libsdl
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-DOCS=(
-	docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
-	docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
-)
-
-PATCHES=(
-	# Sanitize the Makefile and correct a few other issues
-	"${FILESDIR}/${PN}-0.9.20-gentoo.patch"
-	"${FILESDIR}/${P}-libpng1.5.patch" #378199
-	"${FILESDIR}/${P}-LDFLAGS.patch" #334571
-	"${FILESDIR}/${P}-underlinking.patch" #484434
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		-e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
-		Makefile || die
-}
-
-src_compile() {
-	# parallel build may break things
-	emake -j1 CC="$(tc-getCC)" \
-		$(use nls && echo ENABLE_GETTEXT=1)
-}
-
-src_install() {
-	emake -j1 PKG_ROOT="${D}" \
-		$(usex nls ENABLE_GETTEXT=1 '') install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-
-	if ! has_version "${CATEGORY}/${PN}"; then
-		elog "For additional graphic stamps, you can emerge the"
-		elog "media-gfx/tuxpaint-stamps package."
-	fi
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 3343c98e355f..3c6ad96b9f23 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -4,4 +4,4 @@ DIST valentina-5858.patch.bz2 4507 BLAKE2B 10bf1e48b9c822b5fecd040edea05a9fa16bc
 DIST valentina-v0.6.1.tar.bz2 25575677 BLAKE2B 56d5adc973df319b3a65f877768c2195e1af2db39118e18fb17636e5739610d55e4ade4d4516a6817347dcdb0e4468e4587cff91fc5a5ea74a35029c52bf858c SHA512 52a3a02bd08f85c6241fe29baa9c8a2b80d2e8b071877bc68f98c3ff7bcdf810d9975903f804bf4e120f1a65c06de405fd44bc822292ab7b6191b778ec703542
 EBUILD valentina-0.6.1-r1.ebuild 2189 BLAKE2B aea847aa2313d46ebf889531806f1f9c2a5e1d4865c78faed42587ff76d5908e3012da8af7add2f794c1aba39e924d88800a638cfdaa6f791275cadb06bb1e9c SHA512 d52df819ca46613b322b6de0470180b689e954334838adddd61b12aae3d3217facb731f957c5799830461caa03deaf8463a89ca3b1767af4bc8e2b4632cdc8ff
 EBUILD valentina-9999.ebuild 1945 BLAKE2B ba3f8e84d5654d312910d83d7ba2a2d875477b08e85b140e3e9d9bbf43ae25dcc67b32cc3933dd66bb2201e464b853c935378d70583e7295c3c3269c32311a74 SHA512 10651225c740f0a513c3733b7f6a5417510062a30f08743c0d8e50fa6053ec708c29b7e2ec5740fc8ffbff7333b7a8ec987f758924a9bc25a401fb25dda2bb49
-MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
+MISC metadata.xml 334 BLAKE2B adb795cf61ba0bad2643a8376b1afc2389eef4950c489c44e2b69cb7e403ab9e740a7e624b0965381fdb9966f97f7ae31dfbfce38d94e5825b136bf3cc6ac58b SHA512 d68f81b9908fc9646594320b1fad29670274b96189862c262cb0d8d8f4fe22f5ed8cbbcc2b788fdbcf391288e7b6574467259f4183e5d96c355221d97afaa133
diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml
index 2cb24851e365..6e90b2f8c60f 100644
--- a/media-gfx/valentina/metadata.xml
+++ b/media-gfx/valentina/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/media-gfx/viewnior/Manifest b/media-gfx/viewnior/Manifest
index 89d649e091e4..8c658c7aacb7 100644
--- a/media-gfx/viewnior/Manifest
+++ b/media-gfx/viewnior/Manifest
@@ -1,8 +1,5 @@
 AUX 0.17-Replace-calls-to-getenv-with-g_getenv.patch 1182 BLAKE2B 37a7f395e35a8ac3edbfd3b8d057275c1981347c6e5018c8bca29322ebc33a32b16e0880bddcd394cb9da4315eb26592f9342d8cf58c88f1a29f902e858d8f97 SHA512 190f6b1fd7f4640022274207254be0967718c3d602bc521557a3e4eed6afca274bf650cf9e06ed4ec9a0527eca6b45c39c4b8e1091064b8408dac8033ca07c9d
 AUX viewnior-0.17-update_metadata_location.patch 1260 BLAKE2B c3b522f56bcc039978e559f3f0bc4095f5b7750c5d3b54ada39c43631275b0e619a0aed04cabe6a6ca7c0237bed687f46db0eff226f6ab8a6184b08783e09628 SHA512 6ce85095c0cbecfa4d2e9da1a9fa76aec0ef38a585d9aa588403fe9afb76b3faf041144b050e56ad6ec87769cf164c4d7f854003a09d7e21919205903f0f0c2e
-DIST viewnior-1.6.tar.gz 168966 BLAKE2B 1a04ec6ee4e05da8d0721115826d2550c7d24b4299c105eb6de7ec3fe74b350b49605dbe5246a5acd93562fd904923053ab99a5741b929abd99ace8b2ad148cc SHA512 4b150078573bfd3b8c5863d73087a51cd3b7ed5781e26c842fab44eec3e67ea9aea3feba064538578878df1ccb386525a6a84362dae7f92315fb7de735ace617
 DIST viewnior-1.7.tar.gz 165719 BLAKE2B 906ab0b632fcc102ac62dd77d6742c2121c46cd92adc0dfe9ba772bf697eff356519dbb6219016a6470903c855aa4c9081f0d61ca1607d8d1b6d8e03236a19bc SHA512 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5
-EBUILD viewnior-1.6.ebuild 932 BLAKE2B 421cec0425ef6008090cdea7df88f90c45641f0a26355fcedaaf86c9f11f797cdcdcded489c233ca128ed87dd0863f1965013899c6421584f44d6d7e1dbb5d18 SHA512 847f9cd4e8c24460e77df21e99899507f2adf634fdc605bf3884ba0ba317b84e468218ce5f0b46a6d96b8b6c94966c0dd0b170d330cd22ba2c4069bcd4529303
-EBUILD viewnior-1.7-r1.ebuild 1279 BLAKE2B 4302bd5b94b27ff3e5b0f8db78a3f5e7fc092a7f861c3edec053f050368b136b44d19ae151331c4f4a7c915d56c5609fda2099c075fb2e3a944e7ecd598b7a35 SHA512 c974ab91c7110447b9d51a2e6a0481730452bfd8d3d0090ea6b631df0e890a3e0fbfb280e6836a28e01c1f26ecaf36b67ee848d9842bd1268e8f9e9949f3f2c9
 EBUILD viewnior-1.7-r2.ebuild 1167 BLAKE2B 138ed55bfa3439f8030218cb981459eeb4c5347e159f6628e7b22ec5a275892a1aafc85c8d19e34cafb0764284bb4001d7c25c22cdc53a3dc762b8e63a72051e SHA512 520c347b2388a4d31adbb90492ef32577223fa24bc4df6e3c05e316f9bc482ad424894054cf3424fd80d1fa17eef601211387cb70a460905eaba9a6405f08aef
-MISC metadata.xml 522 BLAKE2B 3f08e8b96d95c32bc0c2265afa2b580b92258060f4964c9f595da738fe96814406f8d8cc67965b985b714abded06d848df43bbd9fb72641b1123bbe1fd6f348a SHA512 94a9310a1eb358b2468caf0c21a5d799b81049483443b87e0fd4abe644295390f1703ec1b7a58562db89b353632f682f555cec64f41969e3a3e90017cb5913da
+MISC metadata.xml 552 BLAKE2B 77c212a8a42d4ba1b3eb02559c1bd19e6090553dba0c6807b75dc64daf79607f153e94a6ed0643f4a11ab67f6f674884eab46e7f43197b5c6be85f4c9df8013c SHA512 0023614ec058c607d318aa20cdbff5b5caa1f41baa4f7a1c94323ac212ba714ac5af0772b8a09f709328d1e231104eb569317fbe7bc57fa86a7f5c34a20bb5cb
diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml
index 0b0a73b6d999..3d788b8d3146 100644
--- a/media-gfx/viewnior/metadata.xml
+++ b/media-gfx/viewnior/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>gentoo@tastytea.de</email>
 		<name>Ronny Gutbrod</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/viewnior/viewnior-1.6.ebuild b/media-gfx/viewnior/viewnior-1.6.ebuild
deleted file mode 100644
index 501a6fa864c3..000000000000
--- a/media-gfx/viewnior/viewnior-1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit xdg-utils gnome2-utils autotools
-
-MY_PN=Viewnior
-DESCRIPTION="Fast and simple image viewer"
-HOMEPAGE="https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior"
-SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
-	media-gfx/exiv2
-	>=x11-libs/gtk+-2.20:2
-	x11-misc/shared-mime-info
-"
-RDEPEND="${DEPEND}
-	dev-util/glib-utils
-"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-src_prepare() {
-	default
-
-	# fix for bug #454230
-	sed -r -i "s:(PKG_CHECK_MODULES):AC_CHECK_LIB([m],[cos])\n\n\1:" configure.ac
-
-	eautoreconf
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/viewnior/viewnior-1.7-r1.ebuild b/media-gfx/viewnior/viewnior-1.7-r1.ebuild
deleted file mode 100644
index 65dbbf38b891..000000000000
--- a/media-gfx/viewnior/viewnior-1.7-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-MY_PN=Viewnior
-DESCRIPTION="Fast and simple image viewer"
-HOMEPAGE="https://siyanpanayotov.com/project/viewnior/ https://github.com/hellosiyan/Viewnior"
-SRC_URI="https://github.com/hellosiyan/${MY_PN}/archive/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/glib:2
-	media-gfx/exiv2:0=
-	x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-"
-
-S="${WORKDIR}/${MY_PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/0.17-Replace-calls-to-getenv-with-g_getenv.patch"
-)
-
-src_prepare() {
-	default
-	# That script would update icon cache and desktop database
-	sed -i "s/meson.add_install_script('meson_post_install.py')//" meson.build || die 'Failed to remove post-install-script invocation from meson.build'
-	# Don't let meson compress the manpage
-	sed -i "s/subdir('man')//" meson.build || die 'Failed to remove manpage compression from meson.build'
-}
-
-src_install() {
-	meson_src_install
-	doman man/viewnior.1
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index d3983135816f..3af3759fbb0b 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,13 +1,4 @@
-AUX wings.sh 182 BLAKE2B e9facdbcd7520af19045bab0ef89e835c1e2f1d7b4e8c8d45d64f189a3d2e549336b166f54d77efae68858848ed0ab8aa3c8bacc9973a348851e1ebf52e66f4f SHA512 3b0d606638eb8a2875a90716f18f1584925d56ef43956bde3344e494311a39181171b4ad358a8c9bc20e826c7de727b4aca9d70763a3fe6ee0806747ea32c791
 AUX wings.sh-r1 181 BLAKE2B d892abf053f7f0039e50057869a4a0a26438f7312dca62561fc22280b2341621e17f13c97e7031072b242db42c533f4012b21ac46645cf32e121e5aad1884774 SHA512 739b8e68a1b47a3f4adbff8a1f34b713d7b0ac2d8103d85d3fdd6020bf08e81c231d210239c140d23e1dd135ff7122bfd43327a27585a333eafab473ea1480df
-DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
-DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
-DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
-DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
 DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
-EBUILD wings-2.1.5.ebuild 1180 BLAKE2B 5bef1461396a3add3e4890f6c5da41bc8f05ed6c83a505af235c589c4f8ec82530cef1abee5ec245fb57bb5cb4399bb9f6a5224e6266c8bb3bd7e9b9bc3b4be3 SHA512 07d6bce373c8cb86aefbdb75af8d993f5ba26df4a5efb57553a9bfe0ccbeda95212989d1857f34afd46c3edbb8f659246790f7b638ba9b447d2365cfb11d28e2
-EBUILD wings-2.1.6.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
-EBUILD wings-2.1.7.ebuild 1182 BLAKE2B 015fdd8e991c6780698859d7686dac0e18ed3f64ee8f0507d175b48e3fd0367163636293a8935c6360d9a3549b7736cb6914195e1dc179e2d32612e3a67706a5 SHA512 09756cd501538a3afb36f25229b9e428b02d980ac64756a5e978c11e3f2c6243d4d4b71f63a4f6ba165f23ec5b5b32db544818a0f50a3c85ed65bb9285b7fb07
-EBUILD wings-2.2.5.ebuild 987 BLAKE2B 41187682d8691f9e16585b1dec9648ba0a92d3cb2ffd6ea2e3fa839e4072daa27344086bc4aaeade4b1c0a4afa458717ab65d15a1e395b2b0b8842ad6a29bdfc SHA512 8e6301935d3fea8c0c42151ce31611db965f6a288a72995a3ec12f8e61b8245637ea9683b7fdb2e9c7328c8de2b0b746b064dc6a84444a7ba442661c00f8283b
 EBUILD wings-2.2.6.1.ebuild 1118 BLAKE2B 7256288278684a98dc329f50c2b386e8823357ed592d88dac9322beffc83fd9928b8f3c28249773cf123aee4b80ff920a24ff6300f70aecdcd63103fc460c42a SHA512 b22c3242f8c7f0c756fef38e2fc8fcf971a3de0bef2b8999453ff32ef18588b4f7df39a484a9cbd7caa7a70fc7c14f8ca09bc1ebf211e8107b3befbcc72545e1
 MISC metadata.xml 563 BLAKE2B abcaefdbfcdf37907b5f05dc7b219e27adfc1e8fbdb771833aef706b2e56df205c97c8d827ff18b148242a6d784caecbc02e55ee4ee9bd8d6fdacc1177d4b4c7 SHA512 b78da01e4913d05c103c1a99ab5cfc9567cd202c84be3338713459c7a4178d9faea84feb62ae26592a694745b1eedf01dcea557ace1e36f4dca86c0011bd05c4
diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
deleted file mode 100644
index 3fcebe4b1252..000000000000
--- a/media-gfx/wings/files/wings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-ESDL_ROOT="/usr/lib/erlang/lib/esdl"
-WINGS_ROOT="/usr/lib/erlang/lib/wings"
-exec erl -smp disable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
deleted file mode 100644
index be3e01a0d82e..000000000000
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/include_lib/s|"wings/|"../|' \
-		$(find . -name '*'.erl) \
-		|| die
-
-	sed -i \
-		-e 's|-O3||g' \
-		-e 's|-Werror||g' \
-		-e 's|CFLAGS = |CFLAGS += |g' \
-		$(find . -name Makefile) \
-		|| die
-}
-
-src_configure() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
-	# Work around parallel make issues
-	emake vsn.mk
-	for subdir in intl_tools src e3d icons plugins_src; do
-		emake -C ${subdir}
-	done
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
deleted file mode 100644
index b6561579ab68..000000000000
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>dev-lang/erlang-21[wxwidgets]
-	dev-libs/cl
-	media-libs/glu
-	media-libs/libsdl[opengl]
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_compile() {
-	export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-	# Work around parallel make issues
-	# Set ER_LIBS to the top source directory
-	emake vsn.mk
-	for subdir in intl_tools e3d src plugins_src icons; do
-		emake -C ${subdir} opt ERL_LIBS="${S}"
-	done
-	default
-}
-
-src_install() {
-	WINGS_PATH=${ERL_PATH}/${P}
-	dodir ${WINGS_PATH}
-
-	find -name 'Makefile*' -exec rm -f '{}' \;
-
-	insinto ${WINGS_PATH}
-	doins -r e3d ebin icons plugins priv psd shaders src textures tools
-
-	newbin "${FILESDIR}"/wings.sh-r1 wings
-	dodoc AUTHORS README
-}
diff --git a/media-gfx/yafaray/Manifest b/media-gfx/yafaray/Manifest
index 82b7081f1d17..606798f664e0 100644
--- a/media-gfx/yafaray/Manifest
+++ b/media-gfx/yafaray/Manifest
@@ -1,6 +1,7 @@
 AUX yafaray-3.4.1-0001-Respect-user-pre-defined-CXXFLAGS.patch 1160 BLAKE2B 2145d744a269b25dad27b78afb52baec14b23c7a90041263b907020145b51482165ccd4dd833c537dadd4ca0074cdd90fefb642d8fb3bb5853d37164f5e3f2eb SHA512 d6b327c887badb28685277487fcb76917206781aa5e1d6ebd0f6832a28d573945bca2cce5a0e856a1b573c103a696cf7b7b10a91bb6135649249e8ca143ff8fc
+AUX yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch 1541 BLAKE2B ea13c623fe025440481bfa8a68085d4bd0a46decb5dff9c6ce743ebc0dd30bcd8f3333fc45e041db19e420bc86ce1d1965a084a788882c7d68f1423c884ff8fe SHA512 861683353000e0c25991b64ab70af3839641d6e01f48756798acd5903124890d646fe4f9ef54f6c22c4d857994f2d0adc415dcd83534fb85300e6dbc5128631d
 DIST yafaray-3.5.1.tar.gz 1136455 BLAKE2B 6002f3b96f3626b83f57015eaf3ddd53dcb6b6fd863277912f7fec06e4f176ec81dc48b889a068e6259edf17727dd04d4b1bbc51b571bfe6aad5e48148201e2e SHA512 3ead4d8becd2d524aa5bb4bbde4b9d98b56f8a38d872e7aa49ba19081094406336def02e9bf1503e424ca8e6cade0db4b042214cea8f9345bd4fc542c9346dbe
 DIST yafaray-core-3.4.1.tar.gz 1136077 BLAKE2B a2ce3945f52315084ee744ff4a6733255018196f0000ca6b1786fbd2ec49ade64cb62e98dfba95dca4dec361f47235d59a8c9bd95ee7d095214fc0afbdcb1ee4 SHA512 a9116273fbc2aaaadbc38a65b1eaaa502070ff06f8a2929e880714a9db57188e65cf319c20a3f96e08146af36a67aea139709a633eb024be65319a64330e6f68
 EBUILD yafaray-3.4.1.ebuild 3072 BLAKE2B 99207e9b3c330cc717af5649b951db81cedc259f27a18de0dd1092c9f895aa0ff1feec2cfc8eab2b24c32836b642fa2a0e5c85597f787ff2a35228f556189f23 SHA512 c3164f5fe95c9488a3dbd71bf81e724394dbc71a209153a89fbebff7345fe9102f5c2d8a316145b8359b868ebfd53120fd42de13b835dbac61421dd71d218cc0
-EBUILD yafaray-3.5.1.ebuild 3033 BLAKE2B 30c47e083bb1b15226142ac35265d73745d1e6bcfd8b1b03f8d6834e6b1f6ce7230fe3f610b45e0360b905c9c23d86bd5c3536ba85fba41b44985cabe9905cf1 SHA512 a72113718e7cf63bdf5bb4116be027cbb61d121c988460754f239a6484ca62e0dab237784e9443856fccd640ba160ed9bc8783dde5b59b65f87d82bf6943aadd
-MISC metadata.xml 1060 BLAKE2B b9000a78998846ab5f48afbed71afe450edcafd0251e2fa1390719d766b74b803732916f943c458c56ec6e50db6a4f17c1bd298dbfd20bedf22307e8aa58bb48 SHA512 f61ba34063cc4bea75398a379a82f666f0b85b5d9f1ade9ec98b358ac7a758809fa4c7fd7f919ae10dc6f491b7b1d20ea062a0a1d77f051ad504925849ea8b69
+EBUILD yafaray-3.5.1.ebuild 3105 BLAKE2B 32a01a24dc8273fdebcb5e51d537341e25721e1c30f68011e7cbb76c10dd376ef3699d3714bc5ba6c473786b5f4611ef010f675a9efb95cc815c36f19982fa90 SHA512 181ad2143517df7b6965300f5f1ccc2f80398d32e1d07c71947977ad4a1c336134fb7296d6e93ad493140dafe69790b3cc8e48b6a118aa78d4573d27fff2e012
+MISC metadata.xml 1089 BLAKE2B 642427525ab36b55b7fefbddbd48f0f4133abadc830c23f7278e5ac2f37643d7a4b228139c3adfe10f7049b5674a4d7440d0e1d3d656f478e88d96ef485e9781 SHA512 ce02f7dd179775bde5ac0661fc2ae838281ac8e25ccba802c9f96b14351cc6ec5aca6cfd6f3882028c9981f398d40554cd5fc5c32afa393212585bc9d9b0bfeb
diff --git a/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
new file mode 100644
index 000000000000..67cb8ca3aad2
--- /dev/null
+++ b/media-gfx/yafaray/files/yafaray-3.5.1-0001-respect-distribution-CFLAGS.patch
@@ -0,0 +1,39 @@
+From 2f7e31a06679798c15f737b2725d246a12bcc6b4 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 12 Mar 2021 20:43:20 +0100
+Subject: [PATCH] respect distribution CFLAGS
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00dfda9..ade65a7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,18 +234,18 @@ if(NOT WIN32)
+ 	endif(NOT YAF_BINDINGS_RUBY_DIR)
+ 
+ 	# build flags
+-	set(CMAKE_CXX_FLAGS "-Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE)
++	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-result" CACHE STRING "Default compiler flags" FORCE)
+ 	
+ 	if(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_RELEASE ${USER_RELEASE_OPTIMIZATION_FLAGS})
+ 	else(USER_RELEASE_OPTIMIZATION_FLAGS)
+-		set(YAF_CXX_FLAGS_RELEASE "-Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
++		set(YAF_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -std=c++11 -pthread -O3 -ffast-math -Wno-unused-result")
+ 	endif(USER_RELEASE_OPTIMIZATION_FLAGS)
+ 	
+ 	if(USER_DEBUG_OPTIMIZATION_FLAGS)
+ 		set(YAF_CXX_FLAGS_DEBUG ${USER_DEBUG_OPTIMIZATION_FLAGS})
+ 	else(USER_DEBUG_OPTIMIZATION_FLAGS)
+-		set(YAF_CXX_FLAGS_DEBUG "-Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
++		set(YAF_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -std=c++11 -pthread -ggdb -Wno-unused-result")
+ 	endif(USER_DEBUG_OPTIMIZATION_FLAGS)
+ 	
+ 	if(APPLE)
+-- 
+2.30.1
+
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 1200537158aa..b49def01d4c5 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>waebbl-gentoo@posteo.net</email>
 		<name>Bernd Waibel</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
@@ -29,4 +29,3 @@
 		</flag>
 	</use>
 </pkgmetadata>
-
diff --git a/media-gfx/yafaray/yafaray-3.5.1.ebuild b/media-gfx/yafaray/yafaray-3.5.1.ebuild
index cca93fade785..2b65a4e8f72e 100644
--- a/media-gfx/yafaray/yafaray-3.5.1.ebuild
+++ b/media-gfx/yafaray/yafaray-3.5.1.ebuild
@@ -46,6 +46,10 @@ BDEPEND="python? (
 		dev-lang/swig
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-0001-respect-distribution-CFLAGS.patch
+)
+
 DOCS=( AUTHORS.md CHANGELOG.md CODING.md INSTALL.md README.md )
 
 pkg_setup() {
diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 8cdf1f30b56f..70c493e060c3 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,5 +1,6 @@
 AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1
 AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab
+AUX zbar-0.23.1-autoconf-2.70.patch 1280 BLAKE2B c4e9fd97047c49599477e387590372404c47b66f960bf1e0ffd80c7c694cf59cf080660899e1abc0f33eadd7087e5ba6d40e55e853f0569374a3be0934001450 SHA512 e7317dcd5e3dacce52dd27ce8d37afd07d2b193fa8f40e237a5f4bca911bda1e38ac74b0fd770976c0659ccc44b576775ba291d8135e426ad7a793fbdb104401
 AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122
 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120
 AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957
@@ -11,5 +12,5 @@ AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1
 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b
 DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b
 EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4
-EBUILD zbar-0.23.1.ebuild 5286 BLAKE2B 8134b9a4418963c437be927b68a087b8d18fd533195dc05892b091038f500d62a86f23540ae81659dffa973abbfd8603a62c3839924f14f17405c48b8c60ff52 SHA512 34b395448f86e886460be4687f144c961779acf1ddbdd4e9c460fd4848543285d8084e1303c6d422263e143877f98b75b4a556899d98236feaaca4791a7f9081
-MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19
+EBUILD zbar-0.23.1.ebuild 5328 BLAKE2B 625e339803ae037096dd0dddae0553cb11d4a0a7f7ae144f7e8e5a85964fba652c66ee05bae302c290d837914d2f95f6aaaf91a0277ea6714ab53b7d12bbd7c6 SHA512 41f92ac81780148a1672306eb185f0d1899a5dd607e831a50d69c2a2c594125221172a9907ed63f15f163421917032e45902a1c8701ababe0048728a8e735c78
+MISC metadata.xml 961 BLAKE2B c3ad2c531212c82cef3e1fbae09030591863b82d2b404ad65b696b5ebab4d5abe85e9f0e8733e543af393b395940241ddfc3885a0a3654b33d88ce8d60253e91 SHA512 635d3ba26ffc33e712944153cbd062eb7a6b83f492223ead8e67ff7d6e9c1f336641af56e52d1afca032c3a5716d36954d6222cbd0a076d12d2f4f0159683317
diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
new file mode 100644
index 000000000000..be9547ead111
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
@@ -0,0 +1,38 @@
+https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
+https://bugs.gentoo.org/775656
+
+From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
+From: Boyuan Yang <byang@debian.org>
+Date: Thu, 31 Dec 2020 12:56:26 -0500
+Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
+
+One of the AS_IF() macro was not properly quoted. This commit
+fixes that issue.
+
+This patch closes: #132 (fixes this bug report).
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index df0220a8..db4bc902 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
+ 					    [with_qt="no"])])])
+ 
+ AS_IF([test "x$with_qt" != "xno"],
+-   AS_IF([test "x$with_qt5" != "xno"],
++   [AS_IF([test "x$with_qt5" != "xno"],
+     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+      AC_MSG_NOTICE([using moc from $MOC])
+      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
+@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
+      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
+      AC_MSG_NOTICE([using Qt version $QT_VERSION])
+      qt_pkgconfig_file="zbar-qt.pc"
+-     ]))
++     ])])
+ 
+ AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
+ 
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 064f2be75872..14483e82c58e 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
+	<maintainer type="person" proxied="yes">
 		<email>email@linxon.ru</email>
 		<name>Yury Martynov</name>
 	</maintainer>
-	<maintainer type="project">
+	<maintainer type="project" proxied="proxy">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index 2f529efbe041..d74a878a969a 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -84,8 +84,9 @@ PATCHES=(
 	"${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch"
 	"${FILESDIR}/${P}_fix_unittest.patch"
 	"${FILESDIR}/${P}_musl_include_locale_h.patch"
-	"${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch"
-	"${FILESDIR}/zbar-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_Qt5X11Extras_detect.patch"
+	"${FILESDIR}/${PN}-0.23_fix_python_detect.patch"
+	"${FILESDIR}/${P}-autoconf-2.70.patch"
 )
 
 DOCS=( README.md NEWS.md TODO.md HACKING.md TODO.md ChangeLog )
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-20 14:27:17 +0000
commit	5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch)
tree	66e860a5099bcad013f1cf667255dc372a7c11b3 /media-gfx
parent	7218e1b46bceac05841e90472501742d905fb3fc (diff)