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-themes
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-themes')
-rw-r--r--x11-themes/Tulliana/metadata.xml5
-rw-r--r--x11-themes/adwaita-icon-theme/metadata.xml5
-rw-r--r--x11-themes/audacious-themes/metadata.xml5
-rw-r--r--x11-themes/bespin/metadata.xml5
-rw-r--r--x11-themes/blueglass-xcursors/metadata.xml5
-rw-r--r--x11-themes/chameleon-xcursors/metadata.xml5
-rw-r--r--x11-themes/claws-mail-themes/metadata.xml5
-rw-r--r--x11-themes/clearlooks-phenix/metadata.xml5
-rw-r--r--x11-themes/crystal/metadata.xml5
-rw-r--r--x11-themes/dekorator/metadata.xml5
-rw-r--r--x11-themes/emerald-themes/metadata.xml5
-rw-r--r--x11-themes/ethemes/metadata.xml5
-rw-r--r--x11-themes/experience/metadata.xml5
-rw-r--r--x11-themes/faenza-icon-theme/metadata.xml5
-rw-r--r--x11-themes/flatsvg/metadata.xml5
-rw-r--r--x11-themes/fvwm-crystal/metadata.xml5
-rw-r--r--x11-themes/fvwm-themes-extra/metadata.xml5
-rw-r--r--x11-themes/gargantuan-icon-theme/metadata.xml5
-rw-r--r--x11-themes/gartoon-redux/metadata.xml5
-rw-r--r--x11-themes/gartoon/metadata.xml5
-rw-r--r--x11-themes/gentoo-artwork-livecd/metadata.xml5
-rw-r--r--x11-themes/gentoo-xcursors/metadata.xml5
-rw-r--r--x11-themes/geramik/metadata.xml5
-rw-r--r--x11-themes/gnome-backgrounds/metadata.xml5
-rw-r--r--x11-themes/gnome-colors-common/metadata.xml5
-rw-r--r--x11-themes/gnome-colors-themes/metadata.xml5
-rw-r--r--x11-themes/gnome-icon-theme-extras/metadata.xml5
-rw-r--r--x11-themes/gnome-icon-theme-symbolic/metadata.xml5
-rw-r--r--x11-themes/gnome-icon-theme/metadata.xml5
-rw-r--r--x11-themes/gnome-themes-standard/metadata.xml5
-rw-r--r--x11-themes/gnustep-neos-theme/metadata.xml5
-rw-r--r--x11-themes/gnustep-silver-theme/metadata.xml5
-rw-r--r--x11-themes/golden-xcursors/metadata.xml5
-rw-r--r--x11-themes/greybird/metadata.xml6
-rw-r--r--x11-themes/gtk-chtheme/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-aurora/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-candido/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-experience/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-flat/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-qtpixmap/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-quartz/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-rezlooks/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-ubuntulooks/metadata.xml5
-rw-r--r--x11-themes/gtk-engines-unico/metadata.xml5
-rw-r--r--x11-themes/gtk-engines/metadata.xml5
-rw-r--r--x11-themes/gtk-theme-switch/metadata.xml5
-rw-r--r--x11-themes/haematite-xcursors/metadata.xml5
-rw-r--r--x11-themes/hicolor-icon-theme/metadata.xml1
-rw-r--r--x11-themes/human-icon-theme/metadata.xml5
-rw-r--r--x11-themes/kfaenza/metadata.xml5
-rw-r--r--x11-themes/korilla/metadata.xml5
-rw-r--r--x11-themes/light-themes/metadata.xml5
-rw-r--r--x11-themes/lush/metadata.xml5
-rw-r--r--x11-themes/matchbox-themes-extra/metadata.xml1
-rw-r--r--x11-themes/mate-backgrounds/metadata.xml5
-rw-r--r--x11-themes/mate-icon-theme-faenza/metadata.xml5
-rw-r--r--x11-themes/mate-icon-theme/metadata.xml5
-rw-r--r--x11-themes/mate-themes/metadata.xml5
-rw-r--r--x11-themes/nimbus/metadata.xml5
-rw-r--r--x11-themes/nitrogen/metadata.xml5
-rw-r--r--x11-themes/noia/metadata.xml5
-rw-r--r--x11-themes/notify-osd-icons/metadata.xml1
-rw-r--r--x11-themes/nou-icon-theme/metadata.xml5
-rw-r--r--x11-themes/nuovo-icon-theme/metadata.xml5
-rw-r--r--x11-themes/nuvola/metadata.xml5
-rw-r--r--x11-themes/obsidian-xcursors/metadata.xml5
-rw-r--r--x11-themes/oxygen-gtk/metadata.xml5
-rw-r--r--x11-themes/oxygen-molecule/metadata.xml5
-rw-r--r--x11-themes/pearlgrey-xcursors/metadata.xml5
-rw-r--r--x11-themes/qtcurve/metadata.xml5
-rw-r--r--x11-themes/redhat-artwork/metadata.xml5
-rw-r--r--x11-themes/sawfish-themes/metadata.xml5
-rw-r--r--x11-themes/shiki-colors/metadata.xml5
-rw-r--r--x11-themes/silver-xcursors/metadata.xml5
-rw-r--r--x11-themes/skinenigmang-logos/metadata.xml3
-rw-r--r--x11-themes/skulpture/metadata.xml5
-rw-r--r--x11-themes/slim-themes/metadata.xml5
-rw-r--r--x11-themes/smaragd/metadata.xml5
-rw-r--r--x11-themes/smplayer-skins/metadata.xml10
-rw-r--r--x11-themes/smplayer-themes/metadata.xml10
-rw-r--r--x11-themes/sound-theme-freedesktop/metadata.xml5
-rw-r--r--x11-themes/tactile/metadata.xml5
-rw-r--r--x11-themes/tactile3/metadata.xml5
-rw-r--r--x11-themes/tangerine-icon-theme/metadata.xml5
-rw-r--r--x11-themes/tango-icon-theme-extras/metadata.xml1
-rw-r--r--x11-themes/tango-icon-theme/metadata.xml1
-rw-r--r--x11-themes/vdr-channel-logos/metadata.xml3
-rw-r--r--x11-themes/vdrgraphtft-avp/metadata.xml1
-rw-r--r--x11-themes/vdrgraphtft-deepblue/metadata.xml1
-rw-r--r--x11-themes/vdrgraphtft-deeppurple/metadata.xml1
-rw-r--r--x11-themes/vdrgraphtft-poetter/metadata.xml1
-rw-r--r--x11-themes/windowmaker-themes/metadata.xml5
-rw-r--r--x11-themes/xcursor-themes/metadata.xml5
-rw-r--r--x11-themes/xxv-skins/metadata.xml1
-rw-r--r--x11-themes/yasis-icon-theme/metadata.xml5
-rw-r--r--x11-themes/zukini/metadata.xml5
-rw-r--r--x11-themes/zukitwo-shell/metadata.xml5
-rw-r--r--x11-themes/zukitwo/metadata.xml5
98 files changed, 354 insertions, 103 deletions
diff --git a/x11-themes/Tulliana/metadata.xml b/x11-themes/Tulliana/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/Tulliana/metadata.xml
+++ b/x11-themes/Tulliana/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-themes/adwaita-icon-theme/metadata.xml b/x11-themes/adwaita-icon-theme/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/adwaita-icon-theme/metadata.xml
+++ b/x11-themes/adwaita-icon-theme/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-themes/audacious-themes/metadata.xml b/x11-themes/audacious-themes/metadata.xml
index a025c77c763..d610f01bea8 100644
--- a/x11-themes/audacious-themes/metadata.xml
+++ b/x11-themes/audacious-themes/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>sound</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-themes/bespin/metadata.xml b/x11-themes/bespin/metadata.xml
index 196dab935c0..22f36115c96 100644
--- a/x11-themes/bespin/metadata.xml
+++ b/x11-themes/bespin/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>
<use>
<flag name="windeco">Enable window decoration for KWin.</flag>
</use>
diff --git a/x11-themes/blueglass-xcursors/metadata.xml b/x11-themes/blueglass-xcursors/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/x11-themes/blueglass-xcursors/metadata.xml
+++ b/x11-themes/blueglass-xcursors/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-themes/chameleon-xcursors/metadata.xml b/x11-themes/chameleon-xcursors/metadata.xml
index a20e7b5433b..4a15eb3e512 100644
--- a/x11-themes/chameleon-xcursors/metadata.xml
+++ b/x11-themes/chameleon-xcursors/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>skrattaren@yandex.ru</email>
<name>Nikolaj Sjujskij</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-themes/claws-mail-themes/metadata.xml b/x11-themes/claws-mail-themes/metadata.xml
index 1cc539c3fbe..efef6f7e75c 100644
--- a/x11-themes/claws-mail-themes/metadata.xml
+++ b/x11-themes/claws-mail-themes/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>net-mail</herd>
<maintainer>
<email>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+<maintainer>
+<email>net-mail@gentoo.org</email>
+<name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index c0e6480124b..044c36fd703 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/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>idella4@gentoo.org</email>
<name>Ian Delaney</name>
@@ -11,6 +10,10 @@
<name>Geert Braekmans</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">jpfleury/clearlooks-phenix</remote-id>
</upstream>
diff --git a/x11-themes/crystal/metadata.xml b/x11-themes/crystal/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/x11-themes/crystal/metadata.xml
+++ b/x11-themes/crystal/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-themes/dekorator/metadata.xml b/x11-themes/dekorator/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/x11-themes/dekorator/metadata.xml
+++ b/x11-themes/dekorator/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-themes/emerald-themes/metadata.xml b/x11-themes/emerald-themes/metadata.xml
index 2d71d9c8f25..c99b24a1f09 100644
--- a/x11-themes/emerald-themes/metadata.xml
+++ b/x11-themes/emerald-themes/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>
<longdescription lang="en">Emerald themes are the themes for emerald
</longdescription>
</pkgmetadata>
diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index ac83800a538..4fbe32c84e9 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/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-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index 76f87797194..64bfde1d593 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/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="freshmeat">experience</remote-id>
</upstream>
diff --git a/x11-themes/faenza-icon-theme/metadata.xml b/x11-themes/faenza-icon-theme/metadata.xml
index 23620f36ac2..bc9a390f645 100644
--- a/x11-themes/faenza-icon-theme/metadata.xml
+++ b/x11-themes/faenza-icon-theme/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-misc</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
@@ -10,6 +9,10 @@
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">faenza-icon-theme</remote-id>
</upstream>
diff --git a/x11-themes/flatsvg/metadata.xml b/x11-themes/flatsvg/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/x11-themes/flatsvg/metadata.xml
+++ b/x11-themes/flatsvg/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-themes/fvwm-crystal/metadata.xml b/x11-themes/fvwm-crystal/metadata.xml
index edb3c129e53..ebd5cc0e809 100644
--- a/x11-themes/fvwm-crystal/metadata.xml
+++ b/x11-themes/fvwm-crystal/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>dominique.c.michel@gmail.com</email>
<name>Dominique Michel</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
FVWM-Crystal is a set of configuration files for FVWM window manager,
with additional programs and scripts. Some of it's features are:
diff --git a/x11-themes/fvwm-themes-extra/metadata.xml b/x11-themes/fvwm-themes-extra/metadata.xml
index f6aac99fec2..5b02d66c29c 100644
--- a/x11-themes/fvwm-themes-extra/metadata.xml
+++ b/x11-themes/fvwm-themes-extra/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">fvwm-themes</remote-id>
</upstream>
diff --git a/x11-themes/gargantuan-icon-theme/metadata.xml b/x11-themes/gargantuan-icon-theme/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/x11-themes/gargantuan-icon-theme/metadata.xml
+++ b/x11-themes/gargantuan-icon-theme/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-themes/gartoon-redux/metadata.xml b/x11-themes/gartoon-redux/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/gartoon-redux/metadata.xml
+++ b/x11-themes/gartoon-redux/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-themes/gartoon/metadata.xml b/x11-themes/gartoon/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/x11-themes/gartoon/metadata.xml
+++ b/x11-themes/gartoon/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-themes/gentoo-artwork-livecd/metadata.xml b/x11-themes/gentoo-artwork-livecd/metadata.xml
index 88653ddd717..ec3067b686e 100644
--- a/x11-themes/gentoo-artwork-livecd/metadata.xml
+++ b/x11-themes/gentoo-artwork-livecd/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>livecd</herd>
+<maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-themes/gentoo-xcursors/metadata.xml b/x11-themes/gentoo-xcursors/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/x11-themes/gentoo-xcursors/metadata.xml
+++ b/x11-themes/gentoo-xcursors/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-themes/geramik/metadata.xml b/x11-themes/geramik/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/geramik/metadata.xml
+++ b/x11-themes/geramik/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-themes/gnome-backgrounds/metadata.xml b/x11-themes/gnome-backgrounds/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gnome-backgrounds/metadata.xml
+++ b/x11-themes/gnome-backgrounds/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-themes/gnome-colors-common/metadata.xml b/x11-themes/gnome-colors-common/metadata.xml
index 72f3ce19b53..05a736f1517 100644
--- a/x11-themes/gnome-colors-common/metadata.xml
+++ b/x11-themes/gnome-colors-common/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>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/gnome-colors-themes/metadata.xml b/x11-themes/gnome-colors-themes/metadata.xml
index 72f3ce19b53..05a736f1517 100644
--- a/x11-themes/gnome-colors-themes/metadata.xml
+++ b/x11-themes/gnome-colors-themes/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>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/gnome-icon-theme-extras/metadata.xml b/x11-themes/gnome-icon-theme-extras/metadata.xml
index 6e0e2ecb48c..f0f559a4662 100644
--- a/x11-themes/gnome-icon-theme-extras/metadata.xml
+++ b/x11-themes/gnome-icon-theme-extras/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-themes/gnome-icon-theme-symbolic/metadata.xml b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gnome-icon-theme-symbolic/metadata.xml
+++ b/x11-themes/gnome-icon-theme-symbolic/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-themes/gnome-icon-theme/metadata.xml b/x11-themes/gnome-icon-theme/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gnome-icon-theme/metadata.xml
+++ b/x11-themes/gnome-icon-theme/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-themes/gnome-themes-standard/metadata.xml b/x11-themes/gnome-themes-standard/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gnome-themes-standard/metadata.xml
+++ b/x11-themes/gnome-themes-standard/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-themes/gnustep-neos-theme/metadata.xml b/x11-themes/gnustep-neos-theme/metadata.xml
index 0c694ddbf19..31ab3dcb630 100644
--- a/x11-themes/gnustep-neos-theme/metadata.xml
+++ b/x11-themes/gnustep-neos-theme/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>gnustep</herd>
+ <maintainer>
+ <email>gnustep@gentoo.org</email>
+ <name>Gentoo GNUstep Project</name>
+ </maintainer>
<longdescription>This theme closely follows the original NeXT look and feel. The controls and the user interface have the same guidlenies, the menus, scrollbars and general impression are familiar to to the old-style user. But the Shades are more subtle, several controls look the same, but are made less intursive, more subtle. Some icons are smoother.</longdescription>
</pkgmetadata>
diff --git a/x11-themes/gnustep-silver-theme/metadata.xml b/x11-themes/gnustep-silver-theme/metadata.xml
index 828ce83fbfd..d7b64d0597f 100644
--- a/x11-themes/gnustep-silver-theme/metadata.xml
+++ b/x11-themes/gnustep-silver-theme/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>gnustep</herd>
+ <maintainer>
+ <email>gnustep@gentoo.org</email>
+ <name>Gentoo GNUstep Project</name>
+ </maintainer>
<longdescription>Silver.theme is a theme with menu in-window, silvered controls, scrollbars at right side and arrows at opposite sides. Ideal for people who want use GNUstep apps in desktops like Gnome, KDE, ...</longdescription>
</pkgmetadata>
diff --git a/x11-themes/golden-xcursors/metadata.xml b/x11-themes/golden-xcursors/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/x11-themes/golden-xcursors/metadata.xml
+++ b/x11-themes/golden-xcursors/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-themes/greybird/metadata.xml b/x11-themes/greybird/metadata.xml
index 324478bd550..dd2607ed9dd 100644
--- a/x11-themes/greybird/metadata.xml
+++ b/x11-themes/greybird/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
- <herd>ayatana</herd>
<maintainer>
<email>ayatana-bugs@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">shimmerproject/Greybird</remote-id>
</upstream>
diff --git a/x11-themes/gtk-chtheme/metadata.xml b/x11-themes/gtk-chtheme/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/x11-themes/gtk-chtheme/metadata.xml
+++ b/x11-themes/gtk-chtheme/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-themes/gtk-engines-aurora/metadata.xml b/x11-themes/gtk-engines-aurora/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/x11-themes/gtk-engines-aurora/metadata.xml
+++ b/x11-themes/gtk-engines-aurora/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-themes/gtk-engines-candido/metadata.xml b/x11-themes/gtk-engines-candido/metadata.xml
index 540c2502399..64f877fb306 100644
--- a/x11-themes/gtk-engines-candido/metadata.xml
+++ b/x11-themes/gtk-engines-candido/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">candido.berlios</remote-id>
</upstream>
diff --git a/x11-themes/gtk-engines-experience/metadata.xml b/x11-themes/gtk-engines-experience/metadata.xml
index 109f2e6d74e..507ebb2b45d 100644
--- a/x11-themes/gtk-engines-experience/metadata.xml
+++ b/x11-themes/gtk-engines-experience/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>
<longdescription>
This engine is a very flexible pixmap based GTK-Engine. It is able
to draw widgets as a stack of multiple images. Each of the images
diff --git a/x11-themes/gtk-engines-flat/metadata.xml b/x11-themes/gtk-engines-flat/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gtk-engines-flat/metadata.xml
+++ b/x11-themes/gtk-engines-flat/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-themes/gtk-engines-qtpixmap/metadata.xml b/x11-themes/gtk-engines-qtpixmap/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/gtk-engines-qtpixmap/metadata.xml
+++ b/x11-themes/gtk-engines-qtpixmap/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-themes/gtk-engines-quartz/metadata.xml b/x11-themes/gtk-engines-quartz/metadata.xml
index 87bca60a4b6..3f6d05499ec 100644
--- a/x11-themes/gtk-engines-quartz/metadata.xml
+++ b/x11-themes/gtk-engines-quartz/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>prefix</herd>
+ <maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">downloads</remote-id>
</upstream>
diff --git a/x11-themes/gtk-engines-rezlooks/metadata.xml b/x11-themes/gtk-engines-rezlooks/metadata.xml
index 597ca1b5e61..d918003aa3d 100644
--- a/x11-themes/gtk-engines-rezlooks/metadata.xml
+++ b/x11-themes/gtk-engines-rezlooks/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">
Rezlooks GTK+ Engine, a modified version of the Clearlooks engine.
</longdescription>
diff --git a/x11-themes/gtk-engines-ubuntulooks/metadata.xml b/x11-themes/gtk-engines-ubuntulooks/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/x11-themes/gtk-engines-ubuntulooks/metadata.xml
+++ b/x11-themes/gtk-engines-ubuntulooks/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-themes/gtk-engines-unico/metadata.xml b/x11-themes/gtk-engines-unico/metadata.xml
index 9fd4d4fbe5c..19814dfc179 100644
--- a/x11-themes/gtk-engines-unico/metadata.xml
+++ b/x11-themes/gtk-engines-unico/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="launchpad">ubuntu</remote-id>
</upstream>
diff --git a/x11-themes/gtk-engines/metadata.xml b/x11-themes/gtk-engines/metadata.xml
index 1131e5f9b28..822b933b950 100644
--- a/x11-themes/gtk-engines/metadata.xml
+++ b/x11-themes/gtk-engines/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>
<longdescription>
This package contains some standard themes and theme engines for
GTK+. Version 0.12 provides engines and themes for GTK+ 1,
diff --git a/x11-themes/gtk-theme-switch/metadata.xml b/x11-themes/gtk-theme-switch/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/x11-themes/gtk-theme-switch/metadata.xml
+++ b/x11-themes/gtk-theme-switch/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-themes/haematite-xcursors/metadata.xml b/x11-themes/haematite-xcursors/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/haematite-xcursors/metadata.xml
+++ b/x11-themes/haematite-xcursors/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-themes/hicolor-icon-theme/metadata.xml b/x11-themes/hicolor-icon-theme/metadata.xml
index 9879e83b822..a0f4da6903d 100644
--- a/x11-themes/hicolor-icon-theme/metadata.xml
+++ b/x11-themes/hicolor-icon-theme/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-themes/human-icon-theme/metadata.xml b/x11-themes/human-icon-theme/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/human-icon-theme/metadata.xml
+++ b/x11-themes/human-icon-theme/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-themes/kfaenza/metadata.xml b/x11-themes/kfaenza/metadata.xml
index 50c03fe98d4..b019543b71f 100644
--- a/x11-themes/kfaenza/metadata.xml
+++ b/x11-themes/kfaenza/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>kde</herd>
<maintainer>
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
<use>
<flag name="additional">Install additional KFaenza icons. See third homepage for details</flag>
</use>
diff --git a/x11-themes/korilla/metadata.xml b/x11-themes/korilla/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/korilla/metadata.xml
+++ b/x11-themes/korilla/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-themes/light-themes/metadata.xml b/x11-themes/light-themes/metadata.xml
index 44bb88559d2..99d9e8355d2 100644
--- a/x11-themes/light-themes/metadata.xml
+++ b/x11-themes/light-themes/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>gnome</herd>
<maintainer>
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
@@ -10,6 +9,10 @@
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="gtk3">Support GTK 3.x, too</flag>
</use>
diff --git a/x11-themes/lush/metadata.xml b/x11-themes/lush/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/lush/metadata.xml
+++ b/x11-themes/lush/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-themes/matchbox-themes-extra/metadata.xml b/x11-themes/matchbox-themes-extra/metadata.xml
index 6a17403e0ad..097975e3adc 100644
--- a/x11-themes/matchbox-themes-extra/metadata.xml
+++ b/x11-themes/matchbox-themes-extra/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-themes/mate-backgrounds/metadata.xml b/x11-themes/mate-backgrounds/metadata.xml
index 17a1804db50..b96b8bd474e 100644
--- a/x11-themes/mate-backgrounds/metadata.xml
+++ b/x11-themes/mate-backgrounds/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-backgrounds</remote-id>
</upstream>
diff --git a/x11-themes/mate-icon-theme-faenza/metadata.xml b/x11-themes/mate-icon-theme-faenza/metadata.xml
index 42eff31ad79..ac3cff2f309 100644
--- a/x11-themes/mate-icon-theme-faenza/metadata.xml
+++ b/x11-themes/mate-icon-theme-faenza/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-icon-theme-faenza</remote-id>
</upstream>
diff --git a/x11-themes/mate-icon-theme/metadata.xml b/x11-themes/mate-icon-theme/metadata.xml
index 21fac76bdc1..74320d5692f 100644
--- a/x11-themes/mate-icon-theme/metadata.xml
+++ b/x11-themes/mate-icon-theme/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-icon-theme</remote-id>
</upstream>
diff --git a/x11-themes/mate-themes/metadata.xml b/x11-themes/mate-themes/metadata.xml
index d4b54b37cb6..64567195459 100644
--- a/x11-themes/mate-themes/metadata.xml
+++ b/x11-themes/mate-themes/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-themes</remote-id>
</upstream>
diff --git a/x11-themes/nimbus/metadata.xml b/x11-themes/nimbus/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/x11-themes/nimbus/metadata.xml
+++ b/x11-themes/nimbus/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-themes/nitrogen/metadata.xml b/x11-themes/nitrogen/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/nitrogen/metadata.xml
+++ b/x11-themes/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>kde</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-themes/noia/metadata.xml b/x11-themes/noia/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/noia/metadata.xml
+++ b/x11-themes/noia/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-themes/notify-osd-icons/metadata.xml b/x11-themes/notify-osd-icons/metadata.xml
index 650c2a2edb1..16dde9afc2c 100644
--- a/x11-themes/notify-osd-icons/metadata.xml
+++ b/x11-themes/notify-osd-icons/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-themes/nou-icon-theme/metadata.xml b/x11-themes/nou-icon-theme/metadata.xml
index f1d365960b3..0bf51bf8d2e 100644
--- a/x11-themes/nou-icon-theme/metadata.xml
+++ b/x11-themes/nou-icon-theme/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/nuovo-icon-theme/metadata.xml b/x11-themes/nuovo-icon-theme/metadata.xml
index f1d365960b3..0bf51bf8d2e 100644
--- a/x11-themes/nuovo-icon-theme/metadata.xml
+++ b/x11-themes/nuovo-icon-theme/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/nuvola/metadata.xml b/x11-themes/nuvola/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/nuvola/metadata.xml
+++ b/x11-themes/nuvola/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-themes/obsidian-xcursors/metadata.xml b/x11-themes/obsidian-xcursors/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/obsidian-xcursors/metadata.xml
+++ b/x11-themes/obsidian-xcursors/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-themes/oxygen-gtk/metadata.xml b/x11-themes/oxygen-gtk/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/x11-themes/oxygen-gtk/metadata.xml
+++ b/x11-themes/oxygen-gtk/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-themes/oxygen-molecule/metadata.xml b/x11-themes/oxygen-molecule/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/oxygen-molecule/metadata.xml
+++ b/x11-themes/oxygen-molecule/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-themes/pearlgrey-xcursors/metadata.xml b/x11-themes/pearlgrey-xcursors/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/pearlgrey-xcursors/metadata.xml
+++ b/x11-themes/pearlgrey-xcursors/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-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml
index 2812a23f14c..0e4ea2add38 100644
--- a/x11-themes/qtcurve/metadata.xml
+++ b/x11-themes/qtcurve/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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<use>
<flag name="kde">Enable KDE4 support. This adds a QtCurve configuration
module to KDE's SystemSettings</flag>
diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
index b0b7dd22c5a..22fd0450527 100644
--- a/x11-themes/redhat-artwork/metadata.xml
+++ b/x11-themes/redhat-artwork/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="audacious">Install <pkg>media-sound/audacious</pkg> theme</flag>
<flag name="cursors">Install Bluecurve cursors</flag>
diff --git a/x11-themes/sawfish-themes/metadata.xml b/x11-themes/sawfish-themes/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/sawfish-themes/metadata.xml
+++ b/x11-themes/sawfish-themes/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-themes/shiki-colors/metadata.xml b/x11-themes/shiki-colors/metadata.xml
index 72f3ce19b53..05a736f1517 100644
--- a/x11-themes/shiki-colors/metadata.xml
+++ b/x11-themes/shiki-colors/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>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/silver-xcursors/metadata.xml b/x11-themes/silver-xcursors/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/x11-themes/silver-xcursors/metadata.xml
+++ b/x11-themes/silver-xcursors/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-themes/skinenigmang-logos/metadata.xml b/x11-themes/skinenigmang-logos/metadata.xml
index cf0f79323ba..4ae1036d16b 100644
--- a/x11-themes/skinenigmang-logos/metadata.xml
+++ b/x11-themes/skinenigmang-logos/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/x11-themes/skulpture/metadata.xml b/x11-themes/skulpture/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/skulpture/metadata.xml
+++ b/x11-themes/skulpture/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-themes/slim-themes/metadata.xml b/x11-themes/slim-themes/metadata.xml
index 624896ee5a6..d0fc03248d5 100644
--- a/x11-themes/slim-themes/metadata.xml
+++ b/x11-themes/slim-themes/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>
<upstream>
<remote-id type="sourceforge">slim.berlios</remote-id>
</upstream>
diff --git a/x11-themes/smaragd/metadata.xml b/x11-themes/smaragd/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/x11-themes/smaragd/metadata.xml
+++ b/x11-themes/smaragd/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-themes/smplayer-skins/metadata.xml b/x11-themes/smplayer-skins/metadata.xml
index 862485291ae..a1948a940be 100644
--- a/x11-themes/smplayer-skins/metadata.xml
+++ b/x11-themes/smplayer-skins/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">smplayer</remote-id>
</upstream>
diff --git a/x11-themes/smplayer-themes/metadata.xml b/x11-themes/smplayer-themes/metadata.xml
index 862485291ae..a1948a940be 100644
--- a/x11-themes/smplayer-themes/metadata.xml
+++ b/x11-themes/smplayer-themes/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">smplayer</remote-id>
</upstream>
diff --git a/x11-themes/sound-theme-freedesktop/metadata.xml b/x11-themes/sound-theme-freedesktop/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/x11-themes/sound-theme-freedesktop/metadata.xml
+++ b/x11-themes/sound-theme-freedesktop/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-themes/tactile/metadata.xml b/x11-themes/tactile/metadata.xml
index 13859365aef..c6793101564 100644
--- a/x11-themes/tactile/metadata.xml
+++ b/x11-themes/tactile/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
@@ -11,6 +10,10 @@
<name>Markellos Orfanos</name>
<description>CC him on bugs</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/x11-themes/tactile3/metadata.xml b/x11-themes/tactile3/metadata.xml
index 13859365aef..c6793101564 100644
--- a/x11-themes/tactile3/metadata.xml
+++ b/x11-themes/tactile3/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
@@ -11,6 +10,10 @@
<name>Markellos Orfanos</name>
<description>CC him on bugs</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/x11-themes/tangerine-icon-theme/metadata.xml b/x11-themes/tangerine-icon-theme/metadata.xml
index 540f810e069..b8393889336 100644
--- a/x11-themes/tangerine-icon-theme/metadata.xml
+++ b/x11-themes/tangerine-icon-theme/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-themes/tango-icon-theme-extras/metadata.xml b/x11-themes/tango-icon-theme-extras/metadata.xml
index 8c868061b73..ed32dba4140 100644
--- a/x11-themes/tango-icon-theme-extras/metadata.xml
+++ b/x11-themes/tango-icon-theme-extras/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-themes/tango-icon-theme/metadata.xml b/x11-themes/tango-icon-theme/metadata.xml
index c03b663ea9f..409a64f16e1 100644
--- a/x11-themes/tango-icon-theme/metadata.xml
+++ b/x11-themes/tango-icon-theme/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-themes/vdr-channel-logos/metadata.xml b/x11-themes/vdr-channel-logos/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/x11-themes/vdr-channel-logos/metadata.xml
+++ b/x11-themes/vdr-channel-logos/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/x11-themes/vdrgraphtft-avp/metadata.xml b/x11-themes/vdrgraphtft-avp/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/x11-themes/vdrgraphtft-avp/metadata.xml
+++ b/x11-themes/vdrgraphtft-avp/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-deepblue/metadata.xml b/x11-themes/vdrgraphtft-deepblue/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/x11-themes/vdrgraphtft-deepblue/metadata.xml
+++ b/x11-themes/vdrgraphtft-deepblue/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-deeppurple/metadata.xml b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/x11-themes/vdrgraphtft-deeppurple/metadata.xml
+++ b/x11-themes/vdrgraphtft-deeppurple/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/x11-themes/vdrgraphtft-poetter/metadata.xml b/x11-themes/vdrgraphtft-poetter/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/x11-themes/vdrgraphtft-poetter/metadata.xml
+++ b/x11-themes/vdrgraphtft-poetter/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/x11-themes/windowmaker-themes/metadata.xml b/x11-themes/windowmaker-themes/metadata.xml
index 16a214bf700..9d68cc290f4 100644
--- a/x11-themes/windowmaker-themes/metadata.xml
+++ b/x11-themes/windowmaker-themes/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>gnustep</herd>
+<maintainer>
+ <email>gnustep@gentoo.org</email>
+ <name>Gentoo GNUstep Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-themes/xcursor-themes/metadata.xml b/x11-themes/xcursor-themes/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/x11-themes/xcursor-themes/metadata.xml
+++ b/x11-themes/xcursor-themes/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-themes/xxv-skins/metadata.xml b/x11-themes/xxv-skins/metadata.xml
index b4862f352c9..0fe2766cdd4 100644
--- a/x11-themes/xxv-skins/metadata.xml
+++ b/x11-themes/xxv-skins/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>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/x11-themes/yasis-icon-theme/metadata.xml b/x11-themes/yasis-icon-theme/metadata.xml
index f1d365960b3..0bf51bf8d2e 100644
--- a/x11-themes/yasis-icon-theme/metadata.xml
+++ b/x11-themes/yasis-icon-theme/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/zukini/metadata.xml b/x11-themes/zukini/metadata.xml
index 7aef4e21e88..1170aa55649 100644
--- a/x11-themes/zukini/metadata.xml
+++ b/x11-themes/zukini/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>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-themes/zukitwo-shell/metadata.xml b/x11-themes/zukitwo-shell/metadata.xml
index 6e0e2ecb48c..f0f559a4662 100644
--- a/x11-themes/zukitwo-shell/metadata.xml
+++ b/x11-themes/zukitwo-shell/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-themes/zukitwo/metadata.xml b/x11-themes/zukitwo/metadata.xml
index 65ba7a59ea5..c23e9a0c010 100644
--- a/x11-themes/zukitwo/metadata.xml
+++ b/x11-themes/zukitwo/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="gnome-shell">Install theme for <pkg>gnome-base/gnome-shell</pkg></flag>
</use>