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.

39 files changed, 176 insertions, 44 deletions

diff --git a/app-office/abiword-docs/metadata.xml b/app-office/abiword-docs/metadata.xml
index 669f23da60a..fe3dc94b2bc 100644
--- a/app-office/abiword-docs/metadata.xml
+++ b/app-office/abiword-docs/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-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index c13e2d98bf6..f1e19390a7e 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/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-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="collab">Enable collaborative editing plugin</flag>
 	<flag name="goffice">Enable goffice plugin</flag>
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/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/app-office/borg/metadata.xml b/app-office/borg/metadata.xml
index c5de5a64367..3518ce9a8fd 100644
--- a/app-office/borg/metadata.xml
+++ b/app-office/borg/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>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">borg-calendar</remote-id>
 	</upstream>
diff --git a/app-office/calligra-l10n/metadata.xml b/app-office/calligra-l10n/metadata.xml
index 8f56a0ca69d..55ec89dcf8a 100644
--- a/app-office/calligra-l10n/metadata.xml
+++ b/app-office/calligra-l10n/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>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-office/calligra/metadata.xml b/app-office/calligra/metadata.xml
index 2b3ff5ed653..b3e8c1a17d2 100644
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/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>kde</herd>
-	<herd>office</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="attica">Get hot stuff with <pkg>dev-libs/libattica</pkg></flag>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
diff --git a/app-office/dia/metadata.xml b/app-office/dia/metadata.xml
index a257c231076..41fd03cd0f6 100644
--- a/app-office/dia/metadata.xml
+++ b/app-office/dia/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-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
   Dia is a gtk+ based diagram creation program. It can be used to
   draw many different kinds of diagrams. It currently has special
diff --git a/app-office/dia2code/metadata.xml b/app-office/dia2code/metadata.xml
index 344ede1bdad..3e8527b79bc 100644
--- a/app-office/dia2code/metadata.xml
+++ b/app-office/dia2code/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-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dia2code</remote-id>
 	</upstream>
diff --git a/app-office/eqe/metadata.xml b/app-office/eqe/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-office/eqe/metadata.xml
+++ b/app-office/eqe/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>tex</herd>
+<maintainer>
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-office/glabels/metadata.xml b/app-office/glabels/metadata.xml
index 6cab71eddf7..16037625891 100644
--- a/app-office/glabels/metadata.xml
+++ b/app-office/glabels/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-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>
   gLabels is a program for creating labels and business cards for
   the GNOME desktop environment. It is designed to work with various
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index f089453f502..a72eca09a4a 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/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-office</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="chipcard">Enable support for chipcard reading and
 		processing.</flag>
diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index 8f58012e654..379a2acbe85 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/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-office</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
 	<flag name="libgda">Enable database support through
 		<pkg>gnome-extra/libgda</pkg>.</flag>
diff --git a/app-office/grisbi/metadata.xml b/app-office/grisbi/metadata.xml
index 927ccdcbd1b..5d8e3ba6bff 100644
--- a/app-office/grisbi/metadata.xml
+++ b/app-office/grisbi/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome-office</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>remi@gentoo.org</email>
 	</maintainer>
@@ -12,6 +10,14 @@
 		<description>Third party maintainer, through the gnome-office herd 
     as a proxy</description>
 	</maintainer>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">grisbi</remote-id>
 	</upstream>
diff --git a/app-office/gtimelog/metadata.xml b/app-office/gtimelog/metadata.xml
index 9ffd1e3ec8f..362638c5ba0 100644
--- a/app-office/gtimelog/metadata.xml
+++ b/app-office/gtimelog/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">gtimelog</remote-id>
 	</upstream>
diff --git a/app-office/hourglass/metadata.xml b/app-office/hourglass/metadata.xml
index f1b964a7495..d056080d339 100644
--- a/app-office/hourglass/metadata.xml
+++ b/app-office/hourglass/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>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hourglass</remote-id>
 	</upstream>
diff --git a/app-office/impressive/metadata.xml b/app-office/impressive/metadata.xml
index 0321bffa6d5..aa93f0e9cef 100644
--- a/app-office/impressive/metadata.xml
+++ b/app-office/impressive/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>
 	<upstream>
 		<remote-id type="sourceforge">impressive</remote-id>
 	</upstream>
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 4563e658138..0a69ddc8ae2 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/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="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
diff --git a/app-office/kraft/metadata.xml b/app-office/kraft/metadata.xml
index 218d86983c0..3d6d1b5e9fa 100644
--- a/app-office/kraft/metadata.xml
+++ b/app-office/kraft/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="sourceforge">kraft</remote-id>
 	</upstream>
diff --git a/app-office/libalkimia/metadata.xml b/app-office/libalkimia/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/app-office/libalkimia/metadata.xml
+++ b/app-office/libalkimia/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/app-office/libreoffice-bin-debug/metadata.xml b/app-office/libreoffice-bin-debug/metadata.xml
index 1cca59730e1..d5d27745441 100644
--- a/app-office/libreoffice-bin-debug/metadata.xml
+++ b/app-office/libreoffice-bin-debug/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>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>LibreOffice is a free office suite.
 This is debug info for the binary version of Libreoffice. Use this if you don't want to wait for the source version to build, but still debug crashes etc</longdescription>
 </pkgmetadata>
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index 746a55799a0..a45ed37c0c2 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>office</herd>
 	<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+	<maintainer>
+<email>office@gentoo.org</email>
+<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>LibreOffice is a free office suite.
 This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.</longdescription>
 </pkgmetadata>
diff --git a/app-office/libreoffice-l10n/metadata.xml b/app-office/libreoffice-l10n/metadata.xml
index a1786408cf5..13536eb90ed 100644
--- a/app-office/libreoffice-l10n/metadata.xml
+++ b/app-office/libreoffice-l10n/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>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<use>
 		<flag name="offlinehelp">Install help files locally instead of using the LibreOffice Wiki</flag>
 		<flag name="linguas_ca_valencia">Catalan locale (Valencia)</flag>
diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 4461ef6b90f..6bc45ee454a 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/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>office</herd>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <longdescription>LibreOffice is the successor of OpenOffice.org. 
 This ebuild allows you to compile it yourself. Unfortunately this 
 compilation can take up to a day depending on the speed of your 
diff --git a/app-office/lotus-notes/metadata.xml b/app-office/lotus-notes/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/app-office/lotus-notes/metadata.xml
+++ b/app-office/lotus-notes/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>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index 0d64a133d29..030d146e8ce 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/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>tex</herd>
-<herd>proxy-maintainers</herd>
-<herd>cjk</herd>
 <maintainer>
   <email>ps@twin.jikos.cz</email>
   <name>Pavel Sanda</name>
@@ -14,6 +11,18 @@
   <name>Alexis Ballier</name>
   <description>Proxy Maintainer, CC bugs</description>
 </maintainer>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <use>
   <flag name="docbook">Add support for docbook export</flag>
   <flag name="dia">Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
diff --git a/app-office/magicpoint/metadata.xml b/app-office/magicpoint/metadata.xml
index 042564f391b..c69add79ce3 100644
--- a/app-office/magicpoint/metadata.xml
+++ b/app-office/magicpoint/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>peter@stuge.se</email>
 		<name> Peter Stuger</name>
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Magic Point is an X11 based presentation tool. It is designed to make
 		simple presentations easy while to make complicated presentations
diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index 0b894592894..83ea9bb3cb0 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/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>chris.kerr@mykolab.ch</email>
     <name>Chris Kerr</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="github">brianb/mdbtools</remote-id>
     <remote-id type="sourceforge">mdbtools</remote-id>
diff --git a/app-office/ooextras/metadata.xml b/app-office/ooextras/metadata.xml
index 7dd3b54df11..c68f405ab49 100644
--- a/app-office/ooextras/metadata.xml
+++ b/app-office/ooextras/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>office</herd>
+	<maintainer>
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
 	<longdescription>OOExtras is a set of community generated templates and sample files. For it to do anything useful, you also have to install one of the different flavours of OpenOffice.org that Gentoo provides</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ooextras</remote-id>
diff --git a/app-office/pinpoint/metadata.xml b/app-office/pinpoint/metadata.xml
index 64407e75421..98f81c4327a 100644
--- a/app-office/pinpoint/metadata.xml
+++ b/app-office/pinpoint/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 lang="en">
 		Pinpoint is a simple presentation tool that hopes to avoid audience
 		death by bullet point and instead encourage presentations containing
diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index 20d13ee7e21..f0f559a4662 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/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-office</herd>
+  <maintainer>
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-office/pybliographer/metadata.xml b/app-office/pybliographer/metadata.xml
index 15047be8bef..adf347cf02c 100644
--- a/app-office/pybliographer/metadata.xml
+++ b/app-office/pybliographer/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>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<longdescription lang="en">
   Pybliographer is a tool for managing bibliographic databases, with
   the following features:
diff --git a/app-office/qcharselect/metadata.xml b/app-office/qcharselect/metadata.xml
index 3b7d2294a6d..fdfe9e152aa 100644
--- a/app-office/qcharselect/metadata.xml
+++ b/app-office/qcharselect/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">qcharselect</remote-id>
 	</upstream>
diff --git a/app-office/rubrica/metadata.xml b/app-office/rubrica/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/app-office/rubrica/metadata.xml
+++ b/app-office/rubrica/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/app-office/scribus/metadata.xml b/app-office/scribus/metadata.xml
index c01facd9040..ff6cf27fd75 100644
--- a/app-office/scribus/metadata.xml
+++ b/app-office/scribus/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="boost">Enable support for Boost based enhancement</flag>
     <flag name="graphicsmagick">Add support for <pkg>media-gfx/graphicsmagick</pkg></flag>
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index 4febf40e24b..a7bb83ce898 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/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="activities">Enable kactivities support</flag>
 		<flag name="crypt">Enable encryption using <pkg>dev-db/sqlcipher</pkg></flag>
diff --git a/app-office/texmacs/metadata.xml b/app-office/texmacs/metadata.xml
index 116f8418632..8030077f4d6 100644
--- a/app-office/texmacs/metadata.xml
+++ b/app-office/texmacs/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>sci</herd>
   <maintainer>
     <email>grozin@gentoo.org</email>
     <name>Andrey Grozin</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <use>
     <flag name="netpbm">Add support for <pkg>media-libs/netpbm</pkg></flag>
     <flag name="pdf">Add the experimental native pdf export</flag>
diff --git a/app-office/texmaker/metadata.xml b/app-office/texmaker/metadata.xml
index 173297b1afd..0e398caf925 100644
--- a/app-office/texmaker/metadata.xml
+++ b/app-office/texmaker/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>tex</herd>
   <maintainer>
     <email>k_f@gentoo.org</email>
     <name>Kristian Fiskerstrand</name>
   </maintainer>
+<maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-office/texstudio/metadata.xml b/app-office/texstudio/metadata.xml
index b605075279d..2131ab64868 100644
--- a/app-office/texstudio/metadata.xml
+++ b/app-office/texstudio/metadata.xml
@@ -5,7 +5,10 @@
 		<email>mrueg@gentoo.org</email>
 		<name>Manuel Rüger</name>
 	</maintainer>
-	<herd>tex</herd>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<use>
 		<flag name="video">Use phonon for video embedding</flag>
 	</use>
diff --git a/app-office/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
index 0d2d972433d..d3da362dddf 100644
--- a/app-office/unoconv/metadata.xml
+++ b/app-office/unoconv/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>office</herd>
   <maintainer>
     <email>graaff@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">dagwieers/unoconv</remote-id>
   </upstream>