From cfd93d768e79a349f1e762b92773190295c36980 Mon Sep 17 00:00:00 2001
From: Michał Górny <mgorny@gentoo.org>
Date: Sun, 24 Jan 2016 23:32:36 +0100
Subject: Replace all herds with appropriate projects (GLEP 67)

Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.
---
 x11-proto/bigreqsproto/metadata.xml     |  5 ++++-
 x11-proto/compositeproto/metadata.xml   |  5 ++++-
 x11-proto/damageproto/metadata.xml      |  5 ++++-
 x11-proto/dmxproto/metadata.xml         |  5 ++++-
 x11-proto/dri2proto/metadata.xml        |  5 ++++-
 x11-proto/dri3proto/metadata.xml        |  5 ++++-
 x11-proto/evieext/metadata.xml          |  5 ++++-
 x11-proto/fixesproto/metadata.xml       |  5 ++++-
 x11-proto/fontcacheproto/metadata.xml   |  5 ++++-
 x11-proto/fontsproto/metadata.xml       |  5 ++++-
 x11-proto/glproto/metadata.xml          |  5 ++++-
 x11-proto/inputproto/metadata.xml       |  5 ++++-
 x11-proto/kbproto/metadata.xml          |  5 ++++-
 x11-proto/presentproto/metadata.xml     |  5 ++++-
 x11-proto/printproto/metadata.xml       |  5 ++++-
 x11-proto/randrproto/metadata.xml       |  5 ++++-
 x11-proto/recordproto/metadata.xml      |  5 ++++-
 x11-proto/renderproto/metadata.xml      |  5 ++++-
 x11-proto/resourceproto/metadata.xml    |  5 ++++-
 x11-proto/scrnsaverproto/metadata.xml   |  5 ++++-
 x11-proto/trapproto/metadata.xml        |  5 ++++-
 x11-proto/videoproto/metadata.xml       |  5 ++++-
 x11-proto/xcalibrateproto/metadata.xml  | 10 ++++++++--
 x11-proto/xcb-proto/metadata.xml        |  5 ++++-
 x11-proto/xcmiscproto/metadata.xml      |  5 ++++-
 x11-proto/xextproto/metadata.xml        |  5 ++++-
 x11-proto/xf86bigfontproto/metadata.xml |  5 ++++-
 x11-proto/xf86dgaproto/metadata.xml     |  5 ++++-
 x11-proto/xf86driproto/metadata.xml     |  5 ++++-
 x11-proto/xf86miscproto/metadata.xml    |  5 ++++-
 x11-proto/xf86rushproto/metadata.xml    |  5 ++++-
 x11-proto/xf86vidmodeproto/metadata.xml |  5 ++++-
 x11-proto/xineramaproto/metadata.xml    |  5 ++++-
 x11-proto/xproto/metadata.xml           |  5 ++++-
 34 files changed, 140 insertions(+), 35 deletions(-)

(limited to 'x11-proto')

diff --git a/x11-proto/bigreqsproto/metadata.xml b/x11-proto/bigreqsproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/bigreqsproto/metadata.xml
+++ b/x11-proto/bigreqsproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/compositeproto/metadata.xml b/x11-proto/compositeproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/compositeproto/metadata.xml
+++ b/x11-proto/compositeproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/damageproto/metadata.xml b/x11-proto/damageproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/damageproto/metadata.xml
+++ b/x11-proto/damageproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dmxproto/metadata.xml b/x11-proto/dmxproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dmxproto/metadata.xml
+++ b/x11-proto/dmxproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dri2proto/metadata.xml b/x11-proto/dri2proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dri2proto/metadata.xml
+++ b/x11-proto/dri2proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/dri3proto/metadata.xml b/x11-proto/dri3proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/dri3proto/metadata.xml
+++ b/x11-proto/dri3proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/evieext/metadata.xml b/x11-proto/evieext/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/evieext/metadata.xml
+++ b/x11-proto/evieext/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fixesproto/metadata.xml b/x11-proto/fixesproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fixesproto/metadata.xml
+++ b/x11-proto/fixesproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fontcacheproto/metadata.xml b/x11-proto/fontcacheproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fontcacheproto/metadata.xml
+++ b/x11-proto/fontcacheproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/fontsproto/metadata.xml b/x11-proto/fontsproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/fontsproto/metadata.xml
+++ b/x11-proto/fontsproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/glproto/metadata.xml b/x11-proto/glproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/glproto/metadata.xml
+++ b/x11-proto/glproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/inputproto/metadata.xml b/x11-proto/inputproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/inputproto/metadata.xml
+++ b/x11-proto/inputproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/kbproto/metadata.xml b/x11-proto/kbproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/kbproto/metadata.xml
+++ b/x11-proto/kbproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/presentproto/metadata.xml b/x11-proto/presentproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/presentproto/metadata.xml
+++ b/x11-proto/presentproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/printproto/metadata.xml b/x11-proto/printproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/printproto/metadata.xml
+++ b/x11-proto/printproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/randrproto/metadata.xml b/x11-proto/randrproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/randrproto/metadata.xml
+++ b/x11-proto/randrproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/recordproto/metadata.xml b/x11-proto/recordproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/recordproto/metadata.xml
+++ b/x11-proto/recordproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/renderproto/metadata.xml b/x11-proto/renderproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/renderproto/metadata.xml
+++ b/x11-proto/renderproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/resourceproto/metadata.xml b/x11-proto/resourceproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/resourceproto/metadata.xml
+++ b/x11-proto/resourceproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/scrnsaverproto/metadata.xml b/x11-proto/scrnsaverproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/scrnsaverproto/metadata.xml
+++ b/x11-proto/scrnsaverproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/trapproto/metadata.xml b/x11-proto/trapproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/trapproto/metadata.xml
+++ b/x11-proto/trapproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/videoproto/metadata.xml b/x11-proto/videoproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/videoproto/metadata.xml
+++ b/x11-proto/videoproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcalibrateproto/metadata.xml b/x11-proto/xcalibrateproto/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-proto/xcalibrateproto/metadata.xml
+++ b/x11-proto/xcalibrateproto/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<herd>embedded</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
+<maintainer>
+	<email>embedded@gentoo.org</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcb-proto/metadata.xml b/x11-proto/xcb-proto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xcb-proto/metadata.xml
+++ b/x11-proto/xcb-proto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xcmiscproto/metadata.xml b/x11-proto/xcmiscproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xcmiscproto/metadata.xml
+++ b/x11-proto/xcmiscproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xextproto/metadata.xml b/x11-proto/xextproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xextproto/metadata.xml
+++ b/x11-proto/xextproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86bigfontproto/metadata.xml b/x11-proto/xf86bigfontproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86bigfontproto/metadata.xml
+++ b/x11-proto/xf86bigfontproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86dgaproto/metadata.xml b/x11-proto/xf86dgaproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86dgaproto/metadata.xml
+++ b/x11-proto/xf86dgaproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86driproto/metadata.xml b/x11-proto/xf86driproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86driproto/metadata.xml
+++ b/x11-proto/xf86driproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86miscproto/metadata.xml b/x11-proto/xf86miscproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86miscproto/metadata.xml
+++ b/x11-proto/xf86miscproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86rushproto/metadata.xml b/x11-proto/xf86rushproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86rushproto/metadata.xml
+++ b/x11-proto/xf86rushproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xf86vidmodeproto/metadata.xml b/x11-proto/xf86vidmodeproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xf86vidmodeproto/metadata.xml
+++ b/x11-proto/xf86vidmodeproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xineramaproto/metadata.xml b/x11-proto/xineramaproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xineramaproto/metadata.xml
+++ b/x11-proto/xineramaproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-proto/xproto/metadata.xml b/x11-proto/xproto/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-proto/xproto/metadata.xml
+++ b/x11-proto/xproto/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad