8 files changed, 32 insertions, 8 deletions
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 92d30e8ed79a..2ddbbe6768a6 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/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>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
@@ -11,6 +10,10 @@
     <name>Johan Bergström</name>
     <description>Co-maintainer, CC on bugs.</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="aio">Enables file AIO support</flag>
     <flag name="http">Enable HTTP core support</flag>
diff --git a/www-servers/ocsigenserver/metadata.xml b/www-servers/ocsigenserver/metadata.xml
index 6c2941a2a9ed..3c312bcff7bb 100644
--- a/www-servers/ocsigenserver/metadata.xml
+++ b/www-servers/ocsigenserver/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>ml</herd>
+	<maintainer>
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">ocsigen/ocsigenserver</remote-id>
 	</upstream>
diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
index 56bd1ef88cb0..1ba5e64db90e 100644
--- a/www-servers/resin/metadata.xml
+++ b/www-servers/resin/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>
   <use>
 	  <flag name="admin">Enable Resin admin webapp</flag>
   </use>
diff --git a/www-servers/thin/metadata.xml b/www-servers/thin/metadata.xml
index 468426a55f69..e5e9b73cc1cb 100644
--- a/www-servers/thin/metadata.xml
+++ b/www-servers/thin/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>ruby</herd>
+	<maintainer>
+		<email>ruby@gentoo.org</email>
+		<name>Gentoo Ruby Project</name>
+	</maintainer>
 	<longdescription>
 Thin is a very simple web server written in Ruby. It's single-threaded, which
 means it can only serve one request at a time. This simplicity affords increased
diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index e194d2375db6..f1e2368c8b0b 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/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>
   <longdescription>
     Tomcat is the servlet container that is used in the official Reference
     Implementation for the Java Servlet and JavaServer Pages technologies.
diff --git a/www-servers/tornado/metadata.xml b/www-servers/tornado/metadata.xml
index ec9b762db147..f218826fcc53 100644
--- a/www-servers/tornado/metadata.xml
+++ b/www-servers/tornado/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>python</herd>
   <maintainer>
     <email>alunduil@gentoo.org</email>
     <name>Alex Brandt</name>
   </maintainer>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">tornado</remote-id>
     <remote-id type="github">tornadoweb/tornado</remote-id>
diff --git a/www-servers/uwsgi/metadata.xml b/www-servers/uwsgi/metadata.xml
index 63a1c4418db4..4492241f3085 100644
--- a/www-servers/uwsgi/metadata.xml
+++ b/www-servers/uwsgi/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>python</herd>
 	<maintainer>
 		<email>ultrabug@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<use>
 		<flag name="embedded">Embed plugins instead of building them as real plugins. When disabling this USE flag make sure you specify all used plugins in your uWSGI configuration. Note: Language plugins will always be built as real plugins.</flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> instead of libc's malloc</flag>
diff --git a/www-servers/xsp/metadata.xml b/www-servers/xsp/metadata.xml
index da626214408a..bd28ecd48db9 100644
--- a/www-servers/xsp/metadata.xml
+++ b/www-servers/xsp/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>dotnet</herd>
+	<maintainer>
+                <email>dotnet@gentoo.org</email>
+                <name>Gentoo Dotnet Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		XSP is a standalone web server written in C# that can be used to run
 		your ASP.NET applications.