public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/java:master commit in: dev-java/izpack/, dev-java/eventbus/, dev-java/objenesis/, dev-java/jdic/, ...
@ 2016-04-29 21:51 James Le Cuirot
  0 siblings, 0 replies; only message in thread
From: James Le Cuirot @ 2016-04-29 21:51 UTC (permalink / raw
  To: gentoo-commits

commit:     3a12a5661c66b909b9043c4e4a1288dca91a3512
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 21:49:37 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 21:49:37 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=3a12a566

Fix metadata in line with GLEP 67

This should shut Travis up.

 app-eselect/eselect-gradle/metadata.xml            |  2 +-
 app-eselect/eselect-java/metadata.xml              |  6 ++++--
 dev-java/asterisk-java/metadata.xml                |  4 ++--
 dev-java/bare-bones-browser-launch/metadata.xml    |  5 ++++-
 dev-java/buildmagic-tasks/metadata.xml             |  5 ++++-
 dev-java/cacao/metadata.xml                        |  6 ++++--
 dev-java/caucho-services/metadata.xml              |  5 ++++-
 dev-java/cewolf/metadata.xml                       |  5 ++++-
 dev-java/classworlds/metadata.xml                  |  5 ++++-
 dev-java/easymock/metadata.xml                     |  4 ++--
 dev-java/ebean/metadata.xml                        |  7 +++----
 dev-java/echo2extras/metadata.xml                  |  6 ++++--
 dev-java/eclipse-javax-persistence/metadata.xml    |  5 ++++-
 dev-java/eventbus/metadata.xml                     |  5 ++++-
 dev-java/fast-md5/metadata.xml                     |  6 ++++--
 dev-java/filters/metadata.xml                      |  6 ++++--
 dev-java/flip/metadata.xml                         |  6 ++++--
 dev-java/fuse/metadata.xml                         |  6 ++++--
 dev-java/gdata/metadata.xml                        |  6 ++++--
 dev-java/gef/metadata.xml                          |  6 ++++--
 dev-java/gjt-jpl-pattern/metadata.xml              |  6 ++++--
 dev-java/gjt-jpl-util/metadata.xml                 |  6 ++++--
 dev-java/gluegen/metadata.xml                      |  6 ++++--
 dev-java/gnu-classpath/metadata.xml                |  6 ++++--
 dev-java/gradle-bin/metadata.xml                   |  2 +-
 dev-java/gradle/metadata.xml                       |  2 +-
 dev-java/guava/metadata.xml                        |  7 +++----
 dev-java/h2/metadata.xml                           |  8 +++-----
 dev-java/high-scale-lib/metadata.xml               |  6 ++++--
 dev-java/howl-logger/metadata.xml                  |  6 ++++--
 dev-java/irmi/metadata.xml                         |  6 ++++--
 dev-java/itext/metadata.xml                        | 11 +++--------
 dev-java/izpack/metadata.xml                       |  6 ++++--
 dev-java/j3d-core/metadata.xml                     |  6 ++++--
 dev-java/jai-imageio/metadata.xml                  |  5 ++++-
 dev-java/jama/metadata.xml                         |  5 ++++-
 dev-java/jaminid/metadata.xml                      |  6 ++++--
 dev-java/jamvm/metadata.xml                        |  5 ++++-
 dev-java/janino/metadata.xml                       |  8 +++-----
 dev-java/java-config/metadata.xml                  |  5 ++++-
 dev-java/java3dsloader/metadata.xml                |  4 ++--
 dev-java/jdbm/metadata.xml                         |  6 ++++--
 dev-java/jdic/metadata.xml                         |  6 ++++--
 dev-java/jhighlight/metadata.xml                   |  6 ++++--
 dev-java/jmbus/metadata.xml                        |  6 ++++--
 dev-java/joal/metadata.xml                         |  8 +++-----
 dev-java/joesnmp/metadata.xml                      |  6 ++++--
 dev-java/jopt-simple/metadata.xml                  |  5 ++++-
 dev-java/jorbis/metadata.xml                       |  7 +++----
 dev-java/joscar/metadata.xml                       |  6 ++++--
 dev-java/jsap/metadata.xml                         |  8 +++++---
 dev-java/jwordsplitter/metadata.xml                |  6 ++++--
 dev-java/liquidlnf/metadata.xml                    |  6 ++++--
 dev-java/log4j-api/metadata.xml                    |  5 ++++-
 dev-java/log4j-core/metadata.xml                   |  5 ++++-
 dev-java/morfologik-stemming/metadata.xml          |  6 ++++--
 dev-java/netty-transport-native-epoll/metadata.xml |  5 ++++-
 dev-java/nimrodlf/metadata.xml                     |  6 ++++--
 dev-java/objenesis/metadata.xml                    |  6 ++++--
 dev-java/paulscode-codecjorbis/metadata.xml        |  7 +++----
 dev-java/paulscode-codecwav/metadata.xml           |  7 +++----
 dev-java/paulscode-libraryjavasound/metadata.xml   |  7 +++----
 dev-java/paulscode-librarylwjglopenal/metadata.xml |  7 +++----
 dev-java/paulscode-soundsystem/metadata.xml        |  7 +++----
 dev-java/pircbot/metadata.xml                      |  6 ++++--
 dev-java/ptplot/metadata.xml                       |  8 ++++----
 dev-java/rife-continuations/metadata.xml           |  6 ++++--
 dev-java/saxon/metadata.xml                        |  5 ++++-
 dev-java/seda/metadata.xml                         |  6 ++++--
 dev-java/sequence/metadata.xml                     |  4 ++--
 dev-java/sevenzipjbinding/metadata.xml             |  7 +++----
 dev-java/smoothmetal/metadata.xml                  |  5 ++++-
 dev-java/sqlite-jdbc/metadata.xml                  |  8 +++-----
 dev-java/stempel/metadata.xml                      |  6 ++++--
 dev-java/sun-jce-bin/metadata.xml                  |  5 ++++-
 dev-java/swt/metadata.xml                          |  6 ++++--
 dev-java/swtcalendar/metadata.xml                  |  6 ++++--
 dev-java/trilead-ssh2/metadata.xml                 |  4 ++--
 dev-java/uuid/metadata.xml                         |  6 ++++--
 dev-java/vldocking/metadata.xml                    |  4 ++--
 dev-java/webwork/metadata.xml                      |  6 +++---
 dev-java/xbeans/metadata.xml                       |  6 ++++--
 dev-java/xml-xmlbeans/metadata.xml                 |  6 ++++--
 dev-lang/clojure-contrib/metadata.xml              |  7 +++++--
 dev-lang/clojure/metadata.xml                      |  7 +++++--
 dev-util/eclipse-sdk-bin/metadata.xml              |  5 ++++-
 dev-util/lint4j-bin/metadata.xml                   |  6 ++++--
 dev-util/mtp/metadata.xml                          |  6 ++++--
 games-action/minecraft/metadata.xml                |  7 +++----
 games-board/jin/metadata.xml                       |  7 +++----
 games-puzzle/lemmini/metadata.xml                  |  7 +++----
 games-server/bukkit/metadata.xml                   |  7 +++----
 games-server/minecraft-common/metadata.xml         |  7 +++----
 games-server/minecraft-server/metadata.xml         |  7 +++----
 media-gfx/sunflow/metadata.xml                     |  6 ++++--
 media-gfx/sweethome3d/metadata.xml                 |  4 ++--
 media-libs/proxymusic/metadata.xml                 |  5 ++++-
 media-plugins/tuxguitar-plugins-alsa/metadata.xml  |  6 ++++--
 media-sound/jripper/metadata.xml                   |  6 ++++--
 media-sound/jsynthlib/metadata.xml                 |  4 ++--
 media-sound/tuxguitar/metadata.xml                 | 10 ++++++++--
 media-sound/xenoplay/metadata.xml                  |  5 ++++-
 net-mail/davmail/metadata.xml                      |  5 ++++-
 sys-apps/baselayout-java/metadata.xml              |  5 ++++-
 virtual/gradle/metadata.xml                        |  2 +-
 www-servers/jboss-bin/metadata.xml                 |  6 ++++--
 www-servers/jigsaw/metadata.xml                    |  6 ++++--
 107 files changed, 386 insertions(+), 239 deletions(-)

diff --git a/app-eselect/eselect-gradle/metadata.xml b/app-eselect/eselect-gradle/metadata.xml
index 38a3c02..d524010 100644
--- a/app-eselect/eselect-gradle/metadata.xml
+++ b/app-eselect/eselect-gradle/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>flo@geekplace.eu</email>
 		<description>Maintainer, CC him on bugs</description>
 	</maintainer>

diff --git a/app-eselect/eselect-java/metadata.xml b/app-eselect/eselect-java/metadata.xml
index 82a57cc..a234468 100644
--- a/app-eselect/eselect-java/metadata.xml
+++ b/app-eselect/eselect-java/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/asterisk-java/metadata.xml b/dev-java/asterisk-java/metadata.xml
index 4075832..789d329 100644
--- a/dev-java/asterisk-java/metadata.xml
+++ b/dev-java/asterisk-java/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
+<maintainer type="project">
   <email>java@gentoo.org</email>
+  <name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-java/bare-bones-browser-launch/metadata.xml b/dev-java/bare-bones-browser-launch/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/bare-bones-browser-launch/metadata.xml
+++ b/dev-java/bare-bones-browser-launch/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/buildmagic-tasks/metadata.xml b/dev-java/buildmagic-tasks/metadata.xml
index 838c00a..2444066 100644
--- a/dev-java/buildmagic-tasks/metadata.xml
+++ b/dev-java/buildmagic-tasks/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-java/cacao/metadata.xml b/dev-java/cacao/metadata.xml
index d3217b4..d554f88 100644
--- a/dev-java/cacao/metadata.xml
+++ b/dev-java/cacao/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 CACAO is started out as a research JIT compiler for Java to explore new 

diff --git a/dev-java/caucho-services/metadata.xml b/dev-java/caucho-services/metadata.xml
index 838c00a..2444066 100644
--- a/dev-java/caucho-services/metadata.xml
+++ b/dev-java/caucho-services/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-java/cewolf/metadata.xml b/dev-java/cewolf/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/cewolf/metadata.xml
+++ b/dev-java/cewolf/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/classworlds/metadata.xml b/dev-java/classworlds/metadata.xml
index f133408..ee9d52b 100644
--- a/dev-java/classworlds/metadata.xml
+++ b/dev-java/classworlds/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 classworlds is a framework for container developers who require complex
 manipulation of Java's ClassLoaders. Java's native ClassLoader mechanims

diff --git a/dev-java/easymock/metadata.xml b/dev-java/easymock/metadata.xml
index ee7d5d9..d6ae98e 100644
--- a/dev-java/easymock/metadata.xml
+++ b/dev-java/easymock/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<maintainer>
+	<maintainer type="project">
 		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 	<longdescription>
 	EasyMock provides Mock Objects for interfaces in JUnit tests by generating

diff --git a/dev-java/ebean/metadata.xml b/dev-java/ebean/metadata.xml
index 9b73e77..1719651 100644
--- a/dev-java/ebean/metadata.xml
+++ b/dev-java/ebean/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-	<maintainer>
-		<email>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
 		Ebean is an open source Java Object Relational Mapping tool. It uses JPA Annotations (@entity, @OneToMany...) for mapping. It provides a simple API for fetching and saving object graphs.

diff --git a/dev-java/echo2extras/metadata.xml b/dev-java/echo2extras/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/echo2extras/metadata.xml
+++ b/dev-java/echo2extras/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/eclipse-javax-persistence/metadata.xml b/dev-java/eclipse-javax-persistence/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/eclipse-javax-persistence/metadata.xml
+++ b/dev-java/eclipse-javax-persistence/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/eventbus/metadata.xml b/dev-java/eventbus/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/eventbus/metadata.xml
+++ b/dev-java/eventbus/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/fast-md5/metadata.xml b/dev-java/fast-md5/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/fast-md5/metadata.xml
+++ b/dev-java/fast-md5/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/filters/metadata.xml b/dev-java/filters/metadata.xml
index f5f6181..1161f1b 100644
--- a/dev-java/filters/metadata.xml
+++ b/dev-java/filters/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 This package is a collection of Image filters that are useful in applications
 such as games where images have to be generated on the fly.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/flip/metadata.xml b/dev-java/flip/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/flip/metadata.xml
+++ b/dev-java/flip/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/fuse/metadata.xml b/dev-java/fuse/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/fuse/metadata.xml
+++ b/dev-java/fuse/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/gdata/metadata.xml b/dev-java/gdata/metadata.xml
index 52ffc59..f149494 100644
--- a/dev-java/gdata/metadata.xml
+++ b/dev-java/gdata/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		The Google Data APIs (GData) provide a simple protocol for reading and writing data on the web.
 
@@ -20,4 +23,3 @@
     	* YouTube 
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/gef/metadata.xml b/dev-java/gef/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/gef/metadata.xml
+++ b/dev-java/gef/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/gjt-jpl-pattern/metadata.xml b/dev-java/gjt-jpl-pattern/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/gjt-jpl-pattern/metadata.xml
+++ b/dev-java/gjt-jpl-pattern/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/gjt-jpl-util/metadata.xml b/dev-java/gjt-jpl-util/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/gjt-jpl-util/metadata.xml
+++ b/dev-java/gjt-jpl-util/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/gluegen/metadata.xml b/dev-java/gluegen/metadata.xml
index 24033dd..46978b5 100644
--- a/dev-java/gluegen/metadata.xml
+++ b/dev-java/gluegen/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 GlueGen is a tool which automatically generates the Java and JNI code necessary
 to call C libraries. It reads as input ANSI C header files and separate
@@ -14,4 +17,3 @@ bind even low-level APIs such as the Java Native Interface (JNI) and the AWT
 Native Interface (JAWT) back up to the Java programming language.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
index 4feb4c2..336b9ee 100644
--- a/dev-java/gnu-classpath/metadata.xml
+++ b/dev-java/gnu-classpath/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<use>
 		<flag name="alsa">Build with ALSA javax.sound.midi provider</flag>
 		<flag name="dssi">Build with DSSI javax.sound.midi provider</flag>
@@ -14,4 +17,3 @@
 		<flag name="xml">Build with native XML backend</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-java/gradle-bin/metadata.xml b/dev-java/gradle-bin/metadata.xml
index 1ce94c5..03136bb 100644
--- a/dev-java/gradle-bin/metadata.xml
+++ b/dev-java/gradle-bin/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flo@geekplace.eu</email>
     <description>Maintainer, CC him on bugs</description>
   </maintainer>

diff --git a/dev-java/gradle/metadata.xml b/dev-java/gradle/metadata.xml
index 1ce94c5..03136bb 100644
--- a/dev-java/gradle/metadata.xml
+++ b/dev-java/gradle/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>flo@geekplace.eu</email>
     <description>Maintainer, CC him on bugs</description>
   </maintainer>

diff --git a/dev-java/guava/metadata.xml b/dev-java/guava/metadata.xml
index ce504a0..a33f3c6 100644
--- a/dev-java/guava/metadata.xml
+++ b/dev-java/guava/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 Contains several of Google's core Java libraries that are used in

diff --git a/dev-java/h2/metadata.xml b/dev-java/h2/metadata.xml
index ee0cab6..1e435a1 100644
--- a/dev-java/h2/metadata.xml
+++ b/dev-java/h2/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 H2 is a relational database management system written in Java. It can
@@ -12,4 +11,3 @@ be embedded in Java applications or run in the client-server mode. The
 disk footprint (size of the jar file) is about 1 MB.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/high-scale-lib/metadata.xml b/dev-java/high-scale-lib/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/high-scale-lib/metadata.xml
+++ b/dev-java/high-scale-lib/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/howl-logger/metadata.xml b/dev-java/howl-logger/metadata.xml
index ef3004b..2f919e6 100644
--- a/dev-java/howl-logger/metadata.xml
+++ b/dev-java/howl-logger/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>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		HOWL is a logger implementation providing features required by the
 		ObjectWeb JOTM project, with a public API that is generally usable by
 		any Transaction Manager.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/irmi/metadata.xml b/dev-java/irmi/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/irmi/metadata.xml
+++ b/dev-java/irmi/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/itext/metadata.xml b/dev-java/itext/metadata.xml
index cda1d41..1a2f4e1 100644
--- a/dev-java/itext/metadata.xml
+++ b/dev-java/itext/metadata.xml
@@ -1,14 +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>wltjr@gentoo.org</email>
-		<name>William L. Thomson Jr.</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
-
 	<longdescription>
 		iText is a library that allows you to generate PDF files on
 		the fly. The iText classes are very useful for people who need
@@ -19,5 +15,4 @@
 		iText and PDF you can control exactly how your servlet's output
 		will look.
 	</longdescription>
-
 </pkgmetadata>

diff --git a/dev-java/izpack/metadata.xml b/dev-java/izpack/metadata.xml
index 95a6790..2444066 100644
--- a/dev-java/izpack/metadata.xml
+++ b/dev-java/izpack/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/j3d-core/metadata.xml b/dev-java/j3d-core/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/j3d-core/metadata.xml
+++ b/dev-java/j3d-core/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jai-imageio/metadata.xml b/dev-java/jai-imageio/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/jai-imageio/metadata.xml
+++ b/dev-java/jai-imageio/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/jama/metadata.xml
+++ b/dev-java/jama/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/jaminid/metadata.xml b/dev-java/jaminid/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/jaminid/metadata.xml
+++ b/dev-java/jaminid/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jamvm/metadata.xml b/dev-java/jamvm/metadata.xml
index 250f2d1..37998bf 100644
--- a/dev-java/jamvm/metadata.xml
+++ b/dev-java/jamvm/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 type="project">
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
index bedfaa8..9b49e8e 100644
--- a/dev-java/janino/metadata.xml
+++ b/dev-java/janino/metadata.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<maintainer>
-		<email>ali_bush@gentoo.org</email>
-		<name>Alistair Bush</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 	<longdescription lang="en">
 		Janino is a compiler that reads a JavaTM  expression, block, class body, source file or a set of source files, and generates JavaTM bytecode that is loaded and executed directly. Janino is not intended to be a development tool, but an embedded compiler for run-time compilation purposes, e.g. expression evaluators or "server pages" engines like JSP. 
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/java-config/metadata.xml b/dev-java/java-config/metadata.xml
index 7e8e003..fb57516 100644
--- a/dev-java/java-config/metadata.xml
+++ b/dev-java/java-config/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		java-config is used to configure the Java subsystem on your Gentoo
 		installation. In particular, it can be used to configure system-wide and

diff --git a/dev-java/java3dsloader/metadata.xml b/dev-java/java3dsloader/metadata.xml
index 4075832..789d329 100644
--- a/dev-java/java3dsloader/metadata.xml
+++ b/dev-java/java3dsloader/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
+<maintainer type="project">
   <email>java@gentoo.org</email>
+  <name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-java/jdbm/metadata.xml b/dev-java/jdbm/metadata.xml
index b3ca894..c85111b 100644
--- a/dev-java/jdbm/metadata.xml
+++ b/dev-java/jdbm/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/jdic/metadata.xml b/dev-java/jdic/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/jdic/metadata.xml
+++ b/dev-java/jdic/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jhighlight/metadata.xml b/dev-java/jhighlight/metadata.xml
index 95a6790..2444066 100644
--- a/dev-java/jhighlight/metadata.xml
+++ b/dev-java/jhighlight/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jmbus/metadata.xml b/dev-java/jmbus/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/jmbus/metadata.xml
+++ b/dev-java/jmbus/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/joal/metadata.xml b/dev-java/joal/metadata.xml
index b60592e..11faac1 100644
--- a/dev-java/joal/metadata.xml
+++ b/dev-java/joal/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>alistair.bush at gmail.com</email>
-<name>Alistair Bush</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 The JOAL Project hosts a reference implementation of the Java bindings for
@@ -14,4 +13,3 @@ initiated by the Game Technology Group at Sun Microsystems, with intention of
 making the development of high performance games in Java a reality.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/joesnmp/metadata.xml b/dev-java/joesnmp/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/joesnmp/metadata.xml
+++ b/dev-java/joesnmp/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index 6a24afc..5991b2c 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 JOpt Simple is a Java library for parsing command line options, such
 as those you might pass to an invocation of javac.

diff --git a/dev-java/jorbis/metadata.xml b/dev-java/jorbis/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/jorbis/metadata.xml
+++ b/dev-java/jorbis/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/joscar/metadata.xml b/dev-java/joscar/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/joscar/metadata.xml
+++ b/dev-java/joscar/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jsap/metadata.xml b/dev-java/jsap/metadata.xml
index fcbc2c2..f4ca44e 100644
--- a/dev-java/jsap/metadata.xml
+++ b/dev-java/jsap/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>iperez@babel.ls.fi.upm.es</email>
 		<name>Ivan Perez</name>
 	</maintainer>
+<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/jwordsplitter/metadata.xml b/dev-java/jwordsplitter/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/jwordsplitter/metadata.xml
+++ b/dev-java/jwordsplitter/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/liquidlnf/metadata.xml b/dev-java/liquidlnf/metadata.xml
index 95a6790..2444066 100644
--- a/dev-java/liquidlnf/metadata.xml
+++ b/dev-java/liquidlnf/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/log4j-api/metadata.xml b/dev-java/log4j-api/metadata.xml
index 42ca59b..56484ac 100644
--- a/dev-java/log4j-api/metadata.xml
+++ b/dev-java/log4j-api/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>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>Apache Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and provides many of the improvements available in Logback while fixing some inherent problems in Logback's architecture.</longdescription>
 </pkgmetadata>

diff --git a/dev-java/log4j-core/metadata.xml b/dev-java/log4j-core/metadata.xml
index 42ca59b..56484ac 100644
--- a/dev-java/log4j-core/metadata.xml
+++ b/dev-java/log4j-core/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>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>Apache Log4j 2 is an upgrade to Log4j that provides significant improvements over its predecessor, Log4j 1.x, and provides many of the improvements available in Logback while fixing some inherent problems in Logback's architecture.</longdescription>
 </pkgmetadata>

diff --git a/dev-java/morfologik-stemming/metadata.xml b/dev-java/morfologik-stemming/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/morfologik-stemming/metadata.xml
+++ b/dev-java/morfologik-stemming/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/netty-transport-native-epoll/metadata.xml b/dev-java/netty-transport-native-epoll/metadata.xml
index 838c00a..2444066 100644
--- a/dev-java/netty-transport-native-epoll/metadata.xml
+++ b/dev-java/netty-transport-native-epoll/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-java/nimrodlf/metadata.xml b/dev-java/nimrodlf/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/nimrodlf/metadata.xml
+++ b/dev-java/nimrodlf/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/objenesis/metadata.xml
+++ b/dev-java/objenesis/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/paulscode-codecjorbis/metadata.xml b/dev-java/paulscode-codecjorbis/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/paulscode-codecjorbis/metadata.xml
+++ b/dev-java/paulscode-codecjorbis/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/paulscode-codecwav/metadata.xml b/dev-java/paulscode-codecwav/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/paulscode-codecwav/metadata.xml
+++ b/dev-java/paulscode-codecwav/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/paulscode-libraryjavasound/metadata.xml b/dev-java/paulscode-libraryjavasound/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/paulscode-libraryjavasound/metadata.xml
+++ b/dev-java/paulscode-libraryjavasound/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/paulscode-librarylwjglopenal/metadata.xml b/dev-java/paulscode-librarylwjglopenal/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/paulscode-librarylwjglopenal/metadata.xml
+++ b/dev-java/paulscode-librarylwjglopenal/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/paulscode-soundsystem/metadata.xml b/dev-java/paulscode-soundsystem/metadata.xml
index 7f81c12..952a4b9 100644
--- a/dev-java/paulscode-soundsystem/metadata.xml
+++ b/dev-java/paulscode-soundsystem/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-		<name>James Le Cuirot</name>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/pircbot/metadata.xml b/dev-java/pircbot/metadata.xml
index 396254f..30141e7 100644
--- a/dev-java/pircbot/metadata.xml
+++ b/dev-java/pircbot/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>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 PircBot is a Java framework for writing IRC bots quickly and easily. Its
 features include an event-driven architecture to handle common IRC events, flood
 protection, DCC resuming support, ident support, and more.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/ptplot/metadata.xml b/dev-java/ptplot/metadata.xml
index 830caec..a8099fb 100644
--- a/dev-java/ptplot/metadata.xml
+++ b/dev-java/ptplot/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>sanchan@gentoo.org</email>
-	<name>Sandro Bonazzola</name>
-</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 <longdescription>
 Ptplot is a set of two dimensional signal plotters components written in Java
 with the following properties:

diff --git a/dev-java/rife-continuations/metadata.xml b/dev-java/rife-continuations/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/rife-continuations/metadata.xml
+++ b/dev-java/rife-continuations/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/saxon/metadata.xml b/dev-java/saxon/metadata.xml
index 838c00a..2444066 100644
--- a/dev-java/saxon/metadata.xml
+++ b/dev-java/saxon/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-java/seda/metadata.xml b/dev-java/seda/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/seda/metadata.xml
+++ b/dev-java/seda/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/sequence/metadata.xml b/dev-java/sequence/metadata.xml
index 4075832..789d329 100644
--- a/dev-java/sequence/metadata.xml
+++ b/dev-java/sequence/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
+<maintainer type="project">
   <email>java@gentoo.org</email>
+  <name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-java/sevenzipjbinding/metadata.xml b/dev-java/sevenzipjbinding/metadata.xml
index f32b7f9..64d9ea4 100644
--- a/dev-java/sevenzipjbinding/metadata.xml
+++ b/dev-java/sevenzipjbinding/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 A Java wrapper around the native 7-Zip library, allowing fast

diff --git a/dev-java/smoothmetal/metadata.xml b/dev-java/smoothmetal/metadata.xml
index 838c00a..2444066 100644
--- a/dev-java/smoothmetal/metadata.xml
+++ b/dev-java/smoothmetal/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-java/sqlite-jdbc/metadata.xml b/dev-java/sqlite-jdbc/metadata.xml
index f2b3dd3..3153c18 100644
--- a/dev-java/sqlite-jdbc/metadata.xml
+++ b/dev-java/sqlite-jdbc/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 SQLite JDBC driver developed by Taro L. Saito is an extension of
@@ -12,4 +11,3 @@ Zentus's SQLite JDBC driver that enables Java to access SQLite
 database files.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/stempel/metadata.xml b/dev-java/stempel/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/stempel/metadata.xml
+++ b/dev-java/stempel/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/sun-jce-bin/metadata.xml b/dev-java/sun-jce-bin/metadata.xml
index 7303cef..952a4b9 100644
--- a/dev-java/sun-jce-bin/metadata.xml
+++ b/dev-java/sun-jce-bin/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/swt/metadata.xml b/dev-java/swt/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/swt/metadata.xml
+++ b/dev-java/swt/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/swtcalendar/metadata.xml b/dev-java/swtcalendar/metadata.xml
index 07d2f44..6cfc7d2 100644
--- a/dev-java/swtcalendar/metadata.xml
+++ b/dev-java/swtcalendar/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		SWTCalendar is a port of Kai Toedter's  JCalendar to Eclipse's SWT. It is a GUI date picker for Java using SWT as the GUI toolkit. SWTCalendar was designed to be a flexible component so developer can embed a date picker in their application or create their own standalone date picker dialog.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/trilead-ssh2/metadata.xml b/dev-java/trilead-ssh2/metadata.xml
index 4075832..789d329 100644
--- a/dev-java/trilead-ssh2/metadata.xml
+++ b/dev-java/trilead-ssh2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
+<maintainer type="project">
   <email>java@gentoo.org</email>
+  <name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-java/uuid/metadata.xml b/dev-java/uuid/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/uuid/metadata.xml
+++ b/dev-java/uuid/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/vldocking/metadata.xml b/dev-java/vldocking/metadata.xml
index a2ac2e0..2444066 100644
--- a/dev-java/vldocking/metadata.xml
+++ b/dev-java/vldocking/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
+<maintainer type="project">
 	<email>java@gentoo.org</email>
+	<name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-java/webwork/metadata.xml b/dev-java/webwork/metadata.xml
index 717204f..7e3ec86 100644
--- a/dev-java/webwork/metadata.xml
+++ b/dev-java/webwork/metadata.xml
@@ -1,8 +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>nichoj@gentoo.org</email>
+	<maintainer type="project">
+	  <email>java@gentoo.org</email>
+	  <name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/dev-java/xbeans/metadata.xml b/dev-java/xbeans/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-java/xbeans/metadata.xml
+++ b/dev-java/xbeans/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
index 3f89838..16bd04d 100644
--- a/dev-java/xml-xmlbeans/metadata.xml
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
-<herd>java</herd>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 
 <longdescription>
 

diff --git a/dev-lang/clojure-contrib/metadata.xml b/dev-lang/clojure-contrib/metadata.xml
index 8296f58..cbb3863 100644
--- a/dev-lang/clojure-contrib/metadata.xml
+++ b/dev-lang/clojure-contrib/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>java</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>gentoo@sattvik.com</email>
 		<name>Daniel Solano Gómez</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription>
 		The user contributions library, clojure.contrib, is a collection of
 		namespaces each of which implements features that we believe may be

diff --git a/dev-lang/clojure/metadata.xml b/dev-lang/clojure/metadata.xml
index 12ca42c..70e460b 100644
--- a/dev-lang/clojure/metadata.xml
+++ b/dev-lang/clojure/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>java</herd>
-<maintainer>
+<maintainer type="person">
 	<email>gentoo@sattvik.com</email>
 	<name>Daniel Solano Gómez</name>
 </maintainer>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription>
 	Clojure is a dynamic programming language that targets the Java Virtual
 	Machine.  It is designed to be a general-purpose language, combining the

diff --git a/dev-util/eclipse-sdk-bin/metadata.xml b/dev-util/eclipse-sdk-bin/metadata.xml
index 8335e2c..a234468 100644
--- a/dev-util/eclipse-sdk-bin/metadata.xml
+++ b/dev-util/eclipse-sdk-bin/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/dev-util/lint4j-bin/metadata.xml b/dev-util/lint4j-bin/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-util/lint4j-bin/metadata.xml
+++ b/dev-util/lint4j-bin/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/mtp/metadata.xml b/dev-util/mtp/metadata.xml
index 604e0a4..952a4b9 100644
--- a/dev-util/mtp/metadata.xml
+++ b/dev-util/mtp/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/games-action/minecraft/metadata.xml b/games-action/minecraft/metadata.xml
index c2af30a..44ad611 100644
--- a/games-action/minecraft/metadata.xml
+++ b/games-action/minecraft/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 Minecraft is a commercial game about placing blocks to build anything

diff --git a/games-board/jin/metadata.xml b/games-board/jin/metadata.xml
index 9e605ae..f8bb1ac 100644
--- a/games-board/jin/metadata.xml
+++ b/games-board/jin/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 Jin is a Java client for various chess servers. It currently supports

diff --git a/games-puzzle/lemmini/metadata.xml b/games-puzzle/lemmini/metadata.xml
index 34f9cfe..0cd2a3b 100644
--- a/games-puzzle/lemmini/metadata.xml
+++ b/games-puzzle/lemmini/metadata.xml
@@ -1,9 +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>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 </pkgmetadata>

diff --git a/games-server/bukkit/metadata.xml b/games-server/bukkit/metadata.xml
index 9503c30..a556f47 100644
--- a/games-server/bukkit/metadata.xml
+++ b/games-server/bukkit/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 Bukkit is a plugin-based server mod for Minecraft. This package is for

diff --git a/games-server/minecraft-common/metadata.xml b/games-server/minecraft-common/metadata.xml
index e070d34..7abbbbc 100644
--- a/games-server/minecraft-common/metadata.xml
+++ b/games-server/minecraft-common/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 Gentoo's own common scripts for Minecraft servers. This package does

diff --git a/games-server/minecraft-server/metadata.xml b/games-server/minecraft-server/metadata.xml
index 986c607..8df485b 100644
--- a/games-server/minecraft-server/metadata.xml
+++ b/games-server/minecraft-server/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
-<maintainer>
-<email>chewi at aura-online.co.uk</email>
-<name>James Le Cuirot</name>
+<maintainer type="project">
+<email>java@gentoo.org</email>
+<name>Java</name>
 </maintainer>
 <longdescription lang="en">
 This is the dedicated server for the game Minecraft. It has an ugly

diff --git a/media-gfx/sunflow/metadata.xml b/media-gfx/sunflow/metadata.xml
index 5508681..2917b35 100644
--- a/media-gfx/sunflow/metadata.xml
+++ b/media-gfx/sunflow/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></herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 		Sunflow is an open source rendering system for photo-realistic image
 		synthesis. It is written in Java and built around a flexible ray tracing
 		core and an extensible object-oriented design.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-gfx/sweethome3d/metadata.xml b/media-gfx/sweethome3d/metadata.xml
index 2885beb..952a4b9 100644
--- a/media-gfx/sweethome3d/metadata.xml
+++ b/media-gfx/sweethome3d/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
-	<maintainer>
+	<maintainer type="project">
 		<email>java@gentoo.org</email>
+		<name>Java</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/media-libs/proxymusic/metadata.xml b/media-libs/proxymusic/metadata.xml
index 7303cef..952a4b9 100644
--- a/media-libs/proxymusic/metadata.xml
+++ b/media-libs/proxymusic/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/media-plugins/tuxguitar-plugins-alsa/metadata.xml b/media-plugins/tuxguitar-plugins-alsa/metadata.xml
index 8f771f0..952a4b9 100644
--- a/media-plugins/tuxguitar-plugins-alsa/metadata.xml
+++ b/media-plugins/tuxguitar-plugins-alsa/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd></herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/jripper/metadata.xml b/media-sound/jripper/metadata.xml
index 604e0a4..952a4b9 100644
--- a/media-sound/jripper/metadata.xml
+++ b/media-sound/jripper/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/jsynthlib/metadata.xml b/media-sound/jsynthlib/metadata.xml
index d891326..6ef24c0 100644
--- a/media-sound/jsynthlib/metadata.xml
+++ b/media-sound/jsynthlib/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
+<maintainer type="project">
 <email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
 </maintainer>
 </pkgmetadata>

diff --git a/media-sound/tuxguitar/metadata.xml b/media-sound/tuxguitar/metadata.xml
index e8d8892..67fc655 100644
--- a/media-sound/tuxguitar/metadata.xml
+++ b/media-sound/tuxguitar/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>java</herd>
-	<herd>sound</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sound@gentoo.org</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 	<use>
 		<flag name="fluidsynth">Enable FluidSynth support.</flag>
 	</use>

diff --git a/media-sound/xenoplay/metadata.xml b/media-sound/xenoplay/metadata.xml
index 7303cef..952a4b9 100644
--- a/media-sound/xenoplay/metadata.xml
+++ b/media-sound/xenoplay/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/net-mail/davmail/metadata.xml b/net-mail/davmail/metadata.xml
index 838c00a..2444066 100644
--- a/net-mail/davmail/metadata.xml
+++ b/net-mail/davmail/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/baselayout-java/metadata.xml b/sys-apps/baselayout-java/metadata.xml
index 8335e2c..a234468 100644
--- a/sys-apps/baselayout-java/metadata.xml
+++ b/sys-apps/baselayout-java/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 type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/virtual/gradle/metadata.xml b/virtual/gradle/metadata.xml
index 38a3c02..d524010 100644
--- a/virtual/gradle/metadata.xml
+++ b/virtual/gradle/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>flo@geekplace.eu</email>
 		<description>Maintainer, CC him on bugs</description>
 	</maintainer>

diff --git a/www-servers/jboss-bin/metadata.xml b/www-servers/jboss-bin/metadata.xml
index a8889a8..bf88acc 100644
--- a/www-servers/jboss-bin/metadata.xml
+++ b/www-servers/jboss-bin/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 type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 	<use>
@@ -9,4 +12,3 @@
 		<flag name="srvdir">Store configuration in /srv</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/www-servers/jigsaw/metadata.xml b/www-servers/jigsaw/metadata.xml
index 604e0a4..952a4b9 100644
--- a/www-servers/jigsaw/metadata.xml
+++ b/www-servers/jigsaw/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>java</herd>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 </pkgmetadata>
-


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-04-29 21:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-29 21:51 [gentoo-commits] proj/java:master commit in: dev-java/izpack/, dev-java/eventbus/, dev-java/objenesis/, dev-java/jdic/, James Le Cuirot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox