Adding metadatav21.1.5

29 files changed, 348 insertions, 317 deletions

diff --git a/app-accessibility/accerciser/metadata.xml b/app-accessibility/accerciser/metadata.xml
index b361a7a06606..9d53e45fccfa 100644
--- a/app-accessibility/accerciser/metadata.xml
+++ b/app-accessibility/accerciser/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">
 Accerciser is an interactive Python accessibility explorer for the GNOME desktop. It uses AT-SPI to inspect and control widgets, allowing you to check if an application is providing correct information to assistive technologies and automated test frameworks. Accerciser has a simple plugin framework which you can use to create custom views of accessibility information.
 
 In essence, Accerciser is a next generation at-poke tool.
 </longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/at-spi2-atk/metadata.xml b/app-accessibility/at-spi2-atk/metadata.xml
index 07f7a0b39d71..0a9aab3d3742 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.xml
@@ -1,13 +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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<longdescription lang="en">at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription lang="en">at-spi2-atk is the library used to bridge ATK to AT-SPI, allowing applications
 exposing information via ATK to interface with clients that use AT-SPI. This
 module provides the necessary inter-process communication to allow
 accessibility-oriented software to operate.
 </longdescription>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:gnome:at-spi2-atk</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/at-spi2-core/metadata.xml b/app-accessibility/at-spi2-core/metadata.xml
index 39980802b1da..f2710c9e5c09 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/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/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml
index 8f4dd156f0cf..d232fbd099dd 100644
--- a/app-accessibility/brltty/metadata.xml
+++ b/app-accessibility/brltty/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">
+ <maintainer type="project">
   <email>accessibility@gentoo.org</email>
   <name>Gentoo Accessibility Project</name>
  </maintainer>
- <use>
-  <flag name="api">build brltty's application program interface</flag>
-  <flag name="beeper">support the console tone generator</flag>
-  <flag name="contracted-braille">support in-line contracted braille</flag>
-  <flag name="fm">support for the sound card synthesizer</flag>
-  <flag name="louis">Use braille tranlator <pkg>dev-libs/liblouis</pkg></flag>
-  <flag name="midi">support the musical instrument digital interface</flag>
-  <flag name="pcm">support for sound card digital audio</flag>
-  <flag name="speech">speech support</flag>
-</use>
-<upstream>
-  <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id>
-</upstream>
-<longdescription lang="en">
+ <longdescription lang="en">
 BRLTTY is a background process (daemon) which provides access to the Linux/Unix
 console (when in text mode) for a blind person using a refreshable braille
 display. It drives the braille display, and provides complete screen review
 functionality. Some speech capability has also been incorporated. 
 </longdescription>
-<longdescription lang="ja">
+ <longdescription lang="ja">
 BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ
 ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多
 機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され
 ています。
 </longdescription>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="cpe">cpe:/a:mielke:brltty</remote-id>
+ </upstream>
+ <use>
+  <flag name="api">build brltty's application program interface</flag>
+  <flag name="beeper">support the console tone generator</flag>
+  <flag name="contracted-braille">support in-line contracted braille</flag>
+  <flag name="fm">support for the sound card synthesizer</flag>
+  <flag name="louis">Use braille tranlator <pkg>dev-libs/liblouis</pkg></flag>
+  <flag name="midi">support the musical instrument digital interface</flag>
+  <flag name="pcm">support for sound card digital audio</flag>
+  <flag name="speech">speech support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 30883a2a0fa3..6c2bb97a7097 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,8 +1,8 @@
 AUX caribou-fix-antler-style-css.patch 857 BLAKE2B e909c15b5907f80d24a719c9533cedf1edb5abac49d5e7b56ddadcd93a49ba6a23a27f99ca0a34983e4d4a62bef0ec2ff0c4200deb19241978acdb9562abe04f SHA512 d4129de776b424522e6df7f88858630fe130b805f705f41ad8e993fb57aa99c0b3a35f1cfb6d7d184540331aeb2f78abf05bd44257ae87f61bd0bb8ed40afbed
 AUX caribou-fix-compilation-error.patch 890 BLAKE2B 5e86e73326ba924d8f73121a031b57beed1fafcf53f0f09793ce61e1d6251b5ab3bcf19f791085ef141f4417d6df6f9d04ad5d0506779991f1af40942d06ccc2 SHA512 99e199361a9c50c65eec98a887734df3cbf3bfee3da588f24a76088c335e5f7ef3d750f223524c305360a4155b4812e512895301fdaf2b820f8568b72ef7bcb7
-AUX caribou-fix-python-env.patch 2844 BLAKE2B d043587ea3a7f41c37695ebe94d4268b486d0fffe47c9a23b41f25ae0425569c2380bd47200c7276633fec0fae5c47c7397f7b40dfb55adf1dc2f5d9c12ce8e7 SHA512 bff9ce3c652bf52a08a4410505feed0014f5f9a464175f07997e66b87deb16c7f2f756665d9cf0ee14e94ea246f70b81ef6b513d521ab78488f3010a41194554
+AUX caribou-fix-python-env.patch 2508 BLAKE2B b27a37c5f14affb2610b6a2caca9827a4b51676fe36350e666960559322e42b9bb38e044708cb390726cca3ef2f276210ba01d6322450145bb8931615613abf7 SHA512 0b972f72e0d7d5c9ddb4b3b6ca874343f2e023f7123e9671773fe394a4a062aec7cec8badec9b13b400575c1eccc28dff4b32a0486a9d477b3cc22c0b85aa1c5
 AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f80954a730174f9509e2a3c846b790f8abe861fb65ddf683bee87b0cd99b8d18c4c6eab6413f978a295190cc5d9a355c51 SHA512 8ce9b33c09e19a24e2e8366674437afa03743637d0d1854e8c5b4f73cbd69148b8c4d59d65212c509146fd051015d7a20f9d8ff92e9c835b4d805ca6c564b5c2
 AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r3.ebuild 2159 BLAKE2B 7203f2f5c3a643f3b9cc2f9923ccee273ac6d2eec0952091d3390683d95eb5adcaacdbdcff9ab00b284fe11b05db109faf24fcb4d85d5e4efdafe5f3eb4596ef SHA512 8cca7a458f29aa9807a279e589903851aeb860da8a82beb8f3e46c58247147627aa206a51694d291a8874a9a816c79f4c7935080d0bcaf2f478a130ad6fc303a
-MISC metadata.xml 929 BLAKE2B e0f0d92bd3111da02f03de2ad43e9059f8762cfd81d3d6449b9881105e036d2181b743321f3cf8680e77f3d2ec774107ae5262cea12688f2622e612ae83e0349 SHA512 156e8eb37e0969d2ef654aafd3662cccaee72d2cd63c3d9b1b0a5c53765aa53760e45d4b9b97b14054e3c89a2c470941a61ce52ad5dc0f9f885a2b57b7a92576
+EBUILD caribou-0.4.21-r3.ebuild 2124 BLAKE2B 5a243dd805976616a57800e77aa6daf9b67fb42db7f2e02a4634309fccd10e8a8a178a85220362117345e28562aa9b644fd165c8d33ebc84274e829fd41a4a21 SHA512 f864de1f93f002a365bebefb18ed9ecc36b827ca871e4834b5ce7d29a8f2b467865215b912b54ae8d95075af753e703c21f68ab625a7eb82da827c519e7b27fc
+MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04
diff --git a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
index fa66ac177eaf..3c3ac6687ab7 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
@@ -13,9 +13,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="gtk gtk2"
+IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
@@ -27,16 +27,10 @@ COMMON_DEPEND="
 	dev-libs/libgee:0.8
 	dev-libs/libxml2
 	>=media-libs/clutter-1.5.11:1.0[introspection]
+	>=x11-libs/gtk+-3:3[introspection]
 	x11-libs/libX11
 	x11-libs/libxklavier
 	x11-libs/libXtst
-
-	gtk? (
-		>=x11-libs/gtk+-3:3[introspection]
-	)
-	gtk2? (
-		x11-libs/gtk+:2
-	)
 "
 # gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
 # pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
@@ -82,8 +76,8 @@ src_configure() {
 		--disable-schemas-compile \
 		--disable-docs \
 		--disable-static \
-		$(use_enable gtk2 gtk2-module) \
-		$(use_enable gtk gtk3-module)
+		--disable-gtk2-module \
+		--enable-gtk3-module
 }
 
 src_install() {
diff --git a/app-accessibility/caribou/files/caribou-fix-python-env.patch b/app-accessibility/caribou/files/caribou-fix-python-env.patch
index 216b1ce420e2..3a0b26698fa3 100644
--- a/app-accessibility/caribou/files/caribou-fix-python-env.patch
+++ b/app-accessibility/caribou/files/caribou-fix-python-env.patch
@@ -1,6 +1,5 @@
-diff -rupN caribou-0.4.21.orig/bin/antler-keyboard.in caribou-0.4.21/bin/antler-keyboard.in
---- a/bin/antler-keyboard.in	2016-07-20 01:13:11.000000000 -0400
-+++ b/bin/antler-keyboard.in	2021-01-24 23:54:14.466466751 -0500
+--- a/bin/antler-keyboard.in
++++ b/bin/antler-keyboard.in
 @@ -18,24 +18,4 @@
  # along with this program; if not, write to the Free Software Foundation,
  # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -27,9 +26,8 @@ diff -rupN caribou-0.4.21.orig/bin/antler-keyboard.in caribou-0.4.21/bin/antler-
 -
 -@PYTHON@ -m caribou.antler.main "$@"
 +exec @PYTHON@ -m caribou.antler.main "$@"
-diff -rupN caribou-0.4.21.orig/bin/caribou-preferences.in caribou-0.4.21/bin/caribou-preferences.in
---- a/bin/caribou-preferences.in	2016-07-20 01:13:11.000000000 -0400
-+++ b/bin/caribou-preferences.in	2021-01-24 23:54:39.976665024 -0500
+--- a/bin/caribou-preferences.in
++++ b/bin/caribou-preferences.in
 @@ -18,26 +18,7 @@
  # along with this program; if not, write to the Free Software Foundation,
  # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
diff --git a/app-accessibility/caribou/metadata.xml b/app-accessibility/caribou/metadata.xml
index b01191c27de4..3ae72f9fd57d 100644
--- a/app-accessibility/caribou/metadata.xml
+++ b/app-accessibility/caribou/metadata.xml
@@ -1,23 +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="person">
-		<email>sparky@bluefang-logic.com</email>
-		<name>Matthew Turnbull</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<use>
-		<flag name="gtk2">Build gtk2 support module</flag>
-		<flag name="gtk">Build gtk3 support module</flag>
-	</use>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>sparky@bluefang-logic.com</email>
+  <name>Matthew Turnbull</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription lang="en">
 Caribou is a text entry and UI navigation application being developed as an
 alternative to the Gnome On-screen Keyboard. The overarching goal for Caribou
 is to create a usable solution for people whose primary way of accessing a
 computer is a switch device. The initial goal is to make an in-place on-screen
 keyboard suitable for people who can use a mouse but not a hardware keyboard.
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>cinnamon-overlay</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/edbrowse/metadata.xml b/app-accessibility/edbrowse/metadata.xml
index ff828a76593c..f470b4613252 100644
--- a/app-accessibility/edbrowse/metadata.xml
+++ b/app-accessibility/edbrowse/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>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/eflite/metadata.xml b/app-accessibility/eflite/metadata.xml
index 9c8a9fdaf58f..78552b7523e4 100644
--- a/app-accessibility/eflite/metadata.xml
+++ b/app-accessibility/eflite/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="person">
-		<email>williamh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<use>
-		<flag name="16k_voice">Use a higher-quality voice.</flag>
-	</use>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ <longdescription lang="en">
 	EFlite is a speech server for Emacspeak and other screen readers
 	that allows	them to interface with Festival Lite, a free 
 	text-to-speech engine developed at the CMU Speech Center as an 
 	off-shoot of Festival.
 </longdescription>
-	<longdescription lang="ja">
+ <longdescription lang="ja">
 	EFliteはEmacspeakと他のスクリーン読取り装置のスピーチサーバ。この
 	サーバーで前のプログラムはFestival Lite(CMU Speech Centerで開発した
 	Festivalのようにスピーチにテキストを変わるエンジン。)と
 	インタフェスすることが出来る。
 </longdescription>
-	<upstream>
-		<remote-id type="sourceforge">eflite</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">eflite</remote-id>
+ </upstream>
+ <use>
+  <flag name="16k_voice">Use a higher-quality voice.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/emacspeak-ss/metadata.xml b/app-accessibility/emacspeak-ss/metadata.xml
index 02a513c4c55c..c32decb3a565 100644
--- a/app-accessibility/emacspeak-ss/metadata.xml
+++ b/app-accessibility/emacspeak-ss/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>williamh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <longdescription lang="en">
 		Emacspeak speech servers for DoubleTalk PC and AT,
 		Braille 'n Speak, Type 'n Speak, Braille Lite from Blazie,
 		Accent SA, Apollo 2, JUNO, and JUNO-sp from Dolphin,
 		Spanish ciber 232 (+plus), Spanish PC Hablado notebook.
 	</longdescription>
-	<longdescription lang="ja">
+ <longdescription lang="ja">
 		DoubleTalkPC and ATとBraille 'n SpeakとType 'n SpeakとBlazieから
 		Braille LiteとAccent SAとApollo SAとApollo 2とDolphinからJUNO
 		and JUNO-spとSpanish ciber 232 (+plus)とSpanish PC Hablado
 		notebookのEmacspeakスピーチサーバーです。
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
index 2d3e20711d7a..68200936151e 100644
--- a/app-accessibility/emacspeak/metadata.xml
+++ b/app-accessibility/emacspeak/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="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>gnu-emacs@gentoo.org</email>
-		<name>Gentoo GNU Emacs project</name>
-	</maintainer>
-	<longdescription lang="en">Emacspeak is a speech interface that allows visually impaired 
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>gnu-emacs@gentoo.org</email>
+  <name>Gentoo GNU Emacs project</name>
+ </maintainer>
+ <longdescription lang="en">Emacspeak is a speech interface that allows visually impaired 
 	users to interact independently and efficiently with the computer.</longdescription>
-	<longdescription lang="ja">Emacspeakで視覚障害者が単独と手際良くでコンピュータを
+ <longdescription lang="ja">Emacspeakで視覚障害者が単独と手際良くでコンピュータを
 	使うことが出来る。</longdescription>
-	<use>
-		<flag name="espeak">Adds support for the espeak tts engine</flag>
-	</use>
-	<upstream>
-		<remote-id type="google-code">emacspeak</remote-id>
-		<remote-id type="sourceforge">emacspeak</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="google-code">emacspeak</remote-id>
+  <remote-id type="sourceforge">emacspeak</remote-id>
+ </upstream>
+ <use>
+  <flag name="espeak">Adds support for the espeak tts engine</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/epos/metadata.xml b/app-accessibility/epos/metadata.xml
index ff924802b4d4..6aa934b1fe7e 100644
--- a/app-accessibility/epos/metadata.xml
+++ b/app-accessibility/epos/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">epos</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">epos</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/espeak/metadata.xml b/app-accessibility/espeak/metadata.xml
index 368b975990cf..904224e1abde 100644
--- a/app-accessibility/espeak/metadata.xml
+++ b/app-accessibility/espeak/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="person">
-		<email>williamh@gentoo.org</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">espeak</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">espeak</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/espeakup/metadata.xml b/app-accessibility/espeakup/metadata.xml
index af3734414e2f..422b1a00e8f7 100644
--- a/app-accessibility/espeakup/metadata.xml
+++ b/app-accessibility/espeakup/metadata.xml
@@ -1,18 +1,19 @@
-<?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>williamh@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>accessibility@gentoo.org</email>
-    <name>Gentoo Accessibility Project</name>
-  </maintainer>
-  <longdescription>
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <longdescription>
 Espeakup is a small lightweight connector which makes it possible for
 speakup to use espeak as its synthesizer.
   </longdescription>
-  <upstream>
-    <remote-id type="github">williamh/espeakup</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">williamh/espeakup</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/flite/metadata.xml b/app-accessibility/flite/metadata.xml
index e128f807497d..7d169e642d94 100644
--- a/app-accessibility/flite/metadata.xml
+++ b/app-accessibility/flite/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="project">
-	<email>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<use>
-	<flag name="voices">Install synthetic voices</flag>
-</use>
-<upstream>
-	<remote-id type="github">festvox/flite</remote-id>
-</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">festvox/flite</remote-id>
+ </upstream>
+ <use>
+  <flag name="voices">Install synthetic voices</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/freetts/metadata.xml b/app-accessibility/freetts/metadata.xml
index c7177e539175..2ce017764f22 100644
--- a/app-accessibility/freetts/metadata.xml
+++ b/app-accessibility/freetts/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>java@gentoo.org</email>
-		<name>Java</name>
-	</maintainer>
-	<use>
-		<flag name="jsapi">build Java Speech API (JSAPI)</flag>
-		<flag name="mbrola">Adds support for mbrola voices</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">freetts</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">freetts</remote-id>
+ </upstream>
+ <use>
+  <flag name="jsapi">build Java Speech API (JSAPI)</flag>
+  <flag name="mbrola">Adds support for mbrola voices</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/julius/metadata.xml b/app-accessibility/julius/metadata.xml
index 1631e86a2744..fff8ac592e91 100644
--- a/app-accessibility/julius/metadata.xml
+++ b/app-accessibility/julius/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge-jp">julius</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge-jp">julius</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/kontrast/metadata.xml b/app-accessibility/kontrast/metadata.xml
index 2fdbf33d963d..96ccf0300196 100644
--- a/app-accessibility/kontrast/metadata.xml
+++ b/app-accessibility/kontrast/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/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
index 1dacdab965c1..919c5432c8d7 100644
--- a/app-accessibility/mbrola/metadata.xml
+++ b/app-accessibility/mbrola/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>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml
index 8fb4aba1043e..4fce151c1b4d 100644
--- a/app-accessibility/nfbtrans/metadata.xml
+++ b/app-accessibility/nfbtrans/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">
+ <maintainer type="person">
   <email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
+ </maintainer>
+ <maintainer type="project">
   <email>accessibility@gentoo.org</email>
   <name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/orca/metadata.xml b/app-accessibility/orca/metadata.xml
index 81828abc6360..6560c384259a 100644
--- a/app-accessibility/orca/metadata.xml
+++ b/app-accessibility/orca/metadata.xml
@@ -1,18 +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>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-<use>
-	<flag name="braille">Enable braille support</flag>
-</use>
-<longdescription>
+ <maintainer type="project">
+  <email>gnome@gentoo.org</email>
+  <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <longdescription>
 	Orca is a flexible, extensible, and powerful assistive technology
 	for people with visual impairments. Using various combinations of
 	speech synthesis, braille, and magnification, Orca helps provide
 	access to applications and toolkits that support the AT-SPI (e.g.,
 	the GNOME desktop).
 </longdescription>
-</pkgmetadata>
+ 
+ <use>
+  <flag name="braille">Enable braille support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/powiedz/metadata.xml b/app-accessibility/powiedz/metadata.xml
index 2cb7080a0514..919c5432c8d7 100644
--- a/app-accessibility/powiedz/metadata.xml
+++ b/app-accessibility/powiedz/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>accessibility@gentoo.org</email>
-    <name>Gentoo Accessibility Project</name>
-  </maintainer>
-<maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/sound-icons/metadata.xml b/app-accessibility/sound-icons/metadata.xml
index 8fb4aba1043e..4fce151c1b4d 100644
--- a/app-accessibility/sound-icons/metadata.xml
+++ b/app-accessibility/sound-icons/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">
+ <maintainer type="person">
   <email>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
+ </maintainer>
+ <maintainer type="project">
   <email>accessibility@gentoo.org</email>
   <name>Gentoo Accessibility Project</name>
-</maintainer>
-</pkgmetadata>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/speech-dispatcher/metadata.xml b/app-accessibility/speech-dispatcher/metadata.xml
index 3b8394dd85b4..735fabad226c 100644
--- a/app-accessibility/speech-dispatcher/metadata.xml
+++ b/app-accessibility/speech-dispatcher/metadata.xml
@@ -1,19 +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="person">
-    <email>williamh@gentoo.org</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>accessibility@gentoo.org</email>
-    <name>Gentoo Accessibility Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sound@gentoo.org</email>
-    <name>Gentoo Sound project</name>
-  </maintainer>
-  <use>
-    <flag name="espeak">Adds support for espeak speech engine</flag>
-    <flag name="flite">Adds support for flite speech engine</flag>
-  </use>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="espeak">Adds support for espeak speech engine</flag>
+  <flag name="flite">Adds support for flite speech engine</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/speech-tools/metadata.xml b/app-accessibility/speech-tools/metadata.xml
index 587a705d02c9..a27e4a422b8f 100644
--- a/app-accessibility/speech-tools/metadata.xml
+++ b/app-accessibility/speech-tools/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>accessibility@gentoo.org</email>
-	<name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
-	<email>sound@gentoo.org</email>
-	<name>Gentoo Sound project</name>
-</maintainer>
-<maintainer type="person">
-	<email>bircoph@gentoo.org</email>
-	<name>Andrew Savchenko</name>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>bircoph@gentoo.org</email>
+  <name>Andrew Savchenko</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/speechd-el/metadata.xml b/app-accessibility/speechd-el/metadata.xml
index fb498827c3b3..897b08c066d6 100644
--- a/app-accessibility/speechd-el/metadata.xml
+++ b/app-accessibility/speechd-el/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>williamh@gentoo.org</email>
-</maintainer>
-<maintainer type="project">
+ <maintainer type="person">
+  <email>williamh@gentoo.org</email>
+ </maintainer>
+ <maintainer type="project">
   <email>accessibility@gentoo.org</email>
   <name>Gentoo Accessibility Project</name>
-</maintainer>
-<maintainer type="project">
+ </maintainer>
+ <maintainer type="project">
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
-</maintainer>
-</pkgmetadata>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/sphinx2/metadata.xml b/app-accessibility/sphinx2/metadata.xml
index 5272aff94276..f4ce36578c6e 100644
--- a/app-accessibility/sphinx2/metadata.xml
+++ b/app-accessibility/sphinx2/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="project">
-		<email>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cmusphinx</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>sound@gentoo.org</email>
+  <name>Gentoo Sound project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">cmusphinx</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file
diff --git a/app-accessibility/yasr/metadata.xml b/app-accessibility/yasr/metadata.xml
index 57bad5623af8..c1288319eeac 100644
--- a/app-accessibility/yasr/metadata.xml
+++ b/app-accessibility/yasr/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>accessibility@gentoo.org</email>
-		<name>Gentoo Accessibility Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">yasr</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>accessibility@gentoo.org</email>
+  <name>Gentoo Accessibility Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">yasr</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
\ No newline at end of file