summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /dev-ml
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/ANSITerminal/metadata.xml5
-rw-r--r--dev-ml/async/metadata.xml5
-rw-r--r--dev-ml/async_extra/metadata.xml5
-rw-r--r--dev-ml/async_kernel/metadata.xml5
-rw-r--r--dev-ml/async_rpc_kernel/metadata.xml5
-rw-r--r--dev-ml/async_unix/metadata.xml5
-rw-r--r--dev-ml/batteries/metadata.xml5
-rw-r--r--dev-ml/bignum/metadata.xml5
-rw-r--r--dev-ml/bin-prot/metadata.xml5
-rw-r--r--dev-ml/biniou/metadata.xml5
-rw-r--r--dev-ml/bolt/metadata.xml5
-rw-r--r--dev-ml/cairo-ocaml/metadata.xml5
-rw-r--r--dev-ml/calendar/metadata.xml5
-rw-r--r--dev-ml/camlbz2/metadata.xml5
-rw-r--r--dev-ml/camldbm/metadata.xml5
-rw-r--r--dev-ml/camlidl/metadata.xml5
-rw-r--r--dev-ml/camlimages/metadata.xml5
-rw-r--r--dev-ml/camlp4/metadata.xml5
-rw-r--r--dev-ml/camlp5/metadata.xml5
-rw-r--r--dev-ml/camlzip/metadata.xml5
-rw-r--r--dev-ml/camomile/metadata.xml5
-rw-r--r--dev-ml/cmdliner/metadata.xml5
-rw-r--r--dev-ml/comparelib/metadata.xml5
-rw-r--r--dev-ml/core/metadata.xml5
-rw-r--r--dev-ml/core_bench/metadata.xml5
-rw-r--r--dev-ml/core_extended/metadata.xml5
-rw-r--r--dev-ml/core_kernel/metadata.xml5
-rw-r--r--dev-ml/core_profiler/metadata.xml5
-rw-r--r--dev-ml/cppo/metadata.xml5
-rw-r--r--dev-ml/cryptokit/metadata.xml5
-rw-r--r--dev-ml/csv/metadata.xml5
-rw-r--r--dev-ml/cudf/metadata.xml5
-rw-r--r--dev-ml/custom_printf/metadata.xml5
-rw-r--r--dev-ml/deriving-ocsigen/metadata.xml5
-rw-r--r--dev-ml/deriving/metadata.xml5
-rw-r--r--dev-ml/dose3/metadata.xml5
-rw-r--r--dev-ml/easy-format/metadata.xml5
-rw-r--r--dev-ml/eliom/metadata.xml5
-rw-r--r--dev-ml/enumerate/metadata.xml5
-rw-r--r--dev-ml/extlib/metadata.xml5
-rw-r--r--dev-ml/facile/metadata.xml10
-rw-r--r--dev-ml/faillib/metadata.xml5
-rw-r--r--dev-ml/fieldslib/metadata.xml5
-rw-r--r--dev-ml/findlib/metadata.xml5
-rw-r--r--dev-ml/gd4o/metadata.xml5
-rw-r--r--dev-ml/herelib/metadata.xml5
-rw-r--r--dev-ml/iTeML/metadata.xml5
-rw-r--r--dev-ml/incremental/metadata.xml5
-rw-r--r--dev-ml/io-page/metadata.xml10
-rw-r--r--dev-ml/js_of_ocaml/metadata.xml5
-rw-r--r--dev-ml/jsonm/metadata.xml5
-rw-r--r--dev-ml/kaputt/metadata.xml5
-rw-r--r--dev-ml/lablgl/metadata.xml5
-rw-r--r--dev-ml/lablgtk/metadata.xml5
-rw-r--r--dev-ml/labltk/metadata.xml5
-rw-r--r--dev-ml/lambda-term/metadata.xml5
-rw-r--r--dev-ml/lwt/metadata.xml10
-rw-r--r--dev-ml/macaque/metadata.xml5
-rw-r--r--dev-ml/menhir/metadata.xml5
-rw-r--r--dev-ml/mirage-profile/metadata.xml10
-rw-r--r--dev-ml/oasis/metadata.xml5
-rw-r--r--dev-ml/ocaml-autoconf/metadata.xml5
-rw-r--r--dev-ml/ocaml-base64/metadata.xml5
-rw-r--r--dev-ml/ocaml-cstruct/metadata.xml10
-rw-r--r--dev-ml/ocaml-ctypes/metadata.xml5
-rw-r--r--dev-ml/ocaml-data-notation/metadata.xml10
-rw-r--r--dev-ml/ocaml-dns/metadata.xml10
-rw-r--r--dev-ml/ocaml-doc/metadata.xml5
-rw-r--r--dev-ml/ocaml-expat/metadata.xml5
-rw-r--r--dev-ml/ocaml-expect/metadata.xml10
-rw-r--r--dev-ml/ocaml-fileutils/metadata.xml10
-rw-r--r--dev-ml/ocaml-gettext/metadata.xml5
-rw-r--r--dev-ml/ocaml-ipaddr/metadata.xml5
-rw-r--r--dev-ml/ocaml-make/metadata.xml5
-rw-r--r--dev-ml/ocaml-mysql/metadata.xml5
-rw-r--r--dev-ml/ocaml-pcap/metadata.xml10
-rw-r--r--dev-ml/ocaml-re/metadata.xml5
-rw-r--r--dev-ml/ocaml-safepass/metadata.xml5
-rw-r--r--dev-ml/ocaml-sha/metadata.xml5
-rw-r--r--dev-ml/ocaml-sqlite3/metadata.xml5
-rw-r--r--dev-ml/ocaml-ssl/metadata.xml5
-rw-r--r--dev-ml/ocaml-text/metadata.xml5
-rw-r--r--dev-ml/ocaml-uri/metadata.xml10
-rw-r--r--dev-ml/ocamldap/metadata.xml5
-rw-r--r--dev-ml/ocamldsort/metadata.xml5
-rw-r--r--dev-ml/ocamlgraph/metadata.xml5
-rw-r--r--dev-ml/ocamlgsl/metadata.xml5
-rw-r--r--dev-ml/ocamlify/metadata.xml5
-rw-r--r--dev-ml/ocamlmod/metadata.xml5
-rw-r--r--dev-ml/ocamlnet/metadata.xml5
-rw-r--r--dev-ml/ocamlpam/metadata.xml5
-rw-r--r--dev-ml/ocamlsdl/metadata.xml5
-rw-r--r--dev-ml/ocamlweb/metadata.xml5
-rw-r--r--dev-ml/ocplib-endian/metadata.xml10
-rw-r--r--dev-ml/ocurl/metadata.xml5
-rw-r--r--dev-ml/odns/metadata.xml5
-rw-r--r--dev-ml/opam/metadata.xml5
-rw-r--r--dev-ml/optcomp/metadata.xml5
-rw-r--r--dev-ml/ounit/metadata.xml5
-rw-r--r--dev-ml/pa_bench/metadata.xml5
-rw-r--r--dev-ml/pa_ounit/metadata.xml5
-rw-r--r--dev-ml/pa_structural_sexp/metadata.xml5
-rw-r--r--dev-ml/pa_test/metadata.xml5
-rw-r--r--dev-ml/parmap/metadata.xml5
-rw-r--r--dev-ml/pcre-ocaml/metadata.xml5
-rw-r--r--dev-ml/pgocaml/metadata.xml5
-rw-r--r--dev-ml/pipebang/metadata.xml5
-rw-r--r--dev-ml/pomap/metadata.xml5
-rw-r--r--dev-ml/postgresql-ocaml/metadata.xml5
-rw-r--r--dev-ml/pxp/metadata.xml5
-rw-r--r--dev-ml/qcheck/metadata.xml10
-rw-r--r--dev-ml/re2/metadata.xml5
-rw-r--r--dev-ml/react/metadata.xml5
-rw-r--r--dev-ml/reactiveData/metadata.xml5
-rw-r--r--dev-ml/res/metadata.xml5
-rw-r--r--dev-ml/sexplib/metadata.xml5
-rw-r--r--dev-ml/stringext/metadata.xml10
-rw-r--r--dev-ml/textutils/metadata.xml5
-rw-r--r--dev-ml/type-conv/metadata.xml5
-rw-r--r--dev-ml/typehashlib/metadata.xml5
-rw-r--r--dev-ml/typerep/metadata.xml5
-rw-r--r--dev-ml/typerep_extended/metadata.xml5
-rw-r--r--dev-ml/tyxml/metadata.xml5
-rw-r--r--dev-ml/ulex/metadata.xml5
-rw-r--r--dev-ml/utop/metadata.xml5
-rw-r--r--dev-ml/uutf/metadata.xml5
-rw-r--r--dev-ml/variantslib/metadata.xml5
-rw-r--r--dev-ml/xml-light/metadata.xml5
-rw-r--r--dev-ml/xmlm/metadata.xml10
-rw-r--r--dev-ml/xstr/metadata.xml5
-rw-r--r--dev-ml/yojson/metadata.xml5
-rw-r--r--dev-ml/zarith/metadata.xml5
-rw-r--r--dev-ml/zed/metadata.xml5
133 files changed, 592 insertions, 148 deletions
diff --git a/dev-ml/ANSITerminal/metadata.xml b/dev-ml/ANSITerminal/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ANSITerminal/metadata.xml
+++ b/dev-ml/ANSITerminal/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async/metadata.xml
+++ b/dev-ml/async/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_extra/metadata.xml
+++ b/dev-ml/async_extra/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/async_rpc_kernel/metadata.xml
+++ b/dev-ml/async_rpc_kernel/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
index ce6fb259c213..d0b74cdfcef0 100644
--- a/dev-ml/batteries/metadata.xml
+++ b/dev-ml/batteries/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">ocaml-batteries-team/batteries-included</remote-id>
</upstream>
diff --git a/dev-ml/bignum/metadata.xml b/dev-ml/bignum/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/bignum/metadata.xml
+++ b/dev-ml/bignum/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin-prot/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/bin-prot/metadata.xml
+++ b/dev-ml/bin-prot/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/bolt/metadata.xml b/dev-ml/bolt/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/bolt/metadata.xml
+++ b/dev-ml/bolt/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
index 2212fedc13f4..f745896a2769 100644
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ b/dev-ml/cairo-ocaml/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>
<longdescription lang="en">
This package contains all the development stuff you need to use Cairo in
your OCaml programs. The folowing backends are supported: PostScript,
diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/calendar/metadata.xml
+++ b/dev-ml/calendar/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camldbm/metadata.xml
+++ b/dev-ml/camldbm/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/camlidl/metadata.xml
+++ b/dev-ml/camlidl/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index e4f3fadc36e8..1e7ada87647d 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/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="bitbucket">camlspotter/camlimages</remote-id>
</upstream>
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 61a20d310a0e..e051b6170427 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/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">ocaml/camlp4</remote-id>
</upstream>
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/camlzip/metadata.xml
+++ b/dev-ml/camlzip/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
index c2fd0b301e0c..a30a59a7020d 100644
--- a/dev-ml/camomile/metadata.xml
+++ b/dev-ml/camomile/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">yoriyuki/Camomile</remote-id>
</upstream>
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/comparelib/metadata.xml b/dev-ml/comparelib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/comparelib/metadata.xml
+++ b/dev-ml/comparelib/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
index 3a9dfe0e889c..743230d081ed 100644
--- a/dev-ml/core/metadata.xml
+++ b/dev-ml/core/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>
<longdescription lang="en">
Core is Jane Street Capital's Ocaml standard library overlay. It
provides tail recursive versions of non tail recursive functions in
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_bench/metadata.xml
+++ b/dev-ml/core_bench/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_extended/metadata.xml
+++ b/dev-ml/core_extended/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index f9f1f8a63391..26237397c482 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/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>
<longdescription lang="en">
Core_kernel is the system-independent part of Core. It is aimed for
cases when the full Core is not available, such as in Javascript. It
diff --git a/dev-ml/core_profiler/metadata.xml b/dev-ml/core_profiler/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/core_profiler/metadata.xml
+++ b/dev-ml/core_profiler/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index a9b7bec08858..cc12c7ffd08d 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/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">mjambon/cppo</remote-id>
</upstream>
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cryptokit/metadata.xml
+++ b/dev-ml/cryptokit/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
index 758d5a49ade3..f362b1a9d1ff 100644
--- a/dev-ml/csv/metadata.xml
+++ b/dev-ml/csv/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">Chris00/ocaml-csv</remote-id>
</upstream>
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/custom_printf/metadata.xml b/dev-ml/custom_printf/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/custom_printf/metadata.xml
+++ b/dev-ml/custom_printf/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/deriving-ocsigen/metadata.xml b/dev-ml/deriving-ocsigen/metadata.xml
index d03028baab6f..592a4ddbc8c0 100644
--- a/dev-ml/deriving-ocsigen/metadata.xml
+++ b/dev-ml/deriving-ocsigen/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>
<use>
<flag name="type-conv">Enable type-conv for the syntax extention.</flag>
</use>
diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml
index 09825ef62a07..39b408f3da5a 100644
--- a/dev-ml/deriving/metadata.xml
+++ b/dev-ml/deriving/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/deriving</remote-id>
</upstream>
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index f3dd19f62c3d..14fe3440a105 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/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>
<use>
<flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
<flag name="zip">Adds support for handling zip files.</flag>
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/easy-format/metadata.xml
+++ b/dev-ml/easy-format/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
index 938b956109af..6fef2522e594 100644
--- a/dev-ml/eliom/metadata.xml
+++ b/dev-ml/eliom/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/eliom</remote-id>
</upstream>
diff --git a/dev-ml/enumerate/metadata.xml b/dev-ml/enumerate/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/enumerate/metadata.xml
+++ b/dev-ml/enumerate/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index 0b1f8d274066..b14bb8772372 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/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="google-code">ocaml-extlib</remote-id>
<remote-id type="github">ygrek/ocaml-extlib</remote-id>
diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml
index b8f481c02b36..ae0dca33164b 100644
--- a/dev-ml/facile/metadata.xml
+++ b/dev-ml/facile/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>ml</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/faillib/metadata.xml b/dev-ml/faillib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/faillib/metadata.xml
+++ b/dev-ml/faillib/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index d7fe6e623768..98258ddfd3a2 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/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>
<longdescription lang="en">
This library defines a syntax extension for OCaml using Camlp4 that
can be used to define first class values representing record fields,
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/gd4o/metadata.xml b/dev-ml/gd4o/metadata.xml
index ae5d75598795..f85a15c82e03 100644
--- a/dev-ml/gd4o/metadata.xml
+++ b/dev-ml/gd4o/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="sourceforge">gd4o</remote-id>
</upstream>
diff --git a/dev-ml/herelib/metadata.xml b/dev-ml/herelib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/herelib/metadata.xml
+++ b/dev-ml/herelib/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml
index d49e7e430be4..c37f8e1d29c5 100644
--- a/dev-ml/iTeML/metadata.xml
+++ b/dev-ml/iTeML/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">vincent-hugot/iTeML</remote-id>
</upstream>
diff --git a/dev-ml/incremental/metadata.xml b/dev-ml/incremental/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/incremental/metadata.xml
+++ b/dev-ml/incremental/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml
index 7de4823b6f0b..1ea7e1e10625 100644
--- a/dev-ml/io-page/metadata.xml
+++ b/dev-ml/io-page/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">mirage/io-page</remote-id>
</upstream>
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index eecf32520269..279f72e9dcc6 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/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>
<use>
<flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
</use>
diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/jsonm/metadata.xml
+++ b/dev-ml/jsonm/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/kaputt/metadata.xml b/dev-ml/kaputt/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/kaputt/metadata.xml
+++ b/dev-ml/kaputt/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/lablgl/metadata.xml
+++ b/dev-ml/lablgl/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 4d94d0767d14..ef47bd794414 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/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>
<use>
<flag name="glade">Enable libglade bindings compilation.</flag>
<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/labltk/metadata.xml
+++ b/dev-ml/labltk/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/lambda-term/metadata.xml b/dev-ml/lambda-term/metadata.xml
index f2d915542cad..95f170e27295 100644
--- a/dev-ml/lambda-term/metadata.xml
+++ b/dev-ml/lambda-term/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">diml/lambda-term</remote-id>
</upstream>
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 907abc8009ab..e25dbdecd356 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/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>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
@@ -11,6 +9,14 @@
<email>pclairam@gmail.com</email>
<name>Pierre Clairambault</name>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="react">Enables support for <pkg>dev-ml/react</pkg>: Functional reactive programming (signals, events, etc.).</flag>
<flag name="toplevel">Enables enhanced toplevel.</flag>
diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml
index e85e037a03c3..c04c6d04e80c 100644
--- a/dev-ml/macaque/metadata.xml
+++ b/dev-ml/macaque/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/macaque</remote-id>
</upstream>
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/menhir/metadata.xml
+++ b/dev-ml/menhir/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
index b5b7df083105..951348167032 100644
--- a/dev-ml/mirage-profile/metadata.xml
+++ b/dev-ml/mirage-profile/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">mirage/mirage-profile</remote-id>
</upstream>
diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/oasis/metadata.xml
+++ b/dev-ml/oasis/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-autoconf/metadata.xml
+++ b/dev-ml/ocaml-autoconf/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml
index ca9f4ce9dfc0..c1b1505df3d4 100644
--- a/dev-ml/ocaml-base64/metadata.xml
+++ b/dev-ml/ocaml-base64/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">mirage/ocaml-base64</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
index 0daee3d1c37a..e074d60f9742 100644
--- a/dev-ml/ocaml-cstruct/metadata.xml
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="async">Support for asynchronous execution</flag>
<flag name="camlp4">Enable support for camlp4</flag>
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index df149a6e7595..4816f8cf4404 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/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">ocamllabs/ocaml-ctypes</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-data-notation/metadata.xml b/dev-ml/ocaml-data-notation/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-data-notation/metadata.xml
+++ b/dev-ml/ocaml-data-notation/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>v.ivanov@ymail.com</email>
<name>Vladimir Ivanov</name>
</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-dns/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
index 6a5da2b59c44..505591c8e7a9 100644
--- a/dev-ml/ocaml-dns/metadata.xml
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="async">support for asynchronous execution</flag>
<flag name="lwt">enable threads via lwt</flag>
diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/ocaml-doc/metadata.xml
+++ b/dev-ml/ocaml-doc/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-expect/metadata.xml
+++ b/dev-ml/ocaml-expect/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>v.ivanov@ymail.com</email>
<name>Vladimir Ivanov</name>
</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>v.ivanov@ymail.com</email>
<name>Vladimir Ivanov</name>
</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/ocaml-ipaddr/metadata.xml
index 1b11944eeb16..1f2b5fbcf0e4 100644
--- a/dev-ml/ocaml-ipaddr/metadata.xml
+++ b/dev-ml/ocaml-ipaddr/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">mirage/ocaml-ipaddr</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-make/metadata.xml b/dev-ml/ocaml-make/metadata.xml
index 1abbdf08804c..8d53db6ae683 100644
--- a/dev-ml/ocaml-make/metadata.xml
+++ b/dev-ml/ocaml-make/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="bitbucket">mmottl/ocaml-makefile</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-mysql/metadata.xml b/dev-ml/ocaml-mysql/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocaml-mysql/metadata.xml
+++ b/dev-ml/ocaml-mysql/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml
index 7e5c77c52db0..b6f9747e11b5 100644
--- a/dev-ml/ocaml-pcap/metadata.xml
+++ b/dev-ml/ocaml-pcap/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">mirage/ocaml-pcap</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
index 7bcb58676bed..a1f423d9e7ac 100644
--- a/dev-ml/ocaml-re/metadata.xml
+++ b/dev-ml/ocaml-re/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">ocaml/ocaml-re</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-safepass/metadata.xml b/dev-ml/ocaml-safepass/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocaml-safepass/metadata.xml
+++ b/dev-ml/ocaml-safepass/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocaml-sha/metadata.xml b/dev-ml/ocaml-sha/metadata.xml
index 3776475e41b1..3afafb9725ee 100644
--- a/dev-ml/ocaml-sha/metadata.xml
+++ b/dev-ml/ocaml-sha/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">vincenthz/ocaml-sha</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index a3c258185ade..87539254884c 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/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">mmottl/sqlite3-ocaml</remote-id>
<remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
index 84ea95252eff..9189be440f1f 100644
--- a/dev-ml/ocaml-ssl/metadata.xml
+++ b/dev-ml/ocaml-ssl/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="sourceforge">savonet</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-text/metadata.xml b/dev-ml/ocaml-text/metadata.xml
index 782e02637d6c..2e8e581a16a4 100644
--- a/dev-ml/ocaml-text/metadata.xml
+++ b/dev-ml/ocaml-text/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">vbmithr/ocaml-text</remote-id>
</upstream>
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
index 5b1bec170536..a65a8b262484 100644
--- a/dev-ml/ocaml-uri/metadata.xml
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="allservices">Compile support for all service types</flag>
</use>
diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index 47053589760e..c6fe9e97b02b 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/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>
<longdescription lang="en">
Ocamldap is an implementation of the Light Weight Directory Access Protocol,
and a set of useful tools built around it. It includes high level libraries
diff --git a/dev-ml/ocamldsort/metadata.xml b/dev-ml/ocamldsort/metadata.xml
index a273949ac559..ebdb009a15ec 100644
--- a/dev-ml/ocamldsort/metadata.xml
+++ b/dev-ml/ocamldsort/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlgsl/metadata.xml b/dev-ml/ocamlgsl/metadata.xml
index 2546a401a276..492e3bdc5a9a 100644
--- a/dev-ml/ocamlgsl/metadata.xml
+++ b/dev-ml/ocamlgsl/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>
<longdescription lang="en">
This is an interface to GSL (GNU scientific library), for the
Objective Caml langage.
diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlify/metadata.xml
+++ b/dev-ml/ocamlify/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlmod/metadata.xml
+++ b/dev-ml/ocamlmod/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 156ab399609d..cd0c8b6a519a 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/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>
<use>
<flag name="cryptokit">Enables encryption support via <pkg>dev-ml/cryptokit</pkg></flag>
<flag name="httpd">Enables net-httpd web server component</flag>
diff --git a/dev-ml/ocamlpam/metadata.xml b/dev-ml/ocamlpam/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlpam/metadata.xml
+++ b/dev-ml/ocamlpam/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
index 1f4835fdab32..ceda2912e47a 100644
--- a/dev-ml/ocamlsdl/metadata.xml
+++ b/dev-ml/ocamlsdl/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="sourceforge">ocamlsdl</remote-id>
</upstream>
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 0451b56afc51..9e278a9159ed 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">OCamlPro/ocplib-endian</remote-id>
</upstream>
diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/ocurl/metadata.xml
+++ b/dev-ml/ocurl/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/odns/metadata.xml b/dev-ml/odns/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/odns/metadata.xml
+++ b/dev-ml/odns/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index ae1ce054e115..270c9a6c87a1 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/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">ocaml/opam</remote-id>
</upstream>
diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/optcomp/metadata.xml
index d5c2ef5378ef..ceb0096e3c79 100644
--- a/dev-ml/optcomp/metadata.xml
+++ b/dev-ml/optcomp/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">diml/optcomp</remote-id>
</upstream>
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ounit/metadata.xml
+++ b/dev-ml/ounit/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/pa_bench/metadata.xml b/dev-ml/pa_bench/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pa_bench/metadata.xml
+++ b/dev-ml/pa_bench/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/pa_ounit/metadata.xml b/dev-ml/pa_ounit/metadata.xml
index 97836330981f..804d7e4412f6 100644
--- a/dev-ml/pa_ounit/metadata.xml
+++ b/dev-ml/pa_ounit/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>
<longdescription lang="en">
Pa_ounit is a syntax extension that helps writing in-line test in ocaml
code. It allows user to register tests with a new `TEST` top-level expressions
diff --git a/dev-ml/pa_structural_sexp/metadata.xml b/dev-ml/pa_structural_sexp/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/pa_structural_sexp/metadata.xml
+++ b/dev-ml/pa_structural_sexp/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/pa_test/metadata.xml b/dev-ml/pa_test/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pa_test/metadata.xml
+++ b/dev-ml/pa_test/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
index 11d4f4b68712..33ac819979a2 100644
--- a/dev-ml/parmap/metadata.xml
+++ b/dev-ml/parmap/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">rdicosmo/parmap</remote-id>
</upstream>
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index c3e587532329..105bfa1550ef 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/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">mmottl/pcre-ocaml</remote-id>
<remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index cace4b2b6b62..e6984f8bcaf3 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/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>
<use>
<flag name="batteries">Enable Batteries support instead of extlib</flag>
</use>
diff --git a/dev-ml/pipebang/metadata.xml b/dev-ml/pipebang/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/pipebang/metadata.xml
+++ b/dev-ml/pipebang/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml
index f21c41a2d80a..d1db7be297d5 100644
--- a/dev-ml/pomap/metadata.xml
+++ b/dev-ml/pomap/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">mmottl/pomap</remote-id>
<remote-id type="bitbucket">mmottl/pomap</remote-id>
diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml
index 452a21cd57e1..dc44a3839ee3 100644
--- a/dev-ml/postgresql-ocaml/metadata.xml
+++ b/dev-ml/postgresql-ocaml/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">mmottl/postgresql-ocaml</remote-id>
<remote-id type="bitbucket">mmottl/postgresql-ocaml</remote-id>
diff --git a/dev-ml/pxp/metadata.xml b/dev-ml/pxp/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/pxp/metadata.xml
+++ b/dev-ml/pxp/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
index 3dfaf20734bd..652ff9698081 100644
--- a/dev-ml/qcheck/metadata.xml
+++ b/dev-ml/qcheck/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="ounit">Enable integration with ounit</flag>
</use>
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/re2/metadata.xml
+++ b/dev-ml/re2/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index 80acde625b07..5399f1dd2ace 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/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>
<longdescription lang="en">
React is an OCaml module for functional reactive programming (FRP). It
provides support to program with time varying values : applicative
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
index 46f20a3fc5e9..87bf9c4c33da 100644
--- a/dev-ml/reactiveData/metadata.xml
+++ b/dev-ml/reactiveData/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">hhugo/reactiveData</remote-id>
</upstream>
diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml
index 9ec3dcd9e3d2..f814ac25051b 100644
--- a/dev-ml/res/metadata.xml
+++ b/dev-ml/res/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">mmottl/res</remote-id>
<remote-id type="bitbucket">mmottl/res</remote-id>
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
index 75f5ca2e2b0f..08deef9e562c 100644
--- a/dev-ml/stringext/metadata.xml
+++ b/dev-ml/stringext/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>tomboy64@sina.cn</email>
</maintainer>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">rgrinberg/stringext</remote-id>
</upstream>
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/textutils/metadata.xml
+++ b/dev-ml/textutils/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml
index 849ed8ebf13d..ae2b03abbe34 100644
--- a/dev-ml/type-conv/metadata.xml
+++ b/dev-ml/type-conv/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/dev-ml/typehashlib/metadata.xml b/dev-ml/typehashlib/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typehashlib/metadata.xml
+++ b/dev-ml/typehashlib/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/typerep_extended/metadata.xml b/dev-ml/typerep_extended/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/typerep_extended/metadata.xml
+++ b/dev-ml/typerep_extended/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index e9cdcbb95f3d..9b36613653cb 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/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/tyxml</remote-id>
</upstream>
diff --git a/dev-ml/ulex/metadata.xml b/dev-ml/ulex/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/ulex/metadata.xml
+++ b/dev-ml/ulex/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/utop/metadata.xml b/dev-ml/utop/metadata.xml
index cc0dbaa762f2..76c813712886 100644
--- a/dev-ml/utop/metadata.xml
+++ b/dev-ml/utop/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>
<use>
<flag name="camlp4">Enables camlp4 support.</flag>
</use>
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 959de7257d5d..0f62e48e4995 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/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>
<use>
<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
</use>
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index abf9563dd5c5..5829ab318859 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/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="bitbucket">yminsky/ocaml-core</remote-id>
</upstream>
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml
index 3c86df53987d..7312b9f09304 100644
--- a/dev-ml/xml-light/metadata.xml
+++ b/dev-ml/xml-light/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>andreis.vinogradovs@gmail.com</email>
</maintainer>
@@ -9,4 +8,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml
index 769e0b77304f..b3bc703685d4 100644
--- a/dev-ml/xmlm/metadata.xml
+++ b/dev-ml/xmlm/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>ml</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>v.ivanov@ymail.com</email>
<name>Vladimir Ivanov</name>
</maintainer>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/xstr/metadata.xml b/dev-ml/xstr/metadata.xml
index 2193d772e351..3409127f534c 100644
--- a/dev-ml/xstr/metadata.xml
+++ b/dev-ml/xstr/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>ml</herd>
+<maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index 833e2a3f7de9..6f06e518185f 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/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">mjambon/yojson</remote-id>
</upstream>
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 444c6eb961dd..f18a01531398 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/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>
<use>
<flag name="mpir">Use MPIR library instead of GMP.</flag>
</use>
diff --git a/dev-ml/zed/metadata.xml b/dev-ml/zed/metadata.xml
index 4025bbe5fd5c..e326579a485b 100644
--- a/dev-ml/zed/metadata.xml
+++ b/dev-ml/zed/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">diml/zed</remote-id>
</upstream>