Adding metadatav21.1.5

328 files changed, 5133 insertions, 4724 deletions

diff --git a/media-gfx/aaphoto/aaphoto-0.45.ebuild b/media-gfx/aaphoto/aaphoto-0.45.ebuild
index c9839cf9f3f4..75cd19d8d367 100644
--- a/media-gfx/aaphoto/aaphoto-0.45.ebuild
+++ b/media-gfx/aaphoto/aaphoto-0.45.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Automatic color correction and resizing of photos"
-HOMEPAGE="http://log69.com/aaphoto.html https://github.com/log69/aaphoto"
+HOMEPAGE="https://log69.com/aaphoto.html https://github.com/log69/aaphoto"
 SRC_URI="http://log69.com/downloads/${PN}_sources_${PV}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index 63c0cc7c9a30..2589d03785c1 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>erkiferenc@gmail.com</email>
-		<name>Ferenc Erki</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">log69/aaphoto</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>erkiferenc@gmail.com</email>
+  <name>Ferenc Erki</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">log69/aaphoto</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/aewan/metadata.xml b/media-gfx/aewan/metadata.xml
index d9683f346d31..07eb3a1cd210 100644
--- a/media-gfx/aewan/metadata.xml
+++ b/media-gfx/aewan/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>zlogene@gentoo.org</email>
+  <name>Mikle Kolyada</name>
+ </maintainer>
+ <longdescription lang="en">
 Aewan is a multi-layered ascii-art/animation editor that produces both
 stand-alone cat-able art files and an easy-to-parse format for integration in
 your terminal applications.
 </longdescription>
-	<upstream>
-		<remote-id type="sourceforge">aewan</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">aewan</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ahoviewer/metadata.xml b/media-gfx/ahoviewer/metadata.xml
index fa2e59eb745a..e72f13bd027e 100644
--- a/media-gfx/ahoviewer/metadata.xml
+++ b/media-gfx/ahoviewer/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="rar">Rar archive support</flag>
-    <flag name="zip">Zip archive support</flag>
-  </use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>juippis@gentoo.org</email>
+ </maintainer>
+ 
+ <use>
+  <flag name="rar">Rar archive support</flag>
+  <flag name="zip">Zip archive support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/album/album-4.13-r2.ebuild b/media-gfx/album/album-4.13-r2.ebuild
index a590351eb9fa..aa69e443579d 100644
--- a/media-gfx/album/album-4.13-r2.ebuild
+++ b/media-gfx/album/album-4.13-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DESCRIPTION="HTML photo album generator"
-HOMEPAGE="http://MarginalHacks.com/Hacks/album/"
+HOMEPAGE="https://MarginalHacks.com/Hacks/album/"
 SRC_URI="http://marginalhacks.com/bin/album.versions/${P}.tar.gz
 	http://marginalhacks.com/bin/album.versions/data-4.05.tar.gz"
 
diff --git a/media-gfx/album/album-4.15-r1.ebuild b/media-gfx/album/album-4.15-r1.ebuild
index 9a3c35a53fd1..283dda684e5f 100644
--- a/media-gfx/album/album-4.15-r1.ebuild
+++ b/media-gfx/album/album-4.15-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 DESCRIPTION="HTML photo album generator"
-HOMEPAGE="http://marginalhacks.com/Hacks/album/"
+HOMEPAGE="https://marginalhacks.com/Hacks/album/"
 SRC_URI="https://marginalhacks.com/bin/album.versions/${P}.tar.gz
 	https://marginalhacks.com/bin/album.versions/data-4.05.tar.gz"
 
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index 336b619d715f..08880ed01b0f 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>dilfridge@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="plugins">Install optional plugins</flag>
-	<flag name="themes">Install optional themes</flag>
-</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+ </maintainer>
+ 
+ <use>
+  <flag name="plugins">Install optional plugins</flag>
+  <flag name="themes">Install optional themes</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/alembic/alembic-1.7.16.ebuild b/media-gfx/alembic/alembic-1.7.16.ebuild
index 1fde48d28344..ed542a1b220c 100644
--- a/media-gfx/alembic/alembic-1.7.16.ebuild
+++ b/media-gfx/alembic/alembic-1.7.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="hdf5 test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/alembic/metadata.xml b/media-gfx/alembic/metadata.xml
index cbe5fd8cc576..e697dcd541ea 100644
--- a/media-gfx/alembic/metadata.xml
+++ b/media-gfx/alembic/metadata.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>waebbl-gentoo@posteo.net</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
+ <maintainer type="person">
+  <email>waebbl-gentoo@posteo.net</email>
+  <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 	Alembic is an open computer graphics interchange framework, 
 	developed by Sony Pictures Imageworks Inc. and Lucasfilm Ltd.
 </longdescription>
-<use>
-	<flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
-	<flag name="test">Build and run the test-suite</flag>
-	<flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
-</use>
-<upstream>
-	<bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
-	<remote-id type="github">alembic/alembic</remote-id>
-</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">alembic/alembic</remote-id>
+  <bugs-to>https://github.com/alembic/alembic/issues</bugs-to>
+ </upstream>
+ <use>
+  <flag name="hdf5">Add support <pkg>sci-libs/hdf5</pkg></flag>
+  <flag name="test">Build and run the test-suite</flag>
+  <flag name="zlib">Use <pkg>sys-libs/zlib</pkg> for compressions</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/apng2gif/metadata.xml b/media-gfx/apng2gif/metadata.xml
index 4563e14022e4..f2cd72d3c99a 100644
--- a/media-gfx/apng2gif/metadata.xml
+++ b/media-gfx/apng2gif/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">apng2gif</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">apng2gif</remote-id>
+  <remote-id type="cpe">cpe:/a:apng2gif_project:apng2gif</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index 22e5d4e623b3..073b8685bb13 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="7z">Enable support for 7zip compression</flag>
-		<flag name="zopfli">Enable support for Zopfli compression</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">apngasm</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">apngasm</remote-id>
+ </upstream>
+ <use>
+  <flag name="7z">Enable support for 7zip compression</flag>
+  <flag name="zopfli">Enable support for Zopfli compression</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/apngdis/metadata.xml b/media-gfx/apngdis/metadata.xml
index 6aa87f06540a..359bf66fbc3c 100644
--- a/media-gfx/apngdis/metadata.xml
+++ b/media-gfx/apngdis/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">apngdis</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">apngdis</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/apngopt/metadata.xml b/media-gfx/apngopt/metadata.xml
index 119b7eaeeaaa..5b095ae93007 100644
--- a/media-gfx/apngopt/metadata.xml
+++ b/media-gfx/apngopt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">apng</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">apng</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/argyllcms/metadata.xml b/media-gfx/argyllcms/metadata.xml
index 7d273a80ff68..35a5dd961c9b 100644
--- a/media-gfx/argyllcms/metadata.xml
+++ b/media-gfx/argyllcms/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>voyageur@gentoo.org</email>
+  <name>Bernard Cafarelli</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:argyllcms:argyllcms</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/arss/metadata.xml b/media-gfx/arss/metadata.xml
index 1f6ade8f85de..020ae25d16ec 100644
--- a/media-gfx/arss/metadata.xml
+++ b/media-gfx/arss/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">arss</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">arss</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/asymptote/asymptote-2.68.ebuild b/media-gfx/asymptote/asymptote-2.68.ebuild
index f5fe76526bcf..e0036ca884c7 100644
--- a/media-gfx/asymptote/asymptote-2.68.ebuild
+++ b/media-gfx/asymptote/asymptote-2.68.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/asymptote/${P}.src.tgz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="+boehm-gc doc emacs examples fftw gsl +imagemagick latex offscreen +opengl python sigsegv svg test vim-syntax X"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index fee8887be49c..c40da9a54840 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>grozin@gentoo.org</email>
-		<name>Andrey Grozin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>grozin@gentoo.org</email>
+  <name>Andrey Grozin</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <longdescription lang="en">
 		Asymptote is a powerful descriptive vector graphics language that
 		provides a natural coordinate-based framework for technical drawing.
 		Labels and equations are typeset with LaTeX, for high-quality PostScript
@@ -18,12 +18,13 @@
 		A major advantage of Asymptote over other graphics packages is that it
 		is a programming language, as opposed to just a graphics program.
 	</longdescription>
-	<use>
-		<flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
-		<flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
-		<flag name="offscreen">Enables off-screen rendering</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">asymptote</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">asymptote</remote-id>
+ </upstream>
+ <use>
+  <flag name="boehm-gc">Enables using the Boehm-Demers-Weiser conservative garbage collector</flag>
+  <flag name="sigsegv">Enables using <pkg>dev-libs/libsigsegv</pkg></flag>
+  <flag name="offscreen">Enables off-screen rendering</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/autopano-sift-C/metadata.xml b/media-gfx/autopano-sift-C/metadata.xml
index f602a555b7e2..b6ced6d7dfc3 100644
--- a/media-gfx/autopano-sift-C/metadata.xml
+++ b/media-gfx/autopano-sift-C/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">hugin</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">hugin</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/aview/metadata.xml b/media-gfx/aview/metadata.xml
index 89e6ed9726f3..27274d513feb 100644
--- a/media-gfx/aview/metadata.xml
+++ b/media-gfx/aview/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">aa-project</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">aa-project</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 1e00c8116b92..3456c59fc5d1 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,6 @@
 DIST blender-2.83.10.tar.xz 38624904 BLAKE2B e52597b3acce875943dff75575c42c8c1fdeb19cb74b4f3609e56730e8fb6d5bbc94a6215a1e9da52b46e45c48c9a46dc4f3ed0d22e16186d9e7434b27eef70f SHA512 96b252176d867b3cac76a99cbee95313b60935a34edc44f27c67a1f75f20b353f0894288df2696718e95a03a07a1630797a431b752ffb4dd14692739d714a589
+DIST blender-2.83.12.tar.xz 39132904 BLAKE2B 175e8c5ab9324421f23357bc367b2e70ee8c391130d376d6d53eefbf90529d09921395cd11e7b1709aaa4d24ec6f8df64050869e41bbe211229126db08f22089 SHA512 f313c92e311e852742e74934504fcd3ccd296bcea2499f605cef568e3c615ececd9d70dec5025e4d4ff19f03803c148a8b03a4b68b7ca978554f5b1122c9890b
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d SHA512 061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34 SHA512 e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
 DIST blender-2.91.0.tar.xz 41528920 BLAKE2B f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d SHA512 a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa
+DIST blender-2.91.2.tar.xz 42057100 BLAKE2B f10f838ad6d56135fddf9e9171473e1e589f511a38112845d650436a1eb4da94ea0777571dffc6446f4217dce647b087cf5a18841d7dde2086d187bb8f7d3654 SHA512 9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e
diff --git a/media-gfx/blender/blender-2.83.12.ebuild b/media-gfx/blender/blender-2.83.12.ebuild
new file mode 100644
index 000000000000..12e6057aad7f
--- /dev/null
+++ b/media-gfx/blender/blender-2.83.12.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+		-DWITH_X11=$(usex !headless)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if use python_single_target_python3_8; then
+		elog "You've enabled python-3.8 support for blender, which is still experimental."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_7 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/blender-2.91.0.ebuild b/media-gfx/blender/blender-2.91.0.ebuild
index 1d6447085848..9c61b8676011 100644
--- a/media-gfx/blender/blender-2.91.0.ebuild
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ MY_PV="$(ver_cut 1-2)"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
 	abi6-compat abi7-compat alembic collada color-management cuda cycles \
 	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
diff --git a/media-gfx/blender/blender-2.91.2.ebuild b/media-gfx/blender/blender-2.91.2.ebuild
new file mode 100644
index 000000000000..b5c714918833
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.2.ebuild
@@ -0,0 +1,334 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+	toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org"
+SRC_URI="https://download.blender.org/source/${P}.tar.xz"
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+	abi6-compat abi7-compat alembic collada color-management cuda cycles \
+	debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+	man ndof nls openal opencl openimageio openmp opensubdiv \
+	openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	alembic? ( openexr )
+	cuda? ( cycles )
+	cycles? ( openexr tbb tiff openimageio )
+	elbeem? ( tbb )
+	opencl? ( cycles )
+	openvdb? (
+		^^ ( abi6-compat abi7-compat )
+		tbb
+	)
+	osl? ( cycles llvm )
+	standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/boost:=[nls?,threads(+)]
+	dev-libs/gmp
+	dev-libs/pugixml
+	dev-libs/lzo:2=
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	')
+	media-gfx/potrace
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	media-libs/glew:*
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	sys-libs/zlib:=
+	virtual/glu
+	virtual/jpeg
+	virtual/libintl
+	virtual/opengl
+	alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+	collada? ( >=media-libs/opencollada-1.6.68 )
+	color-management? ( media-libs/opencolorio )
+	cuda? ( dev-util/nvidia-cuda-toolkit:= )
+	cycles? ( media-libs/freeglut )
+	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+	fftw? ( sci-libs/fftw:3.0= )
+	!headless? (
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXxf86vm
+	)
+	jack? ( virtual/jack )
+	jemalloc? ( dev-libs/jemalloc:= )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	llvm? ( sys-devel/llvm:= )
+	ndof? (
+		app-misc/spacenavd
+		dev-libs/libspnav
+	)
+	nls? ( virtual/libiconv )
+	openal? ( media-libs/openal )
+	opencl? ( virtual/opencl )
+	openimageio? ( media-libs/openimageio:= )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
+	openvdb? (
+		~media-gfx/openvdb-7.0.0[abi6-compat(-)?,abi7-compat(-)?]
+		dev-libs/c-blosc:=
+	)
+	osl? ( media-libs/osl:= )
+	sdl? ( media-libs/libsdl2[sound,joystick] )
+	sndfile? ( media-libs/libsndfile )
+	tbb? ( dev-cpp/tbb )
+	tiff? ( media-libs/tiff )
+	valgrind? ( dev-util/valgrind )
+"
+
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:=
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-doc/doxygen[dot]
+		dev-python/sphinx[latex]
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+	nls? ( sys-devel/gettext )
+"
+
+CMAKE_BUILD_TYPE="Release"
+
+blender_check_requirements() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+	if use doc; then
+		CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+	fi
+}
+
+pkg_pretend() {
+	blender_check_requirements
+}
+
+pkg_setup() {
+	blender_check_requirements
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# we don't want static glew, but it's scattered across
+	# multiple files that differ from version to version
+	# !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+	local file
+	while IFS="" read -d $'\0' -r file ; do
+		sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+	done < <(find . -type f -name "CMakeLists.txt")
+
+	# Disable MS Windows help generation. The variable doesn't do what it
+	# it sounds like.
+	sed -e "s|GENERATE_HTMLHELP      = YES|GENERATE_HTMLHELP      = NO|" \
+		-i doc/doxygen/Doxyfile || die
+}
+
+src_configure() {
+	# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu
+	# shadows, see bug #276338 for reference
+	append-flags -funsigned-char
+	append-lfs-flags
+
+	if use openvdb; then
+		local version
+		if use abi6-compat; then
+			version=6;
+		elif use abi7-compat; then
+			version=7;
+		else
+			die "Openvdb abi version not compatible"
+		fi
+		append-cppflags -DOPENVDB_ABI_VERSION_NUMBER=${version}
+	fi
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+		-DPYTHON_LIBRARY="$(python_get_library_path)"
+		-DPYTHON_VERSION="${EPYTHON/python/}"
+		-DWITH_ALEMBIC=$(usex alembic)
+		-DWITH_ASSERT_ABORT=$(usex debug)
+		-DWITH_BOOST=ON
+		-DWITH_BULLET=$(usex bullet)
+		-DWITH_CODEC_FFMPEG=$(usex ffmpeg)
+		-DWITH_CODEC_SNDFILE=$(usex sndfile)
+		-DWITH_CXX_GUARDEDALLOC=$(usex debug)
+		-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+		-DWITH_CYCLES=$(usex cycles)
+		-DWITH_CYCLES_DEVICE_OPENCL=$(usex opencl)
+		-DWITH_CYCLES_EMBREE=OFF
+		-DWITH_CYCLES_STANDALONE=$(usex standalone)
+		-DWITH_CYCLES_STANDALONE_GUI=$(usex standalone)
+		-DWITH_CYCLES_OSL=$(usex osl)
+		-DWITH_DOC_MANPAGE=$(usex man)
+		-DWITH_FFTW3=$(usex fftw)
+		-DWITH_GHOST_X11=$(usex !headless)
+		-DWITH_GTESTS=$(usex test)
+		-DWITH_HEADLESS=$(usex headless)
+		-DWITH_INSTALL_PORTABLE=OFF
+		-DWITH_IMAGE_DDS=$(usex dds)
+		-DWITH_IMAGE_OPENEXR=$(usex openexr)
+		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)
+		-DWITH_IMAGE_TIFF=$(usex tiff)
+		-DWITH_INPUT_NDOF=$(usex ndof)
+		-DWITH_INTERNATIONAL=$(usex nls)
+		-DWITH_JACK=$(usex jack)
+		-DWITH_LLVM=$(usex llvm)
+		-DWITH_MEM_JEMALLOC=$(usex jemalloc)
+		-DWITH_MEM_VALGRIND=$(usex valgrind)
+		-DWITH_MOD_FLUID=$(usex elbeem)
+		-DWITH_MOD_OCEANSIM=$(usex fftw)
+		-DWITH_OPENAL=$(usex openal)
+		-DWITH_OPENCOLLADA=$(usex collada)
+		-DWITH_OPENCOLORIO=$(usex color-management)
+		-DWITH_OPENIMAGEIO=$(usex openimageio)
+		-DWITH_OPENMP=$(usex openmp)
+		-DWITH_OPENSUBDIV=$(usex opensubdiv)
+		-DWITH_OPENVDB=$(usex openvdb)
+		-DWITH_OPENVDB_BLOSC=$(usex openvdb)
+		-DWITH_PYTHON_INSTALL=$(usex system-python OFF ON)
+		-DWITH_PYTHON_INSTALL_NUMPY=$(usex system-numpy OFF ON)
+		-DWITH_SDL=$(usex sdl)
+		-DWITH_STATIC_LIBS=OFF
+		-DWITH_SYSTEM_EIGEN3=ON
+		-DWITH_SYSTEM_GLEW=ON
+		-DWITH_SYSTEM_LZO=ON
+		-DWITH_TBB=$(usex tbb)
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		# Workaround for binary drivers.
+		addpredict /dev/ati
+		addpredict /dev/dri
+		addpredict /dev/nvidiactl
+
+		einfo "Generating Blender C/C++ API docs ..."
+		cd "${CMAKE_USE_DIR}"/doc/doxygen || die
+		doxygen -u Doxyfile || die
+		doxygen || die "doxygen failed to build API docs."
+
+		cd "${CMAKE_USE_DIR}" || die
+		einfo "Generating (BPY) Blender Python API docs ..."
+		"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed."
+
+		cd "${CMAKE_USE_DIR}"/doc/python_api || die
+		sphinx-build sphinx-in BPY_API || die "sphinx failed."
+	fi
+}
+
+src_test() {
+	if use test; then
+		einfo "Running Blender Unit Tests ..."
+		cd "${BUILD_DIR}"/bin/tests || die
+		local f
+		for f in *_test; do
+			./"${f}" || die
+		done
+	fi
+}
+
+src_install() {
+	# Pax mark blender for hardened support.
+	pax-mark m "${BUILD_DIR}"/bin/blender
+
+	if use standalone; then
+		dobin "${BUILD_DIR}"/bin/cycles
+	fi
+
+	if use doc; then
+		docinto "html/API/python"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/.
+
+		docinto "html/API/blender"
+		dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/.
+	fi
+
+	cmake_src_install
+
+	# fix doc installdir
+	docinto "html"
+	dodoc "${CMAKE_USE_DIR}"/release/text/readme.html
+	rm -r "${ED}"/usr/share/doc/blender || die
+
+	python_fix_shebang "${ED}/usr/bin/blender-thumbnailer.py"
+	python_optimize "${ED}/usr/share/blender/${MY_PV}/scripts"
+}
+
+pkg_postinst() {
+	elog
+	elog "Blender uses python integration. As such, may have some"
+	elog "inherent risks with running unknown python scripts."
+	elog
+	elog "It is recommended to change your blender temp directory"
+	elog "from /tmp to /home/user/tmp or another tmp file under your"
+	elog "home directory. This can be done by starting blender, then"
+	elog "dragging the main menu down do display all paths."
+	elog
+	ewarn
+	ewarn "This ebuild does not unbundle the massive amount of 3rd party"
+	ewarn "libraries which are shipped with blender. Note that"
+	ewarn "these have caused security issues in the past."
+	ewarn "If you are concerned about security, file a bug upstream:"
+	ewarn "  https://developer.blender.org/"
+	ewarn
+
+	if use python_single_target_python3_8; then
+		elog "You've enabled python-3.8 support for blender, which is still experimental."
+		elog "If you experience breakages with e.g. plugins, please switch to"
+		elog "python_single_target_python3_7 instead."
+		elog "Bug: https://bugs.gentoo.org/737388"
+		elog
+	fi
+
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+
+	ewarn ""
+	ewarn "You may want to remove the following directory."
+	ewarn "~/.config/${PN}/${MY_PV}/cache/"
+	ewarn "It may contain extra render kernels not tracked by portage"
+	ewarn ""
+}
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 56a4c98b6a4c..de22863fae04 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -1,91 +1,92 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>agrigo2001@yahoo.com.au</email>
-		<name>Adrian Grigo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="person">
+  <email>agrigo2001@yahoo.com.au</email>
+  <name>Adrian Grigo</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 		Blender, the open source software for 3D modeling, animation,
 		rendering, post-production, interactive creation and playback.
 	</longdescription>
-	<use>
-		<flag name="abi6-compat">
+ <upstream>
+  <remote-id type="cpe">cpe:/a:blender:blender</remote-id>
+ </upstream>
+ <use>
+  <flag name="abi6-compat">
 			Build for OpenVDB ABI 6.
 		</flag>
-		<flag name="abi7-compat">
+  <flag name="abi7-compat">
 			Build for OpenVDB ABI 7.
 		</flag>
-		<flag name="alembic">
+  <flag name="alembic">
 			Add support for Alembic through
 			<pkg>media-gfx/alembic</pkg>.
 		</flag>
-		<flag name="bullet">
+  <flag name="bullet">
 			Enable Bullet (Physics Engine).
 		</flag>
-		<flag name="collada">
+  <flag name="collada">
 			Add support for Collada interchange format through
 			<pkg>media-libs/opencollada</pkg>.
 		</flag>
-		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg>.</flag>
-		<flag name="cuda">
+  <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg>.</flag>
+  <flag name="cuda">
 			Build cycles renderer with nVidia CUDA support.
 		</flag>
-		<flag name="cycles">
+  <flag name="cycles">
 			Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
 			<pkg>dev-libs/boost</pkg>).
 		</flag>
-		<flag name="dds">
+  <flag name="dds">
 			Adds DDS textures support to Blender.
 		</flag>
-		<flag name="elbeem">
+  <flag name="elbeem">
 			Adds surface fluid simulation to Blender using El'Beem library.
 		</flag>
-		<flag name="headless">
+  <flag name="headless">
 			Build without graphical support (renderfarm, server mode only).
 		</flag>
-		<flag name="llvm">
+  <flag name="llvm">
 			Enable features depending on llvm.
 		</flag>
-		<flag name="man">
-			Build and install man pages.
-		</flag>
-		<flag name="ndof">
+  <flag name="ndof">
 			Enable NDOF input devices (SpaceNavigator and friends).
 		</flag>
-		<flag name="opencl">
+  <flag name="opencl">
 			Allow OpenCL Graphics Acceleration. This may
 			require extra graphics card drivers.</flag>
-		<flag name="openimageio">Enable OpenImageIO Support</flag>
-		<flag name="opensubdiv">
+  <flag name="openimageio">Enable OpenImageIO Support</flag>
+  <flag name="opensubdiv">
 			Add rendering support form OpenSubdiv from Dreamworks Animation
 			through <pkg>media-libs/opensubdiv</pkg>.
 		</flag>
-		<flag name="openvdb">
+  <flag name="openvdb">
 			Add GPU preview rendering. Only works with nVidia cards.
 		</flag>
-		<flag name="osl">
+  <flag name="osl">
 			Add support for OpenShadingLanguage scripting.
 		</flag>
-		<flag name="standalone">
+  <flag name="standalone">
 			Build the standalone version of Cycles.
 		</flag>
-		<flag name="system-numpy">
+  <flag name="system-numpy">
 			Use the system numpy implementation rather than a local copy.
 		</flag>
-		<flag name="system-python">
+  <flag name="system-python">
 			Use the system python implementation rather than a local copy.
 		</flag>
-		<flag name="tbb">
+  <flag name="tbb">
 			Use threading building blocks library from <pkg>dev-cpp/tbb</pkg>.
 		</flag>
-		<flag name="valgrind">
+  <flag name="valgrind">
 			Add support for memory debugging using
 			<pkg>dev-util/valgrind</pkg>
 		</flag>
-	</use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml
index d688975002b3..a0efc324e838 100644
--- a/media-gfx/cairosvg/metadata.xml
+++ b/media-gfx/cairosvg/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">CairoSVG</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>mgorny@gentoo.org</email>
+  <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="pypi">CairoSVG</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/cellwriter/metadata.xml
+++ b/media-gfx/cellwriter/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/chafa/Manifest b/media-gfx/chafa/Manifest
index c8d6ff58a27a..bcce16cf5d3d 100644
--- a/media-gfx/chafa/Manifest
+++ b/media-gfx/chafa/Manifest
@@ -1 +1,2 @@
 DIST chafa-1.4.1.tar.xz 389428 BLAKE2B 8ed6c6d57953d784763f10c274bd8b7acf7857b095bae58c476d2e17418a7112f1ec000d667eebfc2eda712c9588e686ad4021da017f4d187a5461c0435c5476 SHA512 f0bd1911fd544f93afadbb2105f151dc77e31a2f3af4c7f8441a06f547a7ebe0674664721b18c3a35a7c4e745dda666713adc1dfbe5e97dfdc54856a13bd5063
+DIST chafa-1.6.0.tar.xz 417888 BLAKE2B f9837a9062396f92974088ea2e59e050089b462442ac01af17dc7f47f4c3a24542facd4c977cac2ee9db3c4af9bae2349cea9186f9d0362cf7bb74f4e83d345b SHA512 47843b8bf1b0555ae3570f688229e9f848e2e30c80aa277278230196f6fdb583b7f9170d1740171f2f4c5d5d915e00df407722067bcf6f2dc888804b7bd074da
diff --git a/media-gfx/chafa/chafa-1.6.0.ebuild b/media-gfx/chafa/chafa-1.6.0.ebuild
new file mode 100644
index 000000000000..2c7e6798a528
--- /dev/null
+++ b/media-gfx/chafa/chafa-1.6.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="versatile and fast Unicode/ASCII/ANSI graphics renderer"
+HOMEPAGE="https://hpjansson.org/chafa/ https://github.com/hpjansson/chafa"
+SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+tools"
+
+RDEPEND="
+	dev-libs/glib:2
+	media-gfx/imagemagick:0=
+	tools? ( >=media-libs/freetype-2.0.0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-man \
+		$(use_with tools)
+}
+
+src_install() {
+	local DOCS=( AUTHORS NEWS README TODO )
+	default
+
+	use tools && doman docs/chafa.1
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-gfx/chafa/metadata.xml b/media-gfx/chafa/metadata.xml
index 715490a53a10..41dad439cdb2 100644
--- a/media-gfx/chafa/metadata.xml
+++ b/media-gfx/chafa/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jakov.smolic@sartura.hr</email>
-		<name>Jakov Smolic</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="tools">Build command-line tools</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">hpjansson/chafa</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>jakov.smolic@sartura.hr</email>
+  <name>Jakov Smolic</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">hpjansson/chafa</remote-id>
+ </upstream>
+ <use>
+  <flag name="tools">Build command-line tools</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/clockphoto/metadata.xml b/media-gfx/clockphoto/metadata.xml
index 915f00227065..12533cd44cf0 100644
--- a/media-gfx/clockphoto/metadata.xml
+++ b/media-gfx/clockphoto/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>zx2c4@gentoo.org</email>
+  <name>Jason A. Donenfeld</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/colorhug-client/metadata.xml b/media-gfx/colorhug-client/metadata.xml
index 996e7cacd217..f2710c9e5c09 100644
--- a/media-gfx/colorhug-client/metadata.xml
+++ b/media-gfx/colorhug-client/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/converseen/Manifest b/media-gfx/converseen/Manifest
index ed16f72e5053..7440bc6d7475 100644
--- a/media-gfx/converseen/Manifest
+++ b/media-gfx/converseen/Manifest
@@ -1 +1 @@
-DIST converseen-0.9.6.2.tar.gz 276879 BLAKE2B 3f41c8a85d275b2a2fb1c2c8971f92e447b0c7b236d5b90a07629400925b8627e1e9e837239e2114cd2e6f755941b4ef28adfbecf9813963d01b925af4e348e0 SHA512 897bcb4554ca05d92dc939837f74022fcc21e05273cb40445c0d02ce3e10e87f9e74eeccee69e4ed1bdf63ca3bd759d4d51769daee5ea34df7997114c7937f7c
+DIST converseen-0.9.9.0.tar.gz 280547 BLAKE2B 978df93748cd5585b99f371f9538f9ae0a6fa683c9a452a8fb3eceb0c6a7b972423dbd396f8702a4db839852d39bb7c3b654603a08a5dc61481ed74c6aa3aa0b SHA512 8ec01de40fc32bc83c97b3e1d1d0400b9ae5c8c5f374dfae452a75f1bec648d6db26ea036103e15c84e4360ed83f27ce5d35a64592289de083e9701e6153ca63
diff --git a/media-gfx/converseen/converseen-0.9.6.2.ebuild b/media-gfx/converseen/converseen-0.9.9.0.ebuild
index 4432577b94d1..06de610772d2 100644
--- a/media-gfx/converseen/converseen-0.9.6.2.ebuild
+++ b/media-gfx/converseen/converseen-0.9.9.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Batch image converter and resizer based on ImageMagick"
 HOMEPAGE="https://converseen.fasterland.net/
@@ -24,10 +24,15 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	media-gfx/imagemagick:=[cxx]
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
 S="${WORKDIR}/${P^}"
 
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
+	"${FILESDIR}/${P}-appdata-path.patch"
+	"${FILESDIR}/${P}-no-update.patch"
+)
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
new file mode 100644
index 000000000000..127fc7ad926c
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-appdata-path.patch
@@ -0,0 +1,17 @@
+Description: install appdata to package directory
+ The CMAKE_INSTALL_PREFIX was not set to install path and set its correct
+ location.
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Last-Update: 2018-08-21
+
+--- a/converseen.pro
++++ b/converseen.pro
+@@ -122,7 +122,7 @@ loc/converseen_uk_UA.qm
+  desktopFile.files = res/converseen.desktop
+  kdeservicemenu.path = $${SHARE_DIR}/kservices5/ServiceMenus
+  kdeservicemenu.files = res/converseen_import.desktop
+- appdata.path = /usr/share/appdata/
++ appdata.path = /usr/share/metainfo/
+  appdata.files = converseen.appdata.xml
+ 
+  isEmpty(QMAKE_LRELEASE) {
diff --git a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
index 3b53d056948c..50ad7a01e8db 100644
--- a/media-gfx/converseen/files/converseen-0.9.6.2-gnuinstalldirs.patch
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-gnuinstalldirs.patch
@@ -1,15 +1,15 @@
-From ba62e29b7739c96ad073a7c14d4fdb5883dbe94c Mon Sep 17 00:00:00 2001
+From 6dbded67fdbe977719ded2a6ffdcdc87165dd541 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Tue, 9 Jan 2018 02:06:09 +0100
 Subject: [PATCH] Use GNUInstalldirs
 
 No need to reinvent the wheel, make use of standards provided by cmake.
 ---
- CMakeLists.txt | 36 +++++++++++++++++++-----------------
- 1 file changed, 19 insertions(+), 17 deletions(-)
+ CMakeLists.txt | 40 +++++++++++++++++++++-------------------
+ 1 file changed, 21 insertions(+), 19 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a944102..de5e556 100755
+index f135b66..4bd8764 100755
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -5,6 +5,8 @@ cmake_minimum_required(VERSION 2.6)
@@ -21,7 +21,7 @@ index a944102..de5e556 100755
  ADD_DEFINITIONS( ${OPTIMIZATION_FLAGS} )

    

  SET(converseen_UIS  

-@@ -129,20 +131,20 @@ ADD_EXECUTABLE(${GUI}
+@@ -131,22 +133,22 @@ ADD_EXECUTABLE(${GUI}
    

  TARGET_LINK_LIBRARIES(${GUI} ${Qt5Network_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${ImageMagick_LIBRARY} ${ImageMagick_Magick++_LIBRARY} ${ImageMagick_MagickCore_LIBRARY})

  

@@ -29,7 +29,7 @@ index a944102..de5e556 100755
 -install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)

 -install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)

 -install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/kservices5/ServiceMenus)

--install(FILES converseen.appdata.xml DESTINATION /usr/share/appdata/)

+-install(FILES converseen.appdata.xml DESTINATION /usr/share/metainfo/)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

@@ -42,11 +42,13 @@ index a944102..de5e556 100755
 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_PREFIX}/share/converseen/loc)

 +install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/converseen DESTINATION ${CMAKE_INSTALL_BINDIR})

 +install(FILES res/converseen.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)

 +install(FILES res/converseen.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)

 +install(FILES res/converseen_import.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/kservices5/ServiceMenus)

-+install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata/)

++install(FILES converseen.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_cs_CZ.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_de_DE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_es_CL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

@@ -59,6 +61,8 @@ index a944102..de5e556 100755
 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_pl_PL.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_ja_JP.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_da_DK.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_uk_UA.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/converseen_sv_SE.qm DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/converseen/loc)

 -- 
-2.15.1
+2.30.1
 
diff --git a/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
new file mode 100644
index 000000000000..f4dad00586ab
--- /dev/null
+++ b/media-gfx/converseen/files/converseen-0.9.9.0-no-update.patch
@@ -0,0 +1,20 @@
+Description: Don't check upstream versions
+ Don't check new versions page due to privacy concerns.
+Forwarded: no
+Last-Update: 2018-08-21
+Author: Laszlo Boszormenyi (GCS) <gcs@debian.org>
+Bug-Debian: https://bugs.debian.org/761944
+
+---
+
+--- a/src/mainwindowimpl.cpp
++++ b/src/mainwindowimpl.cpp
+@@ -1012,7 +1012,7 @@ void MainWindowImpl::openFlattrLink()
+ void MainWindowImpl::checkForUpdates()
+ {
+     UpdateChecker *up = new UpdateChecker();
+-    up->checkForUpdates();
++//    up->checkForUpdates();
+ }
+ 
+ void MainWindowImpl::bugReport()
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index c9088408f034..0cfcd2411cb3 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Faster3ck/Converseen</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">Faster3ck/Converseen</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/cropgui/metadata.xml b/media-gfx/cropgui/metadata.xml
index 27aa4f80ba4c..f1a99175003e 100644
--- a/media-gfx/cropgui/metadata.xml
+++ b/media-gfx/cropgui/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>hanno@gentoo.org</email>
-		<name>Hanno Böck</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">jepler/cropgui</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>hanno@gentoo.org</email>
+  <name>Hanno Böck</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">jepler/cropgui</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/crwinfo/metadata.xml b/media-gfx/crwinfo/metadata.xml
index 7b7f99802425..565c080e8d32 100644
--- a/media-gfx/crwinfo/metadata.xml
+++ b/media-gfx/crwinfo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="freshmeat">crwinfo</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="freshmeat">crwinfo</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/cura/metadata.xml b/media-gfx/cura/metadata.xml
index 615b4b60345e..9299037ce899 100644
--- a/media-gfx/cura/metadata.xml
+++ b/media-gfx/cura/metadata.xml
@@ -1,35 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mathy@vanvoorden.be</email>
-		<name>Mathy Vanvoorden</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
-	<slots>
-		<subslots>soname major version number</subslots>
-	</slots>
-	<use>
-		<flag name="usb">Access 3D printers via USB</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/Ultimaker/Cura/issues</bugs-to>
-		<doc>https://github.com/Ultimaker/Cura/wiki</doc>
-		<remote-id type="github">Ultimaker/Cura</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>alexxy@gentoo.org</email>
+  <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>mathy@vanvoorden.be</email>
+  <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>perlovka@gmail.com</email>
+  <name>Michael Perlov</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">Ultimaker/Cura</remote-id>
+  <bugs-to>https://github.com/Ultimaker/Cura/issues</bugs-to>
+  <doc>https://github.com/Ultimaker/Cura/wiki</doc>
+ </upstream>
+ <use>
+  <flag name="usb">Access 3D printers via USB</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+ <slots>
+  <subslots>soname major version number</subslots>
+ </slots>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/curaengine/metadata.xml b/media-gfx/curaengine/metadata.xml
index 9bb6b008a456..a7ce98763dc1 100644
--- a/media-gfx/curaengine/metadata.xml
+++ b/media-gfx/curaengine/metadata.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mathy@vanvoorden.be</email>
-		<name>Mathy Vanvoorden</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>alexxy@gentoo.org</email>
+  <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>mathy@vanvoorden.be</email>
+  <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>perlovka@gmail.com</email>
+  <name>Michael Perlov</name>
+ </maintainer>
+ <longdescription>
 		The CuraEngine is a C++ console application for 3D printing GCode generation.
 		It has been made as a better and faster alternative to the old Skeinforge engine.
 
@@ -30,14 +30,15 @@
 
 		The CuraEngine can be used seperately or in other applications. Feel free to add it to your application.
 	</longdescription>
-	<use>
-		<flag name="arcus">Build with support for communication library between internal components for Ultimaker software</flag>
-	</use>
-	<slots>
-		<subslots>soname major version number</subslots>
-	</slots>
-	<upstream>
-		<bugs-to>https://github.com/Ultimaker/CuraEngine/issues</bugs-to>
-		<remote-id type="github">Ultimaker/CuraEngine</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">Ultimaker/CuraEngine</remote-id>
+  <bugs-to>https://github.com/Ultimaker/CuraEngine/issues</bugs-to>
+ </upstream>
+ <use>
+  <flag name="arcus">Build with support for communication library between internal components for Ultimaker software</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+ <slots>
+  <subslots>soname major version number</subslots>
+ </slots>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest
index 76cacfea9f22..25b0a41f8d0c 100644
--- a/media-gfx/darktable/Manifest
+++ b/media-gfx/darktable/Manifest
@@ -1,8 +1,6 @@
 DIST darktable-2.6.2-gcc9.patch.tar.xz 25864 BLAKE2B 857803d4c46b47b1e06e962533c231621fa23e72dffae617bc4e078316fc22c5883df404b30e63d7ed2111078d0d7b54bfa3510524c92fa739238904e2ec17f0 SHA512 29b208fa0b04aa11a2c45312763ba471785b2d0f669c07a6092b82adc0284428d7dc9ea8ebae7bd851414f04191e6aafb434fcc127f062ef66d075208c7d49cb
 DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0
-DIST darktable-3.2.1.tar.xz 3920728 BLAKE2B 79ef5df93d6c4728d19bc8bf01d018f071efe1ea94a68be53fced7217df608e5362b9905e2e633af4d0a11574ca3e42eac9d97fd3bfaf3a22b45b61213f60070 SHA512 0c76f7c145b470d0b129e4565727cef0c7509c1cb7f2405e41b20c81411741513cfc2976c7b8fe168bc1b017e7bfc292bb2d824c3beddce6432ee7143513bdc7
 DIST darktable-3.4.0.tar.xz 4444452 BLAKE2B 98b717aafe940a6916a2c2c42577be4956a171e7b445d69d20cb6aa1db35a255919524e8547c229461c64022fa3df5ace57a9e7a5ed32304820d5f263c3acbfc SHA512 b0a1e58f9af4007b22bacd7c61c75bdd036db9b1bbb6bd0ed785759d1a7a5a095a49a2a68c1555c661c4fff2549fcd35d2db2d9d4c16fc035bb37939804c749f
 DIST darktable-3.4.1.tar.xz 4456192 BLAKE2B 7b573db69cb32496ad79d6636b50d3b2db471376c2486d356e1da2740d48644821265c3249a40603a521d588ef89cee33e31d7a6b216f106625ca2aa3f8bfb68 SHA512 3376c5e2aa52d02fcfc45d9efb1a60a7bee6210dc81e1131f2c163ca2059860f7e3a64b5cfd05117dcaaf8c7810d08a84058a0b64ef6fd24c90bbafde7ca4f6f
 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14
-DIST darktable-usermanual-3.0.0.pdf 16237603 BLAKE2B ff5c24bb038deb37269a84389937740fa0ff77a9fb5bef4c484cdd903e39609588f632f577ce53c690d3abb832ace451d0d9d3f563ebdb6196ae8e2dac008a01 SHA512 2523b48e2baaa71561dc119340aed3bbf2ab4481dceb0c3ca2bbb7b0cacfaab894fa4eef82b667648cd7bb049304dbda09fa1a638f7734219b672b3ea8ee0eac
 DIST darktable-usermanual-3.4.0.pdf 16241791 BLAKE2B d6fc232c3eddb5474e36ce1fbc02c3472291e5ebdf2eae09c419215263f615546a79f88ee9d252b387fc5e4f2c9714398deab8de176b3d928b6a17c2878cef56 SHA512 fd154c02d5e0c63d9698b2f80a7439a191f4582b717b2f163923eda40aae1ebe8aeaf1a70efdc423eb8c8269d74fc0e23df8c9c0269ee8f5a357611501c3547e
diff --git a/media-gfx/darktable/darktable-3.2.1-r1.ebuild b/media-gfx/darktable/darktable-3.2.1-r1.ebuild
deleted file mode 100644
index 20e5d0b61486..000000000000
--- a/media-gfx/darktable/darktable-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-
-inherit cmake flag-o-matic lua-single toolchain-funcs xdg
-
-DOC_PV="3.0.0"
-MY_PV="${PV/_/}"
-MY_P="${P/_/.}"
-
-DESCRIPTION="A virtual lighttable and darkroom for photographers"
-HOMEPAGE="https://www.darktable.org/"
-SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
-	doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
-
-LICENSE="GPL-3 CC-BY-3.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-LANGS=" de es fr he it pl pt-BR ru sl"
-IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet
-	lto lua nls opencl openmp openexr system-lua tools webp
-	${LANGS// / l10n_}"
-
-REQUIRED_USE="system-lua? ( lua ${LUA_REQUIRED_USE} )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-COMMON_DEPEND="
-	dev-db/sqlite:3
-	dev-libs/json-glib
-	dev-libs/libxml2:2
-	>=dev-libs/pugixml-1.8:0=
-	gnome-base/librsvg:2
-	>=media-gfx/exiv2-0.25-r2:0=[xmp]
-	media-libs/lcms:2
-	>=media-libs/lensfun-0.2.3:0=
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	net-libs/libsoup:2.4
-	net-misc/curl
-	sys-libs/zlib:=
-	virtual/jpeg:0
-	x11-libs/cairo
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/pango
-	colord? ( x11-libs/colord-gtk:0= )
-	cups? ( net-print/cups )
-	flickr? ( media-libs/flickcurl )
-	geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 )
-	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
-	gphoto2? ( media-libs/libgphoto2:= )
-	graphicsmagick? ( media-gfx/graphicsmagick )
-	jpeg2k? ( media-libs/openjpeg:2= )
-	opencl? ( virtual/opencl )
-	openexr? ( media-libs/openexr:0= )
-	system-lua? ( ${LUA_DEPS} )
-	webp? ( media-libs/libwebp:0= )
-"
-DEPEND="${COMMON_DEPEND}
-	opencl? (
-		>=sys-devel/clang-4
-		>=sys-devel/llvm-4
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-find-opencl-header.patch
-	"${FILESDIR}"/${PN}-3.0.2_cmake-march-autodetection.patch
-	"${FILESDIR}"/${PN}-3.0.2_jsonschema-automagic.patch
-)
-
-S="${WORKDIR}/${P/_/~}"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		# Bug #695658
-		if tc-is-gcc; then
-			test-flags-CC -floop-block &> /dev/null || \
-				die "Please switch to a gcc version built with USE=graphite"
-		fi
-
-		if use openmp ; then
-			tc-has-openmp || die "Please switch to an openmp compatible compiler"
-		fi
-	fi
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse3 && append-flags -msse3
-
-	sed -i -e 's:/appdata:/metainfo:g' data/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# As of darktable-3.2.1, AVIF support is not compatible with >=media-libs/libavif-0.8.0; see Bug #751352.
-	# GMIC support mostly works but there are several problems with the media-gfx/gmic ebuilds currently
-	# in the tree, and the package itself has got no maintainer.
-	local mycmakeargs=(
-		-DBUILD_CURVE_TOOLS=$(usex tools)
-		-DBUILD_NOISE_TOOLS=$(usex tools)
-		-DBUILD_PRINT=$(usex cups)
-		-DCUSTOM_CFLAGS=ON
-		-DDONT_USE_INTERNAL_LUA=$(usex system-lua)
-		-DRAWSPEED_ENABLE_LTO=$(usex lto)
-		-DUSE_AVIF=no
-		-DUSE_CAMERA_SUPPORT=$(usex gphoto2)
-		-DUSE_COLORD=$(usex colord)
-		-DUSE_FLICKR=$(usex flickr)
-		-DUSE_GMIC=no
-		-DUSE_GRAPHICSMAGICK=$(usex graphicsmagick)
-		-DUSE_KWALLET=$(usex kwallet)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DUSE_LUA=$(usex lua)
-		-DUSE_MAP=$(usex geolocation)
-		-DUSE_NLS=$(usex nls)
-		-DUSE_OPENCL=$(usex opencl)
-		-DUSE_OPENEXR=$(usex openexr)
-		-DUSE_OPENJPEG=$(usex jpeg2k)
-		-DUSE_OPENMP=$(usex openmp)
-		-DUSE_WEBP=$(usex webp)
-	)
-	CMAKE_BUILD_TYPE="RELWITHDEBINFO"
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-	use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf
-
-	if use nls ; then
-		for lang in ${LANGS} ; do
-			if ! use l10n_${lang}; then
-				rm -r "${ED}"/usr/share/locale/${lang/-/_} || die
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	elog
-	elog "When updating a major version,"
-	elog "please bear in mind that your edits will be preserved during this process,"
-	elog "but it will not be possible to downgrade any more."
-	elog
-	ewarn "It will not be possible to downgrade!"
-	ewarn
-}
diff --git a/media-gfx/darktable/darktable-3.4.0-r1.ebuild b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
index e266303e689f..761e9442a9a4 100644
--- a/media-gfx/darktable/darktable-3.4.0-r1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.0-r1.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="amd64 ~arm64"
+	KEYWORDS="amd64 arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/darktable-3.4.1.ebuild b/media-gfx/darktable/darktable-3.4.1.ebuild
index bb4d534fe329..687bd41c527b 100644
--- a/media-gfx/darktable/darktable-3.4.1.ebuild
+++ b/media-gfx/darktable/darktable-3.4.1.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/darktable-9999.ebuild b/media-gfx/darktable/darktable-9999.ebuild
index 0e96ae38265f..9ae01e024616 100644
--- a/media-gfx/darktable/darktable-9999.ebuild
+++ b/media-gfx/darktable/darktable-9999.ebuild
@@ -25,7 +25,7 @@ else
 	SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz
 		doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )"
 
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="~amd64 ~arm64 -x86"
 	LANGS=" af cs de es fi fr he hu it pl pt-BR ru sk sl"
 fi
 
diff --git a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch b/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
deleted file mode 100644
index 1aa0aec5163f..000000000000
--- a/media-gfx/darktable/files/darktable-3.0.2_jsonschema-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -319,15 +319,7 @@
-   message(STATUS "Test-compilation of OpenCL programs is disabled.")
- endif()
- 
--# we need jsonschema to check noiseprofiles.json
--find_program(jsonschema_BIN jsonschema)
--if(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Missing jsonschema, problems in noiseprofiles.json might go unnoticed")
--  set(VALIDATE_JSON 0)
--else(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
--  message(STATUS "Found jsonschema")
--  set(VALIDATE_JSON 1)
--endif(${jsonschema_BIN} STREQUAL "jsonschema_BIN-NOTFOUND")
-+set(VALIDATE_JSON 0)
- 
- # we need an xslt interpreter to generate preferences_gen.h and darktablerc
- find_program(Xsltproc_BIN xsltproc)
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index a46ea727d4c8..b9be531f4591 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,27 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maekke@gentoo.org</email>
-		<name>Markus Meier</name>
-	</maintainer>
-	<use>
-		<flag name="avif">Support importing and exporting AVIF images</flag>
-		<flag name="flickr">Add support for uploading photos to flickr</flag>
-		<flag name="geolocation">Enable geotagging support</flag>
-		<flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
-		<flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
-		<flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
-		<flag name="opencl">Enable opencl support</flag>
-		<flag name="system-lua">Use <pkg>dev-lang/lua</pkg> instead of the bundled liblua</flag>
-		<flag name="tools">Install tools for generating base curves and noise profiles</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">darktable-org/darktable</remote-id>
-		<remote-id type="sourceforge">darktable</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>maekke@gentoo.org</email>
+  <name>Markus Meier</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">darktable-org/darktable</remote-id>
+ </upstream>
+ <use>
+  <flag name="avif">Support importing and exporting AVIF images</flag>
+  <flag name="flickr">Add support for uploading photos to flickr</flag>
+  <flag name="geolocation">Enable geotagging support</flag>
+  <flag name="gmic">Use the G'MIC image-processing framework (<pkg>media-gfx/gmic</pkg>), e.g. to support Colour LUTs compressed using their compression scheme</flag>
+  <flag name="kwallet">Enable encrypted storage of passwords with <pkg>kde-frameworks/kwallet</pkg></flag>
+  <flag name="lto">Enable link-time optimisations in the RawSpeed library</flag>
+  <flag name="opencl">Enable opencl support</flag>
+  <flag name="tools">Install tools for generating base curves and noise profiles</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
index 7e014846cf46..b6dd6392dd47 100644
--- a/media-gfx/dawn/metadata.xml
+++ b/media-gfx/dawn/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>sci-physics@gentoo.org</email>
-		<name>Gentoo Physics Project</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>sci-physics@gentoo.org</email>
+  <name>Gentoo Physics Project</name>
+ </maintainer>
+ <longdescription lang="en">
 		Fukui Renderer DAWN (Drawer for Academic WritiNgs)
 		is a renderer, which reads 3D geometrical data and visualize them.
 		It is a vectorized 3D PostScript processor with analytical
@@ -25,4 +25,6 @@
 		visualize 3D data generated by a high-energy experimental detector
 		simulator "GEANT4".
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/dcraw/metadata.xml b/media-gfx/dcraw/metadata.xml
index fcea6c683711..8e28b8b37dae 100644
--- a/media-gfx/dcraw/metadata.xml
+++ b/media-gfx/dcraw/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 		This utility converts the native (RAW), format of various digital cameras into
 		netpbm portable pixmap (.ppm) image. Supports the following models: Canon,
 		Kodak, Olympus, Nikon, Fuji, Minolta and Sigma (see
@@ -10,4 +9,6 @@
 		not read directly from the cameras, only the files after they have been
 		downloaded, use gphoto2 for that.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 518cc8835a85..ada6ac529782 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="addressbook">Enable akonadi contact integration</flag>
-		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag>
-		<flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
-		<flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
-		<flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
-		<flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
-		<flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
-		<flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="addressbook">Enable akonadi contact integration</flag>
+  <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files using <pkg>media-libs/x265</pkg></flag>
+  <flag name="imagemagick">Enable support for additional image formats such as XCF, FITS, HEIC etc.</flag>
+  <flag name="lensfun">Enable support for <pkg>media-libs/lensfun</pkg></flag>
+  <flag name="marble">Enable support for geolocation using <pkg>kde-apps/marble</pkg></flag>
+  <flag name="mediaplayer">Enable support for media player using <pkg>media-libs/qtav</pkg></flag>
+  <flag name="panorama">Build the panorama plugin which requires <pkg>media-gfx/hugin</pkg></flag>
+  <flag name="semantic-desktop">Enable <pkg>kde-frameworks/kfilemetadata</pkg> support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ditaa/metadata.xml b/media-gfx/ditaa/metadata.xml
index fac0708bcccb..381e4b60d806 100644
--- a/media-gfx/ditaa/metadata.xml
+++ b/media-gfx/ditaa/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<remote-id type="github">stathissideris/ditaa</remote-id>
-		<remote-id type="sourceforge">ditaa</remote-id>
-	</upstream>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>zmedico@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">stathissideris/ditaa</remote-id>
+  <remote-id type="sourceforge">ditaa</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/dmtx-utils/metadata.xml b/media-gfx/dmtx-utils/metadata.xml
index 3971294e52ef..a9662ffc4e19 100644
--- a/media-gfx/dmtx-utils/metadata.xml
+++ b/media-gfx/dmtx-utils/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>ahippo@yandex.ru</email>
-        <name>Andrey Mazo</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <longdescription>
+ <maintainer type="person">
+  <email>ahippo@yandex.ru</email>
+  <name>Andrey Mazo</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
         Tools for reading and writing two-dimensional Data Matrix barcodes.
         The tools are based on libdmtx library.
     </longdescription>
-    <upstream>
-        <remote-id type="github">dmtx/dmtx-utils</remote-id>
-        <remote-id type="sourceforge">libdmtx</remote-id>
-        <bugs-to>https://github.com/dmtx/dmtx-utils/issues</bugs-to>
-    </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dmtx/dmtx-utils</remote-id>
+  <remote-id type="sourceforge">libdmtx</remote-id>
+  <bugs-to>https://github.com/dmtx/dmtx-utils/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/dpic/metadata.xml b/media-gfx/dpic/metadata.xml
index b992ad5f686f..11a56e7bd36d 100644
--- a/media-gfx/dpic/metadata.xml
+++ b/media-gfx/dpic/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<upstream>
-		<changelog>https://ece.uwaterloo.ca/~aplevich/dpic/CHANGES</changelog>
-		<doc>https://ece.uwaterloo.ca/~aplevich/dpic/dpicdoc.pdf</doc>
-		<maintainer status="active">
-			<name>J. D. Aplevich</name>
-		</maintainer>
-	</upstream>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<longdescription>Dpic is an implementation of the pic "little language" for creating line drawings and illustrations for documents, web pages, and other uses.
+ <maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+ </maintainer>
+ <longdescription>Dpic is an implementation of the pic "little language" for creating line drawings and illustrations for documents, web pages, and other uses.
 	</longdescription>
-</pkgmetadata>
+ <upstream>
+  <changelog>https://ece.uwaterloo.ca/~aplevich/dpic/CHANGES</changelog>
+  <doc>https://ece.uwaterloo.ca/~aplevich/dpic/dpicdoc.pdf</doc>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/duhdraw/metadata.xml b/media-gfx/duhdraw/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/duhdraw/metadata.xml
+++ b/media-gfx/duhdraw/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ebdftopcf/metadata.xml b/media-gfx/ebdftopcf/metadata.xml
index 4ade55bae664..47862bc47190 100644
--- a/media-gfx/ebdftopcf/metadata.xml
+++ b/media-gfx/ebdftopcf/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>robbat2@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index 422145a617bd..870c6a3339d0 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maekke@gentoo.org</email>
-		<name>Markus Meier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enblend</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>maekke@gentoo.org</email>
+  <name>Markus Meier</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">enblend</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/engauge/metadata.xml b/media-gfx/engauge/metadata.xml
index fa3fced03f31..f8288e7525f5 100644
--- a/media-gfx/engauge/metadata.xml
+++ b/media-gfx/engauge/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">digitizer</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">digitizer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index b2ed51eff367..2b79af8de493 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>lu_zero@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-		<name>Gentoo Video project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>mgorny@gentoo.org</email>
+  <name>Michał Górny</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>lu_zero@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>media-video@gentoo.org</email>
+  <name>Gentoo Video project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/eog-plugins/metadata.xml b/media-gfx/eog-plugins/metadata.xml
index 3319801fe837..db7e1d55120c 100644
--- a/media-gfx/eog-plugins/metadata.xml
+++ b/media-gfx/eog-plugins/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="map">Enable world map display using	<pkg>media-libs/libchamplain</pkg></flag>
-	<flag name="picasa">Enable uploading to Google's Picasa Web Albums</flag>
-</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="map">Enable world map display using	<pkg>media-libs/libchamplain</pkg></flag>
+  <flag name="picasa">Enable uploading to Google's Picasa Web Albums</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index eda0593f6d54..58679c3de898 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
 		The Eye of GNOME image viewer is the official image viewer for the GNOME
 		Desktop environment. With it, you can view single image files, as well 
 		as large image collections.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index 333de4c7c117..0409a0cc1ad3 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,6 +1 @@
-DIST eom-1.20.2.tar.xz 2156196 BLAKE2B 5bb5d7d0b54c0e968d21d83fc703db426a538933807f384686c3b8ec7982e318773fc01504471d3bb9fa96f0a1d644d554d704f2827ddd9431d71fed81be5a66 SHA512 bb2a6cf6f609a0dad2e32ba035a1158290831d9909554a77c76e89b994b393da7a00185a670e3c4d007f0dd8b5c7d0c2681acb9b97bf08fe3e690d74faba7ba4
-DIST eom-1.22.1.tar.xz 2142132 BLAKE2B c68f6d6ee4284de7dea3f3d9761f4b67a2edc0a169b3c3ac04ac6efd13e9f1044cf0be023e36891672b31ff73815d7ce765d8db656bbeb69f324e0ee412eb231 SHA512 f510de62b9b6f11d02df067128042d6905484e0509a939b7919405d0c1dd03fe4b6735dcd8ccf780d36c5713f4585b50b2727645a454da148307a74cf542be87
-DIST eom-1.22.2.tar.xz 2158376 BLAKE2B 88d8b635af5b37f1ee4a36c08eb6f4a50cada86f605ab5927b031458f7f36191fa76457263ce38a9f8a02b7ba59308655b5df7039a73083192bf89c15fbee32f SHA512 1045c6bb98056ad707b0acf509c12e0400c21238482bf801abc6b69252f2ffe9687f7fda8b7e09c6338bc80794b104cbb42c1ea89ff1f169c45fdc1fcbdbeabe
-DIST eom-1.23.1.tar.xz 2428496 BLAKE2B 2db348a1f3f19ec9e5dc3fe315d318ab24419d25d6afb335acbea5c2b2066a84eecdd273f5be6779575a76ab4314c0a7fe55329db899d99def273c52a5d87151 SHA512 0161b7686c6a204641088e3f1255fdeb65520c931dc036b60f99c53375e5183773bec019d40baec3b8a4494e6874f6b1cb5f100b3e5ece2fca1dd6d261bc13e4
-DIST eom-1.23.2.tar.xz 2429592 BLAKE2B 740bdde54e14dd044940c01d0d0298f98e1807b71192da2c2d00bb60afccad17b4aea0650410215b07ceeaf69fd39566cdd6dbbd7ff7800fc363f27961b11ac4 SHA512 597e39a0ad6af80549b42267963e53499b6c9ab439937b1baf69241d42221907b52fccd7404fc640dbb8290de6874fb8d9816511f6243d8e82c58b370bbf9596
 DIST eom-1.24.0.tar.xz 2433420 BLAKE2B 58f99ba3cf0df3594c459af691cc6ab281657facb49bc3b6101bec1718b165b72b882aabd9abac3c4981b547157aa64d2f24f174fccae06cdaa685728e49740c SHA512 17d26a9341cde0a86f8d8b65008f554398111d80f5d131441654bd9e907df9c9d696038e678aca8d7f4bd2923ff593f626735a3cc30451118818cdbebceb87ab
diff --git a/media-gfx/eom/eom-1.20.2.ebuild b/media-gfx/eom/eom-1.20.2.ebuild
deleted file mode 100644
index ded609829972..000000000000
--- a/media-gfx/eom/eom-1.20.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libpeas-1.2.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.22.1.ebuild b/media-gfx/eom/eom-1.22.1.ebuild
deleted file mode 100644
index e6779fb6b7d2..000000000000
--- a/media-gfx/eom/eom-1.22.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	virtual/libintl
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.22.2.ebuild b/media-gfx/eom/eom-1.22.2.ebuild
deleted file mode 100644
index e6779fb6b7d2..000000000000
--- a/media-gfx/eom/eom-1.22.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	virtual/libintl
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.23.1.ebuild b/media-gfx/eom/eom-1.23.1.ebuild
deleted file mode 100644
index e6779fb6b7d2..000000000000
--- a/media-gfx/eom/eom-1.23.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	virtual/libintl
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.23.2.ebuild b/media-gfx/eom/eom-1.23.2.ebuild
deleted file mode 100644
index 8b539151b55c..000000000000
--- a/media-gfx/eom/eom-1.23.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug exif +introspection jpeg lcms svg tiff xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.52:2
-	>=dev-libs/libpeas-1.8.0[gtk]
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf
-	>=mate-base/mate-desktop-1.17.0
-	sys-libs/zlib
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?]
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	>=x11-misc/shared-mime-info-0.20
-	exif? (
-		>=media-libs/libexif-0.6.14
-		virtual/jpeg:0
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/yelp-tools
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	mate_src_configure \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_with X x) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/files/eom-1.10-fix-introspection.patch b/media-gfx/eom/files/eom-1.10-fix-introspection.patch
deleted file mode 100644
index 71e20ea02ccb..000000000000
--- a/media-gfx/eom/files/eom-1.10-fix-introspection.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From 3d34cc10a5e62686f661a6653d43e2c42e6a26a2 Mon Sep 17 00:00:00 2001
-From: Sorokin Alexei <sor.alexei@meowr.ru>
-Date: Sat, 12 Dec 2015 16:49:22 +0300
-Subject: [PATCH] Fix compilation with enabled GObject Introspection
-
----
- configure.ac | 2 ++
- src/main.c   | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9b829d0..b3d398f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -142,6 +142,8 @@ else
- 	have_introspection=no
- fi
- 
-+AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$have_introspection" = xyes)
-+
- # ***************
- # ZLIB (required)
- # ***************
-diff --git a/src/main.c b/src/main.c
-index cc999e2..f1b92f7 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -30,7 +30,7 @@
- #include <dbus/dbus-glib-bindings.h>
- #include <gdk/gdkx.h>
- #endif
--#ifdef HAVE_INSTROSPECTION
-+#ifdef HAVE_INTROSPECTION
- #include <girepository.h>
- #endif
- 
-From d6f68de8ed0722fdfecca9f81d68f2a0ff9b82bd Mon Sep 17 00:00:00 2001
-From: Wolfgang Ulbrich <chat-to-me@raveit.de>
-Date: Sun, 6 Dec 2015 23:58:24 +0100
-Subject: [PATCH] fix some gobject-introspection build warnings
-
----
- src/uta.c | 30 ++++++++++++++----------------
- 1 file changed, 14 insertions(+), 16 deletions(-)
-
-diff --git a/src/uta.c b/src/uta.c
-index 8df97bc..c44834d 100644
---- a/src/uta.c
-+++ b/src/uta.c
-@@ -38,9 +38,7 @@
-    be variables. They can also be pstruct->el lvalues. */
- #define eom_expand(p, type, max) do { if(max) { p = eom_renew (p, type, max <<= 1); } else { max = 1; p = g_new(type, 1); } } while (0)
- 
--
--
--/**
-+/*
-  * eom_uta_new: Allocate a new uta.
-  * @x0: Left coordinate of uta.
-  * @y0: Top coordinate of uta.
-@@ -51,7 +49,7 @@
-  * tiles, not pixels.
-  *
-  * Returns: the newly allocated #EomUta.
-- **/
-+ */
- static EomUta *
- eom_uta_new (int x0, int y0, int x1, int y1)
- {
-@@ -68,13 +66,13 @@ eom_uta_new (int x0, int y0, int x1, int y1)
-   return uta;
- }
- 
--/**
-+/*
-  * eom_uta_free: Free a uta.
-  * @uta: The uta to free.
-  *
-  * Frees the microtile array structure, including the actual microtile
-  * data.
-- **/
-+ */
- void
- eom_uta_free (EomUta *uta)
- {
-@@ -82,14 +80,14 @@ eom_uta_free (EomUta *uta)
-   g_free (uta);
- }
- 
--/**
-+/*
-  * eom_irect_intersect: Find intersection of two integer rectangles.
-  * @dest: Where the result is stored.
-  * @src1: A source rectangle.
-  * @src2: Another source rectangle.
-  *
-  * Finds the intersection of @src1 and @src2.
-- **/
-+ */
- void
- eom_irect_intersect (EomIRect *dest, const EomIRect *src1, const EomIRect *src2) {
-   dest->x0 = MAX (src1->x0, src2->x0);
-@@ -98,18 +96,18 @@ eom_irect_intersect (EomIRect *dest, const EomIRect *src1, const EomIRect *src2)
-   dest->y1 = MIN (src1->y1, src2->y1);
- }
- 
--/**
-+/*
-  * eom_irect_empty: Determine whether integer rectangle is empty.
-  * @src: The source rectangle.
-  *
-  * Return value: TRUE if @src is an empty rectangle, FALSE otherwise.
-- **/
-+ */
- int
- eom_irect_empty (const EomIRect *src) {
-   return (src->x1 <= src->x0 || src->y1 <= src->y0);
- }
- 
--/**
-+/*
-  * eom_uta_from_irect: Generate uta covering a rectangle.
-  * @bbox: The source rectangle.
-  *
-@@ -117,7 +115,7 @@ eom_irect_empty (const EomIRect *src) {
-  * function with a @bbox with zero height or width.
-  *
-  * Return value: the new uta.
-- **/
-+ */
- static EomUta *
- eom_uta_from_irect (EomIRect *bbox)
- {
-@@ -217,7 +215,7 @@ eom_uta_from_irect (EomIRect *bbox)
-  * big enough to fit the specified microtile coordinates, or a new array if
-  * it needed to be grown.  In the second case, the original @uta will be
-  * freed automatically.
-- **/
-+ */
- EomUta *
- uta_ensure_size (EomUta *uta, int x1, int y1, int x2, int y2)
- {
-@@ -284,7 +282,7 @@ uta_ensure_size (EomUta *uta, int x1, int y1, int x2, int y2)
-  * Return value: The original @uta, or a new microtile array if the original one
-  * needed to be grown to fit the specified rectangle.  In the second case, the
-  * original @uta will be freed automatically.
-- **/
-+ */
- EomUta *
- uta_add_rect (EomUta *uta, int x1, int y1, int x2, int y2)
- {
-@@ -552,7 +550,7 @@ uta_add_rect (EomUta *uta, int x1, int y1, int x2, int y2)
-  * Removes a rectangular region from the specified microtile array.  Due to the
-  * way microtile arrays represent regions, the tiles at the edge of the
-  * rectangle may not be clipped exactly.
-- **/
-+ */
- void
- uta_remove_rect (EomUta *uta, int x1, int y1, int x2, int y2)
- {
-@@ -1047,7 +1045,7 @@ copy_tile (EomUta *uta, int x, int y, int xofs, int yofs)
-  * expanded if the destination area does not fit within it; rather only the area
-  * that fits will be copied.  The source rectangle must be completely contained
-  * within the microtile array.
-- **/
-+ */
- void
- uta_copy_area (EomUta *uta, int src_x, int src_y, int dest_x, int dest_y, int width, int height)
- {
diff --git a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch b/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
deleted file mode 100644
index ccff8ae923a9..000000000000
--- a/media-gfx/eom/files/eom-1.12.2-gtk3-svg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 038530ed2e9b844f75e2af24e44e0421ad1ccdc8 Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 24 Feb 2016 16:47:08 +0300
-Subject: [PATCH] fix svg rendering that's broken with GTK+3
-
-from
-https://git.gnome.org/browse/eog/commit/?id=a33950c14d7b8da8e1c6289709022affb910be2a
----
- src/eom-scroll-view.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/eom-scroll-view.c b/src/eom-scroll-view.c
-index 6385f29..6d1b290 100644
---- a/src/eom-scroll-view.c
-+++ b/src/eom-scroll-view.c
-@@ -1306,7 +1306,7 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 
- #ifdef HAVE_RSVG
- 	if (eom_image_is_svg (view->priv->image)) {
--		cairo_matrix_t matrix, translate, scale;
-+		cairo_matrix_t matrix, translate, scale, original;
- 		EomTransform *transform = eom_image_get_transform (priv->image);
- 		cairo_matrix_init_identity (&matrix);
- 		if (transform) {
-@@ -1343,6 +1343,8 @@ display_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer data)
- 		cairo_matrix_init_translate (&translate, xofs, yofs);
- 		cairo_matrix_multiply (&matrix, &matrix, &translate);
- 
-+		cairo_get_matrix (cr, &original);
-+		cairo_matrix_multiply (&matrix, &matrix, &original);
- 		cairo_set_matrix (cr, &matrix);
- 
- 		rsvg_handle_render_cairo (eom_image_get_svg (priv->image), cr);
diff --git a/media-gfx/eom/files/eom-cve-2013-7447.patch b/media-gfx/eom/files/eom-cve-2013-7447.patch
deleted file mode 100644
index 410b433eb34a..000000000000
--- a/media-gfx/eom/files/eom-cve-2013-7447.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b7849cc5b6e7fd741ef04e334f586266a444ef8a Mon Sep 17 00:00:00 2001
-From: monsta <monsta@inbox.ru>
-Date: Wed, 10 Feb 2016 14:52:54 +0300
-Subject: [PATCH] avoid integer overflow when allocating a large block of
- memory
-
-it's the same issue as in gdk_cairo_set_source_pixbuf since the code
-is apparently copied from there.
-
-fix is taken from
-https://git.gnome.org/browse/gtk+/commit?id=894b1ae76a32720f4bb3d39cf460402e3ce331d6
----
- src/eom-print-preview.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/eom-print-preview.c b/src/eom-print-preview.c
-index f9f005f..7dc2a8a 100644
---- a/src/eom-print-preview.c
-+++ b/src/eom-print-preview.c
-@@ -732,7 +732,7 @@ create_surface_from_pixbuf (GdkPixbuf *pixbuf)
-     format = CAIRO_FORMAT_ARGB32;
- 
-   cairo_stride = cairo_format_stride_for_width (format, width);
--  cairo_pixels = g_malloc (height * cairo_stride);
-+  cairo_pixels = g_malloc_n (height, cairo_stride);
-   surface = cairo_image_surface_create_for_data ((unsigned char *)cairo_pixels,
- 						 format,
- 						 width, height, cairo_stride);
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index 519571d6611b..192b718f4c42 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>mate@gentoo.org</email>
-        <name>Gentoo MATE Desktop</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mate-desktop/eom</remote-id>
-    </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>mate@gentoo.org</email>
+  <name>Gentoo MATE Desktop</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mate-desktop/eom</remote-id>
+ </upstream>
+ <origin>mate-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ephoto/metadata.xml b/media-gfx/ephoto/metadata.xml
index b0fdb75d8ad2..8c19244bc4a8 100644
--- a/media-gfx/ephoto/metadata.xml
+++ b/media-gfx/ephoto/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>juippis@gentoo.org</email>
-    <name>Joonas Niilola</name>
-  </maintainer>
-  <longdescription>
+ <maintainer type="person">
+  <email>juippis@gentoo.org</email>
+  <name>Joonas Niilola</name>
+ </maintainer>
+ <longdescription>
     Ephoto is an image viewer and editor written using the Enlightenment Foundation 
     Libraries(EFL).  It focuses on simplicity and ease of use, while taking advantage of 
     the speed and small footprint the EFL provide. 
@@ -20,4 +20,6 @@
     - Applying artistic filters to your image such as black and white and old photo, 
     - Drag And Drop along with file operations to easy maintain your photo directories.
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/esci-interpreter-gt-s80/metadata.xml b/media-gfx/esci-interpreter-gt-s80/metadata.xml
index 06222bb652e0..c5cff1144935 100644
--- a/media-gfx/esci-interpreter-gt-s80/metadata.xml
+++ b/media-gfx/esci-interpreter-gt-s80/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit.
@@ -14,4 +13,6 @@
     EPSON GT-S50 / ES-D200
     EPSON GT-S55
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/evoluspencil/metadata.xml b/media-gfx/evoluspencil/metadata.xml
index 4ef6f906fdd1..fd6980704e54 100644
--- a/media-gfx/evoluspencil/metadata.xml
+++ b/media-gfx/evoluspencil/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>kensington@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">evolus/pencil</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>kensington@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">evolus/pencil</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index b4fce831a061..639db4887da4 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>tupone@gentoo.org</email>
-		<name>Tupone Alfredo</name>
-	</maintainer>
-<use>
-	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
-</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>tupone@gentoo.org</email>
+  <name>Tupone Alfredo</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/exif/metadata.xml b/media-gfx/exif/metadata.xml
index 7f099d1061b8..4e83a98b9c35 100644
--- a/media-gfx/exif/metadata.xml
+++ b/media-gfx/exif/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">libexif</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">libexif</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 44e945477c68..ff96674da272 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <longdescription lang="en">
 		Exiv2 is a C++ library and command line utility to read and
 		write EXIF, IPTC and XMP image metadata.
 	</longdescription>
-	<use>
-		<flag name="webready">Support reading metadata over the internet</flag>
-	</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="webready">Support reading metadata over the internet</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/farbfeld/metadata.xml b/media-gfx/farbfeld/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/farbfeld/metadata.xml
+++ b/media-gfx/farbfeld/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fbgrab/metadata.xml b/media-gfx/fbgrab/metadata.xml
index 5b159fbcadd1..38bf5c9019e8 100644
--- a/media-gfx/fbgrab/metadata.xml
+++ b/media-gfx/fbgrab/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>pinkbyte@gentoo.org</email>
-		<name>Sergey Popov</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>pinkbyte@gentoo.org</email>
+  <name>Sergey Popov</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index e7dd09135bed..fc30dfc935c7 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
-<flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>
-<flag name="X">Install the Motif based image viewer "ida"</flag>
-</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
+  <flag name="ghostscript">Install the framebuffer ghostscript viewer "fbgs"</flag>
+  <flag name="X">Install the Motif based image viewer "ida"</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fdm-materials/metadata.xml b/media-gfx/fdm-materials/metadata.xml
index f29b491fa4de..3a522f525566 100644
--- a/media-gfx/fdm-materials/metadata.xml
+++ b/media-gfx/fdm-materials/metadata.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>alexxy@gentoo.org</email>
-		<name>Alexey Shvetsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>mathy@vanvoorden.be</email>
-		<name>Mathy Vanvoorden</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>perlovka@gmail.com</email>
-		<name>Michael Perlov</name>
-	</maintainer>
-	<slots>
-		<subslots>soname major version number</subslots>
-	</slots>
-	<use>
-		<flag name="embedded">Build for Ultimaker Embedded software</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">Ultimaker/fdm_materials</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>alexxy@gentoo.org</email>
+  <name>Alexey Shvetsov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>mathy@vanvoorden.be</email>
+  <name>Mathy Vanvoorden</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>perlovka@gmail.com</email>
+  <name>Michael Perlov</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">Ultimaker/fdm_materials</remote-id>
+ </upstream>
+ <use>
+  <flag name="embedded">Build for Ultimaker Embedded software</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+ <slots>
+  <subslots>soname major version number</subslots>
+ </slots>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/feh/metadata.xml b/media-gfx/feh/metadata.xml
index 8072ef2372e4..d9c0defb1e50 100644
--- a/media-gfx/feh/metadata.xml
+++ b/media-gfx/feh/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>slashbeast@gentoo.org</email>
+  <name>Piotr Karbowski</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/figurine/metadata.xml b/media-gfx/figurine/metadata.xml
index 3441c7fa8147..78fdf736461f 100644
--- a/media-gfx/figurine/metadata.xml
+++ b/media-gfx/figurine/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">figurine</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">figurine</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fim/metadata.xml b/media-gfx/fim/metadata.xml
index 3ee29fb02a4d..022eefefc1c4 100644
--- a/media-gfx/fim/metadata.xml
+++ b/media-gfx/fim/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="bmp">Enable BMP file support</flag>
-		<flag name="dia">Enable DIA file support via app-office/dia</flag>
-		<flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
-		<flag name="pcx">Enable PCX file support</flag>
-		<flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
-	</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="bmp">Enable BMP file support</flag>
+  <flag name="dia">Enable DIA file support via app-office/dia</flag>
+  <flag name="imagemagick">Use convert from media-gfx/imagemagick as fallback file opener</flag>
+  <flag name="pcx">Enable PCX file support</flag>
+  <flag name="xfig">Enable FIG file support via media-gfx/xfig</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/flam3/metadata.xml b/media-gfx/flam3/metadata.xml
index 6cefa895a658..e8e4af9a274d 100644
--- a/media-gfx/flam3/metadata.xml
+++ b/media-gfx/flam3/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">flam3</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>patrick@gentoo.org</email>
+  <name>Patrick Lauer</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="google-code">flam3</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/flameshot/metadata.xml b/media-gfx/flameshot/metadata.xml
index 49f9e82790bb..cac0c72be085 100644
--- a/media-gfx/flameshot/metadata.xml
+++ b/media-gfx/flameshot/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>paul.kalug@gmail.com</email>
-		<name>Pavel Kalugin</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>paul.kalug@gmail.com</email>
+  <name>Pavel Kalugin</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fondu/metadata.xml b/media-gfx/fondu/metadata.xml
index ba3e8d06b8fb..1bf7fb1c10ac 100644
--- a/media-gfx/fondu/metadata.xml
+++ b/media-gfx/fondu/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">fondu</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">fondu</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index c14fd11b9eae..21de06c4c6ec 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+ </maintainer>
+ <longdescription>
 	FontForge -- An outline font editor that lets you create your own
 	postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
 	(bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one
 	format to another. FontForge has support for many macintosh font formats.
 	</longdescription>
-	<use>
-		<flag name="truetype-debugger">Enable truetype debugger in fontforge</flag>
-		<flag name="woff2">Enable support for WOFF2 format</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">troydhanson/uthash</remote-id>
-		<remote-id type="sourceforge">fontforge</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">troydhanson/uthash</remote-id>
+  <remote-id type="sourceforge">fontforge</remote-id>
+ </upstream>
+ <use>
+  <flag name="truetype-debugger">Enable truetype debugger in fontforge</flag>
+  <flag name="woff2">Enable support for WOFF2 format</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fotowall/metadata.xml b/media-gfx/fotowall/metadata.xml
index 407bb6612174..03882080dfee 100644
--- a/media-gfx/fotowall/metadata.xml
+++ b/media-gfx/fotowall/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="webcam">Enable webcam support</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">enricoros/fotowall</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>qt@gentoo.org</email>
+  <name>Gentoo Qt Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">enricoros/fotowall</remote-id>
+ </upstream>
+ <use>
+  <flag name="webcam">Enable webcam support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/fotoxx/metadata.xml b/media-gfx/fotoxx/metadata.xml
index d1ae72d9d648..83e07f81e038 100644
--- a/media-gfx/fotoxx/metadata.xml
+++ b/media-gfx/fotoxx/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		Navigate a large image collection using a thumbnail browser.
 		Import camera RAW files and edit with 16-bit color.
 		Save edited images as TIFF-8/16, PNG or JPEG with adjustable compression.
@@ -12,4 +11,6 @@
 		and search using these criteria and (wildcard) file names.
 		Fotoxx does not use filters, layers, and masks - the edit functions work directly on the image.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
new file mode 100644
index 000000000000..99ac7bbf6792
--- /dev/null
+++ b/media-gfx/freecad/Manifest
@@ -0,0 +1 @@
+DIST freecad-0.19_pre20201231.tar.gz 236040771 BLAKE2B 648d8c1d8ab03f56403544f8e6a20dc5edc35b2cfc353c875202ce3e85449e450cbda93f410fec15366ce3aab342a93e981fa11cd9f5443a2fc40ef38ac0a1d0 SHA512 457792b0a12196d9e2d8113d9721a3b3a6d4fbc93bae001787db3eac43503a74a89a69564903b4005f8648476a150b6d871b3d78adfbf41c7260a4265132da34
diff --git a/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
new file mode 100644
index 000000000000..9f4131f15a3d
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
@@ -0,0 +1,26 @@
+From e08aec1344e753cd338a61c3584230741e00b23f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Thu, 31 Dec 2020 13:26:44 +0100
+Subject: [PATCH 1/2] FindCoin3DDoc.cmake: fix patch for coin docs
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cMake/FindCoin3DDoc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cMake/FindCoin3DDoc.cmake b/cMake/FindCoin3DDoc.cmake
+index c6c92f2..1af53c2 100644
+--- a/cMake/FindCoin3DDoc.cmake
++++ b/cMake/FindCoin3DDoc.cmake
+@@ -22,7 +22,7 @@ IF (COIN3D_FOUND)
+       # Unix systems

+       find_path(COIN3D_DOC_PATH index.html 

+                 /usr/share/doc/libcoin80-doc/html

+-                /usr/share/doc/coin/html

++                /usr/share/doc/coin-4.0.0/html

+                 /usr/share/doc/Coin/html

+       )

+       IF( EXISTS ${COIN3D_DOC_PATH})

+-- 
+2.30.0
+
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
new file mode 100644
index 000000000000..26bb4421077b
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
@@ -0,0 +1,33 @@
+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/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..ac8d194d00ea
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,26 @@
+From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 13 Feb 2021 14:54:28 +0100
+Subject: [PATCH] [Gentoo specific] don't check vcs
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/Tools/SubWCRev.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
+index 9795450..59938bd 100644
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -455,7 +455,7 @@ def main():
+         if o in ("-b", "--bindir"):

+             bindir = a

+ 

+-    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), MercurialControl(), DebianChangelog(), UnknownControl()]

++    vcs=[UnknownControl()]

+     for i in vcs:

+         if i.extractInfo(srcdir, bindir):

+             # Open the template file and the version file

+-- 
+2.30.1
+
diff --git a/media-gfx/freecad/freecad-0.19_pre20201231.ebuild b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
new file mode 100644
index 000000000000..4a9f4fd84fa8
--- /dev/null
+++ b/media-gfx/freecad/freecad-0.19_pre20201231.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	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"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${COMMIT}"
+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"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+	inspection material mesh openscad part-design path points
+	raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull
+	sci-libs/flann[openmp]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	arch? ( mesh )
+	debug? ( mesh )
+	drawing? ( spreadsheet )
+	fem? ( mesh )
+	inspection? ( mesh points )
+	openscad? ( mesh )
+	path? ( mesh robot )
+	ship? ( image plot )
+	techdraw? ( spreadsheet drawing )
+"
+
+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
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i cMake/FindOpenCasCade.cmake || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=$(usex arch)
+		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(usex mesh)
+		-DBUILD_SPREADSHEET=$(usex spreadsheet)
+		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-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
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		-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
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			# sandbox needs mesh support
+			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_TEMPLATE=ON
+			-DBUILD_TEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+			-DBUILD_TEST=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use headless; then
+		dosym ../$(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
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature "interact with git repositories" dev-python/GitPython
+	optfeature "work with COLLADA documents" dev-python/pycollada
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
new file mode 100644
index 000000000000..0eae20f1d535
--- /dev/null
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# vtk needs updating to use 3.9
+PYTHON_COMPAT=( python3_{6,7,8,9,10} )
+
+inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+
+DESCRIPTION="QT based Computer Aided Design application"
+HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-r3
+	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"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/FreeCAD-${COMMIT}"
+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"
+RESTRICT="!test? ( test )"
+
+FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
+FREECAD_STABLE_MODULES="addonmgr arch drawing fem idf image
+	inspection material mesh openscad part-design path points
+	raytracing robot show spreadsheet surface techdraw tux"
+
+for module in ${FREECAD_STABLE_MODULES}; do
+	IUSE="${IUSE} +${module}"
+done
+for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
+	IUSE="${IUSE} -${module}"
+done
+unset module
+
+RDEPEND="
+	${PYTHON_DEPS}
+	>=dev-cpp/eigen-3.3.1:3
+	dev-libs/OpenNI2[opengl(+)]
+	dev-libs/libspnav[X]
+	dev-libs/xerces-c
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	>=media-libs/coin-4.0.0
+	media-libs/freetype
+	media-libs/qhull
+	sci-libs/flann[openmp]
+	>=sci-libs/med-4.0.0-r1[python,${PYTHON_SINGLE_USEDEP}]
+	sci-libs/opencascade:=[vtk(+)]
+	sci-libs/orocos_kdl:=
+	sys-libs/zlib
+	virtual/glu
+	virtual/libusb:1
+	virtual/opengl
+	cloud? (
+		dev-libs/openssl:=
+		net-misc/curl
+	)
+	fem? ( <sci-libs/vtk-9[boost,python,qt5,rendering,${PYTHON_SINGLE_USEDEP}] )
+	mesh? ( sci-libs/hdf5:=[fortran,zlib] )
+	openscad? ( media-gfx/openscad )
+	pcl? ( >=sci-libs/pcl-1.8.1:=[opengl,openni2(+),qt5(+),vtk(+)] )
+	$(python_gen_cond_dep '
+		dev-libs/boost:=[python,threads,${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pivy-0.6.5[${PYTHON_MULTI_USEDEP}]
+		dev-python/pyside2[gui,svg,${PYTHON_MULTI_USEDEP}]
+		dev-python/shiboken2[${PYTHON_MULTI_USEDEP}]
+		addonmgr? ( dev-python/GitPython[${PYTHON_MULTI_USEDEP}] )
+		mesh? ( dev-python/pybind11[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/swig
+	ccache? ( dev-util/ccache )
+"
+
+# To get required dependencies:
+# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
+# We set the following requirements by default:
+# draft, import, part, qt5, sketcher, start, web.
+#
+# Additionally if mesh is set, we auto-enable mesh_part, flat_mesh and smesh
+# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
+# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
+# reflected by the REQUIRES_MODS macro, but at
+# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	arch? ( mesh )
+	debug? ( mesh )
+	drawing? ( spreadsheet )
+	fem? ( mesh )
+	inspection? ( mesh points )
+	openscad? ( mesh )
+	path? ( mesh robot )
+	ship? ( image plot )
+	techdraw? ( spreadsheet drawing )
+"
+
+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
+)
+
+DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+
+CHECKREQS_DISK_BUILD="7G"
+
+pkg_setup() {
+	check-reqs_pkg_setup
+	python-single-r1_pkg_setup
+	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
+}
+
+src_prepare() {
+	# the upstream provided file doesn't find the coin doc tag file,
+	# but cmake ships a working one, so we use this.
+	rm "${S}/cMake/FindCoin3D.cmake" || die
+
+	# Fix OpenCASCADE lookup
+	sed -e 's|/usr/include/opencascade|${CASROOT}/include/opencascade|' \
+		-e 's|/usr/lib|${CASROOT}/'$(get_libdir)' NO_DEFAULT_PATH|' \
+		-i cMake/FindOpenCasCade.cmake || die
+
+	# Fix desktop file
+	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_ADDONMGR=$(usex addonmgr)
+		-DBUILD_ARCH=$(usex arch)
+		-DBUILD_ASSEMBLY=OFF
+		-DBUILD_CLOUD=$(usex cloud)
+		-DBUILD_COMPLETE=OFF					# deprecated
+		-DBUILD_DRAFT=ON						# basic workspace, enable it by default
+		-DBUILD_DRAWING=$(usex drawing)
+		-DBUILD_ENABLE_CXX_STD:STRING="C++14"	# needed for >=boost-1.75.0
+		-DBUILD_FEM=$(usex fem)
+		-DBUILD_FEM_NETGEN=OFF
+		-DBUILD_FLAT_MESH=$(usex mesh)
+		-DBUILD_FORCE_DIRECTORY=ON				# force building in a dedicated directory
+		-DBUILD_FREETYPE=ON						# automagic dep
+		-DBUILD_GUI=$(usex !headless)
+		-DBUILD_IDF=$(usex idf)
+		-DBUILD_IMAGE=$(usex image)
+		-DBUILD_IMPORT=ON						# import module for various file formats
+		-DBUILD_INSPECTION=$(usex inspection)
+		-DBUILD_JTREADER=OFF					# code has been removed upstream, but option is still there
+		-DBUILD_MATERIAL=$(usex material)
+		-DBUILD_MESH=$(usex mesh)
+		-DBUILD_MESH_PART=$(usex mesh)
+		-DBUILD_OPENSCAD=$(usex openscad)
+		-DBUILD_PART=ON							# basic workspace, enable it by default
+		-DBUILD_PART_DESIGN=$(usex part-design)
+		-DBUILD_PATH=$(usex path)
+		-DBUILD_PLOT=$(usex plot)				# conflicts with possible external workbench
+		-DBUILD_POINTS=$(usex points)
+		-DBUILD_QT5=ON							# OFF means to use Qt4
+		-DBUILD_RAYTRACING=$(usex raytracing)
+		-DBUILD_REVERSEENGINEERING=OFF			# currently only an empty sandbox
+		-DBUILD_ROBOT=$(usex robot)
+		-DBUILD_SHIP=$(usex ship)				# conflicts with possible external workbench
+		-DBUILD_SHOW=$(usex show)
+		-DBUILD_SKETCHER=ON						# needed by draft workspace
+		-DBUILD_SMESH=$(usex mesh)
+		-DBUILD_SPREADSHEET=$(usex spreadsheet)
+		-DBUILD_START=ON						# basic workspace, enable it by default
+		-DBUILD_SURFACE=$(usex surface)
+		-DBUILD_TECHDRAW=$(usex techdraw)
+		-DBUILD_TUX=$(usex tux)
+		-DBUILD_VR=OFF
+		-DBUILD_WEB=ON							# needed by start workspace
+		-DBUILD_WITH_CONDA=OFF
+
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
+
+		-DFREECAD_BUILD_DEBIAN=OFF
+
+		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-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
+		-DFREECAD_USE_FREETYPE=ON
+		-DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
+		-DFREECAD_USE_PCL=$(usex pcl)
+		-DFREECAD_USE_PYBIND11=$(usex mesh)
+		-DFREECAD_USE_QT_FILEDIALOG=ON
+		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
+
+		-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
+	)
+
+	if use debug; then
+		mycmakeargs+=(
+			# sandbox needs mesh support
+			-DBUILD_SANDBOX=$(usex mesh)
+			-DBUILD_TEMPLATE=ON
+			-DBUILD_TEST=ON
+		)
+	else
+		mycmakeargs+=(
+			-DBUILD_SANDBOX=OFF
+			-DBUILD_TEMPLATE=OFF
+			-DBUILD_TEST=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if ! use headless; then
+		dosym ../$(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
+
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use plot; then
+		einfo "Note: You are enabling the 'plot' USE flag."
+		einfo "This conflicts with the plot workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	if use ship; then
+		einfo "Note: You are enabling the 'ship' USE flag."
+		einfo "This conflicts with the ship workbench that can be loaded"
+		einfo "via the addon manager! You can only install one of those."
+	fi
+
+	einfo "You can load a lot of additional workbenches using the integrated"
+	einfo "AddonManager."
+
+	einfo "There are a lot of additional tools, for which FreeCAD has builtin"
+	einfo "support. Some of them are available in Gentoo. Take a look at"
+	einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
+	optfeature "interact with git repositories" dev-python/GitPython
+	optfeature "work with COLLADA documents" dev-python/pycollada
+	optfeature "dependency graphs" media-gfx/graphviz
+	optfeature "PBR Rendering" media-gfx/povray
+	optfeature "FEM mesh generator" sci-libs/gmsh
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
new file mode 100644
index 000000000000..12b5478bc0a6
--- /dev/null
+++ b/media-gfx/freecad/metadata.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+  <email>waebbl-gentoo@posteo.net</email>
+  <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <description>Gentoo Proxy Maintainers</description>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">FreeCAD/FreeCAD</remote-id>
+  <bugs-to>https://www.freecadweb.org/tracker/</bugs-to>
+  <doc lang="en">https://www.freecadweb.org/wiki/MainPage</doc>
+ </upstream>
+ <use>
+  <flag name="addonmgr">
+			Build the addon manager module for automatic handling of 3rd 
+			party addons
+		</flag>
+  <flag name="arch">
+			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).
+		</flag>
+  <flag name="drawing">
+			Build the drawing module and workbench to display 3D work on a 
+			2D sheet
+		</flag>
+  <flag name="fem">
+			Build the FEM module and workbench which provides Finite Element 
+			Analysis (FEA) workflows
+		</flag>
+  <flag name="headless">
+			Build FreeCAD without a GUI, usable for server-side instances.
+			The Python modules are still available, without their GUI parts though.
+		</flag>
+  <flag name="idf">
+			Build the IDF module to provide file exchange capabilities with
+			IDF files
+		</flag>
+  <flag name="image">
+			Build the image module and workbench for working with bitmap
+			images
+		</flag>
+  <flag name="inspection">
+			Build the inspection workbench which gives you specific tools
+			for examination of shapes (experimental)
+		</flag>
+  <flag name="material">
+			Build the material module and workbench to work with materials
+		</flag>
+  <flag name="mesh">
+			Build the mesh module and workbench to work with triangulated 
+			meshes
+		</flag>
+  <flag name="openscad">
+			Build the OpenSCAD module for interoperability with OpenSCAD 
+			and repairing Constructive Solid Geometry (CSG) history
+		</flag>
+  <flag name="part-design">
+			Build the part design module and workbench for build part shapes
+			from sketches
+		</flag>
+  <flag name="path"><!-- FIXME: auto-enable through robot? -->
+			Build the path module and workbench to procude G-Code instructions 
+			for CNC
+		</flag>
+  <flag name="pcl">
+			Use external <pkg>sci-libs/pcl</pkg> for point clouds support.
+		</flag>
+  <flag name="plot">
+			Build the internal plot workbench. NOTE: This conflicts with the
+			external plot workbench, which you can add via the Addon Manager!
+		</flag>
+  <flag name="points">
+			Build the points module and workbench for working with point clouds
+		</flag>
+  <flag name="raytracing">
+			Build the raytracing module and workbench for raytracing and rendering
+		</flag>
+  <flag name="robot">
+			Build the robot module and workbench for studying robot movements
+		</flag>
+  <flag name="ship">
+			Build the ship module and workbench which works over ship entities, 
+			that must be created on top of provided geometry. NOTE: This conflicts
+			with the external ship workbench, which you can add via the Addon Manager!
+		</flag>
+  <flag name="show">
+			Build the show module, a helper module for visibility automation
+		</flag>
+  <flag name="spreadsheet">
+			Build the spreadsheet module and workbench to create and manipulate 
+			spreadsheet data
+		</flag>
+  <flag name="surface">
+			Build the surface module and workbench
+		</flag>
+  <flag name="techdraw">
+			Build the techdraw module and workbench, a more advanced and 
+			feature-rich successor of the drawing workbench
+		</flag>
+  <flag name="tux">
+			Build the Tux module
+		</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/freepv/metadata.xml b/media-gfx/freepv/metadata.xml
index f072f4fe0d97..bfdacf4050de 100644
--- a/media-gfx/freepv/metadata.xml
+++ b/media-gfx/freepv/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<longdescription>OpenGL accelerated panorama viewer and browser plugin (supports Quicktime, PangeaVR and GLPanoView panoramas)</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">freepv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>voyageur@gentoo.org</email>
+  <name>Bernard Cafarelli</name>
+ </maintainer>
+ <longdescription>OpenGL accelerated panorama viewer and browser plugin (supports Quicktime, PangeaVR and GLPanoView panoramas)</longdescription>
+ <upstream>
+  <remote-id type="sourceforge">freepv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild b/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
index 14758be518f8..1f78e9385a70 100644
--- a/media-gfx/freewrl/freewrl-3.0.0-r1.ebuild
+++ b/media-gfx/freewrl/freewrl-3.0.0-r1.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=5
@@ -10,7 +10,6 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="git://git.code.sf.net/p/freewrl/git"
 	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
-	KEYWORDS=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/freewrl/freewrl-9999.ebuild b/media-gfx/freewrl/freewrl-9999.ebuild
index ca404f90577b..9a090ec93d6e 100644
--- a/media-gfx/freewrl/freewrl-9999.ebuild
+++ b/media-gfx/freewrl/freewrl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,6 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_BRANCH="develop"
 	S="${WORKDIR}/${P}/freex3d"
 	SRC_URI=
-	KEYWORDS=
 else
 	SRC_URI="mirror://sourceforge/freewrl/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~x86"
diff --git a/media-gfx/freewrl/metadata.xml b/media-gfx/freewrl/metadata.xml
index 46c0887e1b14..0ee1316754d2 100644
--- a/media-gfx/freewrl/metadata.xml
+++ b/media-gfx/freewrl/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 FreeWRL is a VRML97 (VRML-2.0) and X3D interactive viewer, providing both a traditional Xorg application 
 and a nsbrowser plugin for use with many available web browsers.  The package depends heavily on OpenGL 
 support for rendering.  When developing your 3D world or model, you can program with GLSL Shaders using the 
@@ -10,14 +9,15 @@ X3D Shaders Component, put your model exactly where you want them with the Geosp
 throw triangles to the screen as Extrusions, IndexedFaceSets, TriangleSets, Circle2D, Disk2D, Spheres, Boxes, 
 Cubes; the list goes on and on.  With royalty free open standards, your models will continue to render, year after year. 
 </longdescription>
-	<use>
-		<flag name="libeai">Build EAI C library</flag>
-		<flag name="opencl">Enable OpenCL support</flag>
-		<flag name="osc">Allows for OSC-based control and communication between multiple freewrl instances</flag>
-		<flag name="rbp">Enable support for Rigid Body Physics</flag>
-		<flag name="java">Build and install java EAI/SAI support library</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freewrl</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">freewrl</remote-id>
+ </upstream>
+ <use>
+  <flag name="libeai">Build EAI C library</flag>
+  <flag name="opencl">Enable OpenCL support</flag>
+  <flag name="osc">Allows for OSC-based control and communication between multiple freewrl instances</flag>
+  <flag name="rbp">Enable support for Rigid Body Physics</flag>
+  <flag name="java">Build and install java EAI/SAI support library</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/frogr/metadata.xml b/media-gfx/frogr/metadata.xml
index 56b1b12cb47e..28497ffa2aec 100644
--- a/media-gfx/frogr/metadata.xml
+++ b/media-gfx/frogr/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 		Frogr is a small application for the GNOME desktop that allows users to
 		manage their accounts in the Flickr image hosting website. It supports all
 		the basic Flickr features.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/geeqie/metadata.xml b/media-gfx/geeqie/metadata.xml
index 653dda70b091..d3df87692a04 100644
--- a/media-gfx/geeqie/metadata.xml
+++ b/media-gfx/geeqie/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
-	<use>
-		<flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
-		<flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
-		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
-		<flag name="map">Enable items map display - experimental</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>voyageur@gentoo.org</email>
+  <name>Bernard Cafarelli</name>
+ </maintainer>
+ <longdescription>Geeqie is a lightweight image viewer. It was forked from GQview. The development is focused on features for photo collection maintenance: raw format, Exif/IPTC/XMP metadata and integration with programs like UFraw, ImageMagick, Gimp, gPhoto or ExifTool</longdescription>
+ 
+ <use>
+  <flag name="ffmpegthumbnailer">Enable video thumbnail support with <pkg>media-video/ffmpegthumbnailer</pkg></flag>
+  <flag name="gpu-accel">Enable GPU acceleration support - experimental</flag>
+  <flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
+  <flag name="map">Enable items map display - experimental</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gif2apng/metadata.xml b/media-gfx/gif2apng/metadata.xml
index a0efd2e5bb0d..063f4d6fb6da 100644
--- a/media-gfx/gif2apng/metadata.xml
+++ b/media-gfx/gif2apng/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gif2apng</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">gif2apng</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gif2png/gif2png-2.5.14.ebuild b/media-gfx/gif2png/gif2png-2.5.14.ebuild
index 1d1bf7fd8b88..623e4cb25a83 100644
--- a/media-gfx/gif2png/gif2png-2.5.14.ebuild
+++ b/media-gfx/gif2png/gif2png-2.5.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,12 +11,16 @@ 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"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 RDEPEND=">=media-libs/libpng-1.2:0=
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}"
 
+# Tests are known to fail, #688702
+# EOL; Upstream has rewritten gif2png in Go
+RESTRICT=test
+
 src_prepare() {
 	default
 
diff --git a/media-gfx/gif2png/metadata.xml b/media-gfx/gif2png/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/gif2png/metadata.xml
+++ b/media-gfx/gif2png/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gifsicle/metadata.xml b/media-gfx/gifsicle/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/gifsicle/metadata.xml
+++ b/media-gfx/gifsicle/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml
index 119745c2ebb8..1e0ceb19b14a 100644
--- a/media-gfx/gimageview/metadata.xml
+++ b/media-gfx/gimageview/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gtkmmviewer</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">gtkmmviewer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gimp-arrow-brushes/metadata.xml b/media-gfx/gimp-arrow-brushes/metadata.xml
index f61881680816..953c2b357967 100644
--- a/media-gfx/gimp-arrow-brushes/metadata.xml
+++ b/media-gfx/gimp-arrow-brushes/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pacho@gentoo.org</email>
-	<name>Pacho Ramos</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>pacho@gentoo.org</email>
+  <name>Pacho Ramos</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 78e7a42af5d6..3d2eaa2ee2db 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -1,4 +1,2 @@
-DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4590908172971ef240ae87f8caa2c015447deee810fef59c4869810676daae2e40aa611062168feffe38c7cd9b22 SHA512 7cd0b1833af87a167fdfee59fb491a72727fe3071c21c0de1813adb0f8272a92473e1e300517395b1b4593c8cb6781ee30f7a63966756e5a7f523a164308aba6
 DIST gimp-2.10.22.tar.bz2 33152226 BLAKE2B d11b0ee8f0f24934383028a0b21820af30da6133814d64b67981888086f3eaa4378e474ff801db046f2fe5d380325ac7279df6e749d100219e2f6558c9bdf10d SHA512 13841ac4a186df47e4155095ca888a903b2db9e25a73fbb834fe981ccf915cb67a3e08506e5c13b6c5f35e27b1de24befbccf871e438b1a35f67f069bebd8fd0
-DIST gimp-2.99.2.tar.bz2 32375596 BLAKE2B 3dc5af7935e3503106cf2020798974d68fe86e5034792b09683519502474022e3a7832f418dfcdb4a022e6ebe878bb567bfbbbe51a96f0ae76375adc0dfdd6e5 SHA512 0a773ab01427abfb1b7690e855a041dc4883630fc827ce9d83169ccc5b4f925ecb9a0a16928a9c0ed0592c2c351ced5832e212d3115475c0f7a6092822adc194
 DIST gimp-2.99.4.tar.bz2 30355676 BLAKE2B b982139e36809b7e149c1c055d7cf0506c0c00beda2745904c62f4b56f1f1605378358f29ab427f7df6c68251ce367e00d79a1b9b7b3d0fde22526895eb5ce27 SHA512 1abb6851f4c6af440d75d09c55dcb6bf6485739de1960fb536035935729331221265beef589386da685ad8ffbe83e0f0699cf2db55589953deae4d82aa99154b
diff --git a/media-gfx/gimp/gimp-2.10.20-r3.ebuild b/media-gfx/gimp/gimp-2.10.20-r3.ebuild
deleted file mode 100644
index c97aa67e769a..000000000000
--- a/media-gfx/gimp/gimp-2.10.20-r3.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-1.3.0:=
-	>=media-libs/babl-0.1.78
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.24:0.4[cairo]
-	<media-libs/gegl-0.4.28:0.4
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-	if has_version "media-gfx/mypaint-brushes:2.0" ; then
-		sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-	fi
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.22-r1.ebuild b/media-gfx/gimp/gimp-2.10.22-r1.ebuild
deleted file mode 100644
index d0bc4bc4388f..000000000000
--- a/media-gfx/gimp/gimp-2.10.22-r1.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_EAUTORECONF=yes
-WANT_AUTOMAKE=
-
-inherit autotools gnome2 toolchain-funcs virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	>=app-text/poppler-0.50[cairo]
-	>=app-text/poppler-data-0.4.7
-	>=dev-libs/atk-2.2.0
-	>=dev-libs/glib-2.56.2:2
-	>=dev-libs/json-glib-1.2.6
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.6:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.78
-	>=media-libs/fontconfig-2.12.4
-	>=media-libs/freetype-2.1.7
-	>=media-libs/gegl-0.4.26:0.4[cairo]
-	<media-libs/gegl-0.4.28:0.4
-	>=media-libs/gexiv2-0.10.6
-	>=media-libs/harfbuzz-0.9.19
-	>=media-libs/lcms-2.8:2
-	>=media-libs/libmypaint-1.3.0:=
-	>=media-libs/libpng-1.6.25:0=
-	>=media-libs/tiff-3.5.7:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.12.2
-	>=x11-libs/gdk-pixbuf-2.31:2
-	>=x11-libs/gtk+-2.24.32:2
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.29.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.3.2:= )
-	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= )
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-1.6.1:= )
-	postscript? ( app-text/ghostscript-gpl )
-	udev? ( dev-libs/libgudev:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.10.0
-	dev-libs/appstream-glib
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.40.1
-	sys-apps/findutils
-	>=sys-devel/gettext-0.19
-	>=sys-devel/libtool-2.2
-	virtual/pkgconfig
-"
-
-DOCS=( "AUTHORS" "ChangeLog" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-)
-
-src_prepare() {
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/bin/false
-
-		--enable-default-binary
-
-		--disable-check-update
-		--disable-python
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.0/plug-ins || die
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || die
-			mv {,${prepend}}${plugin} || die
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	local gimp_app_version=$(get_version_component_range 1-2)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die
-
-	# Remove gimp devel-docs html files if user doesn't need it
-	if ! use doc; then
-		rm -r "${ED%/}"/usr/share/gtk-doc || die
-	fi
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.10.22-r2.ebuild b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
index 786ca884d747..7da8cd3f7e7c 100644
--- a/media-gfx/gimp/gimp-2.10.22-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.10.22-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 
diff --git a/media-gfx/gimp/gimp-2.99.2-r100.ebuild b/media-gfx/gimp/gimp-2.99.2-r100.ebuild
deleted file mode 100644
index 1d8b0c21eb1e..000000000000
--- a/media-gfx/gimp/gimp-2.99.2-r100.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.40"
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2 lua-single python-single-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/3"
-#KEYWORDS="~amd64"
-
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
-	>=app-text/poppler-0.90.1[cairo]
-	>=app-text/poppler-data-0.4.9
-	>=dev-libs/atk-2.34.1
-	>=dev-libs/glib-2.62.6:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.21:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.78[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
-	<media-libs/gegl-0.4.28:0.4
-	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
-	>=media-libs/lcms-2.9:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.37:0=
-	>=media-libs/tiff-4.1.0:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.42.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.7.0:= )
-	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
-	lua? (
-		${LUA_DEPS}
-		$(lua_gen_cond_dep '
-			dev-lua/lgi[${LUA_USEDEP}]
-		')
-	)
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	udev? ( >=dev-libs/libgudev-167:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
-	dev-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	sys-apps/findutils
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	doc? (
-		>=dev-util/gtk-doc-1.32
-		dev-util/gtk-doc-am
-	)
-	vala? ( $(vala_depend) )
-"
-
-# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-	"${FILESDIR}/${P}_fix_autoconf-2.70.patch"
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	use vala && vala_src_prepare
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
-		--enable-default-binary
-
-		--disable-check-update
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable doc gtk_doc)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with javascript)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with lua)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with python)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/gimp-2.99.2.ebuild b/media-gfx/gimp/gimp-2.99.2.ebuild
deleted file mode 100644
index 335ccf5dcf04..000000000000
--- a/media-gfx/gimp/gimp-2.99.2.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-GNOME2_EAUTORECONF=yes
-VALA_MIN_API_VERSION="0.40"
-VALA_USE_DEPEND=vapigen
-
-inherit autotools gnome2 python-single-r1 toolchain-funcs vala virtualx
-
-DESCRIPTION="GNU Image Manipulation Program"
-HOMEPAGE="https://www.gimp.org/"
-SRC_URI="mirror://gimp/v2.99/${P}.tar.bz2"
-LICENSE="GPL-3 LGPL-3"
-SLOT="0/3"
-#KEYWORDS="~amd64"
-
-IUSE="aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vala vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="!test? ( test )"
-
-# media-libs/{babl,gegl} are required to be built with USE="introspection"
-# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
-COMMON_DEPEND="
-	>=app-text/poppler-0.90.1[cairo]
-	>=app-text/poppler-data-0.4.9
-	>=dev-libs/atk-2.34.1
-	>=dev-libs/glib-2.62.6:2
-	>=dev-libs/json-glib-1.4.4
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.40.21:2
-	>=media-gfx/mypaint-brushes-2.0.2:=
-	>=media-libs/babl-0.1.78[introspection,lcms,vala?]
-	>=media-libs/fontconfig-2.12.6
-	>=media-libs/freetype-2.10.2
-	>=media-libs/gegl-0.4.26:0.4[cairo,introspection,lcms,vala?]
-	<media-libs/gegl-0.4.28:0.4
-	>=media-libs/gexiv2-0.10.10
-	>=media-libs/harfbuzz-2.6.5
-	>=media-libs/lcms-2.9:2
-	>=media-libs/libmypaint-1.6.1:=
-	>=media-libs/libpng-1.6.37:0=
-	>=media-libs/tiff-4.1.0:0
-	net-libs/glib-networking[ssl]
-	sys-libs/zlib
-	virtual/jpeg
-	>=x11-libs/cairo-1.16.0
-	>=x11-libs/gdk-pixbuf-2.40.0:2
-	>=x11-libs/gtk+-3.24.16:3
-	x11-libs/libXcursor
-	>=x11-libs/pango-1.42.4
-	aalib? ( media-libs/aalib )
-	alsa? ( >=media-libs/alsa-lib-1.0.0 )
-	aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 )
-	heif? ( >=media-libs/libheif-1.7.0:= )
-	javascript? ( dev-libs/gjs )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
-	lua? (
-		dev-lang/luajit
-		dev-lua/lgi
-	)
-	mng? ( media-libs/libmng:= )
-	openexr? ( >=media-libs/openexr-2.3.0:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0:3[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	udev? ( >=dev-libs/libgudev-167:= )
-	unwind? ( >=sys-libs/libunwind-1.1.0:= )
-	webp? ( >=media-libs/libwebp-0.6.0:= )
-	wmf? ( >=media-libs/libwmf-0.2.8 )
-	xpm? ( x11-libs/libXpm )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	x11-themes/hicolor-icon-theme
-	gnome? ( gnome-base/gvfs )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	>=dev-lang/perl-5.30.3
-	>=dev-libs/appstream-glib-0.7.16
-	dev-util/gdbus-codegen
-	dev-util/gtk-update-icon-cache
-	>=dev-util/intltool-0.51.0
-	sys-apps/findutils
-	>=sys-devel/autoconf-2.54
-	>=sys-devel/automake-1.11
-	>=sys-devel/gettext-0.21
-	>=sys-devel/libtool-2.4.6
-	virtual/pkgconfig
-	doc? (
-		>=dev-util/gtk-doc-1.32
-		dev-util/gtk-doc-am
-	)
-	vala? ( $(vala_depend) )
-"
-
-DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
-
-# Bugs 685210 (and duplicate 691070)
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10_fix_test-appdata.patch"
-	"${FILESDIR}/${P}_fix_autoconf-2.70.patch"
-)
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e 's/\[gegl_micro_version\], \[27\]/\[gegl_micro_version\], \[26\]/' configure.ac || die
-
-	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' configure.ac || die #737794
-
-	sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864
-	sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144
-
-	gnome2_src_prepare  # calls eautoreconf
-
-	use vala && vala_src_prepare
-
-	sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
-	fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
-
-	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-}
-
-_adjust_sandbox() {
-	# Bugs #569738 and #591214
-	local nv
-	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
-		# We do not check for existence as they may show up later
-		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
-		addwrite "${nv}"
-	done
-
-	addwrite /dev/dri/  # bugs #574038 and #684886
-	addwrite /dev/ati/  # bug #589198
-	addwrite /proc/mtrr  # bug #589198
-}
-
-src_configure() {
-	_adjust_sandbox
-
-	local myconf=(
-		GEGL="${EPREFIX}"/usr/bin/gegl-0.4
-		GDBUS_CODEGEN="${EPREFIX}"/usr/bin/gdbus-codegen
-
-		--enable-default-binary
-
-		--disable-check-update
-		--enable-mp
-		--with-appdata-test
-		--with-bug-report-url=https://bugs.gentoo.org/
-		--with-xmc
-		--without-libbacktrace
-		--without-webkit
-		--without-xvfb-run
-		$(use_enable cpu_flags_ppc_altivec altivec)
-		$(use_enable cpu_flags_x86_mmx mmx)
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable doc gtk_doc)
-		$(use_enable vector-icons)
-		$(use_with aalib aa)
-		$(use_with alsa)
-		$(use_with !aqua x)
-		$(use_with heif libheif)
-		$(use_with javascript)
-		$(use_with jpeg2k jpeg2000)
-		$(use_with lua)
-		$(use_with mng libmng)
-		$(use_with openexr)
-		$(use_with postscript gs)
-		$(use_with python)
-		$(use_with udev gudev)
-		$(use_with unwind libunwind)
-		$(use_with vala)
-		$(use_with webp)
-		$(use_with wmf)
-		$(use_with xpm libxpm)
-	)
-
-	gnome2_src_configure "${myconf[@]}"
-}
-
-src_compile() {
-	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
-	gnome2_src_compile
-}
-
-# for https://bugs.gentoo.org/664938
-_rename_plugins() {
-	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
-	local prepend=gimp-org-
-	(
-		cd "${ED%/}"/usr/$(get_libdir)/gimp/2.99/plug-ins || exit 1
-		for plugin_slash in $(ls -d1 */); do
-		    plugin=${plugin_slash%/}
-		    if [[ -f ${plugin}/${plugin} ]]; then
-			# NOTE: Folder and file name need to match for Gimp to load that plug-in
-			#       so "file-svg/file-svg" becomes "${prepend}file-svg/${prepend}file-svg"
-			mv ${plugin}/{,${prepend}}${plugin} || exit 1
-			mv {,${prepend}}${plugin} || exit 1
-		    fi
-		done
-	)
-}
-
-src_test() {
-	virtx emake check
-}
-
-src_install() {
-	gnome2_src_install
-
-	if use python; then
-		python_optimize
-	fi
-
-	# Workaround for bug #321111 to give GIMP the least
-	# precedence on PDF documents by default
-	mv "${ED%/}"/usr/share/applications/{,zzz-}gimp.desktop || die
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	# Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527)
-	mv "${ED%/}"/usr/share/man/man1/gimp-console{-*,}.1 || die
-
-	_rename_plugins || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 88724f7e8aab..772a33bd2d8f 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>torokhov-s-a@yandex.ru</email>
-		<name>Sergey Torokhov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
-		<flag name="vector-icons">Enable support for vector icons (experimental)</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>torokhov-s-a@yandex.ru</email>
+  <name>Sergey Torokhov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF files</flag>
+  <flag name="vector-icons">Enable support for vector icons (experimental)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index cbad8cc65057..17da03c6dd44 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,2 @@
-DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
 DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 DIST gmic_2.9.5.tar.gz 7304367 BLAKE2B 5227aced76cc5ff0a0144f940c71daeeb947e282b6f8c28894ecfda6b863803d0c2227bac869362ba0710fa33fcf81a4c77ea582cbea77ab8a670f65eef9826c SHA512 95d0642cad057eeaa8f7bdd4259719adf6f36189e7851e9e09399bb61f3a52722f0f83f0d2d5991c4e44a692fd3afc735fdb93e6fe45ae092d1e51a139560809
diff --git a/media-gfx/gmic/gmic-2.9.2-r1.ebuild b/media-gfx/gmic/gmic-2.9.2-r1.ebuild
deleted file mode 100644
index 4af6d1c63fa1..000000000000
--- a/media-gfx/gmic/gmic-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 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 digikam ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib"
-REQUIRED_USE="
-	|| ( cli digikam gimp krita qt5 )
-	digikam? ( png zlib fftw X )
-	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 )
-	digikam? (
-		media-gfx/digikam
-		${QT_DEPEND}
-	)
-	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}
-	digikam? ( dev-qt/linguist-tools )
-	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 digikam || 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 digikam; then
-		mycmakeargs+=( -DGMIC_QT_HOST=digikam )
-		BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_configure
-	fi
-
-	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 digikam && { BUILD_DIR="${BUILD_DIR}"/digikam cmake_src_compile || die "failed building digikam plugin" ; }
-	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 digikam; then
-		local DIGIKAMDIR="/usr/$(get_libdir)/qt5/plugins/digikam/editor"
-		exeinto "${DIGIKAMDIR}"
-		doexe "${BUILD_DIR}"/digikam/Editor_GmicQt_Plugin.so
-	fi
-	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/gmic/gmic-2.9.4.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 0c669de12cc1..09772f17dece 100644
--- a/media-gfx/gmic/gmic-2.9.4.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.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/metadata.xml b/media-gfx/gmic/metadata.xml
index 39d49193716b..8dff171dddd3 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<use>
-		<flag name="cli">Build CLI interface</flag>
-		<flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>
-		<flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
-		<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">dtschump/gmic</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dtschump/gmic</remote-id>
+ </upstream>
+ <use>
+  <flag name="cli">Build CLI interface</flag>
+  <flag name="digikam">Build <pkg>media-gfx/digikam</pkg> plugin</flag>
+  <flag name="krita">Build <pkg>media-gfx/krita</pkg> plugin</flag>
+  <flag name="opencv">Enable support for webcams using the OpenCV library</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
index 13655d3e6d16..6a8d5bd67255 100644
--- a/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.ebuild
+++ b/media-gfx/gnofract4d/gnofract4d-4.3_p20201029.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
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/fract4d/gnofract4d/archive/${COMMIT}.tar.gz -> ${P}.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	media-libs/libpng:0=
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index d11e338560d8..6e1e71969743 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aklhfex@gmail.com</email>
-		<name>Chris Mayo</name>
-	</maintainer>
-	<maintainer type="project">
-		<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>
+ <maintainer type="person">
+  <email>aklhfex@gmail.com</email>
+  <name>Chris Mayo</name>
+ </maintainer>
+ <maintainer type="project">
+  <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>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnome-font-viewer/metadata.xml b/media-gfx/gnome-font-viewer/metadata.xml
index 39980802b1da..f2710c9e5c09 100644
--- a/media-gfx/gnome-font-viewer/metadata.xml
+++ b/media-gfx/gnome-font-viewer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml
index 991ec58281a6..21fdafdf1ace 100644
--- a/media-gfx/gnome-photos/metadata.xml
+++ b/media-gfx/gnome-photos/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="flickr">Ensure runtime Flickr support</flag>
-</use>
-<longdescription lang="en">
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
 	Access, organize and share your photos on GNOME. A simple and elegant
 	replacement for using a file manager to deal with photos. Enhance, crop
 	and edit in a snap. Seamless cloud integration is offered through GNOME
@@ -24,4 +21,9 @@
 	- Select favorites
 	- Easily edit your pictures in the app, or send to a full featured editor for more advanced changes
 </longdescription>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="flickr">Ensure runtime Flickr support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnome-raw-thumbnailer/metadata.xml b/media-gfx/gnome-raw-thumbnailer/metadata.xml
index 4cbddcaa19ad..f2710c9e5c09 100644
--- a/media-gfx/gnome-raw-thumbnailer/metadata.xml
+++ b/media-gfx/gnome-raw-thumbnailer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnome-screenshot/metadata.xml b/media-gfx/gnome-screenshot/metadata.xml
index 39980802b1da..f2710c9e5c09 100644
--- a/media-gfx/gnome-screenshot/metadata.xml
+++ b/media-gfx/gnome-screenshot/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gnuclad/metadata.xml b/media-gfx/gnuclad/metadata.xml
index df2c9cb19525..3fd3ec67f917 100644
--- a/media-gfx/gnuclad/metadata.xml
+++ b/media-gfx/gnuclad/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="launchpad">gnuclad</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="launchpad">gnuclad</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gozer/metadata.xml b/media-gfx/gozer/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/gozer/metadata.xml
+++ b/media-gfx/gozer/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index d2ef3b521ffc..24b01c95f52e 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gphoto</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">gphoto</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gphotofs/metadata.xml b/media-gfx/gphotofs/metadata.xml
index 6ad0ffe21943..77b87c890775 100644
--- a/media-gfx/gphotofs/metadata.xml
+++ b/media-gfx/gphotofs/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zx2c4@gentoo.org</email>
-		<name>Jason A. Donenfeld</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gphoto</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>zx2c4@gentoo.org</email>
+  <name>Jason A. Donenfeld</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">gphoto</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml
index 2d50c260c4ee..2f52ad7b89cf 100644
--- a/media-gfx/gpicview/metadata.xml
+++ b/media-gfx/gpicview/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">lxde</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>slashbeast@gentoo.org</email>
+  <name>Piotr Karbowski</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">lxde</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index ff7e99eb02ba..5514e68e9105 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gqview</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>slyfox@gentoo.org</email>
+  <name>Sergei Trofimovich</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">gqview</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
index def615c4d38a..ab71c09a408a 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.36.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 	S="${WORKDIR}/${MY_P}"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 fi
 
 IUSE="bzip2 +cxx debug dynamic-loading fpx imagemagick jbig jpeg lcms lzma
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 8e4554b3141f..df186ec491d0 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+ <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
   which support reading, writing, and manipulating an image in over 88 major
@@ -11,14 +10,15 @@
   The program is the fork of a better-known ImageMagick (5.5.2), which
   emphasizes end-user and API-stabilities.
   </longdescription>
-  <use>
-    <flag name="fpx">Enable FlashPix support with <pkg>media-libs/libfpx</pkg></flag>
-    <flag name="dynamic-loading">Compile graphicsmagick with dynamically
+ <upstream>
+  <remote-id type="sourceforge">graphicsmagick</remote-id>
+ </upstream>
+ <use>
+  <flag name="fpx">Enable FlashPix support with <pkg>media-libs/libfpx</pkg></flag>
+  <flag name="dynamic-loading">Compile graphicsmagick with dynamically
     loadable modules</flag>
-    <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
-    <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">graphicsmagick</remote-id>
-  </upstream>
-</pkgmetadata>
+  <flag name="q16">Set storage quantum size to 16 (~2*memory)</flag>
+  <flag name="q32">Set storage quantum size to 32 (~5*memory)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/graphite2/metadata.xml b/media-gfx/graphite2/metadata.xml
index 1d691cf5e290..f866013d3982 100644
--- a/media-gfx/graphite2/metadata.xml
+++ b/media-gfx/graphite2/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>office@gentoo.org</email>
-		<name>Gentoo Office project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">silgraphite</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>office@gentoo.org</email>
+  <name>Gentoo Office project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">silgraphite</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 0e17a85326a1..3296528dd026 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>soap@gentoo.org</email>
-		<name>David Seifert</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="person">
+  <email>zlogene@gentoo.org</email>
+  <name>Mikle Kolyada</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>soap@gentoo.org</email>
+  <name>David Seifert</name>
+ </maintainer>
+ <longdescription>
 		graphviz is a set of graph drawing tools for Unix or MS-Windows
 		(win32), including a web service interface (webdot). Source code and
 		binary executables for common platforms are available. Graph drawing
@@ -34,11 +34,13 @@
 		* you would like to discover patterns and communities of interest in
 		a database of telephone calls or e-mail messages
 	</longdescription>
-	<use>
-		<flag name="devil">Enables DevIL output plugin -Tdevil</flag>
-		<flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
-		<flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
-		<flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
-		<flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
-	</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="devil">Enables DevIL output plugin -Tdevil</flag>
+  <flag name="gtk">Enables gtk+ output plugin -Tgtk (needs cairo)</flag>
+  <flag name="gts">Enables support for GNU Triangulated Surface Library (required for sfdp to work)</flag>
+  <flag name="lasi">Enables PostScript output via <pkg>media-libs/lasi</pkg>, for plugin -Tlasi (needs cairo)</flag>
+  <flag name="X">Builds lefty front-end, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/grub-splashes/metadata.xml b/media-gfx/grub-splashes/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/grub-splashes/metadata.xml
+++ b/media-gfx/grub-splashes/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gscan2pdf/metadata.xml b/media-gfx/gscan2pdf/metadata.xml
index 79c9ea23cc9f..4d6ec94b3b40 100644
--- a/media-gfx/gscan2pdf/metadata.xml
+++ b/media-gfx/gscan2pdf/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aklhfex@gmail.com</email>
-		<name>Chris Mayo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gscan2pdf</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>aklhfex@gmail.com</email>
+  <name>Chris Mayo</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">gscan2pdf</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gthumb/gthumb-3.10.2.ebuild b/media-gfx/gthumb/gthumb-3.10.2.ebuild
index 208e1f2dcd15..aae8425356f4 100644
--- a/media-gfx/gthumb/gthumb-3.10.2.ebuild
+++ b/media-gfx/gthumb/gthumb-3.10.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/gthumb"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="cdr colord exif gnome-keyring gstreamer http lcms raw slideshow svg tiff webp"
 
 RDEPEND="
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 7277ae1b1da6..c3f16a41fa1c 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<use>
-		<flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
-		<flag name="slideshow">Enable slideshow plugin</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="http">Enable webservice integration through <pkg>net-libs/webkit-gtk</pkg></flag>
+  <flag name="slideshow">Enable slideshow plugin</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gtkam/metadata.xml b/media-gfx/gtkam/metadata.xml
index d2ef3b521ffc..24b01c95f52e 100644
--- a/media-gfx/gtkam/metadata.xml
+++ b/media-gfx/gtkam/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">gphoto</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">gphoto</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/gtkimageview/metadata.xml b/media-gfx/gtkimageview/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/gtkimageview/metadata.xml
+++ b/media-gfx/gtkimageview/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/hp2xx/metadata.xml b/media-gfx/hp2xx/metadata.xml
index 8223018128a3..0e1c6fd2d664 100644
--- a/media-gfx/hp2xx/metadata.xml
+++ b/media-gfx/hp2xx/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>printing@gentoo.org</email>
-		<name>Gentoo Printing Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
index 275059aaf1a5..3f84c69f1952 100644
--- a/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
+++ b/media-gfx/hugin/hugin-2020.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 LANGS=" ca ca-valencia cs da de en-GB es eu fi fr hu it ja nl pl pt-BR ro ru sk sv zh-CN zh-TW"
 IUSE="debug lapack python raw sift $(echo ${LANGS//\ /\ l10n_})"
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 4b6e44910c05..189144c8917f 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>maekke@gentoo.org</email>
-		<name>Markus Meier</name>
-	</maintainer>
-	<use>
-		<flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">hugin</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>maekke@gentoo.org</email>
+  <name>Markus Meier</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">hugin</remote-id>
+ </upstream>
+ <use>
+  <flag name="sift">automatically align images with <pkg>media-gfx/autopano-sift-C</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/icc-examin/metadata.xml b/media-gfx/icc-examin/metadata.xml
index 322fc08818ee..2b650770a3f6 100644
--- a/media-gfx/icc-examin/metadata.xml
+++ b/media-gfx/icc-examin/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">oyranos-cms/icc-examin</remote-id>
-		<remote-id type="sourceforge">oyranos</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">oyranos-cms/icc-examin</remote-id>
+  <remote-id type="sourceforge">oyranos</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/icon-slicer/metadata.xml b/media-gfx/icon-slicer/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/icon-slicer/metadata.xml
+++ b/media-gfx/icon-slicer/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index 43b420a338cf..57392750405d 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>patrick@gentoo.org</email>
-	<name>Patrick Lauer</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>patrick@gentoo.org</email>
+  <name>Patrick Lauer</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml
index b5a2274dadfe..97a8d916b2d2 100644
--- a/media-gfx/igal/metadata.xml
+++ b/media-gfx/igal/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		iGal is a Perl program that can generate and publish an entire online
 		picture show (static HTML slides, thumbnails and index page) with just
 		one command line invocation in a Linux or Unix environment.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index 7584d31c7d75..75e0fc377028 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -1,2 +1,5 @@
 DIST ImageMagick-6.9.11-61.tar.xz 9171260 BLAKE2B 89047378e414a7455baa28d413f49dfce3eb54e462211ba5e61f786111c569b26166217ca7e9f5e12c0602bde64c8e9726a67ee3c6be4366d692c2b6232dbbbf SHA512 742fb0b3ff4da98ff05a7fd48b1c5db038bf276975575c4e549f30d61001384c6b508cff526f621467d38a29a9cf015f0cc8c42801720f1b47d6737afb4bac78
+DIST ImageMagick-6.9.11-62.tar.xz 9172472 BLAKE2B 4be79ca6024f6d8e12fe492e6a541dfc4c6b70bf33dcfa8b3d2bb4d9a774a39bb974683e7444c47ee82349ae21e05fba458bcc45b71656f55084c9354ef7ddf6 SHA512 92987953b01c8ecdc3be0b78ee7bdc9e50e0a581f9682f283fcc2345a66ab2b75d678e2b989f90bcaf6eba95581b6234cb86ae33ee44faf6090760e72f838232
 DIST ImageMagick-7.0.10-61.tar.xz 10143308 BLAKE2B bc343b72567d326f30825637366e5d5614e8d53e5222fce357acf0acc9aceae84fe99d67bc7ff2d593e754b990d1e8449785a04724437b61a35e9282f9af799b SHA512 f90d8847fed7f1a5ca3fa247eb1ea115d6afe6fe379fb48733c539456663ca89426336f7ef8be087c1caa0eeafc7d63285f3c35c400fa94b30459796650421c3
+DIST ImageMagick-7.0.11-0.tar.xz 10147348 BLAKE2B 7237808a9352fd1e5988b3b91245335202e78576beb1ed07362adee4320e27ad2253dc4e2f0afe5a5510a17210488a60d2a6920634475908c75823986ca9ed03 SHA512 484a1f53c0d49359fc41d681ddb3fe5bcd0fa8a9b89db1f6f19df5cba0596ab1d8c035d6e7e8d000370ebdd040c6a50ca3d867cf6e50ac29c03471bc34bb4e0e
+DIST ImageMagick-7.0.11-1.tar.xz 10145440 BLAKE2B 24d4e455825b631db2d8e5c1dac8a4fe3ea2e5432db649cbc71b1486c497a6041e639bb185a4bff5393cecb762de42074fbe480e29b75d52e2fd143b27360cdd SHA512 046d6008f93506b98c064c87b81fee3e1b7bfd02f5aceb84eb01419b3e13ef8d75be9cdbbf2511247c9382f709a93c4ede53befd7a5c4f6e86d4a307cb838cc4
diff --git a/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
new file mode 100644
index 000000000000..7ff90f249dff
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-6.9.11.62.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver eutils flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+MY_PV="$(ver_rs 3 '-')"
+MY_P="ImageMagick-${MY_PV}"
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+
+LICENSE="imagemagick"
+SLOT="0/6.9.11-60"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+
+REQUIRED_USE="corefonts? ( truetype )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	virtual/pkgconfig
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+#S="${WORKDIR}/ImageMagick6-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local mesa_cards ati_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	IM_COMMANDS+=( "identify -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	IM_COMMANDS+=( "identify -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "6.9.10.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
new file mode 100644
index 000000000000..5256a3f29d2f
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
new file mode 100644
index 000000000000..5256a3f29d2f
--- /dev/null
+++ b/media-gfx/imagemagick/imagemagick-7.0.11.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic libtool perl-functions toolchain-funcs multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git"
+	inherit git-r3
+	MY_P="imagemagick-9999"
+else
+	MY_PV="$(ver_rs 3 '-')"
+	MY_P="ImageMagick-${MY_PV}"
+	SRC_URI="mirror://imagemagick/${MY_P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A collection of tools and libraries for many image formats"
+HOMEPAGE="https://www.imagemagick.org/"
+
+LICENSE="imagemagick"
+SLOT="0/7.0.11-0"
+IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="corefonts? ( truetype )
+	svg? ( xml )
+	test? ( corefonts )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/libltdl:0
+	bzip2? ( app-arch/bzip2 )
+	corefonts? ( media-fonts/corefonts )
+	djvu? ( app-text/djvu )
+	fftw? ( sci-libs/fftw:3.0 )
+	fontconfig? ( media-libs/fontconfig )
+	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
+	graphviz? ( media-gfx/graphviz )
+	heif? ( media-libs/libheif:= )
+	jbig? ( >=media-libs/jbigkit-2:= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 )
+	lcms? ( media-libs/lcms:2= )
+	lqr? ( media-libs/liblqr )
+	opencl? ( virtual/opencl )
+	openexr? ( media-libs/openexr:0= )
+	pango? ( x11-libs/pango )
+	perl? ( >=dev-lang/perl-5.8.8:0= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( app-text/ghostscript-gpl )
+	raw? ( media-libs/libraw:= )
+	svg? (
+		gnome-base/librsvg
+		media-gfx/potrace
+		)
+	tiff? ( media-libs/tiff:0= )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
+	webp? ( media-libs/libwebp:0= )
+	wmf? ( media-libs/libwmf )
+	X? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libXext
+		x11-libs/libXt
+		)
+	xml? ( dev-libs/libxml2:= )
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	!media-gfx/graphicsmagick[imagemagick]
+	X? ( x11-base/xorg-proto )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# Apply hardening #664236
+	cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die
+	sed -i -e '/^<policymap>$/ {
+			r policy-hardening.snippet
+			d
+		}' \
+		config/policy.xml || \
+		die "Failed to apply hardening of policy.xml"
+	einfo "policy.xml hardened"
+
+	elibtoolize # for Darwin modules
+
+	# For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3
+	local ati_cards mesa_cards nvidia_cards render_cards
+	shopt -s nullglob
+	ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+	if test -n "${ati_cards}"; then
+		addpredict "${ati_cards}"
+	fi
+	mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+	if test -n "${mesa_cards}"; then
+		addpredict "${mesa_cards}"
+	fi
+	nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+	if test -n "${nvidia_cards}"; then
+		addpredict "${nvidia_cards}"
+	fi
+	render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+	if test -n "${render_cards}"; then
+		addpredict "${render_cards}"
+	fi
+	shopt -u nullglob
+	addpredict /dev/nvidiactl
+}
+
+src_configure() {
+	local depth=16
+	use q8 && depth=8
+	use q32 && depth=32
+
+	local openmp=disable
+	use openmp && { tc-has-openmp && openmp=enable; }
+
+	use perl && perl_check_env
+
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable hdri)
+		$(use_enable opencl)
+		--with-threads
+		--with-modules
+		--with-quantum-depth=${depth}
+		$(use_with cxx magick-plus-plus)
+		$(use_with perl)
+		--with-perl-options='INSTALLDIRS=vendor'
+		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
+		$(use_with bzip2 bzlib)
+		$(use_with X x)
+		$(use_with zlib)
+		--without-autotrace
+		$(use_with postscript dps)
+		$(use_with djvu)
+		--with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu
+		$(use_with fftw)
+		$(use_with fpx)
+		$(use_with fontconfig)
+		$(use_with truetype freetype)
+		$(use_with postscript gslib)
+		$(use_with graphviz gvc)
+		$(use_with heif heic)
+		$(use_with jbig)
+		$(use_with jpeg)
+		$(use_with jpeg2k openjp2)
+		--without-jxl
+		$(use_with lcms)
+		$(use_with lqr)
+		$(use_with lzma)
+		$(use_with openexr)
+		$(use_with pango)
+		$(use_with png)
+		$(use_with raw)
+		$(use_with svg rsvg)
+		$(use_with tiff)
+		$(use_with webp)
+		$(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts)
+		$(use_with wmf)
+		$(use_with xml)
+		--${openmp}-openmp
+		--with-gcc-arch=no-automagic
+	)
+	CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	# Install default (unrestricted) policy in $HOME for test suite #664238
+	local _im_local_config_home="${HOME}/.config/ImageMagick"
+	mkdir -p "${_im_local_config_home}" || \
+		die "Failed to create IM config dir in '${_im_local_config_home}'"
+	cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \
+		die "Failed to install default blank policy.xml in '${_im_local_config_home}'"
+
+	local im_command= IM_COMMANDS=()
+	if [[ ${PV} == "9999" ]] ; then
+		IM_COMMANDS+=( "magick -version" ) # Show version we are using -- cannot verify because of live ebuild
+	else
+		IM_COMMANDS+=( "magick -version | grep -q -- \"${MY_PV}\"" ) # Verify that we are using version we just built
+	fi
+	IM_COMMANDS+=( "magick -list policy" ) # Verify that policy.xml is used
+	IM_COMMANDS+=( "emake check" ) # Run tests
+
+	for im_command in "${IM_COMMANDS[@]}"; do
+		eval "${S}"/magick.sh \
+			${im_command} || \
+			die "Failed to run \"${im_command}\""
+	done
+}
+
+src_install() {
+	# Ensure documentation installation files and paths with each release!
+	emake \
+		DESTDIR="${D}" \
+		DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	rm -f "${ED}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt}
+	dodoc {AUTHORS,README}.txt ChangeLog
+
+	if use perl; then
+		find "${ED}" -type f -name perllocal.pod -exec rm -f {} +
+		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} +
+	fi
+
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+	# .la files in parent are not needed, keep plugin .la files
+	find "${ED}"/usr/$(get_libdir)/ -maxdepth 1 -name "*.la" -delete || die
+
+	if use opencl; then
+		cat <<-EOF > "${T}"/99${PN}
+		SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/card0:/dev/dri/renderD128"
+		EOF
+
+		insinto /etc/sandbox.d
+		doins "${T}"/99${PN} #472766
+	fi
+
+	insinto /usr/share/${PN}
+	doins config/*icm
+}
+
+pkg_postinst() {
+	local _show_policy_xml_notice=
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		_show_policy_xml_notice=yes
+	else
+		local v
+		for v in ${REPLACING_VERSIONS}; do
+			if ! ver_test "${v}" -gt "7.0.8.10-r2"; then
+				# This is an upgrade
+				_show_policy_xml_notice=yes
+
+				# Show this elog only once
+				break
+			fi
+		done
+	fi
+
+	if [[ -n "${_show_policy_xml_notice}" ]]; then
+		elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7"
+		elog "which will prevent the usage of the following coders by default:"
+		elog ""
+		elog "  - PS"
+		elog "  - PS2"
+		elog "  - PS3"
+		elog "  - EPS"
+		elog "  - PDF"
+		elog "  - XPS"
+	fi
+}
diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild
index 7ac9327f5a45..5256a3f29d2f 100644
--- a/media-gfx/imagemagick/imagemagick-9999.ebuild
+++ b/media-gfx/imagemagick/imagemagick-9999.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A collection of tools and libraries for many image formats"
 HOMEPAGE="https://www.imagemagick.org/"
 
 LICENSE="imagemagick"
-SLOT="0/7.0.10-37"
+SLOT="0/7.0.11-0"
 IUSE="bzip2 corefonts +cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl +png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index b8cb95f4c2a3..c4f93a09c382 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>codec@gentoo.org</email>
-    <name>Gentoo Codec Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-  <use>
-    <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
-    <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
-    <flag name="hdri">Enable High Dynamic Range Images formats</flag>
-    <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
-    <flag name="opencl">Enable OpenCL support</flag>
-    <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
-    <flag name="q32">Set quantum depth value to 32</flag>
-    <flag name="q8">Set quantum depth value to 8</flag>
-  </use>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>codec@gentoo.org</email>
+  <name>Gentoo Codec Project</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id>
+ </upstream>
+ <use>
+  <flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
+  <flag name="fpx">Enable <pkg>media-libs/libfpx</pkg> support</flag>
+  <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
+  <flag name="hdri">Enable High Dynamic Range Images formats</flag>
+  <flag name="lqr">Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
+  <flag name="opencl">Enable OpenCL support</flag>
+  <flag name="pango">Enable Pango support using <pkg>x11-libs/pango</pkg></flag>
+  <flag name="q32">Set quantum depth value to 32</flag>
+  <flag name="q8">Set quantum depth value to 8</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/imageworsener/metadata.xml b/media-gfx/imageworsener/metadata.xml
index ce454a1c5fbd..9a1ff9330ee8 100644
--- a/media-gfx/imageworsener/metadata.xml
+++ b/media-gfx/imageworsener/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>sping@gentoo.org</email>
-	<name>Sebastian Pipping</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>sping@gentoo.org</email>
+  <name>Sebastian Pipping</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/img2pdf/metadata.xml b/media-gfx/img2pdf/metadata.xml
index ca964c7924b5..35ad460199b6 100644
--- a/media-gfx/img2pdf/metadata.xml
+++ b/media-gfx/img2pdf/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sir.suriv@gmail.com</email>
-		<name>Diogo Pereira</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>sir.suriv@gmail.com</email>
+  <name>Diogo Pereira</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
 	Losslessly convert raster images to PDF. The file size will not
 	unnecessarily increase. It can for example be used to create a PDF
 	document from a number of scans that are only available in JPEG format.
@@ -18,12 +17,10 @@
 	to quality loss) or store them in the zip/flate format which results in
 	the PDF becoming unnecessarily large in terms of its file size.
 	</longdescription>
-	<upstream>
-		<maintainer status="active">
-			<email>josch@mister-muffin.de</email>
-			<name>Johannes Schauer</name>
-		</maintainer>
-		<remote-id type="pypi">img2pdf</remote-id>
-		<bugs-to>https://gitlab.mister-muffin.de/josch/img2pdf/issues</bugs-to>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="pypi">img2pdf</remote-id>
+  <bugs-to>https://gitlab.mister-muffin.de/josch/img2pdf/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 00813efe7c9d..755d47506de7 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,2 +1,2 @@
-DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
 DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
+DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
new file mode 100644
index 000000000000..e726d7b093a2
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
@@ -0,0 +1,9 @@
+https://github.com/eXeC64/imv/issues/299
+--- a/src/backend_freeimage.c	2020-12-17 15:30:42.000000000 -0500
++++ b/src/backend_freeimage.c	2021-01-23 12:03:46.175921640 -0500
+@@ -8,4 +8,5 @@
+ #include <FreeImage.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
new file mode 100644
index 000000000000..381013329062
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
@@ -0,0 +1,14 @@
+https://github.com/eXeC64/imv/issues/305
+--- a/src/wl_window.c	2020-12-17 15:30:42.000000000 -0500
++++ b/src/wl_window.c	2021-02-02 19:03:52.598901093 -0500
+@@ -545,2 +545,3 @@
+     wl_surface_commit(window->wl_surface);
++    wl_display_roundtrip(window->wl_display);
+     size_t buffer_width = window->width * window->scale;
+@@ -636,4 +637,4 @@
+         .height = window->height,
+-        .buffer_width = window->width * window->scale,
+-        .buffer_height = window->height * window->scale
++        .buffer_width = buffer_width,
++        .buffer_height = buffer_height,
+       }
diff --git a/media-gfx/imv/imv-4.0.1-r2.ebuild b/media-gfx/imv/imv-4.0.1-r2.ebuild
deleted file mode 100644
index a93b2f9f6269..000000000000
--- a/media-gfx/imv/imv-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,91 +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="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +freeimage jpeg png +svg test tiff wayland"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( X wayland )
-"
-
-RDEPEND="
-	!sys-apps/renameutils
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
-	X? (
-		virtual/glu
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage )
-	jpeg? ( media-libs/libjpeg-turbo )
-	png? ( media-libs/libpng )
-	svg? ( gnome-base/librsvg )
-	tiff? ( media-libs/tiff )
-	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
-"
-DEPEND="
-	${RDEPEND}
-"
-
-src_prepare() {
-	default
-	sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die
-}
-
-src_configure() {
-	tc-export PKG_CONFIG
-	local WINDOWS
-	if use X; then
-		if ! use wayland; then
-			WINDOWS=x11
-		else
-			WINDOWS=all
-		fi
-	else
-		if use wayland; then
-			WINDOWS=wayland
-		fi
-	fi
-
-	BACKENDS=(
-		BACKEND_FREEIMAGE=$(usex freeimage)
-		BACKEND_JPEG=$(usex jpeg)
-		BACKEND_LIBPNG=$(usex png)
-		BACKEND_LIBRSVG=$(usex svg)
-		BACKEND_LIBTIFF=$(usex tiff)
-		WINDOWS=${WINDOWS}
-	)
-}
-
-src_compile() {
-	emake ${BACKENDS[@]}
-}
-
-src_install() {
-	emake ${BACKENDS[@]} DESTDIR="${D}" install
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
new file mode 100644
index 000000000000..25863200b0b2
--- /dev/null
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb:=
+	)
+	freeimage? ( media-libs/freeimage )
+	gif? ( media-libs/libnsgif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
+	wayland? ( dev-libs/wayland )
+	!sys-apps/renameutils
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/asciidoc
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
+	"${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
+)
+
+src_prepare() {
+	default
+
+	# allow building with libglvnd[-X]
+	if ! use X; then
+		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
+	fi
+
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local windows=all
+	use X || windows=wayland
+	use wayland || windows=x11
+
+	local emesonargs=(
+		$(meson_feature freeimage)
+		$(meson_feature gif libnsgif)
+		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
+		$(meson_feature svg librsvg)
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=${windows}
+	)
+	meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 65f50d9221c2..735366ed5332 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,89 +1,81 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 meson xdg-utils
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+	SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-LICENSE="MIT-with-advertising"
 HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv"
 
-KEYWORDS=""
+LICENSE="MIT-with-advertising"
 SLOT="0"
-IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( X wayland )
-"
 
 RDEPEND="
-	!sys-apps/renameutils
 	dev-libs/icu:=
-	media-libs/fontconfig
-	media-libs/libsdl2
-	media-libs/sdl2-ttf
+	dev-libs/inih
+	media-libs/libglvnd[X?]
+	x11-libs/libxkbcommon[X?]
+	x11-libs/pango
 	X? (
-		virtual/glu
 		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon[X]
-		x11-libs/pango
-	)
-	freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
-	!freeimage? (
-		jpeg? ( media-libs/libjpeg-turbo )
-		png? ( media-libs/libpng )
-		tiff? ( media-libs/tiff )
+		x11-libs/libxcb:=
 	)
+	freeimage? ( media-libs/freeimage )
 	gif? ( media-libs/libnsgif )
-	heif? ( media-libs/libheif )
+	heif? ( media-libs/libheif:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
 	svg? ( >=gnome-base/librsvg-2.44 )
+	tiff? ( media-libs/tiff )
 	wayland? ( dev-libs/wayland )
-"
-BDEPEND="
-	app-text/asciidoc
-	test? ( dev-util/cmocka )
+	!sys-apps/renameutils
 "
 DEPEND="
 	${RDEPEND}
+	test? ( dev-util/cmocka )
+"
+BDEPEND="
+	app-text/asciidoc
 "
 
-src_configure() {
-	local WINDOWS
-	if use X; then
-		if ! use wayland; then
-			WINDOWS=x11
-		else
-			WINDOWS=all
-		fi
-	else
-		if use wayland; then
-			WINDOWS=wayland
-		fi
-	fi
+src_prepare() {
+	default
 
-	if ! use test; then
-		sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+	# allow building with libglvnd[-X]
+	if ! use X; then
+		sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
 	fi
 
+	# glu isn't used by anything
+	sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+	local windows=all
+	use X || windows=wayland
+	use wayland || windows=x11
+
 	local emesonargs=(
 		$(meson_feature freeimage)
 		$(meson_feature gif libnsgif)
 		$(meson_feature heif libheif)
+		$(meson_feature jpeg libjpeg)
+		$(meson_feature png libpng)
 		$(meson_feature svg librsvg)
-		$(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
-		$(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
-		-Dwindows=$WINDOWS
+		$(meson_feature test)
+		$(meson_feature tiff libtiff)
+		-Dwindows=${windows}
 	)
 	meson_src_configure
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml
index 5ae50d4b1eeb..9ca5ddfdc1ac 100644
--- a/media-gfx/imv/metadata.xml
+++ b/media-gfx/imv/metadata.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag>
-<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag>
-<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag>
-</use>
-<upstream>
-<remote-id type="github">eXeC64/imv</remote-id>
-</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>sudinave@gmail.com</email>
+  <name>Ionen Wolkens</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">eXeC64/imv</remote-id>
+ </upstream>
+ <use>
+  <flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag>
+  <flag name="heif">Add HEIF/HEIC image support</flag>
+  <flag name="libnsgif">Add animated GIF support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/inkscape/inkscape-1.0.1.ebuild b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
index 533b08c0e9d0..d9af5f9a4adb 100644
--- a/media-gfx/inkscape/inkscape-1.0.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.1-r1.ebuild
@@ -32,14 +32,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/inkscape/inkscape-1.0.2.ebuild b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
index 3b88ef146b3a..720fd71ea3eb 100644
--- a/media-gfx/inkscape/inkscape-1.0.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.0.2-r1.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/inkscape/inkscape-9999.ebuild b/media-gfx/inkscape/inkscape-9999.ebuild
index ce552c13dcb0..66fa07ac5314 100644
--- a/media-gfx/inkscape/inkscape-9999.ebuild
+++ b/media-gfx/inkscape/inkscape-9999.ebuild
@@ -28,14 +28,14 @@ BDEPEND="
 "
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.57.0:=[cairo]
-	>=dev-cpp/cairomm-1.12
-	>=dev-cpp/glibmm-2.54.1
+	>=dev-cpp/cairomm-1.12:0
+	>=dev-cpp/glibmm-2.54.1:2
 	dev-cpp/gtkmm:3.0
-	>=dev-cpp/pangomm-2.40
+	>=dev-cpp/pangomm-2.40:1.4
 	>=dev-libs/boehm-gc-7.1:=
 	dev-libs/double-conversion:=
 	>=dev-libs/glib-2.41
-	>=dev-libs/libsigc++-2.8
+	>=dev-libs/libsigc++-2.8:2
 	>=dev-libs/libxml2-2.7.4
 	>=dev-libs/libxslt-1.1.25
 	dev-libs/gdl:3
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 67658aa01494..400fb6e4c133 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Hüttel</name>
-	</maintainer>
-	<use>
-		<flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag>
-		<flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag>
-		<flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
-		<flag name="svg2">Enable support for new SVG2 features</flag>
-		<flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag>
-		<flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag>
-	</use>
-	<upstream>
-		<remote-id type="gitlab">inkscape/inkscape</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>zlogene@gentoo.org</email>
+  <name>Mikle Kolyada</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Hüttel</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="gitlab">inkscape/inkscape</remote-id>
+ </upstream>
+ <use>
+  <flag name="cdr">Enable support for CorelDRAW files via <pkg>media-libs/libcdr</pkg></flag>
+  <flag name="dia">Enable DIA flow chart import via <pkg>app-office/dia</pkg></flag>
+  <flag name="inkjar">Enable support for OpenOffice.org SVG jar files</flag>
+  <flag name="svg2">Enable support for new SVG2 features</flag>
+  <flag name="visio">Enable support for Microsoft Visio diagrams via <pkg>media-libs/libvisio</pkg></flag>
+  <flag name="wpg">Enable support for WordPerfect graphics via <pkg>app-text/libwpg</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-data/metadata.xml b/media-gfx/iscan-data/metadata.xml
index c1073e27b5c4..5a8ea336098b 100644
--- a/media-gfx/iscan-data/metadata.xml
+++ b/media-gfx/iscan-data/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		Provides the necessary support files for Image Scan! for Linux,
 		including device information and policy file generation logic.
 		Image Scan! for Linux will not function without this package.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-esdip/metadata.xml b/media-gfx/iscan-plugin-esdip/metadata.xml
index 8fec2c8da950..6aa81ad8a770 100644
--- a/media-gfx/iscan-plugin-esdip/metadata.xml
+++ b/media-gfx/iscan-plugin-esdip/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit.
 
     Provides support for image manipulation (deskew and autocrop).
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-gt-f500/metadata.xml b/media-gfx/iscan-plugin-gt-f500/metadata.xml
index fd4975467fc4..5a9a4f24b8e1 100644
--- a/media-gfx/iscan-plugin-gt-f500/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f500/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit only.
@@ -15,10 +14,11 @@
     EPSON Perfection 2480 PHOTO / GT-F500
     EPSON Perfection 2580 PHOTO / GT-F550
   </longdescription>
-
-  <use>
-    <flag name="minimal">
+ 
+ <use>
+  <flag name="minimal">
       Install the firmware only, and not the plugin.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-gt-f720/metadata.xml b/media-gfx/iscan-plugin-gt-f720/metadata.xml
index 33e566367b04..c6be8b7052e8 100644
--- a/media-gfx/iscan-plugin-gt-f720/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f720/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		Proprietary plugin for several EPSON scanner models with the epkowa SANE backend (provided by media-gfx/iscan).
 		This particular plugin (f720) seems to be required for:
 		Epson GT-F720
@@ -10,4 +9,6 @@
 		Epson Perfection V30
 		Epson Perfection V300 Photo
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-gt-x770/metadata.xml b/media-gfx/iscan-plugin-gt-x770/metadata.xml
index 8dfab6ee087f..722a6101883a 100644
--- a/media-gfx/iscan-plugin-gt-x770/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x770/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit.
@@ -11,4 +10,6 @@
 
     EPSON Perfection V500 (GT-X770)
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-gt-x820/metadata.xml b/media-gfx/iscan-plugin-gt-x820/metadata.xml
index 159e2314469c..1fd44d258991 100644
--- a/media-gfx/iscan-plugin-gt-x820/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x820/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit.
@@ -11,4 +10,6 @@
 
     EPSON Perfection V600 Photo (GT-X820)
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-network-nt/metadata.xml b/media-gfx/iscan-plugin-network-nt/metadata.xml
index 80a71f597854..61fc36207086 100644
--- a/media-gfx/iscan-plugin-network-nt/metadata.xml
+++ b/media-gfx/iscan-plugin-network-nt/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan-plugin-perfection-v370/metadata.xml b/media-gfx/iscan-plugin-perfection-v370/metadata.xml
index d1781ff4ec9d..cad52dc15e11 100644
--- a/media-gfx/iscan-plugin-perfection-v370/metadata.xml
+++ b/media-gfx/iscan-plugin-perfection-v370/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Proprietary plugin for several EPSON scanner models, to be used
     with the epkowa SANE backend (provided by
     <pkg>media-gfx/iscan</pkg>). 32-bit and 64-bit.
@@ -14,4 +13,6 @@
     Epson Perfection V37
     Epson Perfection V370 Photo
   </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index 650852b4e4f6..a4f05401508f 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/metadata.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marcin.deranek@slonko.net</email>
-		<name>Marcin Deranek</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Hüttel (only during xmas vacations)</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>marcin.deranek@slonko.net</email>
+  <name>Marcin Deranek</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Hüttel (only during xmas vacations)</name>
+ </maintainer>
+ <longdescription lang="en">
 		Image Scan! is a graphical scanner utility for people that do not need all
 		the bells and whistles provided by several of the other utilities out there
 		(xsane, QuiteInsane, Kooka). At the moment it only supports SEIKO EPSON
 		scanners and all-in-ones. However, the scanner driver it provides can
 		be used by any other SANE standard compliant scanner utility.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml
index 80a71f597854..61fc36207086 100644
--- a/media-gfx/jhead/metadata.xml
+++ b/media-gfx/jhead/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jigl/metadata.xml b/media-gfx/jigl/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/media-gfx/jigl/metadata.xml
+++ b/media-gfx/jigl/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jp2a/metadata.xml b/media-gfx/jp2a/metadata.xml
index a8764429bc70..fd727a075560 100644
--- a/media-gfx/jp2a/metadata.xml
+++ b/media-gfx/jp2a/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chainsaw@gentoo.org</email>
-    <name>Tony Vroon</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">jp2a</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>chainsaw@gentoo.org</email>
+  <name>Tony Vroon</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">jp2a</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index 7b2ed3650703..80872ec7bb4f 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>ulm@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="metric">Default to A4 paper size</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>ulm@gentoo.org</email>
+ </maintainer>
+ 
+ <use>
+  <flag name="metric">Default to A4 paper size</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jpeginfo/metadata.xml b/media-gfx/jpeginfo/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/jpeginfo/metadata.xml
+++ b/media-gfx/jpeginfo/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jpegoptim/metadata.xml b/media-gfx/jpegoptim/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/jpegoptim/metadata.xml
+++ b/media-gfx/jpegoptim/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jpegpixi/metadata.xml b/media-gfx/jpegpixi/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/jpegpixi/metadata.xml
+++ b/media-gfx/jpegpixi/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/jpegtoavi/metadata.xml b/media-gfx/jpegtoavi/metadata.xml
index 468b985dc829..f5f7a6f954db 100644
--- a/media-gfx/jpegtoavi/metadata.xml
+++ b/media-gfx/jpegtoavi/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">jpegtoavi</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>media-video@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">jpegtoavi</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kcoloredit/metadata.xml
index 0cf59224b009..96ccf0300196 100644
--- a/media-gfx/kcoloredit/metadata.xml
+++ b/media-gfx/kcoloredit/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>kde@gentoo.org</email>
-	<name>Gentoo KDE Project</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/kgraphviewer/metadata.xml b/media-gfx/kgraphviewer/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/media-gfx/kgraphviewer/metadata.xml
+++ b/media-gfx/kgraphviewer/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index 5b8b5f496a48..6ffef282b4f0 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
-		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
+  <flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 60a9e5269704..333f01ff5205 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.1.tar.xz 169788052 BLAKE2B fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190 SHA512 8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccaaaadbc1b1f8bcbcdeb607909fee710afe
 DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660 SHA512 a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 000000000000..6a49bd3ba2e7
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 5 Oct 2020 20:11:26 +0200
+Subject: [PATCH] Support quazip 1.0
+
+Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
+---
+ cmake/modules/FindQuaZip.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
+index 7e628fcd4b..345c7909ab 100644
+--- a/cmake/modules/FindQuaZip.cmake
++++ b/cmake/modules/FindQuaZip.cmake
+@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
+ 	ELSE(WIN32)
+ 		FIND_PACKAGE(PkgConfig)
+ #     pkg_check_modules(PC_QCA2 QUIET qca2)
+-		pkg_check_modules(PC_QUAZIP quazip)
++		pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
+ 		FIND_LIBRARY(QUAZIP_LIBRARIES
+ 			WIN32_DEBUG_POSTFIX d
+-            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
+ 			HINTS /usr/lib /usr/lib64
+ 		)
+ 		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
+ 			HINTS /usr/include /usr/local/include
+-			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
++			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
+ 		)
+ 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
+ 	ENDIF (WIN32)
+-- 
+GitLab
+
diff --git a/media-gfx/krita/krita-4.4.1.ebuild b/media-gfx/krita/krita-4.4.1.ebuild
deleted file mode 100644
index a85d5ad8925d..000000000000
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-KFMIN=5.74.0
-QTMIN=5.15.1
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/en/krita https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip
-	$(python_gen_cond_dep '
-		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-		dev-python/sip[${PYTHON_MULTI_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(cmake_use_find_package fftw FFTW3)
-		$(cmake_use_find_package gif GIF)
-		$(cmake_use_find_package gsl GSL)
-		$(cmake_use_find_package heif HEIF)
-		$(cmake_use_find_package jpeg JPEG)
-		$(cmake_use_find_package openexr OpenEXR)
-		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
-		$(cmake_use_find_package tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-4.4.2.ebuild b/media-gfx/krita/krita-4.4.2.ebuild
index b9440da88175..9c343d8f287e 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -31,7 +31,7 @@ BDEPEND="
 "
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
-	dev-libs/quazip
+	dev-libs/quazip:0=
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
 		dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
 	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+	"${FILESDIR}"/${P}-quazip1.patch
 )
 
 pkg_setup() {
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index 0ee0df7f22ce..f16c82d4c74b 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<use>
-		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
-		<flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
-		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
-		<flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+  <flag name="heif">Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using <pkg>media-libs/libheif</pkg></flag>
+  <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
+  <flag name="vc">Enable support for <pkg>dev-libs/vc</pkg>, could be a significant speed boost</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
index dacb6f1032b2..b577b9caa34e 100644
--- a/media-gfx/kuickshow/metadata.xml
+++ b/media-gfx/kuickshow/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chrgerloff@gmx.net</email>
-		<name>Christian Gerloff</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>chrgerloff@gmx.net</email>
+  <name>Christian Gerloff</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/kxstitch/metadata.xml b/media-gfx/kxstitch/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/media-gfx/kxstitch/metadata.xml
+++ b/media-gfx/kxstitch/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
index b434e3e4b783..a0eab3ab6c3b 100644
--- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild
+++ b/media-gfx/libimagequant/libimagequant-2.12.3.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/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
 
 DEPEND=""
diff --git a/media-gfx/libimagequant/metadata.xml b/media-gfx/libimagequant/metadata.xml
index 96bd9789e6c5..f088ab9712ad 100644
--- a/media-gfx/libimagequant/metadata.xml
+++ b/media-gfx/libimagequant/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription lang="en">
+ <longdescription lang="en">
     Small, portable C library for high-quality conversion of RGBA
     images to 8-bit indexed-color (palette) images.
   </longdescription>
-  <upstream>
-    <remote-id type="github">ImageOptim/libimagequant</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ImageOptim/libimagequant</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/librecad/metadata.xml b/media-gfx/librecad/metadata.xml
index e83f7a4a7026..0acd56f04960 100644
--- a/media-gfx/librecad/metadata.xml
+++ b/media-gfx/librecad/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="3d">Require all 2D coordinates stored as 3D</flag>
-    <flag name="tools">Build additional tool programs: tff2lff</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">LibreCAD/LibreCAD</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">LibreCAD/LibreCAD</remote-id>
+ </upstream>
+ <use>
+  <flag name="3d">Require all 2D coordinates stored as 3D</flag>
+  <flag name="tools">Build additional tool programs: tff2lff</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index 3b43b50502a0..266b25ab974b 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>aballier@gentoo.org</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">bgoglin/llgal</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">bgoglin/llgal</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml
index 98754110751f..0ae4f1b75843 100644
--- a/media-gfx/luminance-hdr/metadata.xml
+++ b/media-gfx/luminance-hdr/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dilfridge@gentoo.org</email>
-		<name>Andreas K. Huettel</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ <longdescription lang="en">
 	Qtpfsgui is an open source graphical user interface application that aims
 	to provide a workflow for HDR imaging.
 
@@ -28,11 +28,12 @@
 		* Copy exif data between sets of images.
 		* Supports internationalization.
 	</longdescription>
-	<use>
-		<flag name="fits">Enable support for the FITS format</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">LuminanceHDR/LuminanceHDR</remote-id>
-		<remote-id type="sourceforge">qtpfsgui</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">LuminanceHDR/LuminanceHDR</remote-id>
+  <remote-id type="sourceforge">qtpfsgui</remote-id>
+ </upstream>
+ <use>
+  <flag name="fits">Enable support for the FITS format</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml
index 34f02d52990b..65c670bfbca0 100644
--- a/media-gfx/lximage-qt/metadata.xml
+++ b/media-gfx/lximage-qt/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>lxqt@gentoo.org</email>
-		<name>LXQt</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">lxqt/lximage-qt</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>lxqt@gentoo.org</email>
+  <name>LXQt</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">lxqt/lximage-qt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/maim/metadata.xml b/media-gfx/maim/metadata.xml
index e07ed367a553..9094c464de5f 100644
--- a/media-gfx/maim/metadata.xml
+++ b/media-gfx/maim/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">naelstrof/maim</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">naelstrof/maim</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index 3c8534f5b6af..7f9462e3d76a 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 		Mandelbulber is an easy to use, handy but experimental application 
 		designed to help you render 3D Mandelbrot fractals called Mandelbulb 
 		and some other kind of 3D fractals like Mandelbox, Bulbbox, Juliabulb, 
 		Menger Sponge.
 	</longdescription>
-	<use>
-		<flag name="opencl">Enable GPU rendering support using OpenCL</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">mandelbulber</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">mandelbulber</remote-id>
+ </upstream>
+ <use>
+  <flag name="opencl">Enable GPU rendering support using OpenCL</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index 025aaf951950..3b075abfb038 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>voyageur@gentoo.org</email>
-    <name>Bernard Cafarelli</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="sourceforge">mcomix</remote-id>
-    <remote-id type="github">multiSnow/mcomix3</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>voyageur@gentoo.org</email>
+  <name>Bernard Cafarelli</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">mcomix</remote-id>
+  <remote-id type="github">multiSnow/mcomix3</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 95901ec9bfc4..cd82b2eaf685 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D print</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>amynka@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D print</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>amynka@gentoo.org</email>
+ </maintainer>
+ <longdescription>
 		MeshLab is an open source, portable, and extensible system for the processing and editing of unstructured 3D
 		triangular meshes. The system is aimed to help the processing of the typical not-so-small unstructured models
 		arising in 3D scanning, providing a set of tools for editing, cleaning, healing, inspecting, rendering and
 		converting these kinds of meshes.
 	</longdescription>
-	<use>
-		<flag name="double-precision">Use double type instead of float type for scalars</flag>
-	</use>
-	<upstream>
-		<bugs-to>https://github.com/cnr-isti-vclab/meshlab/issues</bugs-to>
-		<remote-id type="github">cnr-isti-vclab/meshlab</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">cnr-isti-vclab/meshlab</remote-id>
+  <bugs-to>https://github.com/cnr-isti-vclab/meshlab/issues</bugs-to>
+ </upstream>
+ <use>
+  <flag name="double-precision">Use double type instead of float type for scalars</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/metapixel/metadata.xml b/media-gfx/metapixel/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/metapixel/metadata.xml
+++ b/media-gfx/metapixel/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mkgallery/metadata.xml b/media-gfx/mkgallery/metadata.xml
index 76d50ff6b6cb..d5bbf5965b7b 100644
--- a/media-gfx/mkgallery/metadata.xml
+++ b/media-gfx/mkgallery/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">mkgallery</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">mkgallery</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/monica/metadata.xml b/media-gfx/monica/metadata.xml
index 272fc1e5253b..fb4817076445 100644
--- a/media-gfx/monica/metadata.xml
+++ b/media-gfx/monica/metadata.xml
@@ -1,17 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>robbat2@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+ <maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+ </maintainer>
+ <longdescription>
 		Monica is a Monitor Calibration Tool.
 		An easy way to get respectable color rendetion on your screen. Especially
 		important to get a reasonable overall gamma setting, to make sure the basic
 		"brightness" of your screen jibes with what others see... (the Internet sRGB
 		standard gamma of 2.2) 
 	</longdescription>
-	<upstream>
-		<remote-id type="freecode">monica</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="freecode">monica</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mscgen/metadata.xml b/media-gfx/mscgen/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/mscgen/metadata.xml
+++ b/media-gfx/mscgen/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mypaint-brushes/metadata.xml b/media-gfx/mypaint-brushes/metadata.xml
index a1af484833bd..ce6518e766bb 100644
--- a/media-gfx/mypaint-brushes/metadata.xml
+++ b/media-gfx/mypaint-brushes/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
-	<stabilize-allarches/>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/mypaint/metadata.xml b/media-gfx/mypaint/metadata.xml
index 8f3ad100df7e..f517c638647f 100644
--- a/media-gfx/mypaint/metadata.xml
+++ b/media-gfx/mypaint/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sam@gentoo.org</email>
-		<name>Sam James</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mypaint/mypaint</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>sam@gentoo.org</email>
+  <name>Sam James</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mypaint/mypaint</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
index b09023bbc390..cd8dc693a2e1 100644
--- a/media-gfx/netpaint/metadata.xml
+++ b/media-gfx/netpaint/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>monsieurp@gentoo.org</email>
-        <name>Patrice Clement</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>shell-tools@gentoo.org</email>
-        <name>Gentoo Shell Tools Project</name>
-    </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>monsieurp@gentoo.org</email>
+  <name>Patrice Clement</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>shell-tools@gentoo.org</email>
+  <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
new file mode 100644
index 000000000000..06f6b8c2fb81
--- /dev/null
+++ b/media-gfx/nomacs/files/nomacs-3.16.224-quazip1.patch
@@ -0,0 +1,127 @@
+From b4a1e98a83598072ea6d720ae4d56d380bee5a75 Mon Sep 17 00:00:00 2001
+From: Petr Vanek <petr@yarpen.cz>
+Date: Sun, 15 Nov 2020 19:15:59 +0100
+Subject: [PATCH] fixed #569 Build fails with quazip 1.0 (#576)
+
+---
+ cmake/Unix.cmake                | 28 +++++++++++++++------
+ src/DkCore/DkBasicLoader.cpp    |  4 +++
+ src/DkCore/DkImageContainer.cpp |  4 +++
+ src/DkCore/DkImageLoader.cpp    |  6 ++++-
+ src/DkGui/DkDialog.cpp          |  4 +++
+ 5 files changed, 37 insertions(+), 9 deletions(-)
+
+diff --git a/cmake/Unix.cmake b/cmake/Unix.cmake
+index 5567084b..c90ba320 100644
+--- a/cmake/Unix.cmake
++++ b/cmake/Unix.cmake
+@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
+ 
+ if(ENABLE_QUAZIP)
+   if(USE_SYSTEM_QUAZIP)
+-    SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+-
+-    find_package(QuaZip5 QUIET)
+-    if(NOT QUAZIP_FOUND)
+-	    message(FATAL_ERROR "QUAZIP not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
+-    else()
+-	    add_definitions(-DWITH_QUAZIP)
+-    endif()
++    # Let's try QuaZip1 first (it's the bright future)
++    find_package(QuaZip-Qt5 QUIET)
++    if (QuaZip-Qt5_FOUND)
++      message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
++      set(QUAZIP_LIBRARIES QuaZip::QuaZip)
++      add_definitions(-DWITH_QUAZIP1)
++    else ()
++      message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
++      # QuaZip < 1.0. This leg can be removed (including cmake/FindQuaZip5.cmake)
++      # ater the final migration to 1.x in Linux distros
++      SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
++
++      find_package(QuaZip5 QUIET)
++      if(NOT QUAZIP_FOUND)
++        message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
++      endif()
++
++    endif (QuaZip-Qt5_FOUND)
++    # we have any QuaZip after all
++    add_definitions(-DWITH_QUAZIP)
+   else()
+     find_package(ZLIB REQUIRED)
+     set(QUAZIP_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
+diff --git a/src/DkCore/DkBasicLoader.cpp b/src/DkCore/DkBasicLoader.cpp
+index 7f9e889c..b7edfd43 100644
+--- a/src/DkCore/DkBasicLoader.cpp
++++ b/src/DkCore/DkBasicLoader.cpp
+@@ -54,8 +54,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ // opencv
+ #ifdef WITH_OPENCV
+diff --git a/src/DkCore/DkImageContainer.cpp b/src/DkCore/DkImageContainer.cpp
+index 810994d3..150da9c2 100644
+--- a/src/DkCore/DkImageContainer.cpp
++++ b/src/DkCore/DkImageContainer.cpp
+@@ -41,8 +41,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ #pragma warning(pop)		// no warnings from includes - end
+ 
+ #pragma warning(disable: 4251)	// TODO: remove
+diff --git a/src/DkCore/DkImageLoader.cpp b/src/DkCore/DkImageLoader.cpp
+index 09d25d23..e4186f2b 100644
+--- a/src/DkCore/DkImageLoader.cpp
++++ b/src/DkCore/DkImageLoader.cpp
+@@ -79,8 +79,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ // opencv
+ #ifdef WITH_OPENCV
+@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const {
+ 	return mCurrentImage->fileName();
+ }
+ 
+-}
+\ No newline at end of file
++}
+diff --git a/src/DkGui/DkDialog.cpp b/src/DkGui/DkDialog.cpp
+index 008c9a3b..85842eca 100644
+--- a/src/DkGui/DkDialog.cpp
++++ b/src/DkGui/DkDialog.cpp
+@@ -97,8 +97,12 @@
+ 
+ // quazip
+ #ifdef WITH_QUAZIP
++#ifdef WITH_QUAZIP1
++#include <quazip/JlCompress.h>
++#else
+ #include <quazip5/JlCompress.h>
+ #endif
++#endif
+ 
+ #pragma warning(pop)		// no warnings from includes - end
+ 
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 5d40018fc73b..3608ad94aaa7 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.xml
@@ -1,17 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://nomacs.org/redmine/projects/nomacs</bugs-to>
-		<remote-id type="github">nomacs/nomacs</remote-id>
-		<remote-id type="sourceforge">nomacs</remote-id>
-	</upstream>
-	<use>
-		<flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
-		<flag name="plugins">Build officially support plugins</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>qt@gentoo.org</email>
+  <name>Gentoo Qt Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">nomacs/nomacs</remote-id>
+  <remote-id type="sourceforge">nomacs</remote-id>
+  <bugs-to>https://nomacs.org/redmine/projects/nomacs</bugs-to>
+ </upstream>
+ <use>
+  <flag name="opencv">Build support for <pkg>media-libs/opencv</pkg></flag>
+  <flag name="plugins">Build officially support plugins</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/nomacs/nomacs-3.16.224.ebuild b/media-gfx/nomacs/nomacs-3.16.224-r2.ebuild
index 252958e43a9a..9c6f50df1606 100644
--- a/media-gfx/nomacs/nomacs-3.16.224.ebuild
+++ b/media-gfx/nomacs/nomacs-3.16.224-r2.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
@@ -36,7 +36,7 @@ RDEPEND="
 		dev-qt/qtimageformats:5
 		media-libs/tiff
 	)
-	zip? ( dev-libs/quazip )
+	zip? ( dev-libs/quazip:0= )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
@@ -48,6 +48,8 @@ S="${WORKDIR}/${P}/ImageLounge"
 
 DOCS=( src/changelog.txt )
 
+PATCHES=( "${FILESDIR}"/${P}-quazip1.patch )
+
 src_prepare() {
 	if use plugins ; then
 		rmdir plugins || die
diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index 91a119f3f687..0bf098a24bc7 100644
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
+ <longdescription>
 The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
 use with both leading graphics APIs, runtime libraries for CgFX, example
 applications, and extensive documentation. Supporting over 20 different OpenGL
 and DirectX profile targets, Cg will allow you to incorporate stunning
 interactive effects into your 3D applications.
 </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index 504fd8077747..c687cdaacfad 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-	</maintainer>
-	<use>
-		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
-		<flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">castano/nvidia-texture-tools</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>voyageur@gentoo.org</email>
+  <name>Bernard Cafarelli</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">castano/nvidia-texture-tools</remote-id>
+ </upstream>
+ <use>
+  <flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
+  <flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openclipart/metadata.xml b/media-gfx/openclipart/metadata.xml
index 963db72c5398..2acac1e96711 100644
--- a/media-gfx/openclipart/metadata.xml
+++ b/media-gfx/openclipart/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="gzip">Compresses clip art using gzip</flag>
-	</use>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="gzip">Compresses clip art using gzip</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/opencsg/metadata.xml b/media-gfx/opencsg/metadata.xml
index be0edabb6659..fb344b74ccb3 100644
--- a/media-gfx/opencsg/metadata.xml
+++ b/media-gfx/opencsg/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>waebbl-gentoo@posteo.net</email>
-		<name>Bernd Waibel</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="person">
+  <email>waebbl-gentoo@posteo.net</email>
+  <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 		OpenCSG is a library that does image-based CSG rendering using
 		OpenGL. OpenCSG is written in C++ and supports most modern
 		graphics hardware using Microsoft Windows or the Linux operating
@@ -24,4 +24,6 @@
 		applications.  The OpenCSG library requires graphics hardware that
 		either supports frame buffer objects or PBuffers in OpenGL.  
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index 80b95a6d4e5c..8dfcf1893188 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="cg">Add support for nvidia's cg shaders</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">openexr/openexr</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>media-video@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">openexr/openexr</remote-id>
+ </upstream>
+ <use>
+  <flag name="cg">Add support for nvidia's cg shaders</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openmesh/metadata.xml b/media-gfx/openmesh/metadata.xml
index 2401960ac413..90fe415a7923 100644
--- a/media-gfx/openmesh/metadata.xml
+++ b/media-gfx/openmesh/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 		OpenMesh is a generic and efficient data structure for representing and
 		manipulating polygonal meshes. OpenMesh is developed at the Computer Graphics
 		Group, RWTH Aachen, as part of the  OpenSGPlus project, is funded by the
@@ -10,4 +9,6 @@
 		geometry kernel upon which the so-called high level primitives (e.g.
 		subdivision surfaces or progressive meshes) of OpenSGPlus are built.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml
index 75aa20b67f16..bcbfb4c9f642 100644
--- a/media-gfx/openscad/metadata.xml
+++ b/media-gfx/openscad/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>waebbl-gentoo@posteo.net</email>
-	<name>Bernd Waibel</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
-<longdescription>
+ <maintainer type="person">
+  <email>waebbl-gentoo@posteo.net</email>
+  <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 	OpenSCAD is a software for creating solid 3D CAD objects.  Unlike
 	most free software for creating 3D models (such as the famous
 	application Blender) it does not focus on the artistic aspects of 3D
@@ -20,12 +20,13 @@
 	OpenSCAD is free software and available for Linux/UNIX, MS Windows and
 	Mac OS X.
 </longdescription>
-<use>
-	<flag name="ccache">
+ <upstream>
+  <remote-id type="github">openscad/openscad</remote-id>
+ </upstream>
+ <use>
+  <flag name="ccache">
 		Use <pkg>dev-util/ccache</pkg> to speed up rebuilds
 	</flag>
-</use>
-<upstream>
-	<remote-id type="github">openscad/openscad</remote-id>
-</upstream>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openscad/openscad-2019.05-r3.ebuild b/media-gfx/openscad/openscad-2019.05-r3.ebuild
deleted file mode 100644
index 42738f600c39..000000000000
--- a/media-gfx/openscad/openscad-2019.05-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp-common qmake-utils xdg
-
-SITEFILE="50${PN}-gentoo.el"
-
-DESCRIPTION="The Programmers Solid 3D CAD Modeller"
-HOMEPAGE="https://www.openscad.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="ccache emacs"
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}_fix-boost-1.72.0-build.patch"
-	"${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch"
-)
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	dev-libs/double-conversion:=
-	dev-libs/glib:2
-	dev-libs/gmp:0=
-	dev-libs/hidapi
-	dev-libs/libspnav
-	dev-libs/libzip:=
-	dev-libs/mpfr:0=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[-gles2-only]
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5
-	media-gfx/opencsg
-	media-libs/fontconfig
-	media-libs/freetype
-	>=media-libs/glew-2.0.0:0=
-	media-libs/harfbuzz:=
-	media-libs/lib3mf
-	<sci-mathematics/cgal-5:=
-	>=x11-libs/qscintilla-2.10.3:=
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/itstool
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	ccache? ( dev-util/ccache )
-"
-
-src_prepare() {
-	default
-
-	# fix path prefix
-	sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die
-
-	# disable ccache
-	if ! use ccache; then
-		eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch"
-	fi
-}
-
-src_configure() {
-	eqmake5 "${PN}.pro"
-}
-
-src_compile() {
-	default
-
-	if use emacs ; then
-		elisp-compile contrib/*.el
-	fi
-}
-
-src_install() {
-	emake install INSTALL_ROOT="${D}"
-
-	if use emacs; then
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		elisp-install ${PN} contrib/*.el contrib/*.elc
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/media-gfx/openscad/openscad-2019.05-r4.ebuild b/media-gfx/openscad/openscad-2019.05-r4.ebuild
index 2ac3f77c9665..32ad22bf16f5 100644
--- a/media-gfx/openscad/openscad-2019.05-r4.ebuild
+++ b/media-gfx/openscad/openscad-2019.05-r4.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="ccache emacs"
 RESTRICT="test"
 
diff --git a/media-gfx/opentoonz/Manifest b/media-gfx/opentoonz/Manifest
index 17d952a18c89..71e06c6c4845 100644
--- a/media-gfx/opentoonz/Manifest
+++ b/media-gfx/opentoonz/Manifest
@@ -1,2 +1 @@
-DIST opentoonz-1.3.0.tar.gz 39920932 BLAKE2B 292e01c078a4cf461fff0814a60e4ab6aea9a74a63f23e854815632432e07e65d5c01dce9d3aab36595f94ca06dd83b078e52858532d8dadb2e7518514c08b08 SHA512 5df272c943f2c222a457545c99388266579d88c702d6c7e71dfe0c924a0189e30323cf9e369c96755c507ee5347620da0140215b2647555f0b3bdae41c615c71
 DIST opentoonz-1.4.0.tar.gz 53531141 BLAKE2B adb7a85fb0581d92119b5f6b75dc320428ea0763955f8c883072cba78045acdeea75a5cea82065a29d2c59f53b4843d8ff92690c9a47c01605b4702fd36d6c13 SHA512 777f5d59ec8076e1e53a81347e15bef198bea77449073f1e9d5fdd371a61e20fd6dc8b26c6656c783959782bd71008fbb63c05742aaa50c92bd317aded7d0649
diff --git a/media-gfx/opentoonz/metadata.xml b/media-gfx/opentoonz/metadata.xml
index 83ff81ea39b7..31ff163910c2 100644
--- a/media-gfx/opentoonz/metadata.xml
+++ b/media-gfx/opentoonz/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>otakuto.gentoo@gmail.com</email>
-		<name>Tact Yoshida</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">opentoonz/opentoonz</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>otakuto.gentoo@gmail.com</email>
+  <name>Tact Yoshida</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">opentoonz/opentoonz</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild b/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
deleted file mode 100644
index b9eb63a13837..000000000000
--- a/media-gfx/opentoonz/opentoonz-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="An open-source full-featured 2D animation creation software"
-HOMEPAGE="https://github.com/opentoonz/opentoonz"
-SRC_URI="https://github.com/opentoonz/opentoonz/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD libtiff"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-arch/lz4:=
-	>=dev-libs/boost-1.55.0:=
-	dev-libs/lzo:2
-	>=dev-qt/qtcore-5.9:5
-	>=dev-qt/qtgui-5.9:5
-	>=dev-qt/qtmultimedia-5.9:5[widgets]
-	>=dev-qt/qtnetwork-5.9:5
-	>=dev-qt/qtopengl-5.9:5
-	>=dev-qt/qtprintsupport-5.9:5
-	>=dev-qt/qtscript-5.9:5
-	>=dev-qt/qtsvg-5.9:5
-	>=dev-qt/qtwidgets-5.9:5
-	>=dev-qt/qtxml-5.9:5
-	media-libs/freeglut
-	media-libs/freetype:2
-	media-libs/glew:=
-	media-libs/libjpeg-turbo
-	>=media-libs/libmypaint-1.3.0:=
-	media-libs/libpng:=
-	media-libs/libsdl2
-	virtual/cblas
-	>=sci-libs/superlu-4.1:=
-	sys-libs/zlib:=
-	virtual/libusb:=
-	virtual/opengl
-"
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${S}"/toonz/sources
-
-src_configure() {
-	local mycmakeargs=(
-		-DTIFF_LIBRARY="${S}/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.a"
-		-DSUPERLU_INCLUDE_DIR="${EPREFIX}/usr/include/superlu"
-		-DLZO_INCLUDE_DIR="${EPREFIX}/usr/include/lzo"
-		-DCMAKE_SKIP_RPATH=ON
-	)
-
-	# The upstream uses their own modified libtiff
-	# See: https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md#building-libtiff
-	cd thirdparty/tiff-4.0.3 || die
-	econf \
-		--with-pic \
-		--disable-jbig \
-		--enable-static \
-		--disable-shared
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cd "${S}"/thirdparty/tiff-4.0.3 || die
-	emake
-
-	cmake-utils_src_compile
-}
-
-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/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index aac3bf03086b..7385c43ea424 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -1,43 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>agrigo2001@yahoo.com.au</email>
-		<name>Adrian Grigo</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="person">
+  <email>agrigo2001@yahoo.com.au</email>
+  <name>Adrian Grigo</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 		Libraries from Dreamworks Animation for the efficient manipulation 
 		of volumetric data used in big budget movies like 'Cloudy with a
 		Chance of Meatballs2' and 'How to Train Your Dragon 2'. 
 	</longdescription>
-	<use>
-		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="numpy">
+ <upstream>
+  <remote-id type="github">AcademySoftwareFoundation/openvdb</remote-id>
+ </upstream>
+ <use>
+  <flag 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">
+  <flag name="abi3-compat">
 			Disables newer features to maintain compatibility with ABI3.
 		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-7.0.0" name="abi4-compat">
+  <flag name="abi4-compat">
 			Disables newer features to maintain compatibility with ABI4.
 		</flag>
-		<flag restrict="&lt;=media-gfx/openvdb-7.1.0" name="abi5-compat">
+  <flag name="abi5-compat">
 			Disables newer features to maintain compatibility with ABI5.
 		</flag>
-		<flag restrict="&gt;=media-gfx/openvdb-6.0.0" name="abi6-compat">
+  <flag name="abi6-compat">
 			Disables newer features to maintain compatibility with ABI6.
 		</flag>
-		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="abi7-compat">
+  <flag name="abi7-compat">
 			Disables newer features to maintain compatibility with ABI7.
 		</flag>
-		<flag restrict="&gt;=media-gfx/openvdb-7.0.0" name="utils">
+  <flag name="utils">
 			Build utility binaries
 		</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">AcademySoftwareFoundation/openvdb</remote-id>
-	</upstream>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
index b7eb762eb36b..28552d2adebd 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r1.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/${PN}/archive/v${PV}.tar.g
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="cpu_flags_x86_avx cpu_flags_x86_sse4_2 doc numpy python static-libs test utils abi5-compat abi6-compat +abi7-compat"
 RESTRICT="!test? ( test )"
 
diff --git a/media-gfx/optipng/metadata.xml b/media-gfx/optipng/metadata.xml
index 8b613f7e1d55..1cfd9ba5f1a8 100644
--- a/media-gfx/optipng/metadata.xml
+++ b/media-gfx/optipng/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">optipng</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>sping@gentoo.org</email>
+  <name>Sebastian Pipping</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">optipng</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index c6eb0baf8592..d27bab247b52 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">lazarus-pkgs/panini</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">lazarus-pkgs/panini</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pdf2svg/metadata.xml b/media-gfx/pdf2svg/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/pdf2svg/metadata.xml
+++ b/media-gfx/pdf2svg/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pencil/metadata.xml b/media-gfx/pencil/metadata.xml
index 9fb96e2736a9..54cc92bec71e 100644
--- a/media-gfx/pencil/metadata.xml
+++ b/media-gfx/pencil/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bkohler@gentoo.org</email>
-		<name>Ben Kohler</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pencil-planner</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>bkohler@gentoo.org</email>
+  <name>Ben Kohler</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">pencil-planner</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/peps/metadata.xml b/media-gfx/peps/metadata.xml
index c9cedb15eff0..518887bddddd 100644
--- a/media-gfx/peps/metadata.xml
+++ b/media-gfx/peps/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		peps will preprocess encapsulated Postscript files and allow you to
 		convert them into bitmaps. Note the word allow: peps does not do the
 		conversion for you. Rather, it prepares the Postscript input for a
 		bitmap conversion by Ghostscript, which must already be installed on
 		your system.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/photopc/metadata.xml b/media-gfx/photopc/metadata.xml
index a06d2968f54f..c62ad81cb06d 100644
--- a/media-gfx/photopc/metadata.xml
+++ b/media-gfx/photopc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">photopc</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">photopc</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index b44c7e9f4433..0b2ffb1f1461 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>qt@gentoo.org</email>
-		<name>Gentoo Qt Project</name>
-	</maintainer>
-	<use>
-		<flag name="devil">
+ <maintainer type="project">
+  <email>qt@gentoo.org</email>
+  <name>Gentoo Qt Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="devil">
 			Support additional image formats using <pkg>media-libs/devil</pkg>
 		</flag>
-		<flag name="freeimage">
+  <flag name="freeimage">
 			Support additional image formats using <pkg>media-libs/freeimage</pkg>
 		</flag>
-	</use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/phototonic/metadata.xml b/media-gfx/phototonic/metadata.xml
index 56d75214d8b3..40c71177160d 100644
--- a/media-gfx/phototonic/metadata.xml
+++ b/media-gfx/phototonic/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>qt@gentoo.org</email>
-    <name>Gentoo Qt Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">oferkv/phototonic</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>qt@gentoo.org</email>
+  <name>Gentoo Qt Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">oferkv/phototonic</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pixels2pgf/metadata.xml b/media-gfx/pixels2pgf/metadata.xml
index 201d4e0e1c2e..8581901472be 100644
--- a/media-gfx/pixels2pgf/metadata.xml
+++ b/media-gfx/pixels2pgf/metadata.xml
@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>mgorny@gentoo.org</email>
-			<name>Michał Górny</name>
-		</maintainer>
-		<bugs-to>https://github.com/mgorny/pixels2pgf/issues/</bugs-to>
-		<remote-id type="github">mgorny/pixels2pgf</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>mgorny@gentoo.org</email>
+  <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mgorny/pixels2pgf</remote-id>
+  <bugs-to>https://github.com/mgorny/pixels2pgf/issues/</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/plantuml/metadata.xml b/media-gfx/plantuml/metadata.xml
index b6419daacdd0..808b220f044e 100644
--- a/media-gfx/plantuml/metadata.xml
+++ b/media-gfx/plantuml/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+ </maintainer>
+ <longdescription lang="en">
 	PlantUMLis a component that allows to quickly write: sequence diagram, use
 	case diagram, class diagram, activity diagram, component diagram, state
 	diagram, object diagram and wireframe graphical interface.
@@ -15,7 +15,8 @@
 	or SVG format. It is also possible to generate ASCII art diagrams (only for
 	sequence diagrams).
 	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">plantuml</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">plantuml</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/png2ico/metadata.xml b/media-gfx/png2ico/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/png2ico/metadata.xml
+++ b/media-gfx/png2ico/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngcheck/Manifest b/media-gfx/pngcheck/Manifest
index 66af13d7895f..38a9de56965b 100644
--- a/media-gfx/pngcheck/Manifest
+++ b/media-gfx/pngcheck/Manifest
@@ -1,2 +1 @@
-DIST pngcheck-2.3.0.tar.gz 59864 BLAKE2B 3c635555f76d22d6949309707b7054608f5e093d3a557eb88eb9fc48aef76326f8e6b0dbcdf8e30213a042416f0e6f798e41411763e7604b12495b6b2748cddc SHA512 d099a360d41fc553e9ea02e56ae9812a4a72f3b7f1cd73c021fdb0b9233bb247e100b95fe8e297a2dcdd1bb996128a365794cb8f5702e5c93618af03f18140ad
 DIST pngcheck-3.0.2.tar.gz 63202 BLAKE2B 4cc6040e087aa2f5829e79ea1a5feb45af8bb15fa72325f9cb4822169c7d278306d6d89b936fd4c3c3819a09380e07f1f64ce0c276e776c3146c1533b1ee1363 SHA512 81bba699141c0f506ee589785eccc4b1ea882df5d211bcd91885bbcc4230bf14d23fc1298ffc10a110d6a8459522f6a01bfba1f81739f6085e4d3de964bda3d5
diff --git a/media-gfx/pngcheck/metadata.xml b/media-gfx/pngcheck/metadata.xml
index e25fb712a900..67a7f7b8aaf8 100644
--- a/media-gfx/pngcheck/metadata.xml
+++ b/media-gfx/pngcheck/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">png-mng</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">png-mng</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild b/media-gfx/pngcheck/pngcheck-2.3.0.ebuild
deleted file mode 100644
index 4a5faaa25e3c..000000000000
--- a/media-gfx/pngcheck/pngcheck-2.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Verifies the integrity of PNG, JNG and MNG files with internal checksums"
-HOMEPAGE="https://www.libpng.org/pub/png/apps/pngcheck.html"
-SRC_URI="mirror://sourceforge/png-mng/${P}.tar.gz"
-
-LICENSE="HPND GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	emake -f Makefile.unx \
-		CC="$(tc-getCC)" \
-		CFLAGS="${LDFLAGS} ${CFLAGS} -DUSE_ZLIB" \
-		ZLIB="-lz"
-}
-
-src_install() {
-	dobin png{check,split,-fix-IDAT-windowsize}
-	einstalldocs
-}
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index 5081ca62df6c..ed5ab4d480f8 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -1,19 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<upstream>
-		<maintainer status="active">
-			<email>glennrp@gmail.com</email>
-			<name>Glenn Randers-Pehrson</name>
-		</maintainer>
-		<bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
-		<remote-id type="sourceforge">pmt</remote-id>
-	</upstream>
-	<use>
-		<flag name="system-libs">Use libpng and libz provided by system</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>marecki@gentoo.org</email>
+  <name>Marek Szuba</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">pmt</remote-id>
+  <bugs-to>https://sourceforge.net/p/pmt/bugs/</bugs-to>
+ </upstream>
+ <use>
+  <flag name="system-libs">Use libpng and libz provided by system</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngnq/metadata.xml b/media-gfx/pngnq/metadata.xml
index 278b141113f1..03d4b3c25fd7 100644
--- a/media-gfx/pngnq/metadata.xml
+++ b/media-gfx/pngnq/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">pngnq</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">pngnq</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 80a71f597854..61fc36207086 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>dilfridge@gentoo.org</email>
-    <name>Andreas K. Huettel</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>dilfridge@gentoo.org</email>
+  <name>Andreas K. Huettel</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngrewrite/metadata.xml b/media-gfx/pngrewrite/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/pngrewrite/metadata.xml
+++ b/media-gfx/pngrewrite/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngtoico/metadata.xml b/media-gfx/pngtoico/metadata.xml
index cca0f56491e9..705a8e898b67 100644
--- a/media-gfx/pngtoico/metadata.xml
+++ b/media-gfx/pngtoico/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>graaff@gentoo.org</email>
-<name>Hans de Graaff</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>graaff@gentoo.org</email>
+  <name>Hans de Graaff</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pngtools/metadata.xml b/media-gfx/pngtools/metadata.xml
index 79d462e85571..d7ab5d348232 100644
--- a/media-gfx/pngtools/metadata.xml
+++ b/media-gfx/pngtools/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+ <maintainer type="person">
   <email>robbat2@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/potrace/metadata.xml b/media-gfx/potrace/metadata.xml
index 6fe485f4ab7a..76903eb89d86 100644
--- a/media-gfx/potrace/metadata.xml
+++ b/media-gfx/potrace/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<use>
-		<flag name="metric">
+ <maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">potrace</remote-id>
+ </upstream>
+ <use>
+  <flag name="metric">
 			default to a4 paper size and metric measurement
 		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">potrace</remote-id>
-	</upstream>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/povray/metadata.xml b/media-gfx/povray/metadata.xml
index fbb9f48050c7..0384cad6e89e 100644
--- a/media-gfx/povray/metadata.xml
+++ b/media-gfx/povray/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">POV-Ray/povray</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">POV-Ray/povray</remote-id>
+ </upstream>
+ <use>
+  <flag name="io-restrictions">POV-Ray's mechanism for control of I/O operations</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/povtree/metadata.xml b/media-gfx/povtree/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/povtree/metadata.xml
+++ b/media-gfx/povtree/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index 9a7fe36ac765..c198d0f5a8df 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/metadata.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <maintainer>
-      <email>phillip.berndt@googlemail.com</email>
-      <name>Phillip Berndt</name>
-    </maintainer>
-    <remote-id type="github">phillipberndt/pqiv</remote-id>
-  </upstream>
-  <use>
-    <flag name="archive">Enable support for images in archives and cbX comic book files</flag>
-  </use>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">phillipberndt/pqiv</remote-id>
+ </upstream>
+ <use>
+  <flag name="archive">Enable support for images in archives and cbX comic book files</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pqstego/metadata.xml b/media-gfx/pqstego/metadata.xml
index 365722ece28f..bf69aaf76111 100644
--- a/media-gfx/pqstego/metadata.xml
+++ b/media-gfx/pqstego/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">pqstego</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">pqstego</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/propaganda/metadata.xml b/media-gfx/propaganda/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/propaganda/metadata.xml
+++ b/media-gfx/propaganda/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop b/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
deleted file mode 100644
index 4b73cc905c6c..000000000000
--- a/media-gfx/prusaslicer/files/PrusaGcodeviewer.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Prusa GCode viewer
-Exec=prusa-slicer --gcodeviewer %F
-Icon=PrusaSlicer
-Terminal=false
-Type=Application
-MimeType=text/x.gcode;
-Categories=Graphics;3DGraphics;
-Keywords=3D;Printing;Slicer;
diff --git a/media-gfx/prusaslicer/files/PrusaSlicer.desktop b/media-gfx/prusaslicer/files/PrusaSlicer.desktop
deleted file mode 100644
index dae507b54abb..000000000000
--- a/media-gfx/prusaslicer/files/PrusaSlicer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-GenericName=3D Printing Software
-Icon=PrusaSlicer
-Exec=prusa-slicer %F
-Terminal=false
-Type=Application
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
-Categories=Graphics;3DGraphics;Engineering;
-Keywords=3D;Printing;Slicer;slice;3D;printer;convert;gcode;stl;obj;amf;SLA
-StartupNotify=false
-StartupWMClass=prusa-slicer
\ No newline at end of file
diff --git a/media-gfx/prusaslicer/metadata.xml b/media-gfx/prusaslicer/metadata.xml
index dd17dbe10ea6..b3b0f71fd90d 100644
--- a/media-gfx/prusaslicer/metadata.xml
+++ b/media-gfx/prusaslicer/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
-	<longdescription>
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <longdescription>
 		PrusaSlicer takes 3D models (STL, OBJ, AMF) and converts them into G-code instructions for FFF printers or PNG
 		layers for mSLA 3D printers. It's compatible with any modern printer based on the RepRap toolchain, including
 		all those based on the Marlin, Prusa, Sprinter and Repetier firmware. It also works with Mach3, LinuxCNC and
@@ -13,9 +13,10 @@
 
 		PrusaSlicer is based on Slic3r by Alessandro Ranellucci and the RepRap community.
 	</longdescription>
-	<upstream>
-		<bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
-		<doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
-		<remote-id type="github">prusa3d/PrusaSlicer</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">prusa3d/PrusaSlicer</remote-id>
+  <bugs-to>https://github.com/prusa3d/PrusaSlicer/issues</bugs-to>
+  <doc>https://help.prusa3d.com/en/article/general-info_1910</doc>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/psftools/metadata.xml b/media-gfx/psftools/metadata.xml
index 13ee79314597..42bd0695f04e 100644
--- a/media-gfx/psftools/metadata.xml
+++ b/media-gfx/psftools/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>fonts@gentoo.org</email>
-	<name>Fonts</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml
index 6bf9a32c5235..bbae6372296c 100644
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>tex@gentoo.org</email>
-    <name>Gentoo TeX Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <use>
-    <flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
-    <flag name="pptx">Enable support for generating PowerPoint pptx files</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">pstoedit</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">pstoedit</remote-id>
+ </upstream>
+ <use>
+  <flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
+  <flag name="pptx">Enable support for generating PowerPoint pptx files</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml
index 09edd32618cc..252e482c7b94 100644
--- a/media-gfx/qimgv/metadata.xml
+++ b/media-gfx/qimgv/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jeff.no.zhao@gmail.com</email>
-		<name>Jiayi Zhao</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="opencv">Enable HQ scaling via <pkg>media-libs/opencv</pkg></flag>
-		<flag name="video">Add support for gif/webm playback via libmpv</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>jeff.no.zhao@gmail.com</email>
+  <name>Jiayi Zhao</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="opencv">Enable HQ scaling via <pkg>media-libs/opencv</pkg></flag>
+  <flag name="video">Add support for gif/webm playback via libmpv</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/qrencode/metadata.xml b/media-gfx/qrencode/metadata.xml
index c9678884551b..bb38f623a590 100644
--- a/media-gfx/qrencode/metadata.xml
+++ b/media-gfx/qrencode/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>bircoph@gentoo.org</email>
-    <name>Andrew Savchenko</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>mgorny@gentoo.org</email>
-    <name>Michał Górny</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>bircoph@gentoo.org</email>
+  <name>Andrew Savchenko</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>mgorny@gentoo.org</email>
+  <name>Michał Górny</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/quat/metadata.xml b/media-gfx/quat/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/quat/metadata.xml
+++ b/media-gfx/quat/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/qvv/metadata.xml b/media-gfx/qvv/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/qvv/metadata.xml
+++ b/media-gfx/qvv/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 8254b1919cd5..e18db4cbb3dc 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">raw-thumbnailer</remote-id>
-		<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="google-code">raw-thumbnailer</remote-id>
+  <remote-id type="github">erlendd/raw-thumbnailer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index db7bb13ec0ef..0b09361d5135 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>vivo75@gmail.com</email>
-		<name>Francesco Riosa</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	</pkgmetadata>
+ <maintainer type="person">
+  <email>vivo75@gmail.com</email>
+  <name>Francesco Riosa</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/recoverjpeg/metadata.xml b/media-gfx/recoverjpeg/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/recoverjpeg/metadata.xml
+++ b/media-gfx/recoverjpeg/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ristretto/metadata.xml b/media-gfx/ristretto/metadata.xml
index 359901b31db4..13165ba88fe1 100644
--- a/media-gfx/ristretto/metadata.xml
+++ b/media-gfx/ristretto/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>xfce@gentoo.org</email>
-    <name>XFCE Team</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>xfce@gentoo.org</email>
+  <name>XFCE Team</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/rotoscope/metadata.xml b/media-gfx/rotoscope/metadata.xml
index 6320e2dd14e7..d8503a982904 100644
--- a/media-gfx/rotoscope/metadata.xml
+++ b/media-gfx/rotoscope/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">rotoscope</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">rotoscope</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/sam2p/metadata.xml b/media-gfx/sam2p/metadata.xml
index 7dab55141c22..399156787a0b 100644
--- a/media-gfx/sam2p/metadata.xml
+++ b/media-gfx/sam2p/metadata.xml
@@ -1,12 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">sam2p</remote-id>
-		<remote-id type="github">pts/sam2p</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="google-code">sam2p</remote-id>
+  <remote-id type="github">pts/sam2p</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 92df0ba49ba5..222ed7a66f9e 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<upstream>
-<remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id>
-</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/scantailor-advanced/metadata.xml b/media-gfx/scantailor-advanced/metadata.xml
index 7e9fa11b9ccc..a2007b83163b 100644
--- a/media-gfx/scantailor-advanced/metadata.xml
+++ b/media-gfx/scantailor-advanced/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">4lex4/scantailor-advanced</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">4lex4/scantailor-advanced</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/scour/metadata.xml b/media-gfx/scour/metadata.xml
index 8ae4eabc5162..f0609a5259d1 100644
--- a/media-gfx/scour/metadata.xml
+++ b/media-gfx/scour/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <stabilize-allarches/>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+ <stabilize-allarches/>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index 25a1448081f3..a8ab82260b18 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">sfftools</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">sfftools</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index 7cee5435cd2e..4a65b2573869 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nicolasbock@gentoo.org</email>
-		<name>Nicolas Bock</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Project</name>
-	</maintainer>
-	<use>
-		<flag name="opencv">Enable face detection via <pkg>media-libs/opencv</pkg></flag>
-	</use>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>nicolasbock@gentoo.org</email>
+  <name>Nicolas Bock</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Project</name>
+ </maintainer>
+ <longdescription lang="en">
 		Shotwell is a digital photo manager designed for the GNOME desktop
 		environment.  It allows you to import photos from disk or camera,
 		organize them by keywords and events, view them in full-window or fullscreen
 		mode, and share them with others via social networking and more.
 	</longdescription>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="opencv">Enable face detection via <pkg>media-libs/opencv</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index 6c0216e15c75..c8ea1a2aff98 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>gnome@gentoo.org</email>
-		<name>Gentoo GNOME Desktop</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">
 		A really easy way to scan both documents and photos. You can crop out
 		the bad parts of a photo and rotate it if it is the wrong way round.
 		You can print your scans, export them to pdf, or save them in a range
 		of image formats.
 	</longdescription>
-	<upstream>
-		<remote-id type="launchpad">simple-scan</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="launchpad">simple-scan</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/slic3r/metadata.xml b/media-gfx/slic3r/metadata.xml
index 41ad86d64fad..a7370ffa682e 100644
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="project">
-        <email>3dprint@gentoo.org</email>
-        <name>Gentoo 3D Printer Project</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>perl@gentoo.org</email>
-        <name>Gentoo Perl Project</name>
-    </maintainer>
-    <longdescription lang="en">
+ <maintainer type="project">
+  <email>3dprint@gentoo.org</email>
+  <name>Gentoo 3D Printer Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>perl@gentoo.org</email>
+  <name>Gentoo Perl Project</name>
+ </maintainer>
+ <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 >
-        <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
-        <doc>https://manual.slic3r.org/</doc>
-        <remote-id type="github">slic3r/Slic3r</remote-id>
-    </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">slic3r/Slic3r</remote-id>
+  <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
+  <doc>https://manual.slic3r.org/</doc>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml
index e63161bebc65..2363b71bffce 100644
--- a/media-gfx/solvespace/metadata.xml
+++ b/media-gfx/solvespace/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>ktrace@yandex.ru</email>
-        <name>Victor Kustov</name>
-    </maintainer>
-    <maintainer type="project">
-        <email>proxy-maint@gentoo.org</email>
-        <name>Proxy Maintainers</name>
-    </maintainer>
-    <longdescription lang="en">
+ <maintainer type="person">
+  <email>ktrace@yandex.ru</email>
+  <name>Victor Kustov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
     Solvespace is a parametric 2D/3D CAD tool. Applications include:
     - modeling 3d parts — draw with extrudes, revolves, and Boolean (union / difference) operations
     - modeling 2d parts — draw the part as a single section, and export DXF, PDF, SVG; use 3d assembly to verify fit
@@ -19,4 +19,6 @@
     - mechanism design — use the constraint solver to simulate planar or spatial linkages, with pin, ball, or slide joints
     - plane and solid geometry — replace hand-solved trigonometry and spreadsheets with a live dimensioned drawing
     </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/springgraph/metadata.xml b/media-gfx/springgraph/metadata.xml
index e88f112c87c5..1d504cd82d01 100644
--- a/media-gfx/springgraph/metadata.xml
+++ b/media-gfx/springgraph/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+ <maintainer type="person">
   <email>robbat2@gentoo.org</email>
-</maintainer>
-<longdescription> Springgraph will read in a .dot file description of a graph,
+ </maintainer>
+ <longdescription> Springgraph will read in a .dot file description of a graph,
     which, for each node, specifies its name and which other nodes it is
     connected to, and then renders a graph. Each node is drawn as an ellipse,
     and each connection is drawn as an arrow. The node placement is a result of
     all of the nodes moving away from each other, while all nodes which are
     connected move toward each other. This movement is repeated until it
     stabilizes.</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index 3e0a25ba5a56..f09cd3dcf77f 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,14 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-		<name>Steve Arnold</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>nerdboy@gentoo.org</email>
+  <name>Steve Arnold</name>
+ </maintainer>
+ <longdescription lang="en">
 		A tool to convert from SVG to reportlab graphics objects.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">sarnold/svg2rlg</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">sarnold/svg2rlg</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
index 050ab1e7959d..6e7996f3bc6a 100644
--- a/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
+++ b/media-gfx/svg2rlg/svg2rlg-0.4.0.ebuild
@@ -14,7 +14,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/sarnold/svg2rlg.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${PN}-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index 98e54fd27945..d71881375b4e 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">muennich/sxiv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gyakovlev@gentoo.org</email>
+  <name>Georgy Yakovlev</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">muennich/sxiv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/symboleditor/metadata.xml b/media-gfx/symboleditor/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/media-gfx/symboleditor/metadata.xml
+++ b/media-gfx/symboleditor/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/synnefo/metadata.xml b/media-gfx/synnefo/metadata.xml
index d85e5ec3d7c1..792310058e97 100644
--- a/media-gfx/synnefo/metadata.xml
+++ b/media-gfx/synnefo/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">oyranos-cms/Synnefo</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">oyranos-cms/Synnefo</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tachyon/metadata.xml b/media-gfx/tachyon/metadata.xml
index ab6b74b6c31b..e4c25c112d9d 100644
--- a/media-gfx/tachyon/metadata.xml
+++ b/media-gfx/tachyon/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>alexxy@gentoo.org</email>
-  </maintainer>
-<maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>alexxy@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/termtosvg/metadata.xml b/media-gfx/termtosvg/metadata.xml
index 38b28ff6e621..0ae03c58e397 100644
--- a/media-gfx/termtosvg/metadata.xml
+++ b/media-gfx/termtosvg/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>zx2c4@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>zx2c4@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tgif/metadata.xml b/media-gfx/tgif/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/tgif/metadata.xml
+++ b/media-gfx/tgif/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tif22pnm/metadata.xml b/media-gfx/tif22pnm/metadata.xml
index d788f91ed14d..ad14cfebb2ee 100644
--- a/media-gfx/tif22pnm/metadata.xml
+++ b/media-gfx/tif22pnm/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>tex@gentoo.org</email>
-		<name>Gentoo TeX Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">sam2p</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="google-code">sam2p</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tintii/metadata.xml b/media-gfx/tintii/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/tintii/metadata.xml
+++ b/media-gfx/tintii/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/transfig/metadata.xml b/media-gfx/transfig/metadata.xml
index 05e2c4230006..6c6991491819 100644
--- a/media-gfx/transfig/metadata.xml
+++ b/media-gfx/transfig/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="sourceforge">mcj</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">mcj</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
index 53498c3546b2..5c2d730704e1 100644
--- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
+++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/mcj/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 RDEPEND="x11-libs/libXpm
 	virtual/jpeg
diff --git a/media-gfx/ttygif/metadata.xml b/media-gfx/ttygif/metadata.xml
index 0bb66f2138d8..426980e59b6f 100644
--- a/media-gfx/ttygif/metadata.xml
+++ b/media-gfx/ttygif/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>monsieurp@gentoo.org</email>
-    <name>Patrice Clement</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">icholy/ttygif</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>monsieurp@gentoo.org</email>
+  <name>Patrice Clement</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">icholy/ttygif</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tuxpaint-stamps/metadata.xml b/media-gfx/tuxpaint-stamps/metadata.xml
index b6da2c1fac45..11c19337bb7c 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">tuxpaint</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">tuxpaint</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index cf4d63d4273d..27bbaa7738d6 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
+ <longdescription>
   Tux Paint is a free drawing program designed for young children
   (kids ages 3 and up). It has a simple, easy-to-use interface, fun
   sound effects, and an encouraging cartoon mascot who helps guide
   children as they use the program. It provides a blank canvas and a
   variety of drawing tools to help your child be creative.
 </longdescription>
-  <upstream>
-    <remote-id type="sourceforge">tuxpaint</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">tuxpaint</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index 6cf2734b4a8b..3ecae7f18135 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="contrast">enable contrast setting option</flag>
-		<flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
-		<flag name="timezone">enable DST correction for file timestamps</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">ufraw</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">ufraw</remote-id>
+ </upstream>
+ <use>
+  <flag name="contrast">enable contrast setting option</flag>
+  <flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
+  <flag name="timezone">enable DST correction for file timestamps</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/utsushi/Manifest b/media-gfx/utsushi/Manifest
deleted file mode 100644
index a4f4ce2746c0..000000000000
--- a/media-gfx/utsushi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-AUX utsushi-9999-boost.patch 2322 BLAKE2B 3c0ed2966897e8610ed90dc7f27d6648535b64628b33cc799874f18dac45335c37c2c9ac175d5744e9d7c4448575fa9023a30bf64fccedd98541dea862d10265 SHA512 8cbc2605135b0d730340b9365612d7cea5f22eabd77e200a1ff0371e3d4dd63606974efdee6ac3688d18ecd423ae5881e635e374009499ccd127b7caf1a13d01
-AUX utsushi-9999-magick-pp.patch 1038 BLAKE2B 80cc535640dc51b914604599a64d3da9ba349288cecaf8da5f50bca6650109f9d947526440e8b7bed552bd8510d6ab861252ab244abf9032bc4f3fe4a7536e96 SHA512 9ddb87ec5bccce55e08eaa47ba4d609aa0f9b095ef68c3898197b6d4e1b221693b19237292645b910dd73d66b849a38c46b2f668443eb3c8c2c9a6af5172a6aa
-EBUILD utsushi-9999.ebuild 2765 BLAKE2B 3b115472bb315b468be665fe36daaf1dc016dd4f8fa490ac1177bcb9a3e015bc609de46bbaba844249a319a8424a8d82b30f4adc399c576112c7f8b6c4f8da13 SHA512 5271abc5e6ad77d36ba57de9ebe9ee393c467518b495527624781d36a0bf17f07797d23eec03c02ad743430779ad1cd370dd5333c77c234496842e2be964ab34
diff --git a/media-gfx/utsushi/files/utsushi-9999-boost.patch b/media-gfx/utsushi/files/utsushi-9999-boost.patch
deleted file mode 100644
index 84a0e78f426f..000000000000
--- a/media-gfx/utsushi/files/utsushi-9999-boost.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/bootstrap b/bootstrap
-index 56c68a7..ba910e7 100755
---- a/bootstrap
-+++ b/bootstrap
-@@ -209,7 +209,7 @@ fi
- #  not diagnosed by autoreconf itself (or could use some extra help
- #  explaining what to do in those cases).
- 
--if grep AX_BOOST configure >/dev/null 2>&1; then
-+if ! grep AX_BOOST configure >/dev/null 2>&1; then
-     cat <<EOF
- It seems 'aclocal' could not find the autoconf macros for the Boost
- library.  These macros are available in the 'autoconf-archive'.  If
-@@ -233,50 +233,6 @@ EOF
-     exit 1
- fi
- 
--#  Patch up AX_BOOST_BASE to suit our purposes
--#  While recent versions do support the ACTION-IF-[NOT-]FOUND API,
--#  they still produce a way too verbose message for the case where
--#  we can fall back to our included Boost sources.
--#  Older versions did not support the ACTION-IF-[NOT-]FOUND API.
--
--serial=`awk '/^#serial/{ if ($2>26) print $2 }' $macro_dir/ax_boost_base.m4`
--if test -n "$serial"; then
--    cat <<EOF >&2
--It seems there is a new AX_BOOST_BASE macro version out there.  The
--local patching that follows has not been tested on this version, so
--there may be trouble ahead.  If everything went fine for you please
--update the serial number used for this check in $0.
--
--When doing so, also check if our patch is still correct/necessary.
--EOF
--fi
--sed -i 's/\(-VERSION\]\))/\1, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])/' \
--    $macro_dir/ax_boost_base.m4
--sed -i '/"$succeeded" != "yes"/q' $macro_dir/ax_boost_base.m4
--sed -i '/"$succeeded" != "yes"/d' $macro_dir/ax_boost_base.m4
--cat <<EOF >> $macro_dir/ax_boost_base.m4
--    if test "\$succeeded" != "yes" ; then
--        if test "\$_version" = "0" ; then
--            AC_MSG_RESULT([no])
--        else
--            AC_MSG_RESULT([too old (\$_version)])
--        fi
--        # execute ACTION-IF-NOT-FOUND (if present):
--        ifelse([\$3], , :, [\$3])
--    else
--        AC_SUBST(BOOST_CPPFLAGS)
--        AC_SUBST(BOOST_LDFLAGS)
--        AC_DEFINE(HAVE_BOOST,,[define if the Boost library is available])
--        # execute ACTION-IF-FOUND (if present):
--        ifelse([\$2], , :, [\$2])
--    fi
--
--    CPPFLAGS="\$CPPFLAGS_SAVED"
--    LDFLAGS="\$LDFLAGS_SAVED"
--fi
--
--])
--EOF
- autoreconf                      # sync build infra-structure
- 
- #  Make sure the top-level config.h and its dependencies can be found
diff --git a/media-gfx/utsushi/files/utsushi-9999-configure.patch b/media-gfx/utsushi/files/utsushi-9999-configure.patch
deleted file mode 100644
index 89e7c0dd6b7d..000000000000
--- a/media-gfx/utsushi/files/utsushi-9999-configure.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -u utsushi-9999/configure.ac utsushi-9999-patched/configure.ac
---- utsushi-9999/configure.ac	2018-06-02 21:12:44.745999644 +0200
-+++ utsushi-9999-patched/configure.ac	2018-06-02 21:14:07.844308412 +0200
-@@ -201,7 +201,7 @@
- 
- dnl  checks for programs, modules and libraries
- 
--AM_INIT_AUTOMAKE([1.11.2 gnu tar-ustar -Wall -Werror std-options nostdinc subdir-objects])
-+AM_INIT_AUTOMAKE([1.11.2 gnu tar-ustar -Wall std-options nostdinc subdir-objects])
- AM_MAINTAINER_MODE([enable])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
-@@ -612,8 +612,8 @@
-      ['-I$(top_builddir) $(BOOST_CPPFLAGS)'])])
- 
- #  Check if we can assume whether All Warnings Are Really Errors
--AS_IF([test xyes = x$ac_cv_cxx_compiler_gnu],
--  [gcc_AWARE=-Werror])
-+#AS_IF([test xyes = x$ac_cv_cxx_compiler_gnu],
-+#  [gcc_AWARE=-Werror])
- 
- AC_SUBST([AM_CXXFLAGS], ["-Wall $gcc_AWARE $code_coverage_cxxflags"])
- AC_SUBST([AM_LDFLAGS], [""])
diff --git a/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch b/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch
deleted file mode 100644
index b87075e1e643..000000000000
--- a/media-gfx/utsushi/files/utsushi-9999-magick-pp.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/filters/doc-locate.cpp b/filters/doc-locate.cpp
-index 4b09b29..4508274 100644
---- a/filters/doc-locate.cpp
-+++ b/filters/doc-locate.cpp
-@@ -260,17 +260,17 @@ public:
-     clone.rotate (deskew_angle ());
- 
-     Magick::Geometry rv = bbox (clone);
--    if (HAVE_IMAGE_MAGICK_PP)
--    {
--      if (clone.page ().xNegative ())
--        rv.xOff (rv.xOff () - clone.page ().xOff());
--      else
--        rv.xOff (rv.xOff () + clone.page ().xOff());
--      if (clone.page ().yNegative ())
--        rv.yOff (rv.yOff () - clone.page ().yOff());
--      else
--        rv.yOff (rv.yOff () + clone.page ().yOff());
--    }
-+    /*if (HAVE_IMAGE_MAGICK_PP)
-+     *{
-+     *  if (clone.page ().xNegative ())
-+     *    rv.xOff (rv.xOff () - clone.page ().xOff());
-+     *  else
-+     *    rv.xOff (rv.xOff () + clone.page ().xOff());
-+     *  if (clone.page ().yNegative ())
-+     *    rv.yOff (rv.yOff () - clone.page ().yOff());
-+     *  else
-+     *    rv.yOff (rv.yOff () + clone.page ().yOff());
-+    }*/
-     return scale (rv);
-   }
- 
diff --git a/media-gfx/utsushi/utsushi-9999.ebuild b/media-gfx/utsushi/utsushi-9999.ebuild
deleted file mode 100644
index ce10520fd892..000000000000
--- a/media-gfx/utsushi/utsushi-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils git-r3 multilib toolchain-funcs
-
-DESCRIPTION="SANE backend driver for newer Epson scanners (DS, ET, PX, etc)"
-HOMEPAGE="https://github.com/utsushi/utsushi"
-EGIT_REPO_URI="https://github.com/utsushi/utsushi.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~x64"
-IUSE="gtk jpeg +network nls openmp tiff udev"
-
-# These are needed by utsushi's 'bootstrap':
-#   dev-libs/gnulib
-#   sys-devel/autoconf-archive
-#   sys-devel/autoconf-wrapper
-#   sys-devel/automake-wrapper
-#   sys-devel/gettext
-#   sys-devel/libtool
-#   sys-devel/patch
-#
-# NOTE:
-#   Utsushi fails to build with GCC >= 8.0
-#   Utsushi fails to build with libusb >= 1.0.22
-#   ImageMagick is now a hard dependency. See:
-#     https://github.com/utsushi/utsushi/issues/58
-DEPEND="
-	dev-libs/gnulib
-	sys-devel/autoconf-archive
-	sys-devel/autoconf-wrapper
-	sys-devel/automake-wrapper
-	sys-devel/gettext
-	sys-devel/libtool
-	sys-devel/patch
-	media-gfx/imagemagick
-	media-gfx/sane-backends
-	<sys-devel/gcc-8
-	<=dev-libs/libusb-1.0.22
-	>=dev-libs/boost-1.50.0
-	gtk?          ( dev-cpp/gtkmm:2.4 )
-	jpeg?         ( virtual/jpeg:0 )
-	tiff?         ( media-libs/tiff:0= )
-	udev?         ( virtual/udev )
-"
-
-RDEPEND="
-	${DEPEND}
-	network?     ( media-gfx/epson-ds-plugins )
-"
-
-PATCHES=(
-	# AX_BOOST_BASE does not need to be patched
-	"${FILESDIR}/${PF}-boost.patch"
-
-	# ImageMagick >= 7 removed various *_MAGICK_PP api's, which are possibly
-	# not needed. See: https://github.com/utsushi/utsushi/issues/43
-	"${FILESDIR}/${PF}-magick-pp.patch"
-
-	# Disable Werror in configure
-	"${FILESDIR}/${PF}-configure.patch"
-)
-
-pkg_setup() {
-	# Ensure GCC <= 8 is used, as a user may have a lower version installed
-	# but is currently set to use GCC >= 8
-	if (( $(gcc-major-version) >= 8 )); then
-		eerror
-		eerror "'${PN}' does not currently compile with >=sys-devel/gcc-8.0.0"
-		eerror "Use 'gcc-config' to set GCC to a lower version"
-		eerror
-		die
-	fi
-}
-
-src_prepare() {
-	default
-
-	# utsushi requires using this bootstrap wrapper in lieu of autotools
-	${S}/bootstrap || die
-
-	# Create SANE configuration directory (used by sane/Makefile.am to create
-	# utsushi backend config)
-	dodir /etc/sane.d/dll.d
-}
-
-src_configure() {
-	econf \
-		--with-sane                                 \
-		--with-sane-confdir="${EPREFIX}"/etc/sane.d \
-		--with-boost=yes                            \
-		--with-magick                               \
-		--with-magick-pp                            \
-		$(use_with gtk gtkmm)                       \
-		$(use_with jpeg)                            \
-		$(use_enable nls)                           \
-		$(use_enable openmp)                        \
-		$(use_with tiff)                            \
-		$(use_enable udev udev-config)              \
-		$(use_with udev udev-confdir "${EPREFIX}"/$(get_libdir)/udev)
-}
-
diff --git a/media-gfx/valentina/metadata.xml b/media-gfx/valentina/metadata.xml
index 2cb24851e365..4411d78a6dfa 100644
--- a/media-gfx/valentina/metadata.xml
+++ b/media-gfx/valentina/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>fordfrog@gentoo.org</email>
-		<name>Miroslav Šulc</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">dismine/valentina</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>fordfrog@gentoo.org</email>
+  <name>Miroslav Šulc</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="bitbucket">dismine/valentina</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/videorbits/metadata.xml b/media-gfx/videorbits/metadata.xml
index e416281791b7..0efc93c424b9 100644
--- a/media-gfx/videorbits/metadata.xml
+++ b/media-gfx/videorbits/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">comparametric</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">comparametric</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/viewer/metadata.xml b/media-gfx/viewer/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/viewer/metadata.xml
+++ b/media-gfx/viewer/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml
index 0b0a73b6d999..233dbf601292 100644
--- a/media-gfx/viewnior/metadata.xml
+++ b/media-gfx/viewnior/metadata.xml
@@ -1,16 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gentoo@tastytea.de</email>
-		<name>Ronny Gutbrod</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">hellosiyan/Viewnior</remote-id>
-		<changelog>https://siyanpanayotov.com/project/viewnior/news</changelog>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gentoo@tastytea.de</email>
+  <name>Ronny Gutbrod</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">hellosiyan/Viewnior</remote-id>
+  <changelog>https://siyanpanayotov.com/project/viewnior/news</changelog>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/w3mimgfb/metadata.xml b/media-gfx/w3mimgfb/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/w3mimgfb/metadata.xml
+++ b/media-gfx/w3mimgfb/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
index 7c9fd1249e8c..cfe0c714fd7c 100644
--- a/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
+++ b/media-gfx/waifu2x-ncnn-vulkan/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">nihui/waifu2x-ncnn-vulkan</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>slashbeast@gentoo.org</email>
+  <name>Piotr Karbowski</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">nihui/waifu2x-ncnn-vulkan</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index 2490feb795e5..2bfe9a0ed869 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription>
+ <longdescription>
 Wings 3D is a polygon mesh modeler inspired by Nendo and 
 Mirai from Izware.
 
@@ -12,7 +11,8 @@ in those features before Wings goes 1.0.
 
 There is no support in Wings for doing animations.
 </longdescription>
-	<upstream>
-		<remote-id type="sourceforge">wings</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">wings</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/word_cloud/metadata.xml b/media-gfx/word_cloud/metadata.xml
index c665e48637be..cf60c1663ccd 100644
--- a/media-gfx/word_cloud/metadata.xml
+++ b/media-gfx/word_cloud/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
+ <maintainer type="person">
   <email>ulm@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xdot/metadata.xml b/media-gfx/xdot/metadata.xml
index fbe4f1f1c762..ffa2ac2e5548 100644
--- a/media-gfx/xdot/metadata.xml
+++ b/media-gfx/xdot/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>mattst88@gentoo.org</email>
-    <name>Matt Turner</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">jrfonseca/xdot.py</remote-id>
-    <bugs-to>https://github.com/jrfonseca/xdot.py</bugs-to>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>mattst88@gentoo.org</email>
+  <name>Matt Turner</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">jrfonseca/xdot.py</remote-id>
+  <bugs-to>https://github.com/jrfonseca/xdot.py</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xdot/xdot-1.2.ebuild b/media-gfx/xdot/xdot-1.2.ebuild
index bbc9f9c1b1ed..2e4218672395 100644
--- a/media-gfx/xdot/xdot-1.2.ebuild
+++ b/media-gfx/xdot/xdot-1.2.ebuild
@@ -27,6 +27,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 
 DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	media-gfx/graphviz
diff --git a/media-gfx/xdot/xdot-9999.ebuild b/media-gfx/xdot/xdot-9999.ebuild
index fe081a4eb136..db542fae0591 100644
--- a/media-gfx/xdot/xdot-9999.ebuild
+++ b/media-gfx/xdot/xdot-9999.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
@@ -27,6 +27,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 
 DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pycairo[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	media-gfx/graphviz
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
index 05e2c4230006..6c6991491819 100644
--- a/media-gfx/xfig/metadata.xml
+++ b/media-gfx/xfig/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
-	<upstream>
-		<remote-id type="sourceforge">mcj</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">mcj</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xli/metadata.xml b/media-gfx/xli/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/media-gfx/xli/metadata.xml
+++ b/media-gfx/xli/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xloadimage/metadata.xml b/media-gfx/xloadimage/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/media-gfx/xloadimage/metadata.xml
+++ b/media-gfx/xloadimage/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xpaint/metadata.xml b/media-gfx/xpaint/metadata.xml
index 8165ff483f18..d19961e40d5b 100644
--- a/media-gfx/xpaint/metadata.xml
+++ b/media-gfx/xpaint/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		XPaint is an X Window System color image bitmap editing program.
 		It also supports advanced features, such as image processing
 		algorithms, scripting and batch jobs. XPaint allows the edition
@@ -21,10 +20,11 @@
 		scripts in plain C. The package includes a substantial list of
 		examples and some support for batch processing.
 	</longdescription>
-	<use>
-		<flag name="pgf">Support for loading PGF images</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">sf-xpaint</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">sf-xpaint</remote-id>
+ </upstream>
+ <use>
+  <flag name="pgf">Support for loading PGF images</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index 05e8d7f7eccd..ad7aeccb1cc4 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-        <email>printing@gentoo.org</email>
-        <name>Gentoo Printing Project</name>
-</maintainer>
-<use>
-        <flag name="ocr">Enable support for Optical Character Recognition reader</flag>
-</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="ocr">Enable support for Optical Character Recognition reader</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index 8235e845464e..67a7f7b8aaf8 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="sourceforge">png-mng</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">png-mng</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
index 5778315c9cb2..ad013ea7d4ba 100644
--- a/media-gfx/xzgv/metadata.xml
+++ b/media-gfx/xzgv/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">xzgv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">xzgv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 2c614e94cc33..c1b890397085 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>waebbl-gentoo@posteo.net</email>
-		<name>Bernd Waibel</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>waebbl-gentoo@posteo.net</email>
+  <name>Bernd Waibel</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
 		YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
 		An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.
 	</longdescription>
-	<use>
-		<flag name="fastmath">Enable mathematic approximations to make code faster</flag>
-		<flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
-		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
-	</use>
-</pkgmetadata>
-
+ 
+ <use>
+  <flag name="fastmath">Enable mathematic approximations to make code faster</flag>
+  <flag name="fasttrig">Enable trigonometric approximations to make code faster</flag>
+  <flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
new file mode 100644
index 000000000000..1206a209d458
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/769716
+
+From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001
+From: Klaus Ethgen <Klaus@Ethgen.de>
+Date: Sun, 7 Feb 2021 14:22:52 +0100
+Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=iso8859-1
+Content-Transfer-Encoding: 8bit
+
+---
+ configure.ac | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c2b7819..f6224a1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk],
+ AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
+ AC_ARG_VAR([GTK_VERSION_MAJOR])
+ 
+-AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
++AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"],
+   [PKG_CHECK_MODULES([GTK3], [gtk+-3.0],
+     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
+      GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion`
+@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"],
+     ])
+   ])
+ 
+-AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"],
++AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"],
+   [PKG_CHECK_MODULES([GTK2], [gtk+-2.0],
+     [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
+      GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion`
+@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)])
+ AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)])
+ 
+ AS_IF([test -z "$PYTHON"],
+-      [AS_IF([test "x$with_python" == "xauto"],
++      [AS_IF([test "x$with_python" = "xauto"],
+              [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])],
+-             [AS_IF([test "x$with_python" == "xpython3"],
++             [AS_IF([test "x$with_python" = "xpython3"],
+                     [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])],
+-                    [AS_IF([test "x$with_python" == "xpython2"],
++                    [AS_IF([test "x$with_python" = "xpython2"],
+                            [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])],
+                            [with_python="no"])
+                     ])
+@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"])
+ 
+ dnl GObject Introspection (GIR)
+ 
+-AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"],
++AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"],
+   [m4_ifdef([GOBJECT_INTROSPECTION_CHECK],
+     [GOBJECT_INTROSPECTION_CHECK([0.6.7])
+      AS_IF([test "x$found_introspection" = "xyes"],
+@@ -696,7 +696,7 @@ AC_ARG_WITH([java],
+   [],
+   [with_java="check"])
+ 
+-JAVAC=${JAVAC/ecj/ecj -1.5}
++JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')"
+ 
+ # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
+ # look strictly at the $JAVA_HOME in order to avoid mixing different versions
+@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
+ 
+ AC_ARG_VAR([JAR], [location of Java archive tool])
+ AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH])
+-AS_IF([test "x$JAR" == "x:"], [have_java="no"])
++AS_IF([test "x$JAR" = "x:"], [have_java="no"])
+ 
+ AC_ARG_VAR([JAVA], [location of Java application launcher])
+ AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH])
+ 
+ AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
+-AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."])
++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
+ 
+ dnl Search for Java unit test library
+ AS_IF([test -z "$JUNIT_HOME"],
+@@ -850,7 +850,7 @@ echo "GTK                    --with-gtk=$with_gtk          Gtk${GTK_VERSION}"
+ echo "GObject introspection  --with-gir=$with_gir"
+ echo "Qt                     --with-qt=$with_qt            Qt${QT_VERSION}"
+ echo "Java                   --with-java=$with_java"
+-AS_IF([test "x$win32" == "xno"],
++AS_IF([test "x$win32" = "xno"],
+   [echo "Dbus                   --with-dbus=$with_dbus"])
+ AS_IF([test "x$have_GM" = "xyes"],
+   [echo "GraphicsMagick         --with-graphicsmagick=yes"],
+@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"],
+   [echo "        => the zbarimg file scanner will *NOT* be built"])
+ AS_IF([test "x$have_GM" = "xyes"],
+   [echo "        => ImageMagick is preferred, as GraphicsMagick doesn't support https"])
+-AS_IF([test "x$with_gtk" == "xno"],
++AS_IF([test "x$with_gtk" = "xno"],
+   [echo "        => GTK support will *NOT* be built"])
+ AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"],
+   [echo "        => the Python 2 GTK widget wrapper will *NOT* be built"])
+ AS_IF([test "x$with_qt" != "xyes"],
+   [echo "        => the Qt widget will *NOT* be built"])
+-AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ],
++AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ],
+   [echo "        => Building a static Qt library"])
+ AS_IF([test "x$with_java" != "xyes"],
+   [echo "        => the Java interface will *NOT* be built"])
+@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"],
+ #echo "NPAPI Plugin     --with-npapi=$with_npapi"
+ #AS_IF([test "x$with_mozilla" != "xyes"],
+ #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
+-AS_IF([test "x$enable_pdf417" == "xyes"],
++AS_IF([test "x$enable_pdf417" = "xyes"],
+   [echo "        => the pdf417 code support is incomplete!"])
+-- 
+2.30.0
+
diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
new file mode 100644
index 000000000000..916dee61d431
--- /dev/null
+++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
@@ -0,0 +1,23 @@
+https://github.com/mchehab/zbar/pull/115
+--- a/zbarcam/zbarcam.c
++++ b/zbarcam/zbarcam.c
+@@ -37,6 +37,7 @@
+ #ifdef ENABLE_NLS
+ #include "../zbar/gettext.h"
+ # include <libintl.h>
++# include <locale.h>
+ # define _(string) gettext(string)
+ #else
+ # define _(string) string
+--- a/zbarimg/zbarimg.c
++++ b/zbarimg/zbarimg.c
+@@ -42,6 +42,7 @@
+ #ifdef ENABLE_NLS
+ #include "../zbar/gettext.h"
+ # include <libintl.h>
++# include <locale.h>
+ # define _(string) gettext(string)
+ #else
+ # define _(string) string
+-- 
+2.26.2
diff --git a/media-gfx/zbar/metadata.xml b/media-gfx/zbar/metadata.xml
index 064f2be75872..a03cef9b900d 100644
--- a/media-gfx/zbar/metadata.xml
+++ b/media-gfx/zbar/metadata.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>email@linxon.ru</email>
-		<name>Yury Martynov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">zbar</remote-id>
-		<remote-id type="github">mchehab/zbar</remote-id>
-		<bugs-to>https://github.com/mchehab/zbar/issues</bugs-to>
-	</upstream>
-	<longdescription>
+ <maintainer type="person">
+  <email>email@linxon.ru</email>
+  <name>Yury Martynov</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
 		The ZBar Bar Code Reader is a library for scanning and decoding bar
 		codes from various sources such as video streams, image files or raw
 		intensity sensors.  It supports EAN, UPC, Code 128, Code 93, Code 39
 		and Interleaved 2 of 5. The flexible, layered architecture features a
 		fast, streaming interface with a minimal memory footprint.
 	</longdescription>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">zbar</remote-id>
+  <remote-id type="github">mchehab/zbar</remote-id>
+  <bugs-to>https://github.com/mchehab/zbar/issues</bugs-to>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild
index 8c168715124a..3b2bc23398d2 100644
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild
@@ -78,6 +78,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.10-errors.patch"
+	"${FILESDIR}/${PN}-0.23-r1-nonbash.patch"
 	"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch"
 	"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch"
 	"${FILESDIR}/${P}_fix_python_detect.patch"
diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild
index b60ea35f2951..26431147a085 100644
--- a/media-gfx/zbar/zbar-0.23.1.ebuild
+++ b/media-gfx/zbar/zbar-0.23.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv"
 REQUIRED_USE="
@@ -83,6 +83,7 @@ BDEPEND="
 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"
 )
diff --git a/media-gfx/zgv/metadata.xml b/media-gfx/zgv/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/media-gfx/zgv/metadata.xml
+++ b/media-gfx/zgv/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file