summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /x11-drivers
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
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.
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/afb-ucode/metadata.xml5
-rw-r--r--x11-drivers/ati-drivers/metadata.xml6
-rw-r--r--x11-drivers/xf86-input-acecad/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-aiptek/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-elographics/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-evdev/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-fpit/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-hyperpen/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-joystick/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-keyboard/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-libinput/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-mouse/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-mtrack/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-mutouch/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-penmount/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-synaptics/metadata.xml10
-rw-r--r--x11-drivers/xf86-input-tslib/metadata.xml10
-rw-r--r--x11-drivers/xf86-input-vmmouse/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-void/metadata.xml5
-rw-r--r--x11-drivers/xf86-input-wacom/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-amdgpu/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-apm/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-ark/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-ast/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-ati/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-chips/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-cirrus/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-dummy/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-fbdev/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-freedreno/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-geode/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-glint/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-i128/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-i740/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-intel/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-ivtv/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-mach64/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-mga/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-modesetting/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-neomagic/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-newport/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-nouveau/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-nv/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-omap/metadata.xml10
-rw-r--r--x11-drivers/xf86-video-omapfb/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-openchrome/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-opentegra/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-qxl/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-r128/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-rendition/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-s3/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-s3virge/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-savage/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-siliconmotion/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-sis/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-sisusb/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-suncg14/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-suncg3/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-suncg6/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-sunffb/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-sunleo/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-suntcx/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-tdfx/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-tga/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-trident/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-tseng/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-v4l/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-vesa/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-vmware/metadata.xml5
-rw-r--r--x11-drivers/xf86-video-voodoo/metadata.xml5
70 files changed, 292 insertions, 74 deletions
diff --git a/x11-drivers/afb-ucode/metadata.xml b/x11-drivers/afb-ucode/metadata.xml
index bec30fdf4884..9d2258a9da51 100644
--- a/x11-drivers/afb-ucode/metadata.xml
+++ b/x11-drivers/afb-ucode/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>sparc</herd>
+<maintainer>
+ <email>sparc@gentoo.org</email>
+ <name>Gentoo Linux SPARC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 41b5fc7e9f57..e1a4e77417d1 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>x11@gentoo.org</email>
<description>Assign to herd.</description>
@@ -11,6 +9,10 @@
<email>jekarlson@gmail.com</email>
<description>Proxy maintainer, CC him on bugs.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="qt4">
Install qt4 dependent optional tools (e.g Catalyst Control Panel)
diff --git a/x11-drivers/xf86-input-acecad/metadata.xml b/x11-drivers/xf86-input-acecad/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-acecad/metadata.xml
+++ b/x11-drivers/xf86-input-acecad/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-drivers/xf86-input-aiptek/metadata.xml b/x11-drivers/xf86-input-aiptek/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-aiptek/metadata.xml
+++ b/x11-drivers/xf86-input-aiptek/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-drivers/xf86-input-elographics/metadata.xml b/x11-drivers/xf86-input-elographics/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-elographics/metadata.xml
+++ b/x11-drivers/xf86-input-elographics/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-drivers/xf86-input-evdev/metadata.xml b/x11-drivers/xf86-input-evdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-evdev/metadata.xml
+++ b/x11-drivers/xf86-input-evdev/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-drivers/xf86-input-fpit/metadata.xml b/x11-drivers/xf86-input-fpit/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-fpit/metadata.xml
+++ b/x11-drivers/xf86-input-fpit/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-drivers/xf86-input-hyperpen/metadata.xml b/x11-drivers/xf86-input-hyperpen/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-hyperpen/metadata.xml
+++ b/x11-drivers/xf86-input-hyperpen/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-drivers/xf86-input-joystick/metadata.xml b/x11-drivers/xf86-input-joystick/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-joystick/metadata.xml
+++ b/x11-drivers/xf86-input-joystick/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-drivers/xf86-input-keyboard/metadata.xml b/x11-drivers/xf86-input-keyboard/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-keyboard/metadata.xml
+++ b/x11-drivers/xf86-input-keyboard/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-drivers/xf86-input-libinput/metadata.xml b/x11-drivers/xf86-input-libinput/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-libinput/metadata.xml
+++ b/x11-drivers/xf86-input-libinput/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-drivers/xf86-input-mouse/metadata.xml b/x11-drivers/xf86-input-mouse/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-mouse/metadata.xml
+++ b/x11-drivers/xf86-input-mouse/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-drivers/xf86-input-mtrack/metadata.xml b/x11-drivers/xf86-input-mtrack/metadata.xml
index 9f444a786712..16d41677c196 100644
--- a/x11-drivers/xf86-input-mtrack/metadata.xml
+++ b/x11-drivers/xf86-input-mtrack/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<upstream>
<remote-id type="github">BlueDragonX/xf86-input-mtrack</remote-id>
</upstream>
diff --git a/x11-drivers/xf86-input-mutouch/metadata.xml b/x11-drivers/xf86-input-mutouch/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-mutouch/metadata.xml
+++ b/x11-drivers/xf86-input-mutouch/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-drivers/xf86-input-penmount/metadata.xml b/x11-drivers/xf86-input-penmount/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-penmount/metadata.xml
+++ b/x11-drivers/xf86-input-penmount/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-drivers/xf86-input-synaptics/metadata.xml b/x11-drivers/xf86-input-synaptics/metadata.xml
index c923f3ff7c16..37e9c1087310 100644
--- a/x11-drivers/xf86-input-synaptics/metadata.xml
+++ b/x11-drivers/xf86-input-synaptics/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>eva@gentoo.org</email>
<name>Gilles Dartiguelongue</name>
@@ -12,4 +10,12 @@
<name>Christoph Brill</name>
<description>upstream co-maintainer</description>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-input-tslib/metadata.xml b/x11-drivers/xf86-input-tslib/metadata.xml
index 83fba9ad767e..5bcf802750e7 100644
--- a/x11-drivers/xf86-input-tslib/metadata.xml
+++ b/x11-drivers/xf86-input-tslib/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>embedded</herd>
-<herd>x11</herd>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-input-vmmouse/metadata.xml b/x11-drivers/xf86-input-vmmouse/metadata.xml
index 8a4ab6d163db..e0f72925dde3 100644
--- a/x11-drivers/xf86-input-vmmouse/metadata.xml
+++ b/x11-drivers/xf86-input-vmmouse/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
<maintainer>
<email>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-input-void/metadata.xml b/x11-drivers/xf86-input-void/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-input-void/metadata.xml
+++ b/x11-drivers/xf86-input-void/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-drivers/xf86-input-wacom/metadata.xml b/x11-drivers/xf86-input-wacom/metadata.xml
index dfa7f95c2666..1a222876a093 100644
--- a/x11-drivers/xf86-input-wacom/metadata.xml
+++ b/x11-drivers/xf86-input-wacom/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<longdescription>Driver for Wacom tablets and drawing devices (friendly fork of linuxwacom)</longdescription>
<upstream>
<remote-id type="sourceforge">linuxwacom</remote-id>
diff --git a/x11-drivers/xf86-video-amdgpu/metadata.xml b/x11-drivers/xf86-video-amdgpu/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-amdgpu/metadata.xml
+++ b/x11-drivers/xf86-video-amdgpu/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
</use>
diff --git a/x11-drivers/xf86-video-apm/metadata.xml b/x11-drivers/xf86-video-apm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-apm/metadata.xml
+++ b/x11-drivers/xf86-video-apm/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-drivers/xf86-video-ark/metadata.xml b/x11-drivers/xf86-video-ark/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-ark/metadata.xml
+++ b/x11-drivers/xf86-video-ark/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-drivers/xf86-video-ast/metadata.xml b/x11-drivers/xf86-video-ast/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-ast/metadata.xml
+++ b/x11-drivers/xf86-video-ast/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-drivers/xf86-video-ati/metadata.xml b/x11-drivers/xf86-video-ati/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-ati/metadata.xml
+++ b/x11-drivers/xf86-video-ati/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
</use>
diff --git a/x11-drivers/xf86-video-chips/metadata.xml b/x11-drivers/xf86-video-chips/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-chips/metadata.xml
+++ b/x11-drivers/xf86-video-chips/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-drivers/xf86-video-cirrus/metadata.xml b/x11-drivers/xf86-video-cirrus/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-cirrus/metadata.xml
+++ b/x11-drivers/xf86-video-cirrus/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-drivers/xf86-video-dummy/metadata.xml b/x11-drivers/xf86-video-dummy/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-dummy/metadata.xml
+++ b/x11-drivers/xf86-video-dummy/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-drivers/xf86-video-fbdev/metadata.xml b/x11-drivers/xf86-video-fbdev/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-fbdev/metadata.xml
+++ b/x11-drivers/xf86-video-fbdev/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-drivers/xf86-video-freedreno/metadata.xml b/x11-drivers/xf86-video-freedreno/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-drivers/xf86-video-freedreno/metadata.xml
+++ b/x11-drivers/xf86-video-freedreno/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-drivers/xf86-video-geode/metadata.xml b/x11-drivers/xf86-video-geode/metadata.xml
index 6634fd0793d3..48bf9304d1cb 100644
--- a/x11-drivers/xf86-video-geode/metadata.xml
+++ b/x11-drivers/xf86-video-geode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
<maintainer>
<email>leio@gentoo.org</email>
</maintainer>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
<use>
<flag name="ztv">Enable building the V4L2 ZTV driver</flag>
</use>
diff --git a/x11-drivers/xf86-video-glint/metadata.xml b/x11-drivers/xf86-video-glint/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-glint/metadata.xml
+++ b/x11-drivers/xf86-video-glint/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-drivers/xf86-video-i128/metadata.xml b/x11-drivers/xf86-video-i128/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-i128/metadata.xml
+++ b/x11-drivers/xf86-video-i128/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-drivers/xf86-video-i740/metadata.xml b/x11-drivers/xf86-video-i740/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-i740/metadata.xml
+++ b/x11-drivers/xf86-video-i740/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-drivers/xf86-video-intel/metadata.xml b/x11-drivers/xf86-video-intel/metadata.xml
index fd3227137901..ff0923340194 100644
--- a/x11-drivers/xf86-video-intel/metadata.xml
+++ b/x11-drivers/xf86-video-intel/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
<flag name="sna">Enable SandyBridge's New Acceleration (useful on all chipsets, not just SandyBridge)</flag>
diff --git a/x11-drivers/xf86-video-ivtv/metadata.xml b/x11-drivers/xf86-video-ivtv/metadata.xml
index 9815514cc5a1..2c08b337dac8 100644
--- a/x11-drivers/xf86-video-ivtv/metadata.xml
+++ b/x11-drivers/xf86-video-ivtv/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
<maintainer>
<email>je_fro@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<longdescription lang="en">
X.Org driver for TV-out on ivtv cards
</longdescription>
diff --git a/x11-drivers/xf86-video-mach64/metadata.xml b/x11-drivers/xf86-video-mach64/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-mach64/metadata.xml
+++ b/x11-drivers/xf86-video-mach64/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-drivers/xf86-video-mga/metadata.xml b/x11-drivers/xf86-video-mga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-mga/metadata.xml
+++ b/x11-drivers/xf86-video-mga/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-drivers/xf86-video-modesetting/metadata.xml b/x11-drivers/xf86-video-modesetting/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-modesetting/metadata.xml
+++ b/x11-drivers/xf86-video-modesetting/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-drivers/xf86-video-neomagic/metadata.xml b/x11-drivers/xf86-video-neomagic/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-neomagic/metadata.xml
+++ b/x11-drivers/xf86-video-neomagic/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-drivers/xf86-video-newport/metadata.xml b/x11-drivers/xf86-video-newport/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-newport/metadata.xml
+++ b/x11-drivers/xf86-video-newport/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-drivers/xf86-video-nouveau/metadata.xml b/x11-drivers/xf86-video-nouveau/metadata.xml
index b19c4dca8ea3..cc665df2a20e 100644
--- a/x11-drivers/xf86-video-nouveau/metadata.xml
+++ b/x11-drivers/xf86-video-nouveau/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
</use>
diff --git a/x11-drivers/xf86-video-nv/metadata.xml b/x11-drivers/xf86-video-nv/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-nv/metadata.xml
+++ b/x11-drivers/xf86-video-nv/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-drivers/xf86-video-omap/metadata.xml b/x11-drivers/xf86-video-omap/metadata.xml
index 48b24f0a1db6..df5ca67c3772 100644
--- a/x11-drivers/xf86-video-omap/metadata.xml
+++ b/x11-drivers/xf86-video-omap/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>arm</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<maintainer>
+ <email>arm@gentoo.org</email>
+ <name>Gentoo Linux ARM Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-video-omapfb/metadata.xml b/x11-drivers/xf86-video-omapfb/metadata.xml
index 5454528f2093..fe573c6bd8a7 100644
--- a/x11-drivers/xf86-video-omapfb/metadata.xml
+++ b/x11-drivers/xf86-video-omapfb/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>arm</herd>
+<maintainer>
+ <email>arm@gentoo.org</email>
+ <name>Gentoo Linux ARM Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-video-openchrome/metadata.xml b/x11-drivers/xf86-video-openchrome/metadata.xml
index 8c3d909e870e..50e9760eee86 100644
--- a/x11-drivers/xf86-video-openchrome/metadata.xml
+++ b/x11-drivers/xf86-video-openchrome/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="viaregtool">Install registers dumper tool</flag>
</use>
diff --git a/x11-drivers/xf86-video-opentegra/metadata.xml b/x11-drivers/xf86-video-opentegra/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-opentegra/metadata.xml
+++ b/x11-drivers/xf86-video-opentegra/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-drivers/xf86-video-qxl/metadata.xml b/x11-drivers/xf86-video-qxl/metadata.xml
index 7fd8b1eb5c3e..1c9e935050c7 100644
--- a/x11-drivers/xf86-video-qxl/metadata.xml
+++ b/x11-drivers/xf86-video-qxl/metadata.xml
@@ -1,7 +1,10 @@
<?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>
<use>
<flag name="xspice">Build the xspice driver</flag>
</use>
diff --git a/x11-drivers/xf86-video-r128/metadata.xml b/x11-drivers/xf86-video-r128/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-r128/metadata.xml
+++ b/x11-drivers/xf86-video-r128/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-drivers/xf86-video-rendition/metadata.xml b/x11-drivers/xf86-video-rendition/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-rendition/metadata.xml
+++ b/x11-drivers/xf86-video-rendition/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-drivers/xf86-video-s3/metadata.xml b/x11-drivers/xf86-video-s3/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-s3/metadata.xml
+++ b/x11-drivers/xf86-video-s3/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-drivers/xf86-video-s3virge/metadata.xml b/x11-drivers/xf86-video-s3virge/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-s3virge/metadata.xml
+++ b/x11-drivers/xf86-video-s3virge/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-drivers/xf86-video-savage/metadata.xml b/x11-drivers/xf86-video-savage/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-savage/metadata.xml
+++ b/x11-drivers/xf86-video-savage/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-drivers/xf86-video-siliconmotion/metadata.xml b/x11-drivers/xf86-video-siliconmotion/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-siliconmotion/metadata.xml
+++ b/x11-drivers/xf86-video-siliconmotion/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-drivers/xf86-video-sis/metadata.xml b/x11-drivers/xf86-video-sis/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sis/metadata.xml
+++ b/x11-drivers/xf86-video-sis/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-drivers/xf86-video-sisusb/metadata.xml b/x11-drivers/xf86-video-sisusb/metadata.xml
index 3cb365e8431a..6293af6c4818 100644
--- a/x11-drivers/xf86-video-sisusb/metadata.xml
+++ b/x11-drivers/xf86-video-sisusb/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
<maintainer>
<email>vapier@gentoo.org</email>
<name>Mike Frysinger</name>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-video-suncg14/metadata.xml b/x11-drivers/xf86-video-suncg14/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg14/metadata.xml
+++ b/x11-drivers/xf86-video-suncg14/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-drivers/xf86-video-suncg3/metadata.xml b/x11-drivers/xf86-video-suncg3/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg3/metadata.xml
+++ b/x11-drivers/xf86-video-suncg3/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-drivers/xf86-video-suncg6/metadata.xml b/x11-drivers/xf86-video-suncg6/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suncg6/metadata.xml
+++ b/x11-drivers/xf86-video-suncg6/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-drivers/xf86-video-sunffb/metadata.xml b/x11-drivers/xf86-video-sunffb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sunffb/metadata.xml
+++ b/x11-drivers/xf86-video-sunffb/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-drivers/xf86-video-sunleo/metadata.xml b/x11-drivers/xf86-video-sunleo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-sunleo/metadata.xml
+++ b/x11-drivers/xf86-video-sunleo/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-drivers/xf86-video-suntcx/metadata.xml b/x11-drivers/xf86-video-suntcx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-suntcx/metadata.xml
+++ b/x11-drivers/xf86-video-suntcx/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-drivers/xf86-video-tdfx/metadata.xml b/x11-drivers/xf86-video-tdfx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tdfx/metadata.xml
+++ b/x11-drivers/xf86-video-tdfx/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-drivers/xf86-video-tga/metadata.xml b/x11-drivers/xf86-video-tga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tga/metadata.xml
+++ b/x11-drivers/xf86-video-tga/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-drivers/xf86-video-trident/metadata.xml b/x11-drivers/xf86-video-trident/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-trident/metadata.xml
+++ b/x11-drivers/xf86-video-trident/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-drivers/xf86-video-tseng/metadata.xml b/x11-drivers/xf86-video-tseng/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-tseng/metadata.xml
+++ b/x11-drivers/xf86-video-tseng/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-drivers/xf86-video-v4l/metadata.xml b/x11-drivers/xf86-video-v4l/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-v4l/metadata.xml
+++ b/x11-drivers/xf86-video-v4l/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-drivers/xf86-video-vesa/metadata.xml b/x11-drivers/xf86-video-vesa/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-vesa/metadata.xml
+++ b/x11-drivers/xf86-video-vesa/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-drivers/xf86-video-vmware/metadata.xml b/x11-drivers/xf86-video-vmware/metadata.xml
index 8a4ab6d163db..e0f72925dde3 100644
--- a/x11-drivers/xf86-video-vmware/metadata.xml
+++ b/x11-drivers/xf86-video-vmware/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
<maintainer>
<email>dev-zero@gentoo.org</email>
<name>Tiziano Müller</name>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-drivers/xf86-video-voodoo/metadata.xml b/x11-drivers/xf86-video-voodoo/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-drivers/xf86-video-voodoo/metadata.xml
+++ b/x11-drivers/xf86-video-voodoo/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>