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-misc
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-misc')
-rw-r--r--x11-misc/3ddesktop/metadata.xml5
-rw-r--r--x11-misc/3dfb/metadata.xml5
-rw-r--r--x11-misc/3dfm/metadata.xml5
-rw-r--r--x11-misc/Xorgautoconfig/metadata.xml5
-rw-r--r--x11-misc/accessx/metadata.xml5
-rw-r--r--x11-misc/afbinit/metadata.xml6
-rw-r--r--x11-misc/alacarte/metadata.xml5
-rw-r--r--x11-misc/andromeda/metadata.xml5
-rw-r--r--x11-misc/appmenu-qt/metadata.xml5
-rw-r--r--x11-misc/apwal/metadata.xml5
-rw-r--r--x11-misc/arandr/metadata.xml5
-rw-r--r--x11-misc/autocutsel/metadata.xml5
-rw-r--r--x11-misc/basqet/metadata.xml5
-rw-r--r--x11-misc/bbacpi/metadata.xml5
-rw-r--r--x11-misc/bumblebee/metadata.xml5
-rw-r--r--x11-misc/cairo-clock/metadata.xml5
-rw-r--r--x11-misc/calise/metadata.xml5
-rw-r--r--x11-misc/cbatticon/metadata.xml5
-rw-r--r--x11-misc/chgres/metadata.xml5
-rw-r--r--x11-misc/colord/metadata.xml5
-rw-r--r--x11-misc/compton/metadata.xml5
-rw-r--r--x11-misc/dclock/metadata.xml5
-rw-r--r--x11-misc/devilspie/metadata.xml5
-rw-r--r--x11-misc/devilspie2/metadata.xml5
-rw-r--r--x11-misc/dmenu/metadata.xml5
-rw-r--r--x11-misc/driconf/metadata.xml5
-rw-r--r--x11-misc/dsx/metadata.xml5
-rw-r--r--x11-misc/dxpc/metadata.xml5
-rw-r--r--x11-misc/dzen/metadata.xml5
-rw-r--r--x11-misc/e16keyedit/metadata.xml5
-rw-r--r--x11-misc/e16menuedit2/metadata.xml5
-rw-r--r--x11-misc/easystroke/metadata.xml5
-rw-r--r--x11-misc/efax-gtk/metadata.xml5
-rw-r--r--x11-misc/evolvotron/metadata.xml5
-rw-r--r--x11-misc/fbpanel/metadata.xml5
-rw-r--r--x11-misc/fireflies/metadata.xml5
-rw-r--r--x11-misc/fracplanet/metadata.xml5
-rw-r--r--x11-misc/fraqtive/metadata.xml5
-rw-r--r--x11-misc/gbase/metadata.xml5
-rw-r--r--x11-misc/gbdfed/metadata.xml5
-rw-r--r--x11-misc/gccmakedep/metadata.xml5
-rw-r--r--x11-misc/gcolor2/metadata.xml5
-rw-r--r--x11-misc/gdevilspie/metadata.xml5
-rw-r--r--x11-misc/gmrun/metadata.xml5
-rw-r--r--x11-misc/grabc/metadata.xml5
-rw-r--r--x11-misc/gromit/metadata.xml5
-rw-r--r--x11-misc/grun/metadata.xml5
-rw-r--r--x11-misc/gtk2fontsel/metadata.xml5
-rw-r--r--x11-misc/gtkdialog/metadata.xml5
-rw-r--r--x11-misc/gxmessage/metadata.xml5
-rw-r--r--x11-misc/habak/metadata.xml5
-rw-r--r--x11-misc/hsetroot/metadata.xml5
-rw-r--r--x11-misc/i3lock/metadata.xml5
-rw-r--r--x11-misc/i3status/metadata.xml5
-rw-r--r--x11-misc/i855crt/metadata.xml5
-rw-r--r--x11-misc/icewmcp/metadata.xml5
-rw-r--r--x11-misc/icon-naming-utils/metadata.xml1
-rw-r--r--x11-misc/iconbox/metadata.xml5
-rw-r--r--x11-misc/idesk/metadata.xml5
-rw-r--r--x11-misc/imake/metadata.xml5
-rw-r--r--x11-misc/imwheel/metadata.xml5
-rw-r--r--x11-misc/kapow/metadata.xml5
-rw-r--r--x11-misc/kaqaz/metadata.xml5
-rw-r--r--x11-misc/kdocker/metadata.xml5
-rw-r--r--x11-misc/kronometer/metadata.xml5
-rw-r--r--x11-misc/ksuperkey/metadata.xml5
-rw-r--r--x11-misc/ktsuss/metadata.xml5
-rw-r--r--x11-misc/lightdm-kde/metadata.xml5
-rw-r--r--x11-misc/lineak-defaultplugin/metadata.xml5
-rw-r--r--x11-misc/lineak-xosdplugin/metadata.xml5
-rw-r--r--x11-misc/lineakd/metadata.xml5
-rw-r--r--x11-misc/lndir/metadata.xml5
-rw-r--r--x11-misc/lsw/metadata.xml5
-rw-r--r--x11-misc/lxmed/metadata.xml5
-rw-r--r--x11-misc/macopix/metadata.xml5
-rw-r--r--x11-misc/magick-rotation/metadata.xml5
-rw-r--r--x11-misc/makedepend/metadata.xml5
-rw-r--r--x11-misc/matchbox-keyboard/metadata.xml1
-rw-r--r--x11-misc/matchbox-panel-manager/metadata.xml1
-rw-r--r--x11-misc/mate-notification-daemon/metadata.xml5
-rw-r--r--x11-misc/menulibre/metadata.xml5
-rw-r--r--x11-misc/menumaker/metadata.xml5
-rw-r--r--x11-misc/mgm/metadata.xml5
-rw-r--r--x11-misc/mixer_app/metadata.xml1
-rw-r--r--x11-misc/mozo/metadata.xml5
-rw-r--r--x11-misc/nitrogen/metadata.xml5
-rw-r--r--x11-misc/notification-daemon/metadata.xml5
-rw-r--r--x11-misc/notify-osd/metadata.xml1
-rw-r--r--x11-misc/numlockx/metadata.xml5
-rw-r--r--x11-misc/obconf-qt/metadata.xml5
-rw-r--r--x11-misc/obtheme/metadata.xml5
-rw-r--r--x11-misc/okindd/metadata.xml5
-rw-r--r--x11-misc/openbox-menu/metadata.xml5
-rw-r--r--x11-misc/parcellite/metadata.xml5
-rw-r--r--x11-misc/pcmanfm-qt/metadata.xml5
-rw-r--r--x11-misc/pcmanfm/metadata.xml5
-rw-r--r--x11-misc/piedock/metadata.xml5
-rw-r--r--x11-misc/ptbatterysystemtray/metadata.xml5
-rw-r--r--x11-misc/pypanel/metadata.xml5
-rw-r--r--x11-misc/qcomicbook/metadata.xml10
-rw-r--r--x11-misc/qlipper/metadata.xml5
-rw-r--r--x11-misc/qps/metadata.xml5
-rw-r--r--x11-misc/qsynergy/metadata.xml5
-rw-r--r--x11-misc/qterm/metadata.xml5
-rw-r--r--x11-misc/qtfm/metadata.xml10
-rw-r--r--x11-misc/qtnotifydaemon/metadata.xml10
-rw-r--r--x11-misc/quitcount/metadata.xml5
-rw-r--r--x11-misc/qxkb/metadata.xml5
-rw-r--r--x11-misc/read-edid/metadata.xml5
-rw-r--r--x11-misc/redshift/metadata.xml5
-rw-r--r--x11-misc/rendercheck/metadata.xml5
-rw-r--r--x11-misc/rofi/metadata.xml5
-rw-r--r--x11-misc/rss-glx/metadata.xml5
-rw-r--r--x11-misc/screengrab/metadata.xml5
-rw-r--r--x11-misc/sddm/metadata.xml5
-rw-r--r--x11-misc/shared-mime-info/metadata.xml1
-rw-r--r--x11-misc/shutter/metadata.xml5
-rw-r--r--x11-misc/sisctrl/metadata.xml5
-rw-r--r--x11-misc/skippy/metadata.xml5
-rw-r--r--x11-misc/slim/metadata.xml5
-rw-r--r--x11-misc/slock/metadata.xml5
-rw-r--r--x11-misc/spnavcfg/metadata.xml5
-rw-r--r--x11-misc/sselp/metadata.xml5
-rw-r--r--x11-misc/stalonetray/metadata.xml1
-rw-r--r--x11-misc/sunflower/metadata.xml5
-rw-r--r--x11-misc/sux/metadata.xml5
-rw-r--r--x11-misc/synergy/metadata.xml5
-rw-r--r--x11-misc/tabbed/metadata.xml5
-rw-r--r--x11-misc/tinymount/metadata.xml15
-rw-r--r--x11-misc/touchfreeze/metadata.xml5
-rw-r--r--x11-misc/trayer/metadata.xml1
-rw-r--r--x11-misc/treeline/metadata.xml5
-rw-r--r--x11-misc/unclutter/metadata.xml5
-rw-r--r--x11-misc/util-macros/metadata.xml5
-rw-r--r--x11-misc/viewglob/metadata.xml5
-rw-r--r--x11-misc/virtualgl/metadata.xml5
-rw-r--r--x11-misc/vnc2swf/metadata.xml5
-rw-r--r--x11-misc/vym/metadata.xml5
-rw-r--r--x11-misc/wayv/metadata.xml5
-rw-r--r--x11-misc/wbar/metadata.xml5
-rw-r--r--x11-misc/wbarconf/metadata.xml5
-rw-r--r--x11-misc/wdm/metadata.xml5
-rw-r--r--x11-misc/wininfo/metadata.xml5
-rw-r--r--x11-misc/wmakerconf/metadata.xml5
-rw-r--r--x11-misc/wmiface/metadata.xml5
-rw-r--r--x11-misc/x11vnc/metadata.xml5
-rw-r--r--x11-misc/x2vnc/metadata.xml5
-rw-r--r--x11-misc/x2x/metadata.xml5
-rw-r--r--x11-misc/xaos/metadata.xml5
-rw-r--r--x11-misc/xautolock/metadata.xml5
-rw-r--r--x11-misc/xautomation/metadata.xml5
-rw-r--r--x11-misc/xbatt/metadata.xml5
-rw-r--r--x11-misc/xbattbar/metadata.xml5
-rw-r--r--x11-misc/xbindkeys/metadata.xml5
-rw-r--r--x11-misc/xbitmaps/metadata.xml5
-rw-r--r--x11-misc/xcalendar/metadata.xml5
-rw-r--r--x11-misc/xcape/metadata.xml5
-rw-r--r--x11-misc/xcave/metadata.xml5
-rw-r--r--x11-misc/xcb/metadata.xml5
-rw-r--r--x11-misc/xclip/metadata.xml5
-rw-r--r--x11-misc/xcompmgr/metadata.xml5
-rw-r--r--x11-misc/xdaliclock/metadata.xml5
-rw-r--r--x11-misc/xdesktopwaves/metadata.xml5
-rw-r--r--x11-misc/xdg-user-dirs-gtk/metadata.xml1
-rw-r--r--x11-misc/xdg-user-dirs/metadata.xml1
-rw-r--r--x11-misc/xdg-utils/metadata.xml1
-rw-r--r--x11-misc/xdialog/metadata.xml5
-rw-r--r--x11-misc/xdiskusage/metadata.xml5
-rw-r--r--x11-misc/xdock/metadata.xml1
-rw-r--r--x11-misc/xearth/metadata.xml5
-rw-r--r--x11-misc/xfe/metadata.xml5
-rw-r--r--x11-misc/xfishtank/metadata.xml5
-rw-r--r--x11-misc/xhkeys/metadata.xml5
-rw-r--r--x11-misc/xkbd/metadata.xml5
-rw-r--r--x11-misc/xkeyboard-config/metadata.xml5
-rw-r--r--x11-misc/xkeycaps/metadata.xml5
-rw-r--r--x11-misc/xlockmore/metadata.xml5
-rw-r--r--x11-misc/xmobar/metadata.xml1
-rw-r--r--x11-misc/xmonad-log-applet/metadata.xml1
-rw-r--r--x11-misc/xmountains/metadata.xml5
-rw-r--r--x11-misc/xnee/metadata.xml5
-rw-r--r--x11-misc/xnots/metadata.xml5
-rw-r--r--x11-misc/xoo/metadata.xml1
-rw-r--r--x11-misc/xorg-cf-files/metadata.xml5
-rw-r--r--x11-misc/xosview/metadata.xml5
-rw-r--r--x11-misc/xpad/metadata.xml5
-rw-r--r--x11-misc/xplanet/metadata.xml5
-rw-r--r--x11-misc/xrestop/metadata.xml5
-rw-r--r--x11-misc/xrmap/metadata.xml5
-rw-r--r--x11-misc/xrootconsole/metadata.xml5
-rw-r--r--x11-misc/xscreensaver-app/metadata.xml5
-rw-r--r--x11-misc/xscreensaver/metadata.xml5
-rw-r--r--x11-misc/xsel/metadata.xml5
-rw-r--r--x11-misc/xsensors/metadata.xml5
-rw-r--r--x11-misc/xsetleds/metadata.xml12
-rw-r--r--x11-misc/xsnap/metadata.xml5
-rw-r--r--x11-misc/xsnow/metadata.xml5
-rw-r--r--x11-misc/xsri/metadata.xml5
-rw-r--r--x11-misc/xssstate/metadata.xml5
-rw-r--r--x11-misc/xstroke/metadata.xml5
-rw-r--r--x11-misc/xteddy/metadata.xml5
-rw-r--r--x11-misc/xtermcontrol/metadata.xml5
-rw-r--r--x11-misc/xtoolwait/metadata.xml5
-rw-r--r--x11-misc/xtrace/metadata.xml5
-rw-r--r--x11-misc/xtrlock/metadata.xml5
-rw-r--r--x11-misc/xtscal/metadata.xml10
-rw-r--r--x11-misc/xvkbd/metadata.xml5
-rw-r--r--x11-misc/xwit/metadata.xml5
-rw-r--r--x11-misc/xwrits/metadata.xml5
-rw-r--r--x11-misc/xxkb/metadata.xml5
-rw-r--r--x11-misc/zim/metadata.xml5
211 files changed, 813 insertions, 220 deletions
diff --git a/x11-misc/3ddesktop/metadata.xml b/x11-misc/3ddesktop/metadata.xml
index a31c49d0edc4..31d528e232ac 100644
--- a/x11-misc/3ddesktop/metadata.xml
+++ b/x11-misc/3ddesktop/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
3d Destkop is an OpenGL program for switching virtual desktops in a seamless
3-dimensional manner. The current desktop is mapped into a 3D space where you
diff --git a/x11-misc/3dfb/metadata.xml b/x11-misc/3dfb/metadata.xml
index d0053fa8abcf..b3b087251d6a 100644
--- a/x11-misc/3dfb/metadata.xml
+++ b/x11-misc/3dfb/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>desktop-effects</herd>
+ <maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dz3d</remote-id>
</upstream>
diff --git a/x11-misc/3dfm/metadata.xml b/x11-misc/3dfm/metadata.xml
index 8b279ff8e12d..09e9443d572e 100644
--- a/x11-misc/3dfm/metadata.xml
+++ b/x11-misc/3dfm/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>desktop-effects</herd>
+ <maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">innolab</remote-id>
</upstream>
diff --git a/x11-misc/Xorgautoconfig/metadata.xml b/x11-misc/Xorgautoconfig/metadata.xml
index e6b7521efb30..265a00c46d8a 100644
--- a/x11-misc/Xorgautoconfig/metadata.xml
+++ b/x11-misc/Xorgautoconfig/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ppc</herd>
<maintainer>
<email>josejx@gentoo.org</email>
<name>Joseph Jezak</name>
</maintainer>
+<maintainer>
+<email>ppc@gentoo.org</email>
+<name>Gentoo Linux PowerPC Development</name>
+</maintainer>
<longdescription lang="en">
An X.org auto configuration tool for PPC machines.
</longdescription>
diff --git a/x11-misc/accessx/metadata.xml b/x11-misc/accessx/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/accessx/metadata.xml
+++ b/x11-misc/accessx/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/afbinit/metadata.xml b/x11-misc/afbinit/metadata.xml
index b87e94c3126f..f6d278ffb701 100644
--- a/x11-misc/afbinit/metadata.xml
+++ b/x11-misc/afbinit/metadata.xml
@@ -2,6 +2,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-misc/alacarte/metadata.xml b/x11-misc/alacarte/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-misc/alacarte/metadata.xml
+++ b/x11-misc/alacarte/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/andromeda/metadata.xml b/x11-misc/andromeda/metadata.xml
index 52ac90661a13..34c03c2482aa 100644
--- a/x11-misc/andromeda/metadata.xml
+++ b/x11-misc/andromeda/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ABBAPOH/andromeda</remote-id>
</upstream>
diff --git a/x11-misc/appmenu-qt/metadata.xml b/x11-misc/appmenu-qt/metadata.xml
index 0d275ddb5633..1427543c8e2b 100644
--- a/x11-misc/appmenu-qt/metadata.xml
+++ b/x11-misc/appmenu-qt/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">appmenu-qt</remote-id>
</upstream>
diff --git a/x11-misc/apwal/metadata.xml b/x11-misc/apwal/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/apwal/metadata.xml
+++ b/x11-misc/apwal/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/arandr/metadata.xml b/x11-misc/arandr/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/arandr/metadata.xml
+++ b/x11-misc/arandr/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
index de3e31e37b47..a0e2763fb4ee 100644
--- a/x11-misc/autocutsel/metadata.xml
+++ b/x11-misc/autocutsel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>autocutsel synchronizes the two copy/paste buffers mainly used by X applications. It unifies "clipboards" between VNC servers and Windows.</longdescription>
<upstream>
<remote-id type="github">sigmike/autocutsel</remote-id>
diff --git a/x11-misc/basqet/metadata.xml b/x11-misc/basqet/metadata.xml
index c1ca52bbfce4..6594cc52265b 100644
--- a/x11-misc/basqet/metadata.xml
+++ b/x11-misc/basqet/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">basqet</remote-id>
<remote-id type="bitbucket">ridderby/basqet</remote-id>
diff --git a/x11-misc/bbacpi/metadata.xml b/x11-misc/bbacpi/metadata.xml
index 42fe8839ccee..dc6e906551a2 100644
--- a/x11-misc/bbacpi/metadata.xml
+++ b/x11-misc/bbacpi/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription lang="en">
Utility for viewing ACPI data via X11
</longdescription>
diff --git a/x11-misc/bumblebee/metadata.xml b/x11-misc/bumblebee/metadata.xml
index 15a5547eef62..9e789c85fe74 100644
--- a/x11-misc/bumblebee/metadata.xml
+++ b/x11-misc/bumblebee/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
@@ -10,6 +9,10 @@
<email>rei4dan@gmail.com</email>
<name>My Th</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
A rewrite of the original Bumblebee service, providing an elegant and stable
means of managing Optimus hybrid graphics chipsets. A primary goal of this
diff --git a/x11-misc/cairo-clock/metadata.xml b/x11-misc/cairo-clock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/cairo-clock/metadata.xml
+++ b/x11-misc/cairo-clock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/calise/metadata.xml b/x11-misc/calise/metadata.xml
index bcc862bc668f..13e04a1591e2 100644
--- a/x11-misc/calise/metadata.xml
+++ b/x11-misc/calise/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">calise</remote-id>
</upstream>
diff --git a/x11-misc/cbatticon/metadata.xml b/x11-misc/cbatticon/metadata.xml
index 419ec4f290b0..e80c791ebcc1 100644
--- a/x11-misc/cbatticon/metadata.xml
+++ b/x11-misc/cbatticon/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ColinJones/cbatticon</remote-id>
</upstream>
diff --git a/x11-misc/chgres/metadata.xml b/x11-misc/chgres/metadata.xml
index 170550f4616e..3cd3a443c932 100644
--- a/x11-misc/chgres/metadata.xml
+++ b/x11-misc/chgres/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>chgres is a small tool which uses the XFree86-VidModeExtension X11 extension to query and set the resolution of your XFree86 display, without restarting it. It has a simple command-line user interface which makes it suitable for use in shell scripts.</longdescription>
</pkgmetadata>
diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 419ce9848522..230450efe4c8 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="argyllcms">Enable ArgyllCMS sensor</flag>
<flag name="extra-print-profiles">Generate extra print profiles.
diff --git a/x11-misc/compton/metadata.xml b/x11-misc/compton/metadata.xml
index bad8680cf41c..5f3a0b24bbf6 100644
--- a/x11-misc/compton/metadata.xml
+++ b/x11-misc/compton/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="drm">Enable VSync with DRM_IOCTL_WAIT_VBLANK</flag>
<flag name="opengl">Enable VSync with SGI_swap_control OpenGL extension</flag>
diff --git a/x11-misc/dclock/metadata.xml b/x11-misc/dclock/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/dclock/metadata.xml
+++ b/x11-misc/dclock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/devilspie/metadata.xml b/x11-misc/devilspie/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/devilspie/metadata.xml
+++ b/x11-misc/devilspie/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/dmenu/metadata.xml b/x11-misc/dmenu/metadata.xml
index 9c37c491d29b..bb364468f578 100644
--- a/x11-misc/dmenu/metadata.xml
+++ b/x11-misc/dmenu/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="xft">Enable unofficial <pkg>x11-libs/libXft</pkg> support</flag>
</use>
diff --git a/x11-misc/driconf/metadata.xml b/x11-misc/driconf/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-misc/driconf/metadata.xml
+++ b/x11-misc/driconf/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-misc/dsx/metadata.xml b/x11-misc/dsx/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/dsx/metadata.xml
+++ b/x11-misc/dsx/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/dxpc/metadata.xml b/x11-misc/dxpc/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/dxpc/metadata.xml
+++ b/x11-misc/dxpc/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/dzen/metadata.xml b/x11-misc/dzen/metadata.xml
index a5cf379b5fce..b211a2ba7bfb 100644
--- a/x11-misc/dzen/metadata.xml
+++ b/x11-misc/dzen/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>Dzen is a general purpose messaging, notification and menuing
program for X11. It was designed to be scriptable in any language and
integrate well with window managers like dwm, wmii and xmonad though it will
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
index 2e3907c587c3..da3d4b614ece 100644
--- a/x11-misc/e16keyedit/metadata.xml
+++ b/x11-misc/e16keyedit/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<longdescription>
This is a standalone keybindings editor for enlightenment version 0.16.
</longdescription>
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
index ac83800a5389..4fbe32c84e9d 100644
--- a/x11-misc/e16menuedit2/metadata.xml
+++ b/x11-misc/e16menuedit2/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">enlightenment</remote-id>
</upstream>
diff --git a/x11-misc/easystroke/metadata.xml b/x11-misc/easystroke/metadata.xml
index 2c734e7ab536..02c848c75a28 100644
--- a/x11-misc/easystroke/metadata.xml
+++ b/x11-misc/easystroke/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">easystroke</remote-id>
</upstream>
diff --git a/x11-misc/efax-gtk/metadata.xml b/x11-misc/efax-gtk/metadata.xml
index 5b7b5e3a3f21..4b660f56744f 100644
--- a/x11-misc/efax-gtk/metadata.xml
+++ b/x11-misc/efax-gtk/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">efax-gtk</remote-id>
</upstream>
diff --git a/x11-misc/evolvotron/metadata.xml b/x11-misc/evolvotron/metadata.xml
index 77c9e1d9c3f6..e296ed03c2cc 100644
--- a/x11-misc/evolvotron/metadata.xml
+++ b/x11-misc/evolvotron/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">evolvotron</remote-id>
</upstream>
diff --git a/x11-misc/fbpanel/metadata.xml b/x11-misc/fbpanel/metadata.xml
index 4172fa486e98..ad159c2276c2 100644
--- a/x11-misc/fbpanel/metadata.xml
+++ b/x11-misc/fbpanel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fbpanel</remote-id>
</upstream>
diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
index 230e5d15e8b6..10be6bacb669 100644
--- a/x11-misc/fireflies/metadata.xml
+++ b/x11-misc/fireflies/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">mpcomplete/fireflies</remote-id>
</upstream>
diff --git a/x11-misc/fracplanet/metadata.xml b/x11-misc/fracplanet/metadata.xml
index 2fa57541046f..15b5ae0e77c0 100644
--- a/x11-misc/fracplanet/metadata.xml
+++ b/x11-misc/fracplanet/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fracplanet</remote-id>
</upstream>
diff --git a/x11-misc/fraqtive/metadata.xml b/x11-misc/fraqtive/metadata.xml
index 4e66ecce0fd7..23b98c912f84 100644
--- a/x11-misc/fraqtive/metadata.xml
+++ b/x11-misc/fraqtive/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fraqtive</remote-id>
</upstream>
diff --git a/x11-misc/gbase/metadata.xml b/x11-misc/gbase/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/gbase/metadata.xml
+++ b/x11-misc/gbase/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/gbdfed/metadata.xml b/x11-misc/gbdfed/metadata.xml
index 64cc0b687d48..2e8cbd4ea628 100644
--- a/x11-misc/gbdfed/metadata.xml
+++ b/x11-misc/gbdfed/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/gccmakedep/metadata.xml b/x11-misc/gccmakedep/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/gccmakedep/metadata.xml
+++ b/x11-misc/gccmakedep/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-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml
index 340e98c59a07..2086f919c3a9 100644
--- a/x11-misc/gcolor2/metadata.xml
+++ b/x11-misc/gcolor2/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gcolor2</remote-id>
</upstream>
diff --git a/x11-misc/gdevilspie/metadata.xml b/x11-misc/gdevilspie/metadata.xml
index 70778a76521f..3ce1741f293e 100644
--- a/x11-misc/gdevilspie/metadata.xml
+++ b/x11-misc/gdevilspie/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">gdevilspie</remote-id>
</upstream>
diff --git a/x11-misc/gmrun/metadata.xml b/x11-misc/gmrun/metadata.xml
index 0db3203fd1e0..a2fb13852ee9 100644
--- a/x11-misc/gmrun/metadata.xml
+++ b/x11-misc/gmrun/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
A run utility intended to replace grun or gnome-run. Most prominent
features include slim design and bash style auto-completion.
diff --git a/x11-misc/grabc/metadata.xml b/x11-misc/grabc/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/grabc/metadata.xml
+++ b/x11-misc/grabc/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/gromit/metadata.xml b/x11-misc/gromit/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/x11-misc/gromit/metadata.xml
+++ b/x11-misc/gromit/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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/grun/metadata.xml b/x11-misc/grun/metadata.xml
index 62788e9b0972..3a8b2ec5c0cf 100644
--- a/x11-misc/grun/metadata.xml
+++ b/x11-misc/grun/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">grun</remote-id>
<remote-id type="github">lrgc/grun</remote-id>
diff --git a/x11-misc/gtk2fontsel/metadata.xml b/x11-misc/gtk2fontsel/metadata.xml
index da9d520c562a..35344ad9e71c 100644
--- a/x11-misc/gtk2fontsel/metadata.xml
+++ b/x11-misc/gtk2fontsel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gtk2fontsel</remote-id>
</upstream>
diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 0bbea4d60131..5af84a98b9d6 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/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>desktop-misc</herd>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription>
gtkdialog is a GUI-creation utility that can be used with an arbitrary
interpreter. It enables the programmer to describe a graphical user interface
diff --git a/x11-misc/gxmessage/metadata.xml b/x11-misc/gxmessage/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/gxmessage/metadata.xml
+++ b/x11-misc/gxmessage/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/habak/metadata.xml b/x11-misc/habak/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/habak/metadata.xml
+++ b/x11-misc/habak/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/hsetroot/metadata.xml b/x11-misc/hsetroot/metadata.xml
index cbdd24cc0a74..80bd1cbddd86 100644
--- a/x11-misc/hsetroot/metadata.xml
+++ b/x11-misc/hsetroot/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription>
hsetroot is a tool which allows you to compose wallpapers ("root pixmaps") for X. It has a lot of options like rendering gradients, solids, images but it also allows you to perform manipulations on those things, or chain them together. You could use one standard background image for isntance, and using tint to make it fit your current theme. And yes, of course it is compatible with semi-translucent applications like aterm and xchat :)
diff --git a/x11-misc/i3lock/metadata.xml b/x11-misc/i3lock/metadata.xml
index b5caab41c7b2..03272407361f 100644
--- a/x11-misc/i3lock/metadata.xml
+++ b/x11-misc/i3lock/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>desktop-misc</herd>
<maintainer>
<email>xarthisius@gentoo.org</email>
<name>Kacper Kowalik</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/i3status/metadata.xml b/x11-misc/i3status/metadata.xml
index 29dbb30b93cd..987a5b32977a 100644
--- a/x11-misc/i3status/metadata.xml
+++ b/x11-misc/i3status/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
<maintainer>
<email>xarthisius@gentoo.org</email>
<name>Kacper Kowalik</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
i3status is a small program (about 1500 SLOC) for generating a status bar for
dzen2, xmobar or similar programs. It is designed to be very efficient by
diff --git a/x11-misc/i855crt/metadata.xml b/x11-misc/i855crt/metadata.xml
index 91dfec751a9f..0bbf40398c2a 100644
--- a/x11-misc/i855crt/metadata.xml
+++ b/x11-misc/i855crt/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription lang="en">
i855crt is a tool to send the output of a i855-based graphic card to the
external VGA, primarily used for presentations.
diff --git a/x11-misc/icewmcp/metadata.xml b/x11-misc/icewmcp/metadata.xml
index 0c74c3eb46a6..0273131f275e 100644
--- a/x11-misc/icewmcp/metadata.xml
+++ b/x11-misc/icewmcp/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">icesoundmanager</remote-id>
</upstream>
diff --git a/x11-misc/icon-naming-utils/metadata.xml b/x11-misc/icon-naming-utils/metadata.xml
index c03b663ea9ff..409a64f16e1f 100644
--- a/x11-misc/icon-naming-utils/metadata.xml
+++ b/x11-misc/icon-naming-utils/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/iconbox/metadata.xml b/x11-misc/iconbox/metadata.xml
index c1bd756104cc..af6575bed871 100644
--- a/x11-misc/iconbox/metadata.xml
+++ b/x11-misc/iconbox/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription lang="en">
Iconbox is a free desktop tool that allows applications to be started quickly
with one mouse click. When Iconbox is running, the main window is invisible
diff --git a/x11-misc/idesk/metadata.xml b/x11-misc/idesk/metadata.xml
index fb0d57fe87f6..58031ad6c89a 100644
--- a/x11-misc/idesk/metadata.xml
+++ b/x11-misc/idesk/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">idesk</remote-id>
</upstream>
diff --git a/x11-misc/imake/metadata.xml b/x11-misc/imake/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/imake/metadata.xml
+++ b/x11-misc/imake/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-misc/imwheel/metadata.xml b/x11-misc/imwheel/metadata.xml
index da024bcfa0b3..21d3364c9756 100644
--- a/x11-misc/imwheel/metadata.xml
+++ b/x11-misc/imwheel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">imwheel</remote-id>
</upstream>
diff --git a/x11-misc/kapow/metadata.xml b/x11-misc/kapow/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/kapow/metadata.xml
+++ b/x11-misc/kapow/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/kaqaz/metadata.xml b/x11-misc/kaqaz/metadata.xml
index d40c59e42cfd..4543e383936a 100644
--- a/x11-misc/kaqaz/metadata.xml
+++ b/x11-misc/kaqaz/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">sialan-labs/kaqaz</remote-id>
</upstream>
diff --git a/x11-misc/kdocker/metadata.xml b/x11-misc/kdocker/metadata.xml
index 9ea37bfe2e26..ef07223a8049 100644
--- a/x11-misc/kdocker/metadata.xml
+++ b/x11-misc/kdocker/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">kdocker</remote-id>
<bugs-to>https://bugs.launchpad.net/kdocker</bugs-to>
diff --git a/x11-misc/kronometer/metadata.xml b/x11-misc/kronometer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/kronometer/metadata.xml
+++ b/x11-misc/kronometer/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/ksuperkey/metadata.xml b/x11-misc/ksuperkey/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/ksuperkey/metadata.xml
+++ b/x11-misc/ksuperkey/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/ktsuss/metadata.xml b/x11-misc/ktsuss/metadata.xml
index a6a88629dac8..7fa1d3f6d1c7 100644
--- a/x11-misc/ktsuss/metadata.xml
+++ b/x11-misc/ktsuss/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hypnos75@gmail.com</email>
<name>Hypnos</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">ktsuss</remote-id>
<remote-id type="github">nomius/ktsuss</remote-id>
diff --git a/x11-misc/lightdm-kde/metadata.xml b/x11-misc/lightdm-kde/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/x11-misc/lightdm-kde/metadata.xml
+++ b/x11-misc/lightdm-kde/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>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/lineak-defaultplugin/metadata.xml b/x11-misc/lineak-defaultplugin/metadata.xml
index c01576627929..05ff45013a05 100644
--- a/x11-misc/lineak-defaultplugin/metadata.xml
+++ b/x11-misc/lineak-defaultplugin/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lineak</remote-id>
</upstream>
diff --git a/x11-misc/lineak-xosdplugin/metadata.xml b/x11-misc/lineak-xosdplugin/metadata.xml
index 381a9fd5d696..817f2ef05d41 100644
--- a/x11-misc/lineak-xosdplugin/metadata.xml
+++ b/x11-misc/lineak-xosdplugin/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lineak</remote-id>
</upstream>
diff --git a/x11-misc/lineakd/metadata.xml b/x11-misc/lineakd/metadata.xml
index 381a9fd5d696..817f2ef05d41 100644
--- a/x11-misc/lineakd/metadata.xml
+++ b/x11-misc/lineakd/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lineak</remote-id>
</upstream>
diff --git a/x11-misc/lndir/metadata.xml b/x11-misc/lndir/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/lndir/metadata.xml
+++ b/x11-misc/lndir/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-misc/lsw/metadata.xml b/x11-misc/lsw/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/lsw/metadata.xml
+++ b/x11-misc/lsw/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/lxmed/metadata.xml b/x11-misc/lxmed/metadata.xml
index 09cb6b0857cb..c21e3b86bc05 100644
--- a/x11-misc/lxmed/metadata.xml
+++ b/x11-misc/lxmed/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lxmed</remote-id>
</upstream>
diff --git a/x11-misc/macopix/metadata.xml b/x11-misc/macopix/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/macopix/metadata.xml
+++ b/x11-misc/macopix/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/magick-rotation/metadata.xml b/x11-misc/magick-rotation/metadata.xml
index 7e1cd0d686a6..71b91866c43d 100644
--- a/x11-misc/magick-rotation/metadata.xml
+++ b/x11-misc/magick-rotation/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>evadim@evadim.ru</email>
<name>Vadim Efimov</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">magick-rotation</remote-id>
</upstream>
diff --git a/x11-misc/makedepend/metadata.xml b/x11-misc/makedepend/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/makedepend/metadata.xml
+++ b/x11-misc/makedepend/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-misc/matchbox-keyboard/metadata.xml b/x11-misc/matchbox-keyboard/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/matchbox-keyboard/metadata.xml
+++ b/x11-misc/matchbox-keyboard/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gpe</herd>
</pkgmetadata>
diff --git a/x11-misc/matchbox-panel-manager/metadata.xml b/x11-misc/matchbox-panel-manager/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/matchbox-panel-manager/metadata.xml
+++ b/x11-misc/matchbox-panel-manager/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gpe</herd>
</pkgmetadata>
diff --git a/x11-misc/mate-notification-daemon/metadata.xml b/x11-misc/mate-notification-daemon/metadata.xml
index 504b80a3baa5..2ba06ffe4e69 100644
--- a/x11-misc/mate-notification-daemon/metadata.xml
+++ b/x11-misc/mate-notification-daemon/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>mate</herd>
+ <maintainer>
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">mate-desktop/mate-notification-daemon</remote-id>
</upstream>
diff --git a/x11-misc/menulibre/metadata.xml b/x11-misc/menulibre/metadata.xml
index 15139ff6b48f..322b806b6003 100644
--- a/x11-misc/menulibre/metadata.xml
+++ b/x11-misc/menulibre/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">menulibre</remote-id>
</upstream>
diff --git a/x11-misc/menumaker/metadata.xml b/x11-misc/menumaker/metadata.xml
index 97202cc660ab..34c3b3fcca63 100644
--- a/x11-misc/menumaker/metadata.xml
+++ b/x11-misc/menumaker/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>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">menumaker</remote-id>
</upstream>
diff --git a/x11-misc/mgm/metadata.xml b/x11-misc/mgm/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/mgm/metadata.xml
+++ b/x11-misc/mgm/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/mixer_app/metadata.xml b/x11-misc/mixer_app/metadata.xml
index cde059093b99..ea02039c8d10 100644
--- a/x11-misc/mixer_app/metadata.xml
+++ b/x11-misc/mixer_app/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-dock</herd>
<maintainer>
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
diff --git a/x11-misc/mozo/metadata.xml b/x11-misc/mozo/metadata.xml
index 07173e378ed5..132a09dbfadc 100644
--- a/x11-misc/mozo/metadata.xml
+++ b/x11-misc/mozo/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>mate</herd>
+ <maintainer>
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">mate-desktop/mozo</remote-id>
</upstream>
diff --git a/x11-misc/nitrogen/metadata.xml b/x11-misc/nitrogen/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/nitrogen/metadata.xml
+++ b/x11-misc/nitrogen/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/notification-daemon/metadata.xml b/x11-misc/notification-daemon/metadata.xml
index 854288052d19..05a369b487a6 100644
--- a/x11-misc/notification-daemon/metadata.xml
+++ b/x11-misc/notification-daemon/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>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/notify-osd/metadata.xml b/x11-misc/notify-osd/metadata.xml
index 650c2a2edb1f..16dde9afc2c6 100644
--- a/x11-misc/notify-osd/metadata.xml
+++ b/x11-misc/notify-osd/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/numlockx/metadata.xml b/x11-misc/numlockx/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/numlockx/metadata.xml
+++ b/x11-misc/numlockx/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/x11-misc/obconf-qt/metadata.xml
+++ b/x11-misc/obconf-qt/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>lxqt</herd>
<maintainer>
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
+<maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/obtheme/metadata.xml b/x11-misc/obtheme/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/obtheme/metadata.xml
+++ b/x11-misc/obtheme/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/okindd/metadata.xml b/x11-misc/okindd/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/x11-misc/okindd/metadata.xml
+++ b/x11-misc/okindd/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index fafd300e32bd..ce347c888ba7 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>mimasgpc@free.fr</email>
diff --git a/x11-misc/parcellite/metadata.xml b/x11-misc/parcellite/metadata.xml
index 8e77238df625..d63857b56fe7 100644
--- a/x11-misc/parcellite/metadata.xml
+++ b/x11-misc/parcellite/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">parcellite</remote-id>
</upstream>
diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index 716a047bea5d..ff18e5548f06 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>lxqt</herd>
<maintainer>
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml
index 3522b159f8ef..7b85f5faa50d 100644
--- a/x11-misc/pcmanfm/metadata.xml
+++ b/x11-misc/pcmanfm/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>lxde</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>lxde@gentoo.org</email>
+ <name>Gentoo LXDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pcmanfm</remote-id>
</upstream>
diff --git a/x11-misc/piedock/metadata.xml b/x11-misc/piedock/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/piedock/metadata.xml
+++ b/x11-misc/piedock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/ptbatterysystemtray/metadata.xml b/x11-misc/ptbatterysystemtray/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/x11-misc/ptbatterysystemtray/metadata.xml
+++ b/x11-misc/ptbatterysystemtray/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>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/pypanel/metadata.xml b/x11-misc/pypanel/metadata.xml
index ca302fdca57c..e57a81277e93 100644
--- a/x11-misc/pypanel/metadata.xml
+++ b/x11-misc/pypanel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
PyPanel is a lightweight panel/taskbar for X11 window managers that can
be easily customized to match any desktop theme or taste.
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
index baccd90af55a..8933d7d0ef34 100644
--- a/x11-misc/qcomicbook/metadata.xml
+++ b/x11-misc/qcomicbook/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>desktop-misc</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/qlipper/metadata.xml b/x11-misc/qlipper/metadata.xml
index 417967a8329b..268b841650eb 100644
--- a/x11-misc/qlipper/metadata.xml
+++ b/x11-misc/qlipper/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">pvanek/qlipper</remote-id>
</upstream>
diff --git a/x11-misc/qps/metadata.xml b/x11-misc/qps/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/x11-misc/qps/metadata.xml
+++ b/x11-misc/qps/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/qsynergy/metadata.xml b/x11-misc/qsynergy/metadata.xml
index 6346c424e69b..27f338c9a90e 100644
--- a/x11-misc/qsynergy/metadata.xml
+++ b/x11-misc/qsynergy/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">qsynergy</remote-id>
</upstream>
diff --git a/x11-misc/qterm/metadata.xml b/x11-misc/qterm/metadata.xml
index 734d356f5763..8335b931c4df 100644
--- a/x11-misc/qterm/metadata.xml
+++ b/x11-misc/qterm/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">qterm</remote-id>
</upstream>
diff --git a/x11-misc/qtfm/metadata.xml b/x11-misc/qtfm/metadata.xml
index fe7f2a00ab81..17c274294684 100644
--- a/x11-misc/qtfm/metadata.xml
+++ b/x11-misc/qtfm/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>qt</herd>
-<herd>desktop-misc</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/qtnotifydaemon/metadata.xml b/x11-misc/qtnotifydaemon/metadata.xml
index e44f13e08d2e..79972e53f2a2 100644
--- a/x11-misc/qtnotifydaemon/metadata.xml
+++ b/x11-misc/qtnotifydaemon/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>desktop-misc</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">qtnotifydaemon</remote-id>
</upstream>
diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml
index ecca2400b8fa..93d697fa5633 100644
--- a/x11-misc/quitcount/metadata.xml
+++ b/x11-misc/quitcount/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>Laurent Vivier</email>
<name>laurent@lamzi.com</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">quitcount</remote-id>
</upstream>
diff --git a/x11-misc/qxkb/metadata.xml b/x11-misc/qxkb/metadata.xml
index 32bdd4ceba31..92889dff3cf8 100644
--- a/x11-misc/qxkb/metadata.xml
+++ b/x11-misc/qxkb/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">disels/qxkb</remote-id>
</upstream>
diff --git a/x11-misc/read-edid/metadata.xml b/x11-misc/read-edid/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/read-edid/metadata.xml
+++ b/x11-misc/read-edid/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/redshift/metadata.xml b/x11-misc/redshift/metadata.xml
index 5232af440a8a..5e74ee1d2b56 100644
--- a/x11-misc/redshift/metadata.xml
+++ b/x11-misc/redshift/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>desktop-misc</herd>
<maintainer>
<email>sping@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="appindicator">Enable usage of <pkg>dev-libs/libappindicator</pkg> to export menu options in to unity and KDE 5</flag>
<flag name="geoclue">Control dependency on <pkg>app-misc/geoclue</pkg></flag>
diff --git a/x11-misc/rendercheck/metadata.xml b/x11-misc/rendercheck/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/rendercheck/metadata.xml
+++ b/x11-misc/rendercheck/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-misc/rofi/metadata.xml b/x11-misc/rofi/metadata.xml
index b63b5dec9933..2e303314ab06 100644
--- a/x11-misc/rofi/metadata.xml
+++ b/x11-misc/rofi/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<use>
<flag name="i3">Compile in support for the <pkg>x11-wm/i3</pkg> window manager</flag>
<flag name="windowmode">Enable normal window mode</flag>
diff --git a/x11-misc/rss-glx/metadata.xml b/x11-misc/rss-glx/metadata.xml
index b5d864c0bffc..5705761e8a66 100644
--- a/x11-misc/rss-glx/metadata.xml
+++ b/x11-misc/rss-glx/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="quesoglc">Enable support for OpenGL Character Renderer</flag>
</use>
diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
index 2c3e7818e959..ef0cfda08013 100644
--- a/x11-misc/screengrab/metadata.xml
+++ b/x11-misc/screengrab/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">screengrab-qt</remote-id>
<remote-id type="github">DOOMer/screengrab</remote-id>
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index fdeadb584e84..1068dbe8a11a 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>lxqt</herd>
<maintainer>
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
<use>
<flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
</use>
diff --git a/x11-misc/shared-mime-info/metadata.xml b/x11-misc/shared-mime-info/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-misc/shared-mime-info/metadata.xml
+++ b/x11-misc/shared-mime-info/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index 441dd42644fc..815bb2a1aa6c 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<use>
<flag name="webphoto">Enables screenshots of websites</flag>
<flag name="drawing">Enables drawing tool</flag>
diff --git a/x11-misc/sisctrl/metadata.xml b/x11-misc/sisctrl/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/sisctrl/metadata.xml
+++ b/x11-misc/sisctrl/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/skippy/metadata.xml b/x11-misc/skippy/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/skippy/metadata.xml
+++ b/x11-misc/skippy/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index 56c5cc2069cb..10b599d4b590 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/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>desktop-misc</herd>
<maintainer>
<email>axs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="consolekit">Enable native consolekit support</flag>
</use>
diff --git a/x11-misc/slock/metadata.xml b/x11-misc/slock/metadata.xml
index 68ea403e7ceb..80306f672867 100644
--- a/x11-misc/slock/metadata.xml
+++ b/x11-misc/slock/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription>simple X screen locker</longdescription>
</pkgmetadata>
diff --git a/x11-misc/spnavcfg/metadata.xml b/x11-misc/spnavcfg/metadata.xml
index 691a96f7a8d8..445e70dd95ea 100644
--- a/x11-misc/spnavcfg/metadata.xml
+++ b/x11-misc/spnavcfg/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>anthoine.bourgeois@gmail.com</email>
<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
The spnavcfg is the GTK-based configuration GUI for
<pkg>sys-libs/spacenavd</pkg>.
diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/sselp/metadata.xml
+++ b/x11-misc/sselp/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/stalonetray/metadata.xml b/x11-misc/stalonetray/metadata.xml
index 77344c741801..e5961abc14ad 100644
--- a/x11-misc/stalonetray/metadata.xml
+++ b/x11-misc/stalonetray/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-dock</herd>
<use>
<flag name="graceful-exit">use non-portable hack to exit gracefuly on signal</flag>
</use>
diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index d9df2048b4c0..f390d00169ac 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
<name>Henrique Dias</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">MeanEYE/Sunflower</remote-id>
</upstream>
diff --git a/x11-misc/sux/metadata.xml b/x11-misc/sux/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/sux/metadata.xml
+++ b/x11-misc/sux/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/synergy/metadata.xml b/x11-misc/synergy/metadata.xml
index e3df9aad5ab5..7f90c0588d32 100644
--- a/x11-misc/synergy/metadata.xml
+++ b/x11-misc/synergy/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">synergy</remote-id>
<remote-id type="github">synergy/synergy</remote-id>
diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/tabbed/metadata.xml
+++ b/x11-misc/tabbed/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/tinymount/metadata.xml b/x11-misc/tinymount/metadata.xml
index 102f7269c2c8..273b5612266f 100644
--- a/x11-misc/tinymount/metadata.xml
+++ b/x11-misc/tinymount/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>desktop-misc</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>limanski@narod.ru</email>
<name>Mike Limansky</name>
@@ -13,6 +10,18 @@
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">limansky/tinymount</remote-id>
</upstream>
diff --git a/x11-misc/touchfreeze/metadata.xml b/x11-misc/touchfreeze/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/x11-misc/touchfreeze/metadata.xml
+++ b/x11-misc/touchfreeze/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>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/trayer/metadata.xml b/x11-misc/trayer/metadata.xml
index b1a9efc4f2f0..097975e3adc2 100644
--- a/x11-misc/trayer/metadata.xml
+++ b/x11-misc/trayer/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-dock</herd>
</pkgmetadata>
diff --git a/x11-misc/treeline/metadata.xml b/x11-misc/treeline/metadata.xml
index a3891ce6e178..ea1b48ffe67e 100644
--- a/x11-misc/treeline/metadata.xml
+++ b/x11-misc/treeline/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">treeline</remote-id>
</upstream>
diff --git a/x11-misc/unclutter/metadata.xml b/x11-misc/unclutter/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/unclutter/metadata.xml
+++ b/x11-misc/unclutter/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/util-macros/metadata.xml b/x11-misc/util-macros/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/util-macros/metadata.xml
+++ b/x11-misc/util-macros/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-misc/viewglob/metadata.xml b/x11-misc/viewglob/metadata.xml
index 665f68caaade..3bc2a0d5dc9c 100644
--- a/x11-misc/viewglob/metadata.xml
+++ b/x11-misc/viewglob/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<longdescription lang="en">
Viewglob is a package that graphically displays the results of a shell
glob, helping beginners of shell usage become acclimitised to filename
diff --git a/x11-misc/virtualgl/metadata.xml b/x11-misc/virtualgl/metadata.xml
index 82630efb1696..8bd428fb8890 100644
--- a/x11-misc/virtualgl/metadata.xml
+++ b/x11-misc/virtualgl/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
@@ -14,6 +13,10 @@
<email>rei4dan@gmail.com</email>
<name>My Th</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
An open source package that gives any Unix or Linux remote display software
the ability to run OpenGL applications with full 3D hardware acceleration.
diff --git a/x11-misc/vnc2swf/metadata.xml b/x11-misc/vnc2swf/metadata.xml
index e022ba6cabdd..98529cb64373 100644
--- a/x11-misc/vnc2swf/metadata.xml
+++ b/x11-misc/vnc2swf/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
Vnc2swf is a cross-platform screen recording tool for ShockWave Flash (swf)
format. Vnc2swf comes with two different implementations, a Python one
diff --git a/x11-misc/vym/metadata.xml b/x11-misc/vym/metadata.xml
index 33d6f84ad262..1dca93f27949 100644
--- a/x11-misc/vym/metadata.xml
+++ b/x11-misc/vym/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">vym</remote-id>
</upstream>
diff --git a/x11-misc/wayv/metadata.xml b/x11-misc/wayv/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wayv/metadata.xml
+++ b/x11-misc/wayv/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/wbar/metadata.xml b/x11-misc/wbar/metadata.xml
index 2b43af1b2da0..7905144e1cde 100644
--- a/x11-misc/wbar/metadata.xml
+++ b/x11-misc/wbar/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="gtk">Enables the gtk-based wbar-config GUI</flag>
</use>
diff --git a/x11-misc/wbarconf/metadata.xml b/x11-misc/wbarconf/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wbarconf/metadata.xml
+++ b/x11-misc/wbarconf/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/wdm/metadata.xml b/x11-misc/wdm/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/wdm/metadata.xml
+++ b/x11-misc/wdm/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/wininfo/metadata.xml b/x11-misc/wininfo/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/wininfo/metadata.xml
+++ b/x11-misc/wininfo/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/wmakerconf/metadata.xml b/x11-misc/wmakerconf/metadata.xml
index 1f7c89842d5d..a0f0c869da8d 100644
--- a/x11-misc/wmakerconf/metadata.xml
+++ b/x11-misc/wmakerconf/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>gnustep</herd>
+ <maintainer>
+ <email>gnustep@gentoo.org</email>
+ <name>Gentoo GNUstep Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wmakerconf</remote-id>
</upstream>
diff --git a/x11-misc/wmiface/metadata.xml b/x11-misc/wmiface/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-misc/wmiface/metadata.xml
+++ b/x11-misc/wmiface/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index c5d0849608ed..119ea7586605 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
The primary goal of this program is to create a portable and
simple command-line server utility that allows a VNC viewer
diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/x2vnc/metadata.xml
+++ b/x11-misc/x2vnc/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/x2x/metadata.xml b/x11-misc/x2x/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/x2x/metadata.xml
+++ b/x11-misc/x2x/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xaos/metadata.xml b/x11-misc/xaos/metadata.xml
index a359aa3b27f9..f6fea6b343ad 100644
--- a/x11-misc/xaos/metadata.xml
+++ b/x11-misc/xaos/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
XaoS is a fast, portable real-time interactive fractal zoomer. It
displays the Mandelbrot set (among other escape time fractals) and
diff --git a/x11-misc/xautolock/metadata.xml b/x11-misc/xautolock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xautolock/metadata.xml
+++ b/x11-misc/xautolock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xautomation/metadata.xml b/x11-misc/xautomation/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xautomation/metadata.xml
+++ b/x11-misc/xautomation/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xbatt/metadata.xml b/x11-misc/xbatt/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xbatt/metadata.xml
+++ b/x11-misc/xbatt/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xbattbar/metadata.xml b/x11-misc/xbattbar/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xbattbar/metadata.xml
+++ b/x11-misc/xbattbar/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xbindkeys/metadata.xml b/x11-misc/xbindkeys/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xbindkeys/metadata.xml
+++ b/x11-misc/xbindkeys/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xbitmaps/metadata.xml b/x11-misc/xbitmaps/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xbitmaps/metadata.xml
+++ b/x11-misc/xbitmaps/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-misc/xcalendar/metadata.xml b/x11-misc/xcalendar/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xcalendar/metadata.xml
+++ b/x11-misc/xcalendar/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xcape/metadata.xml b/x11-misc/xcape/metadata.xml
index 43e57ddbd5aa..331e5f6a6a88 100644
--- a/x11-misc/xcape/metadata.xml
+++ b/x11-misc/xcape/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>aditsu@yahoo.com</email>
<description>Maintainer. Assign bugs to him</description>
@@ -11,6 +10,10 @@
<name>Sergey Popov</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">alols/xcape</remote-id>
<bugs-to>https://github.com/alols/xcape/issues</bugs-to>
diff --git a/x11-misc/xcave/metadata.xml b/x11-misc/xcave/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/xcave/metadata.xml
+++ b/x11-misc/xcave/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xcb/metadata.xml b/x11-misc/xcb/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xcb/metadata.xml
+++ b/x11-misc/xcb/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xclip/metadata.xml b/x11-misc/xclip/metadata.xml
index 52b5463d56b9..70897c6896b9 100644
--- a/x11-misc/xclip/metadata.xml
+++ b/x11-misc/xclip/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xclip</remote-id>
</upstream>
diff --git a/x11-misc/xcompmgr/metadata.xml b/x11-misc/xcompmgr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xcompmgr/metadata.xml
+++ b/x11-misc/xcompmgr/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-misc/xdaliclock/metadata.xml b/x11-misc/xdaliclock/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xdaliclock/metadata.xml
+++ b/x11-misc/xdaliclock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xdesktopwaves/metadata.xml b/x11-misc/xdesktopwaves/metadata.xml
index e6f7528ea31a..6a4564facff5 100644
--- a/x11-misc/xdesktopwaves/metadata.xml
+++ b/x11-misc/xdesktopwaves/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
xdesktopwaves is a cellular automata setting the background of your
X Windows desktop under water. Windows and mouse are like ships on the
diff --git a/x11-misc/xdg-user-dirs-gtk/metadata.xml b/x11-misc/xdg-user-dirs-gtk/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/x11-misc/xdg-user-dirs-gtk/metadata.xml
+++ b/x11-misc/xdg-user-dirs-gtk/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/xdg-user-dirs/metadata.xml b/x11-misc/xdg-user-dirs/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/x11-misc/xdg-user-dirs/metadata.xml
+++ b/x11-misc/xdg-user-dirs/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/xdg-utils/metadata.xml b/x11-misc/xdg-utils/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-misc/xdg-utils/metadata.xml
+++ b/x11-misc/xdg-utils/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/xdialog/metadata.xml b/x11-misc/xdialog/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xdialog/metadata.xml
+++ b/x11-misc/xdialog/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml
index e4f009e486c5..0e7ac58760de 100644
--- a/x11-misc/xdiskusage/metadata.xml
+++ b/x11-misc/xdiskusage/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription>
xdiskusage is a user-friendly program to show you what is using up all your disk space.
</longdescription>
diff --git a/x11-misc/xdock/metadata.xml b/x11-misc/xdock/metadata.xml
index 0e065732328d..3ca134189578 100644
--- a/x11-misc/xdock/metadata.xml
+++ b/x11-misc/xdock/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-dock</herd>
<upstream>
<remote-id type="sourceforge">xdock</remote-id>
</upstream>
diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xearth/metadata.xml
+++ b/x11-misc/xearth/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xfe/metadata.xml b/x11-misc/xfe/metadata.xml
index 900869d128f4..73bcd5209d81 100644
--- a/x11-misc/xfe/metadata.xml
+++ b/x11-misc/xfe/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xfe</remote-id>
</upstream>
diff --git a/x11-misc/xfishtank/metadata.xml b/x11-misc/xfishtank/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xfishtank/metadata.xml
+++ b/x11-misc/xfishtank/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xhkeys/metadata.xml b/x11-misc/xhkeys/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xhkeys/metadata.xml
+++ b/x11-misc/xhkeys/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xkbd/metadata.xml b/x11-misc/xkbd/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xkbd/metadata.xml
+++ b/x11-misc/xkbd/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/xkeyboard-config/metadata.xml b/x11-misc/xkeyboard-config/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xkeyboard-config/metadata.xml
+++ b/x11-misc/xkeyboard-config/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-misc/xkeycaps/metadata.xml b/x11-misc/xkeycaps/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xkeycaps/metadata.xml
+++ b/x11-misc/xkeycaps/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xlockmore/metadata.xml b/x11-misc/xlockmore/metadata.xml
index 48c7c37b15d0..858bc515489d 100644
--- a/x11-misc/xlockmore/metadata.xml
+++ b/x11-misc/xlockmore/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="xlockrc">Enables xlockrc for people without PAM</flag>
</use>
diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index 007f3439bb69..e393b5c0892f 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/xmonad-log-applet/metadata.xml b/x11-misc/xmonad-log-applet/metadata.xml
index 1e501a4b3854..7e5b44480d7a 100644
--- a/x11-misc/xmonad-log-applet/metadata.xml
+++ b/x11-misc/xmonad-log-applet/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
diff --git a/x11-misc/xmountains/metadata.xml b/x11-misc/xmountains/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xmountains/metadata.xml
+++ b/x11-misc/xmountains/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xnee/metadata.xml b/x11-misc/xnee/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xnee/metadata.xml
+++ b/x11-misc/xnee/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xnots/metadata.xml b/x11-misc/xnots/metadata.xml
index c21707af8d13..0a8b12688e1b 100644
--- a/x11-misc/xnots/metadata.xml
+++ b/x11-misc/xnots/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xnots</remote-id>
<remote-id type="github">thePalindrome/xnots</remote-id>
diff --git a/x11-misc/xoo/metadata.xml b/x11-misc/xoo/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-misc/xoo/metadata.xml
+++ b/x11-misc/xoo/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gpe</herd>
</pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-misc/xorg-cf-files/metadata.xml
+++ b/x11-misc/xorg-cf-files/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-misc/xosview/metadata.xml b/x11-misc/xosview/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xosview/metadata.xml
+++ b/x11-misc/xosview/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xpad/metadata.xml b/x11-misc/xpad/metadata.xml
index f16af1d84223..d4c45d0e1b3d 100644
--- a/x11-misc/xpad/metadata.xml
+++ b/x11-misc/xpad/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">xpad</remote-id>
</upstream>
diff --git a/x11-misc/xplanet/metadata.xml b/x11-misc/xplanet/metadata.xml
index a565416dca3c..6e6d6108f23b 100644
--- a/x11-misc/xplanet/metadata.xml
+++ b/x11-misc/xplanet/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xplanet</remote-id>
</upstream>
diff --git a/x11-misc/xrestop/metadata.xml b/x11-misc/xrestop/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xrestop/metadata.xml
+++ b/x11-misc/xrestop/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xrmap/metadata.xml b/x11-misc/xrmap/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xrmap/metadata.xml
+++ b/x11-misc/xrmap/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xrootconsole/metadata.xml b/x11-misc/xrootconsole/metadata.xml
index b5be7343e366..a64fe1d085cc 100644
--- a/x11-misc/xrootconsole/metadata.xml
+++ b/x11-misc/xrootconsole/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xrootconsole</remote-id>
</upstream>
diff --git a/x11-misc/xscreensaver-app/metadata.xml b/x11-misc/xscreensaver-app/metadata.xml
index 7d6c82b3f272..8aedeaf742b8 100644
--- a/x11-misc/xscreensaver-app/metadata.xml
+++ b/x11-misc/xscreensaver-app/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xscreensaverapp</remote-id>
</upstream>
diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 5f7839bd0fb9..6cff6787849f 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<maintainer>
<email>jwz@jwz.org</email>
diff --git a/x11-misc/xsel/metadata.xml b/x11-misc/xsel/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsel/metadata.xml
+++ b/x11-misc/xsel/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xsensors/metadata.xml b/x11-misc/xsensors/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsensors/metadata.xml
+++ b/x11-misc/xsensors/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xsetleds/metadata.xml b/x11-misc/xsetleds/metadata.xml
index 09b04e7fe07d..5bbaaf72a08e 100644
--- a/x11-misc/xsetleds/metadata.xml
+++ b/x11-misc/xsetleds/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
- <herd>proxy-maintainers</herd>
-<maintainer>
+ <maintainer>
<email>jss2k2@chello.no</email>
<name>Unknown</name>
<description>seemant@gentoo.org as a proxy maintainer. Please refer to jss2k2</description>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xsnap/metadata.xml b/x11-misc/xsnap/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-misc/xsnap/metadata.xml
+++ b/x11-misc/xsnap/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xsnow/metadata.xml b/x11-misc/xsnow/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xsnow/metadata.xml
+++ b/x11-misc/xsnow/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xsri/metadata.xml b/x11-misc/xsri/metadata.xml
index 40838bc36783..b56027119286 100644
--- a/x11-misc/xsri/metadata.xml
+++ b/x11-misc/xsri/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
index 08ca0a5b219b..0d65c4afd16a 100644
--- a/x11-misc/xssstate/metadata.xml
+++ b/x11-misc/xssstate/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>desktop-misc</herd>
<maintainer>
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/xstroke/metadata.xml b/x11-misc/xstroke/metadata.xml
index 6b3af6a2eb25..7e69141a086b 100644
--- a/x11-misc/xstroke/metadata.xml
+++ b/x11-misc/xstroke/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="freshmeat">xstroke</remote-id>
</upstream>
diff --git a/x11-misc/xteddy/metadata.xml b/x11-misc/xteddy/metadata.xml
index 61b5fb040877..5c8b382da261 100644
--- a/x11-misc/xteddy/metadata.xml
+++ b/x11-misc/xteddy/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<longdescription lang="en">
Normally, xteddy just sits around doing nothing. After all, that's what
teddy bears are for. Look at him, talk to him, place heavy windows on
diff --git a/x11-misc/xtermcontrol/metadata.xml b/x11-misc/xtermcontrol/metadata.xml
index 546318348d25..3af7a8669a4a 100644
--- a/x11-misc/xtermcontrol/metadata.xml
+++ b/x11-misc/xtermcontrol/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>
xtermcontrol enables dynamic control of xterm properties.
It makes it easy to change colors, title, font and geometry of a running xterm,
diff --git a/x11-misc/xtoolwait/metadata.xml b/x11-misc/xtoolwait/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xtoolwait/metadata.xml
+++ b/x11-misc/xtoolwait/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xtrace/metadata.xml b/x11-misc/xtrace/metadata.xml
index 9f624545b1b0..6ef5e0a6de15 100644
--- a/x11-misc/xtrace/metadata.xml
+++ b/x11-misc/xtrace/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>nightnord@gmail.com</email>
<name>Andrian Nord</name>
@@ -10,4 +9,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-misc/xtrlock/metadata.xml b/x11-misc/xtrlock/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xtrlock/metadata.xml
+++ b/x11-misc/xtrlock/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xtscal/metadata.xml b/x11-misc/xtscal/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-misc/xtscal/metadata.xml
+++ b/x11-misc/xtscal/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-misc/xvkbd/metadata.xml b/x11-misc/xvkbd/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xvkbd/metadata.xml
+++ b/x11-misc/xvkbd/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xwit/metadata.xml b/x11-misc/xwit/metadata.xml
index 2518313f5241..3447e5c316aa 100644
--- a/x11-misc/xwit/metadata.xml
+++ b/x11-misc/xwit/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xwrits/metadata.xml b/x11-misc/xwrits/metadata.xml
index 731225048652..90e28ed17f63 100644
--- a/x11-misc/xwrits/metadata.xml
+++ b/x11-misc/xwrits/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-misc/xxkb/metadata.xml b/x11-misc/xxkb/metadata.xml
index 37b1d4e5f29c..b2f0ab733f79 100644
--- a/x11-misc/xxkb/metadata.xml
+++ b/x11-misc/xxkb/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xxkb</remote-id>
</upstream>
diff --git a/x11-misc/zim/metadata.xml b/x11-misc/zim/metadata.xml
index 82797295f61e..afd553847dae 100644
--- a/x11-misc/zim/metadata.xml
+++ b/x11-misc/zim/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>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription lang="en">
Zim is a graphical text editor used to maintain a collection of wiki pages.
Each page can contain links to other pages, simple formatting and images. Pages