14 files changed, 56 insertions, 14 deletions
diff --git a/java-virtuals/ejb-api/metadata.xml b/java-virtuals/ejb-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/ejb-api/metadata.xml
+++ b/java-virtuals/ejb-api/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/interceptor-api/metadata.xml b/java-virtuals/interceptor-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/interceptor-api/metadata.xml
+++ b/java-virtuals/interceptor-api/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jaf/metadata.xml b/java-virtuals/jaf/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jaf/metadata.xml
+++ b/java-virtuals/jaf/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/javamail/metadata.xml b/java-virtuals/javamail/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/javamail/metadata.xml
+++ b/java-virtuals/javamail/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jaxp-virtual/metadata.xml b/java-virtuals/jaxp-virtual/metadata.xml
index 484092bc5681..d662d3c902af 100644
--- a/java-virtuals/jaxp-virtual/metadata.xml
+++ b/java-virtuals/jaxp-virtual/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 lang="en">
     Virtual for Java API for XML Processing (JAXP)
   </longdescription>
diff --git a/java-virtuals/jdk-with-com-sun/metadata.xml b/java-virtuals/jdk-with-com-sun/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jdk-with-com-sun/metadata.xml
+++ b/java-virtuals/jdk-with-com-sun/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jms/metadata.xml b/java-virtuals/jms/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jms/metadata.xml
+++ b/java-virtuals/jms/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/jmx/metadata.xml b/java-virtuals/jmx/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/jmx/metadata.xml
+++ b/java-virtuals/jmx/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/saaj-api/metadata.xml b/java-virtuals/saaj-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/saaj-api/metadata.xml
+++ b/java-virtuals/saaj-api/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/script-api/metadata.xml b/java-virtuals/script-api/metadata.xml
index 8335e2c18589..ab3798dea81e 100644
--- a/java-virtuals/script-api/metadata.xml
+++ b/java-virtuals/script-api/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 lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/java-virtuals/servlet-api/metadata.xml b/java-virtuals/servlet-api/metadata.xml
index 4989a7a7a7eb..6ecbdb18241a 100644
--- a/java-virtuals/servlet-api/metadata.xml
+++ b/java-virtuals/servlet-api/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>
 	Virtual of Servlet API to allow for user selectable implementation of 
 	the Servlet API specification.
diff --git a/java-virtuals/stax-api/metadata.xml b/java-virtuals/stax-api/metadata.xml
index 6c80d418686d..a865d18d6a7b 100644
--- a/java-virtuals/stax-api/metadata.xml
+++ b/java-virtuals/stax-api/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 lang="en">
     Virtual for Streaming API for XML (StAX)
   </longdescription>
diff --git a/java-virtuals/transaction-api/metadata.xml b/java-virtuals/transaction-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/transaction-api/metadata.xml
+++ b/java-virtuals/transaction-api/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
diff --git a/java-virtuals/xmlrpc-api/metadata.xml b/java-virtuals/xmlrpc-api/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/java-virtuals/xmlrpc-api/metadata.xml
+++ b/java-virtuals/xmlrpc-api/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>java</herd>
+<maintainer>
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>