Follow current metadata.dtd

8 files changed, 55 insertions, 49 deletions

diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 7999c07b..92215426 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>martin@mvath.de</email>
-		<name>Martin Väth</name>
-		<description>Upstream developer, assign bugs</description>
-	</maintainer>
-	<maintainer>
-		<email>axs@gentoo.org</email>
-		<description>Proxy committer, CC bugs</description>
-	</maintainer>
-	<upstream>
-		<maintainer>
-			<email>martin@mvath.de</email>
-			<name>Martin Väth</name>
-		</maintainer>
-		<bugs-to>https://github.com/vaeth/eix/issues/</bugs-to>
-		<remote-id type="github">vaeth/eix</remote-id>
-	</upstream>
-	<use>
-		<flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
-		<flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
-		<flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
-		<flag name="doc">Create description of the eix cache file additionally in html format</flag>
-		<flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
-		<flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
-		<flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
-		<flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
-		<flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
-		<flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
-		<flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
-	</use>
+  <maintainer type="person">
+    <email>martin@mvath.de</email>
+    <name>Martin Väth</name>
+    <description>Upstream developer, assign bugs</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>axs@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
+    <flag name="dep">Make DEP=true the default which enables support for {,R,P}DEPEND but requires roughly double disk and memory.</flag>
+    <flag name="doc">Create description of the eix cache file additionally in html format</flag>
+    <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
+    <flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
+    <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
+    <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
+    <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
+    <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
+    <flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
+    <flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
+  </use>
+  <upstream>
+    <remote-id type="github">vaeth/eix</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-portage/find_cruft/metadata.xml b/app-portage/find_cruft/metadata.xml
index d66620e7..b408d25f 100644
--- a/app-portage/find_cruft/metadata.xml
+++ b/app-portage/find_cruft/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>
diff --git a/app-portage/getdelta/metadata.xml b/app-portage/getdelta/metadata.xml
index cd5e732e..9550c8c1 100644
--- a/app-portage/getdelta/metadata.xml
+++ b/app-portage/getdelta/metadata.xml
@@ -1,17 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>martin@mvath.de</email>
-		<name>Martin Väth</name>
-		<description>maintainer of the updates in the mv overlay</description>
-	</maintainer>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
-	<maintainer>
-		<email>nlissne@linux01.gwdg.de</email>
-		<name>Nicolai Lissner</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>martin@mvath.de</email>
+    <name>Martin Väth</name>
+    <description>maintainer of the updates in the mv overlay</description>
+  </maintainer>
+  <maintainer type="person">
+    <email>patrick@gentoo.org</email>
+    <name>Patrick Lauer</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>nlissne@linux01.gwdg.de</email>
+    <name>Nicolai Lissner</name>
+  </maintainer>
+<maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-portage/logclean/metadata.xml b/app-portage/logclean/metadata.xml
index 7d030fd7..d2834dca 100644
--- a/app-portage/logclean/metadata.xml
+++ b/app-portage/logclean/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>
diff --git a/app-portage/portage-bashrc-mv/metadata.xml b/app-portage/portage-bashrc-mv/metadata.xml
index cb260f08..8e9431a9 100644
--- a/app-portage/portage-bashrc-mv/metadata.xml
+++ b/app-portage/portage-bashrc-mv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>
diff --git a/app-portage/trickyfetch/metadata.xml b/app-portage/trickyfetch/metadata.xml
index 379e730b..46f3c59f 100644
--- a/app-portage/trickyfetch/metadata.xml
+++ b/app-portage/trickyfetch/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>
diff --git a/app-portage/useflags/metadata.xml b/app-portage/useflags/metadata.xml
index 4e3965d1..2a199ebc 100644
--- a/app-portage/useflags/metadata.xml
+++ b/app-portage/useflags/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>
diff --git a/app-portage/world-mv/metadata.xml b/app-portage/world-mv/metadata.xml
index 8ba273b2..1311ab80 100644
--- a/app-portage/world-mv/metadata.xml
+++ b/app-portage/world-mv/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>martin@mvath.de</email>
 		<name>Martin Väth</name>
 	</maintainer>