[gentoo-commits] repo/proj/guru:dev commit in: dev-ml/async_inotify/, dev-ml/mirage-block/, dev-ml/xenstore-clients/, ...

[Alessandro Barbieri]

commit:     8ba1e8a9c8f235f05cc51a443d508cd1d859074f
Author:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Tue Apr 26 10:32:34 2022 +0000
Commit:     Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue Apr 26 10:33:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=8ba1e8a9

dev-ml/*: improve metadata

Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>

 dev-ml/afl-persistent/metadata.xml             |  8 ++++
 dev-ml/alcotest-lwt/metadata.xml               |  8 +++-
 dev-ml/angstrom/metadata.xml                   | 18 +++++++--
 dev-ml/arp/metadata.xml                        | 22 +++++++----
 dev-ml/asn1-combinators/metadata.xml           | 28 ++++++++++----
 dev-ml/async_find/metadata.xml                 | 16 ++++----
 dev-ml/async_inotify/metadata.xml              | 16 ++++----
 dev-ml/async_ssl/metadata.xml                  |  6 ++-
 dev-ml/bheap/metadata.xml                      | 20 ++++++----
 dev-ml/bigstringaf/metadata.xml                | 14 +++++++
 dev-ml/ca-certs-nss/metadata.xml               |  6 +++
 dev-ml/ca-certs/metadata.xml                   |  9 +++++
 dev-ml/cdrom/metadata.xml                      | 15 ++++----
 dev-ml/cohttp/metadata.xml                     | 29 ++++++++++++--
 dev-ml/conduit/metadata.xml                    | 51 ++++++++++++++++++-------
 dev-ml/configurator/metadata.xml               | 12 +++++-
 dev-ml/core_unix/metadata.xml                  |  4 +-
 dev-ml/cow/metadata.xml                        | 23 ++++++++----
 dev-ml/crc/metadata.xml                        | 15 ++++----
 dev-ml/crowbar/metadata.xml                    |  8 ++++
 dev-ml/cstruct/metadata.xml                    | 39 +++++++++++--------
 dev-ml/diet/metadata.xml                       | 23 ++++++++----
 dev-ml/dns/metadata.xml                        | 52 ++++++++++++++++----------
 dev-ml/domain-name/metadata.xml                | 28 ++++++++++----
 dev-ml/emile/metadata.xml                      | 22 +++++++----
 dev-ml/eqaf/metadata.xml                       |  9 ++++-
 dev-ml/ethernet/metadata.xml                   | 19 ++++++----
 dev-ml/expect_test_helpers/metadata.xml        |  6 +++
 dev-ml/expect_test_helpers_core/metadata.xml   |  6 +++
 dev-ml/expect_test_helpers_kernel/metadata.xml |  6 +++
 dev-ml/ezjsonm/metadata.xml                    | 35 +++++++++++------
 dev-ml/fd-send-recv/metadata.xml               | 16 ++++----
 dev-ml/gmap/metadata.xml                       | 28 ++++++++++----
 dev-ml/happy-eyeballs/metadata.xml             | 29 ++++++++------
 dev-ml/hex/metadata.xml                        | 22 +++++++----
 dev-ml/hkdf/metadata.xml                       | 24 ++++++++----
 dev-ml/inotify/metadata.xml                    | 16 ++++----
 dev-ml/ipaddr/metadata.xml                     | 50 ++++++++++++++++++-------
 dev-ml/js_of_ocaml/metadata.xml                | 33 ++++++++--------
 dev-ml/lru/metadata.xml                        |  8 ++++
 dev-ml/lwt-dllist/metadata.xml                 | 27 +++++++++----
 dev-ml/magic-mime/metadata.xml                 | 33 ++++++++++++----
 dev-ml/metrics/metadata.xml                    | 46 ++++++++++++++++-------
 dev-ml/mirage-block-unix/metadata.xml          | 24 ++++++++----
 dev-ml/mirage-block/metadata.xml               | 26 ++++++++-----
 dev-ml/mirage-clock-unix/metadata.xml          | 25 +++++++++----
 dev-ml/mirage-crypto/metadata.xml              | 38 +++++++++++--------
 dev-ml/mirage-flow/metadata.xml                | 31 +++++++++------
 dev-ml/mirage-kv/metadata.xml                  | 22 +++++++----
 dev-ml/mirage-net/metadata.xml                 | 20 ++++++----
 dev-ml/mirage-profile/metadata.xml             | 41 ++++++++++++++------
 dev-ml/mirage-random-test/metadata.xml         | 20 ++++++----
 dev-ml/mirage-random/metadata.xml              | 20 ++++++----
 dev-ml/mirage-time/metadata.xml                | 26 ++++++++-----
 dev-ml/mirage-unix/metadata.xml                | 22 +++++++----
 dev-ml/mirage-vnetif/metadata.xml              | 30 ++++++++++-----
 dev-ml/mirage-xen/metadata.xml                 | 23 ++++++++----
 dev-ml/mirage/metadata.xml                     | 34 +++++++++++++----
 dev-ml/mustache/metadata.xml                   | 22 +++++++----
 dev-ml/nbd/metadata.xml                        | 30 +++++++++------
 dev-ml/netlink/metadata.xml                    | 22 +++++++----
 dev-ml/ocaml_intrinsics/metadata.xml           |  8 +++-
 dev-ml/omd/metadata.xml                        | 29 ++++++++++----
 dev-ml/pbkdf/metadata.xml                      |  7 ++++
 dev-ml/pcap-format/metadata.xml                | 24 ++++++++----
 dev-ml/pci/metadata.xml                        | 19 ++++++----
 dev-ml/pecu/metadata.xml                       | 22 +++++++----
 dev-ml/polly/metadata.xml                      | 23 ++++++++----
 dev-ml/psq/metadata.xml                        |  8 ++++
 dev-ml/ptime/metadata.xml                      | 26 ++++++++++++-
 dev-ml/qmp/metadata.xml                        | 18 +++++----
 dev-ml/randomconv/metadata.xml                 | 24 ++++++++----
 dev-ml/rpc/metadata.xml                        | 39 +++++++++++++------
 dev-ml/sexp_pretty/metadata.xml                |  4 ++
 dev-ml/shared-block-ring/metadata.xml          | 20 ++++++----
 dev-ml/shared-memory-ring/metadata.xml         | 34 +++++++++++++----
 dev-ml/stringext/metadata.xml                  | 21 +++++++----
 dev-ml/systemd/metadata.xml                    | 19 ++++++----
 dev-ml/tar/metadata.xml                        | 32 ++++++++++------
 dev-ml/tcpip/metadata.xml                      | 28 ++++++++++----
 dev-ml/tls/metadata.xml                        | 29 ++++++++++++--
 dev-ml/tuntap/metadata.xml                     | 28 ++++++++++----
 dev-ml/tyxml/metadata.xml                      | 19 ++++++----
 dev-ml/uri/metadata.xml                        | 16 ++++++--
 dev-ml/vchan/metadata.xml                      | 31 +++++++++------
 dev-ml/vhd/metadata.xml                        | 26 ++++++++-----
 dev-ml/x509/metadata.xml                       | 29 ++++++++++----
 dev-ml/xapi-backtrace/metadata.xml             | 15 ++++----
 dev-ml/xapi-stdext/metadata.xml                | 19 ++++++----
 dev-ml/xapi-test-utils/metadata.xml            | 19 ++++++----
 dev-ml/xcp-inventory/metadata.xml              | 15 ++++----
 dev-ml/xcp-rrd/metadata.xml                    | 15 ++++----
 dev-ml/xen-evtchn/metadata.xml                 | 33 +++++++++++-----
 dev-ml/xen-gnt/metadata.xml                    | 32 +++++++++++-----
 dev-ml/xenstore-clients/metadata.xml           | 19 ++++++----
 dev-ml/xenstore/metadata.xml                   | 27 +++++++++----
 dev-ml/xmlm/metadata.xml                       | 16 +++++++-
 97 files changed, 1522 insertions(+), 652 deletions(-)

diff --git a/dev-ml/afl-persistent/metadata.xml b/dev-ml/afl-persistent/metadata.xml
index f3e866eb3..7397a6b77 100644
--- a/dev-ml/afl-persistent/metadata.xml
+++ b/dev-ml/afl-persistent/metadata.xml
@@ -6,7 +6,15 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">afl-fuzz normally works by repeatedly fork()ing the program being
+tested. using this package, you can run afl-fuzz in 'persistent mode',
+which avoids repeated forking and is much faster.</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/stedolan/ocaml-afl-persistent/issues</bugs-to>
 		<remote-id type="github">stedolan/ocaml-afl-persistent</remote-id>
+		<maintainer>
+			<name>Stephen Dolan</name>
+			<email>stephen.dolan@×××××××××.uk</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/alcotest-lwt/metadata.xml b/dev-ml/alcotest-lwt/metadata.xml
index 0a1af60ec..509b2891c 100644
--- a/dev-ml/alcotest-lwt/metadata.xml
+++ b/dev-ml/alcotest-lwt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -7,6 +7,12 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<upstream>
+		<doc>https://mirage.github.io/alcotest</doc>
+		<bugs-to>https://github.com/mirage/alcotest/issues</bugs-to>
 		<remote-id type="github">mirage/alcotest</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/angstrom/metadata.xml b/dev-ml/angstrom/metadata.xml
index 8afdb71fe..0387e67e7 100644
--- a/dev-ml/angstrom/metadata.xml
+++ b/dev-ml/angstrom/metadata.xml
@@ -6,12 +6,24 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">inhabitedtype/angstrom</remote-id>
-	</upstream>
 	<use>
 		<flag name="async">Async support for Angstrom</flag>
 		<flag name="lwt-unix">Lwt_unix support for Angstrom</flag>
 		<flag name="unix">Unix support for Angstrom</flag>
 	</use>
+	<longdescription lang="en">Angstrom is a parser-combinator library that makes it easy to write efficient,
+expressive, and reusable parsers suitable for high-performance applications. It
+exposes monadic and applicative interfaces for composition, and supports
+incremental input through buffered and unbuffered interfaces. Both interfaces
+give the user total control over the blocking behavior of their application,
+with the unbuffered interface enabling zero-copy IO. Parsers are backtracking by
+default and support unbounded lookahead.</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/inhabitedtype/angstrom/issues</bugs-to>
+		<remote-id type="github">inhabitedtype/angstrom</remote-id>
+		<maintainer>
+			<name>Spiros Eliopoulos</name>
+			<email>spiros@×××××××××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/arp/metadata.xml b/dev-ml/arp/metadata.xml
index 6aae058a5..a48df8ac9 100644
--- a/dev-ml/arp/metadata.xml
+++ b/dev-ml/arp/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/arp</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">ARP is an implementation of the address resolution protocol (RFC826) purely in
+OCaml.	It handles IPv4 protocol addresses and Ethernet hardware addresses only.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/arp/</doc>
+		<bugs-to>https://github.com/mirage/arp/issues</bugs-to>
+		<remote-id type="github">mirage/arp</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/asn1-combinators/metadata.xml b/dev-ml/asn1-combinators/metadata.xml
index 730bfe343..3b78ec8d7 100644
--- a/dev-ml/asn1-combinators/metadata.xml
+++ b/dev-ml/asn1-combinators/metadata.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirleft/ocaml-asn1-combinators</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">asn1-combinators is a library for expressing ASN.1 in OCaml. Skip the notation
+part of ASN.1, and embed the abstract syntax directly in the language. These
+abstract syntax representations can be used for parsing, serialization, or
+random testing.
+
+The only ASN.1 encodings currently supported are BER and DER.</longdescription>
+	<upstream>
+		<doc>https://mirleft.github.io/ocaml-asn1-combinators/doc</doc>
+		<bugs-to>https://github.com/mirleft/ocaml-asn1-combinators/issues</bugs-to>
+		<remote-id type="github">mirleft/ocaml-asn1-combinators</remote-id>
+		<maintainer>
+			<name>David Kaloper Meršinjak</name>
+			<email>dk505@××××××.uk</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/async_find/metadata.xml b/dev-ml/async_find/metadata.xml
index caace9866..b822a3750 100644
--- a/dev-ml/async_find/metadata.xml
+++ b/dev-ml/async_find/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">janestreet/async_find</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/async_find/index.html</doc>
+		<bugs-to>https://github.com/janestreet/async_find/issues</bugs-to>
+		<remote-id type="github">janestreet/async_find</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/async_inotify/metadata.xml b/dev-ml/async_inotify/metadata.xml
index 53514bc6d..4b2cc03db 100644
--- a/dev-ml/async_inotify/metadata.xml
+++ b/dev-ml/async_inotify/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">janestreet/async_inotify</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/async_inotify/index.html</doc>
+		<bugs-to>https://github.com/janestreet/async_inotify/issues</bugs-to>
+		<remote-id type="github">janestreet/async_inotify</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml
index 0c01f1446..779ff9d7a 100644
--- a/dev-ml/async_ssl/metadata.xml
+++ b/dev-ml/async_ssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,7 +6,11 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">This library allows you to create an SSL client and server, with
+encrypted communication between both.</longdescription>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/async_ssl/index.html</doc>
+		<bugs-to>https://github.com/janestreet/async_ssl/issues</bugs-to>
 		<remote-id type="github">janestreet/async_ssl</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/bheap/metadata.xml b/dev-ml/bheap/metadata.xml
index 35f91fbce..9c422a5a1 100644
--- a/dev-ml/bheap/metadata.xml
+++ b/dev-ml/bheap/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">backtracking/bheap</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://backtracking.github.io/bheap</doc>
+		<bugs-to>https://github.com/backtracking/bheap/issues</bugs-to>
+		<remote-id type="github">backtracking/bheap</remote-id>
+		<maintainer>
+			<name>Jean-Christophe Filliâtre</name>
+			<email>Jean-Christophe.Filliatre@×××.fr</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/bigstringaf/metadata.xml b/dev-ml/bigstringaf/metadata.xml
index 66a4dd251..6449daf15 100644
--- a/dev-ml/bigstringaf/metadata.xml
+++ b/dev-ml/bigstringaf/metadata.xml
@@ -6,7 +6,21 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Bigstring intrinsics and fast blits based on memcpy/memmove
+
+The OCaml compiler has a bunch of intrinsics for Bigstrings, but they're not
+widely-known, sometimes misused, and so programs that use Bigstrings are slower
+than they have to be. And even if a library got that part right and exposed the
+intrinsics properly, the compiler doesn't have any fast blits between
+Bigstrings and other string-like types.
+
+So here they are. Go crazy.</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/inhabitedtype/bigstringaf/issues</bugs-to>
 		<remote-id type="github">inhabitedtype/bigstringaf</remote-id>
+		<maintainer>
+			<name>Spiros Eliopoulos</name>
+			<email>spiros@×××××××××××××.com</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ca-certs-nss/metadata.xml b/dev-ml/ca-certs-nss/metadata.xml
index 236246213..86289ee07 100644
--- a/dev-ml/ca-certs-nss/metadata.xml
+++ b/dev-ml/ca-certs-nss/metadata.xml
@@ -6,6 +6,12 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<upstream>
+		<doc>https://mirage.github.io/ca-certs-nss/doc</doc>
+		<bugs-to>https://github.com/mirage/ca-certs-nss/issues</bugs-to>
 		<remote-id type="github">mirage/ca-certs-nss</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ca-certs/metadata.xml b/dev-ml/ca-certs/metadata.xml
index 0ecf89340..6a878ac37 100644
--- a/dev-ml/ca-certs/metadata.xml
+++ b/dev-ml/ca-certs/metadata.xml
@@ -6,7 +6,16 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">TLS requires a set of root anchors (Certificate Authorities) to
+authenticate servers. This library exposes this list so that it can be
+registered with ocaml-tls.</longdescription>
 	<upstream>
+		<doc>https://mirage.github.io/ca-certs/doc</doc>
+		<bugs-to>https://github.com/mirage/ca-certs/issues</bugs-to>
 		<remote-id type="github">mirage/ca-certs</remote-id>
+		<maintainer>
+			<name>Etienne Millon</name>
+			<email>me@×××××××.org</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/cdrom/metadata.xml b/dev-ml/cdrom/metadata.xml
index cb2143979..7987c6c74 100644
--- a/dev-ml/cdrom/metadata.xml
+++ b/dev-ml/cdrom/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/cdrom</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/xapi-project/cdrom/issues</bugs-to>
+		<remote-id type="github">xapi-project/cdrom</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/cohttp/metadata.xml b/dev-ml/cohttp/metadata.xml
index 49177d5b3..663a78f00 100644
--- a/dev-ml/cohttp/metadata.xml
+++ b/dev-ml/cohttp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,9 +6,6 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-cohttp</remote-id>
-	</upstream>
 	<use>
 		<flag name="async">CoHTTP implementation for the Async concurrency library</flag>
 		<flag name="bench">Benchmarks binaries for Cohttp</flag>
@@ -22,4 +19,28 @@
 		<flag name="server-lwt-unix">Lightweight Cohttp plus Lwt based HTTP server</flag>
 		<flag name="top">CoHTTP toplevel pretty printers for HTTP types</flag>
 	</use>
+	<longdescription lang="en">Cohttp is an OCaml library for creating HTTP daemons. It has a portable
+HTTP parser, and implementations using various asynchronous programming
+libraries.
+
+See the cohttp-async, cohttp-lwt, cohttp-lwt-unix, cohttp-lwt-jsoo and
+cohttp-mirage libraries for concrete implementations for particular
+targets.
+
+You can implement other targets using the parser very easily. Look at the `IO`
+signature in `lib/s.mli` and implement that in the desired backend.
+
+You can activate some runtime debugging by setting `COHTTP_DEBUG` to any
+value, and all requests and responses will be written to stderr.	Further
+debugging of the connection layer can be obtained by setting `CONDUIT_DEBUG`
+to any value.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-cohttp/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-cohttp/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-cohttp</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/conduit/metadata.xml b/dev-ml/conduit/metadata.xml
index 818fe748b..5666346a7 100644
--- a/dev-ml/conduit/metadata.xml
+++ b/dev-ml/conduit/metadata.xml
@@ -1,17 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/ocaml-conduit</remote-id>
-    </upstream>
-    <use>
-        <flag name="async">A network connection establishment library for Async</flag>
-        <flag name="lwt">A portable network connection establishment library using Lwt</flag>
-        <flag name="lwt-unix">A network connection establishment library for Lwt_unix</flag>
-        <flag name="mirage">A network connection establishment library for MirageOS</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="async">A network connection establishment library for Async</flag>
+		<flag name="lwt">A portable network connection establishment library using Lwt</flag>
+		<flag name="lwt-unix">A network connection establishment library for Lwt_unix</flag>
+		<flag name="mirage">A network connection establishment library for MirageOS</flag>
+	</use>
+	<longdescription lang="en">The `conduit` library takes care of establishing and listening for
+TCP and SSL/TLS connections for the Lwt and Async libraries.
+
+The reason this library exists is to provide a degree of abstraction
+from the precise SSL library used, since there are a variety of ways
+to bind to a library (e.g. the C FFI, or the Ctypes library), as well
+as well as which library is used (just OpenSSL for now).
+
+By default, OpenSSL is used as the preferred connection library, but
+you can force the use of the pure OCaml TLS stack by setting the
+environment variable `CONDUIT_TLS=native` when starting your program.
+
+The useful opam packages available that extend this library are:
+
+- `conduit`: the main `Conduit` module
+- `conduit-lwt`: the portable Lwt implementation
+- `conduit-lwt-unix`: the Lwt/Unix implementation
+- `conduit-async` the Jane Street Async implementation
+- `conduit-mirage`: the MirageOS compatible implementation</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-conduit/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-conduit/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-conduit</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/configurator/metadata.xml b/dev-ml/configurator/metadata.xml
index 666c314ee..8732967fc 100644
--- a/dev-ml/configurator/metadata.xml
+++ b/dev-ml/configurator/metadata.xml
@@ -1,11 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Configurator is a small library that helps writing OCaml scripts that
+test features available on the system, in order to generate config.h
+files for instance.
+
+Configurator allows one to:
+- test if a C program compiles
+- query pkg-config
+- import #define from OCaml header files
+- generate config.h file</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/janestreet/configurator/issues</bugs-to>
 		<remote-id type="github">janestreet/configurator</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/core_unix/metadata.xml b/dev-ml/core_unix/metadata.xml
index 855160905..5cee9e0ba 100644
--- a/dev-ml/core_unix/metadata.xml
+++ b/dev-ml/core_unix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,6 +6,8 @@
 		<name>Alessandro Barbieri</name>
 	</maintainer>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/core_unix/index.html</doc>
+		<bugs-to>https://github.com/janestreet/core_unix/issues</bugs-to>
 		<remote-id type="github">janestreet/core_unix</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/cow/metadata.xml b/dev-ml/cow/metadata.xml
index 06464e369..4b9daf2fe 100644
--- a/dev-ml/cow/metadata.xml
+++ b/dev-ml/cow/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-cow</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Writing web-applications requires a lot of skills: HTML, XML, JSON and
+Markdown, to name but a few!	This library provides OCaml combinators
+for these web formats.</longdescription>
+	<upstream>
+		<doc>http://mirage.github.io/ocaml-cow/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-cow/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-cow</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/crc/metadata.xml b/dev-ml/crc/metadata.xml
index 7853df327..2bbaad06f 100644
--- a/dev-ml/crc/metadata.xml
+++ b/dev-ml/crc/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/ocaml-crc</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/xapi-project/ocaml-crc/issues</bugs-to>
+		<remote-id type="github">xapi-project/ocaml-crc</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/crowbar/metadata.xml b/dev-ml/crowbar/metadata.xml
index ef71756ba..af0b0000f 100644
--- a/dev-ml/crowbar/metadata.xml
+++ b/dev-ml/crowbar/metadata.xml
@@ -6,7 +6,15 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Crowbar is a library for testing code, combining QuickCheck-style
+property-based testing and the magical bug-finding powers of
+[afl-fuzz](http://lcamtuf.coredump.cx/afl/).</longdescription>
 	<upstream>
+		<bugs-to>https://github.com/stedolan/crowbar/issues</bugs-to>
 		<remote-id type="github">stedolan/crowbar</remote-id>
+		<maintainer>
+			<name>Stephen Dolan</name>
+			<email>stephen.dolan@×××××××××.uk</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/cstruct/metadata.xml b/dev-ml/cstruct/metadata.xml
index 0f3f50ae2..08687284a 100644
--- a/dev-ml/cstruct/metadata.xml
+++ b/dev-ml/cstruct/metadata.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-cstruct</remote-id>
-  </upstream>
-  <use>
-    <flag name="async">provide Async Pipe and Bigstring support</flag>
-    <flag name="lwt">provide Lwt variants of read/write functions</flag>
-    <flag name="ppx">a PPX syntax extension</flag>
-    <flag name="sexp">serialisers into s-expression format of Cstructs</flag>
-    <flag name="unix">provide Unix variations of the read/write functions using file descriptors</flag>
-  </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="async">provide Async Pipe and Bigstring support</flag>
+		<flag name="lwt">provide Lwt variants of read/write functions</flag>
+		<flag name="ppx">a PPX syntax extension</flag>
+		<flag name="sexp">serialisers into s-expression format of Cstructs</flag>
+		<flag name="unix">provide Unix variations of the read/write functions using file descriptors</flag>
+	</use>
+	<longdescription lang="en">Cstruct is a library and syntax extension to make it easier to access C-like
+structures directly from OCaml.	It supports both reading and writing to these
+structures, and they are accessed via the `Bigarray` module.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-cstruct/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-cstruct/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-cstruct</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/diet/metadata.xml b/dev-ml/diet/metadata.xml
index 836835d2f..360ef5b05 100644
--- a/dev-ml/diet/metadata.xml
+++ b/dev-ml/diet/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-diet</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This data structure is based on the
+[Functional Pearls: Diets for Fat Sets](https://web.engr.oregonstate.edu/~erwig/papers/Diet_JFP98.pdf)
+by Martin Erwig.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-diet/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-diet/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-diet</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/dns/metadata.xml b/dev-ml/dns/metadata.xml
index 57d04d4a5..e49cb457d 100644
--- a/dev-ml/dns/metadata.xml
+++ b/dev-ml/dns/metadata.xml
@@ -1,23 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/ocaml-dns</remote-id>
-    </upstream>
-    <use>
-        <flag name="certify">MirageOS let's encrypt certificate retrieval</flag>
-        <flag name="cli">Unix command line utilities using uDNS</flag>
-        <flag name="client">DNS resolver API</flag>
-        <flag name="dnssec">DNSSec support for OCaml-DNS</flag>
-        <flag name="mirage">An opinionated Domain Name System (DNS) library</flag>
-        <flag name="resolver">DNS resolver business logic</flag>
-        <flag name="server">DNS server, primary and secondary</flag>
-        <flag name="stub">DNS stub resolver</flag>
-        <flag name="tsig">TSIG support for DNS</flag>
-    </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="certify">MirageOS let's encrypt certificate retrieval</flag>
+		<flag name="cli">Unix command line utilities using uDNS</flag>
+		<flag name="client">DNS resolver API</flag>
+		<flag name="dnssec">DNSSec support for OCaml-DNS</flag>
+		<flag name="mirage">An opinionated Domain Name System (DNS) library</flag>
+		<flag name="resolver">DNS resolver business logic</flag>
+		<flag name="server">DNS server, primary and secondary</flag>
+		<flag name="stub">DNS stub resolver</flag>
+		<flag name="tsig">TSIG support for DNS</flag>
+	</use>
+	<longdescription lang="en">µDNS supports most of the domain name system used in the wild.	It adheres to
+strict conventions.	Failing early and hard.	It is mostly implemented in the
+pure fragment of OCaml (no mutation, isolated IO, no exceptions).
+
+Legacy resource record types are not dealt with, and there is no plan to support
+`ISDN`, `MAILA`, `MAILB`, `WKS`, `MB`, `NULL`, `HINFO`, ... .	`AXFR` is only
+handled via TCP connections.	The only resource class supported is `IN` (the
+Internet).	Truncated hmac in `TSIG` are not supported (always the full length
+of the hash algorithm is used).
+
+Please read [the blog article](https://hannes.nqsb.io/Posts/DNS) for a more
+detailed overview.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-dns/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-dns/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-dns</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/domain-name/metadata.xml b/dev-ml/domain-name/metadata.xml
index 9d8dba8df..9df790c3a 100644
--- a/dev-ml/domain-name/metadata.xml
+++ b/dev-ml/domain-name/metadata.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">hannesm/domain-name</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">A domain name is a sequence of labels separated by dots, such as `foo.example`.
+Each label may contain any bytes. The length of each label may not exceed 63
+charactes.	The total length of a domain name is limited to 253 (byte
+representation is 255), but other protocols (such as SMTP) may apply even
+smaller limits.	A domain name label is case preserving, comparison is done in a
+case insensitive manner.</longdescription>
+	<upstream>
+		<doc>https://hannesm.github.io/domain-name/doc</doc>
+		<bugs-to>https://github.com/hannesm/domain-name/issues</bugs-to>
+		<remote-id type="github">hannesm/domain-name</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/emile/metadata.xml b/dev-ml/emile/metadata.xml
index a1a030d7a..fc8d09944 100644
--- a/dev-ml/emile/metadata.xml
+++ b/dev-ml/emile/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/emile</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">A parser of email address according RFC822, RFC2822, RFC5321 and RFC6532.
+It handles UTF-8 email addresses and encoded-word according RFC2047.</longdescription>
+	<upstream>
+		<doc>https://dinosaure.github.io/emile/</doc>
+		<bugs-to>https://github.com/dinosaure/emile/issues</bugs-to>
+		<remote-id type="github">dinosaure/emile</remote-id>
+		<maintainer>
+			<name>Romain Calascibetta</name>
+			<email>romain.calascibetta@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/eqaf/metadata.xml b/dev-ml/eqaf/metadata.xml
index fbe05ef42..b7de0410e 100644
--- a/dev-ml/eqaf/metadata.xml
+++ b/dev-ml/eqaf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,7 +6,14 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">This package provides an equal function on string in constant-time to avoid timing-attack with crypto stuff.</longdescription>
 	<upstream>
+		<doc>https://mirage.github.io/eqaf/</doc>
+		<bugs-to>https://github.com/mirage/eqaf/issues</bugs-to>
 		<remote-id type="github">mirage/eqaf</remote-id>
+		<maintainer>
+			<name>Romain Calascibetta</name>
+			<email>romain.calascibetta@×××××.com</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ethernet/metadata.xml b/dev-ml/ethernet/metadata.xml
index e23736c96..952d79ff4 100644
--- a/dev-ml/ethernet/metadata.xml
+++ b/dev-ml/ethernet/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ethernet</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">`ethernet` provides an [Ethernet](https://en.wikipedia.org/wiki/Ethernet)
+(specified by IEEE 802.3) layer implementation for the
+[Mirage operating system](https://mirage.io).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ethernet/</doc>
+		<bugs-to>https://github.com/mirage/ethernet/issues</bugs-to>
+		<remote-id type="github">mirage/ethernet</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/expect_test_helpers/metadata.xml b/dev-ml/expect_test_helpers/metadata.xml
index a3344688f..37880b36a 100644
--- a/dev-ml/expect_test_helpers/metadata.xml
+++ b/dev-ml/expect_test_helpers/metadata.xml
@@ -6,7 +6,13 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">This library provides helper functions for writing expect tests.
+
+Note that this library uses Async, for helpers that don't use Async,
+look at expect_test_helpers_kernel.</longdescription>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/expect_test_helpers/index.html</doc>
+		<bugs-to>https://github.com/janestreet/expect_test_helpers/issues</bugs-to>
 		<remote-id type="github">janestreet/expect_test_helpers</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/expect_test_helpers_core/metadata.xml b/dev-ml/expect_test_helpers_core/metadata.xml
index 5eda91b64..b63296e94 100644
--- a/dev-ml/expect_test_helpers_core/metadata.xml
+++ b/dev-ml/expect_test_helpers_core/metadata.xml
@@ -6,7 +6,13 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">This library provides helper functions for writing expect tests.
+
+If you want helpers for writing expect tests using the Async library,
+look at expect_test_helpers_async.</longdescription>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/expect_test_helpers_core/index.html</doc>
+		<bugs-to>https://github.com/janestreet/expect_test_helpers_core/issues</bugs-to>
 		<remote-id type="github">janestreet/expect_test_helpers_core</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/expect_test_helpers_kernel/metadata.xml b/dev-ml/expect_test_helpers_kernel/metadata.xml
index fd4109999..43b6393fb 100644
--- a/dev-ml/expect_test_helpers_kernel/metadata.xml
+++ b/dev-ml/expect_test_helpers_kernel/metadata.xml
@@ -6,7 +6,13 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">This library provides helper functions for writing expect tests.
+
+If you want helpers for writing expect tests using the Async library,
+look at expect_test_helpers.</longdescription>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/expect_test_helpers_kernel/index.html</doc>
+		<bugs-to>https://github.com/janestreet/expect_test_helpers_kernel/issues</bugs-to>
 		<remote-id type="github">janestreet/expect_test_helpers_kernel</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ezjsonm/metadata.xml b/dev-ml/ezjsonm/metadata.xml
index a9cdbcbd4..f91fa129f 100644
--- a/dev-ml/ezjsonm/metadata.xml
+++ b/dev-ml/ezjsonm/metadata.xml
@@ -1,15 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ezjsonm</remote-id>
-  </upstream>
-  <use>
-    <flag name="lwt">Simple Lwt-based interface to the Jsonm JSON library</flag>
-  </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="lwt">Simple Lwt-based interface to the Jsonm JSON library</flag>
+	</use>
+	<longdescription lang="en">Ezjsonm provides more convenient (but far less flexible)
+input and output functions that go to and from `string` values.
+This avoids the need to write signal code, which is useful for
+quick scripts that manipulate JSON.
+
+More advanced users should go straight to the Jsonm library and
+use it directly, rather than be saddled with the Ezjsonm interface.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ezjsonm/</doc>
+		<bugs-to>https://github.com/mirage/ezjsonm/issues</bugs-to>
+		<remote-id type="github">mirage/ezjsonm</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/fd-send-recv/metadata.xml b/dev-ml/fd-send-recv/metadata.xml
index c9f3e0001..bd0825126 100644
--- a/dev-ml/fd-send-recv/metadata.xml
+++ b/dev-ml/fd-send-recv/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/ocaml-fd-send-recv</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://github.com/xapi-project/ocaml-fd-send-recv/blob/master/lib/fd_send_recv.mli</doc>
+		<bugs-to>https://github.com/xapi-project/ocaml-fd-send-recv/issues</bugs-to>
+		<remote-id type="github">xapi-project/ocaml-fd-send-recv</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/gmap/metadata.xml b/dev-ml/gmap/metadata.xml
index f7c50c568..9a86141a3 100644
--- a/dev-ml/gmap/metadata.xml
+++ b/dev-ml/gmap/metadata.xml
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">hannesm/gmap</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Gmap exposes the functor `Make` which takes a key type (a
+[GADT](https://en.wikipedia.org/wiki/Generalized_algebraic_data_type) 'a key)
+and outputs a type-safe Map where each 'a key is associated with a 'a value.
+This removes the need for additional packing.	It uses OCaml's stdlib
+[Map](http://caml.inria.fr/pub/docs/manual-ocaml/libref/Map.html) data
+structure.</longdescription>
+	<upstream>
+		<doc>https://hannesm.github.io/gmap/doc</doc>
+		<bugs-to>https://github.com/hannesm/gmap/issues</bugs-to>
+		<remote-id type="github">hannesm/gmap</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/happy-eyeballs/metadata.xml b/dev-ml/happy-eyeballs/metadata.xml
index 50a217c44..4e2d981e7 100644
--- a/dev-ml/happy-eyeballs/metadata.xml
+++ b/dev-ml/happy-eyeballs/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">roburio/happy-eyeballs</remote-id>
-    </upstream>
-    <use>
-        <flag name="lwt">Connecting to a remote host via IP version 4 or 6 using Lwt_unix</flag>
-        <flag name="mirage">Connecting to a remote host via IP version 4 or 6 using Mirage</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="lwt">Connecting to a remote host via IP version 4 or 6 using Lwt_unix</flag>
+		<flag name="mirage">Connecting to a remote host via IP version 4 or 6 using Mirage</flag>
+	</use>
+	<longdescription lang="en">Happy eyeballs is an implementation of
+[RFC 8305](https://datatracker.ietf.org/doc/html/rfc8305) which specifies how
+to connect to a remote host using either IP protocol version 4 or IP protocol
+version 6. This is the core of the algorithm in value passing style, with a
+slick dependency cone.</longdescription>
+	<upstream>
+		<doc>https://roburio.github.io/happy-eyeballs/</doc>
+		<bugs-to>https://github.com/roburio/happy-eyeballs/issues</bugs-to>
+		<remote-id type="github">roburio/happy-eyeballs</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/hex/metadata.xml b/dev-ml/hex/metadata.xml
index d343e1f4e..ce2e36563 100644
--- a/dev-ml/hex/metadata.xml
+++ b/dev-ml/hex/metadata.xml
@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-hex</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-hex/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-hex/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-hex</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/hkdf/metadata.xml b/dev-ml/hkdf/metadata.xml
index 78153fde6..c78a8cabd 100644
--- a/dev-ml/hkdf/metadata.xml
+++ b/dev-ml/hkdf/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">hannesm/ocaml-hkdf</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">An implementation of [HKDF](https://tools.ietf.org/html/rfc5869) using
+[nocrypto](https://github.com/mirleft/ocaml-nocrypto).</longdescription>
+	<upstream>
+		<doc>https://hannesm.github.io/ocaml-hkdf/doc</doc>
+		<bugs-to>https://github.com/hannesm/ocaml-hkdf/issues</bugs-to>
+		<remote-id type="github">hannesm/ocaml-hkdf</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/inotify/metadata.xml b/dev-ml/inotify/metadata.xml
index b420263b8..88413f94b 100644
--- a/dev-ml/inotify/metadata.xml
+++ b/dev-ml/inotify/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">whitequark/ocaml-inotify</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>http://whitequark.github.io/ocaml-inotify</doc>
+		<bugs-to>https://github.com/whitequark/ocaml-inotify/issues</bugs-to>
+		<remote-id type="github">whitequark/ocaml-inotify</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ipaddr/metadata.xml b/dev-ml/ipaddr/metadata.xml
index edd708d23..86787e642 100644
--- a/dev-ml/ipaddr/metadata.xml
+++ b/dev-ml/ipaddr/metadata.xml
@@ -1,18 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
-  </upstream>
-  <use>
-    <flag name="cstruct">A library for manipulation of IP address representations using Cstructs</flag>
-    <flag name="sexp">A library for manipulation of IP address representations using sexp</flag>
-    <flag name="macaddr-cstruct">A library for manipulation of MAC address representations using Cstructs</flag>
-    <flag name="macaddr-sexp">A library for manipulation of MAC address representations using sexp</flag>
-  </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="cstruct">A library for manipulation of IP address representations using Cstructs</flag>
+		<flag name="sexp">A library for manipulation of IP address representations using sexp</flag>
+		<flag name="macaddr-cstruct">A library for manipulation of MAC address representations using Cstructs</flag>
+		<flag name="macaddr-sexp">A library for manipulation of MAC address representations using sexp</flag>
+	</use>
+	<longdescription lang="en">Features:
+* Depends only on sexplib (conditionalization under consideration)
+* oUnit-based tests
+* IPv4 and IPv6 support
+* IPv4 and IPv6 CIDR prefix support
+* IPv4 and IPv6 [CIDR-scoped address](http://tools.ietf.org/html/rfc4291#section-2.3) support
+* `Ipaddr.V4` and `Ipaddr.V4.Prefix` modules are `Map.OrderedType`
+* `Ipaddr.V6` and `Ipaddr.V6.Prefix` modules are `Map.OrderedType`
+* `Ipaddr` and `Ipaddr.Prefix` modules are `Map.OrderedType`
+* `Ipaddr_unix` in findlib subpackage `ipaddr.unix` provides compatibility with the standard library `Unix` module
+* `Ipaddr_top` in findlib subpackage `ipaddr.top` provides top-level pretty printers (requires compiler-libs default since OCaml 4.0)
+* IP address scope classification
+* IPv4-mapped addresses in IPv6 (::ffff:0:0/96) are an embedding of IPv4
+* MAC-48 (Ethernet) address support
+* `Macaddr` is a `Map.OrderedType`
+* All types have sexplib serializers/deserializers</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-ipaddr/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-ipaddr/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-ipaddr</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index 28d8e7f62..05f2b4031 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/js_of_ocaml</remote-id>
-  </upstream>
-  <use>
-    <flag name="lwt">lwt support</flag>
-    <flag name="ppx">a ppx syntax extension</flag>
-    <flag name="ppx-deriving-json">ppx_deriving_json</flag>
-    <flag name="toplevel">lib and tools to build an ocaml toplevel to javascript</flag>
-    <flag name="tyxml">tyxml support</flag>
-  </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="lwt">lwt support</flag>
+		<flag name="ppx">a ppx syntax extension</flag>
+		<flag name="ppx-deriving-json">ppx_deriving_json</flag>
+		<flag name="toplevel">lib and tools to build an ocaml toplevel to javascript</flag>
+		<flag name="tyxml">tyxml support</flag>
+	</use>
+	<longdescription lang="en">Js_of_ocaml is a compiler from OCaml bytecode to JavaScript. It makes it possible to run pure OCaml programs in JavaScript environment like browsers and Node.js</longdescription>
+	<upstream>
+		<doc>https://ocsigen.org/js_of_ocaml/latest/manual/overview</doc>
+		<bugs-to>https://github.com/ocsigen/js_of_ocaml/issues</bugs-to>
+		<remote-id type="github">ocsigen/js_of_ocaml</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/lru/metadata.xml b/dev-ml/lru/metadata.xml
index e7e365d7b..defd87481 100644
--- a/dev-ml/lru/metadata.xml
+++ b/dev-ml/lru/metadata.xml
@@ -6,7 +6,15 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Lru provides weight-bounded finite maps that can remove the least-recently-used
+(LRU) bindings in order to maintain a weight constraint.</longdescription>
 	<upstream>
+		<doc>https://pqwy.github.io/lru/doc</doc>
+		<bugs-to>https://github.com/pqwy/lru/issues</bugs-to>
 		<remote-id type="github">pqwy/lru</remote-id>
+		<maintainer>
+			<name>David Kaloper Meršinjak</name>
+			<email>dk505@××××××.uk</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/lwt-dllist/metadata.xml b/dev-ml/lwt-dllist/metadata.xml
index f9b5363d5..484231ac3 100644
--- a/dev-ml/lwt-dllist/metadata.xml
+++ b/dev-ml/lwt-dllist/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/lwt-dllist</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">A sequence is an object holding a list of elements which support
+the following operations:
+
+- adding an element to the left or the right in time and space O(1)
+- taking an element from the left or the right in time and space O(1)
+- removing a previously added element from a sequence in time and space O(1)
+- removing an element while the sequence is being transversed.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/lwt-dllist/</doc>
+		<bugs-to>https://github.com/mirage/lwt-dllist/issues</bugs-to>
+		<remote-id type="github">mirage/lwt-dllist</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/magic-mime/metadata.xml b/dev-ml/magic-mime/metadata.xml
index 42a4f93bd..02a56e20f 100644
--- a/dev-ml/magic-mime/metadata.xml
+++ b/dev-ml/magic-mime/metadata.xml
@@ -1,11 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/ocaml-magic-mime</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This library contains a database of MIME types that maps filename extensions
+into MIME types suitable for use in many Internet protocols such as HTTP or
+e-mail.	It is generated from the `mime.types` file found in Unix systems, but
+has no dependency on a filesystem since it includes the contents of the
+database as an ML datastructure.
+
+For example, here's how to lookup MIME types in the [utop] REPL:
+
+		#require "magic-mime";;
+		Magic_mime.lookup "/foo/bar.txt";;
+		- : bytes = "text/plain"
+		Magic_mime.lookup "bar.css";;
+		- : bytes = "text/css"</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-magic-mime/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-magic-mime/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-magic-mime</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/metrics/metadata.xml b/dev-ml/metrics/metadata.xml
index 4e8d5310f..adaea289d 100644
--- a/dev-ml/metrics/metadata.xml
+++ b/dev-ml/metrics/metadata.xml
@@ -1,18 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/metrics</remote-id>
-  </upstream>
-  <use>
-    <flag name="influx">Influx reporter for the Metrics library</flag>
-    <flag name="lwt">Lwt backend for the Metrics library</flag>
-    <flag name="rusage">Resource usage (getrusage) sources for the Metrics library</flag>
-    <flag name="unix">Unix backend for the Metrics library</flag>
-  </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="influx">Influx reporter for the Metrics library</flag>
+		<flag name="lwt">Lwt backend for the Metrics library</flag>
+		<flag name="rusage">Resource usage (getrusage) sources for the Metrics library</flag>
+		<flag name="unix">Unix backend for the Metrics library</flag>
+	</use>
+	<longdescription lang="en">Metrics provides a basic infrastructure to monitor and gather runtime
+metrics for OCaml program. Monitoring is performed on sources, indexed
+by tags, allowing users to enable or disable at runtime the gathering
+of data-points. As disabled metric sources have a low runtime cost
+(only a closure allocation), the library is designed to instrument
+production systems.
+
+Metric reporting is decoupled from monitoring and is handled by a
+custom reporter. A few reporters are (will be) provided by default.
+
+Metrics is heavily inspired by
+[Logs](http://erratique.ch/software/logs).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/metrics/</doc>
+		<bugs-to>https://github.com/mirage/metrics/issues</bugs-to>
+		<remote-id type="github">mirage/metrics</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-block-unix/metadata.xml b/dev-ml/mirage-block-unix/metadata.xml
index e0c0fc994..9db2eb0a3 100644
--- a/dev-ml/mirage-block-unix/metadata.xml
+++ b/dev-ml/mirage-block-unix/metadata.xml
@@ -1,11 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-block-unix</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Unix implementation of the Mirage `BLOCK_DEVICE` interface.
+
+This module provides raw I/O to files and block devices with as little
+caching as possible.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-block-unix/</doc>
+		<bugs-to>https://github.com/mirage/mirage-block-unix/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-block-unix</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-block/metadata.xml b/dev-ml/mirage-block/metadata.xml
index f1b9cef23..e92ec5d71 100644
--- a/dev-ml/mirage-block/metadata.xml
+++ b/dev-ml/mirage-block/metadata.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-block</remote-id>
-  </upstream>
-  <use>
-    <flag name="combinators">Build the package specialised to the Lwt concurrency library for IO</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="combinators">Build the package specialised to the Lwt concurrency library for IO</flag>
+	</use>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-block/</doc>
+		<bugs-to>https://github.com/mirage/mirage-block/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-block</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-clock-unix/metadata.xml b/dev-ml/mirage-clock-unix/metadata.xml
index 5c0849326..005a1def7 100644
--- a/dev-ml/mirage-clock-unix/metadata.xml
+++ b/dev-ml/mirage-clock-unix/metadata.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-clock</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">The Unix implementation of the MirageOS Clock interface uses
+`gettimeofday` or `clock_gettime`, depending on
+which OS is in use (see [clock_stubs.c](https://github.com/mirage/mirage-clock/blob/master/unix/clock_stubs.c)).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-clock/</doc>
+		<bugs-to>https://github.com/mirage/mirage-clock/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-clock</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-crypto/metadata.xml b/dev-ml/mirage-crypto/metadata.xml
index e05bee98b..30ca9c803 100644
--- a/dev-ml/mirage-crypto/metadata.xml
+++ b/dev-ml/mirage-crypto/metadata.xml
@@ -1,19 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/mirage-crypto</remote-id>
-    </upstream>
-    <use>
-        <flag name="ec">Elliptic Curve Cryptography with primitives taken from Fiat</flag>
-        <flag name="pk">Simple public-key cryptography for the modern age</flag>
-        <flag name="rng">A cryptographically secure PRNG</flag>
-        <flag name="rng-async">Feed the entropy source in an Async-friendly way</flag>
-        <flag name="rng-mirage">Entropy collection for a cryptographically secure PRNG</flag>
-    </use>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="ec">Elliptic Curve Cryptography with primitives taken from Fiat</flag>
+		<flag name="pk">Simple public-key cryptography for the modern age</flag>
+		<flag name="rng">A cryptographically secure PRNG</flag>
+		<flag name="rng-async">Feed the entropy source in an Async-friendly way</flag>
+		<flag name="rng-mirage">Entropy collection for a cryptographically secure PRNG</flag>
+	</use>
+	<longdescription lang="en">Mirage-crypto provides symmetric ciphers (DES, AES, RC4, ChaCha20/Poly1305), and
+hashes (MD5, SHA-1, SHA-2).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-crypto/doc</doc>
+		<bugs-to>https://github.com/mirage/mirage-crypto/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-crypto</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-flow/metadata.xml b/dev-ml/mirage-flow/metadata.xml
index c94d17833..264c03b97 100644
--- a/dev-ml/mirage-flow/metadata.xml
+++ b/dev-ml/mirage-flow/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-flow</remote-id>
-    </upstream>
-    <use>
-        <flag name="combinators">Flow implementations and combinators for MirageOS specialized to lwt</flag>
-        <flag name="unix">Flow implementations and combinators for MirageOS on Unix</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="combinators">Flow implementations and combinators for MirageOS specialized to lwt</flag>
+		<flag name="unix">Flow implementations and combinators for MirageOS on Unix</flag>
+	</use>
+	<longdescription lang="en">This repo contains generic operations over Mirage `FLOW` implementations.
+
+Please consult [the API documentation](https://mirage.github.io/mirage-flow/index.html).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-flow/</doc>
+		<bugs-to>https://github.com/mirage/mirage-flow/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-flow</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-kv/metadata.xml b/dev-ml/mirage-kv/metadata.xml
index 69b772df1..28f3c8379 100644
--- a/dev-ml/mirage-kv/metadata.xml
+++ b/dev-ml/mirage-kv/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-kv</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">mirage-kv provides the `Mirage_kv.RO` and `Mirage_kv.RW`
+signatures the MirageOS key/value devices should implement.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-kv/</doc>
+		<bugs-to>https://github.com/mirage/mirage-kv/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-kv</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-net/metadata.xml b/dev-ml/mirage-net/metadata.xml
index dae051bbb..d888bcfde 100644
--- a/dev-ml/mirage-net/metadata.xml
+++ b/dev-ml/mirage-net/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-net</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-net/</doc>
+		<bugs-to>https://github.com/mirage/mirage-net/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-net</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
index d19645d32..c7ae49dd0 100644
--- a/dev-ml/mirage-profile/metadata.xml
+++ b/dev-ml/mirage-profile/metadata.xml
@@ -1,15 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-profile</remote-id>
-    </upstream>
-    <use>
-        <flag name="unix">Adds a Unix backend collector</flag>
-        <!--<flag name="xen">Adds a Xen MirageOS backend collector</flag>-->
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="unix">Adds a Unix backend collector</flag>
+		<!--<flag name="xen">Adds a Xen MirageOS backend collector</flag>-->
+	</use>
+	<longdescription lang="en">This library can be used to trace execution of OCaml/Lwt programs (such as
+Mirage unikernels) at the level of Lwt threads.	The traces can be viewed using
+JavaScript or GTK viewers provided by [mirage-trace-viewer][] or processed by
+tools supporting the [Common Trace Format (CTF)][ctf].	Some example traces can
+be found in the blog post [Visualising an Asynchronous
+Monad](http://roscidus.com/blog/blog/2014/10/27/visualising-an-asynchronous-monad/).
+
+Libraries can use the functions mirage-profile provides to annotate the traces
+with extra information.	When compiled against a normal version of Lwt,
+mirage-profile's functions are null-ops (or call the underlying untraced
+operation, as appropriate) and OCaml's cross-module inlining will optimise
+these calls away, meaning there should be no overhead in the non-profiling
+case.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-profile/</doc>
+		<bugs-to>https://github.com/mirage/mirage-profile/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-profile</remote-id>
+		<maintainer>
+			<name>Thomas Leonard</name>
+			<email>talex5@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-random-test/metadata.xml b/dev-ml/mirage-random-test/metadata.xml
index f71fbc3cb..265197fba 100644
--- a/dev-ml/mirage-random-test/metadata.xml
+++ b/dev-ml/mirage-random-test/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-random-test</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-random-test/</doc>
+		<bugs-to>https://github.com/mirage/mirage-random-test/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-random-test</remote-id>
+		<maintainer>
+			<name>Hannes Menhert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-random/metadata.xml b/dev-ml/mirage-random/metadata.xml
index dd61869c6..309636eae 100644
--- a/dev-ml/mirage-random/metadata.xml
+++ b/dev-ml/mirage-random/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-random</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-random/</doc>
+		<bugs-to>https://github.com/mirage/mirage-random/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-random</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-time/metadata.xml b/dev-ml/mirage-time/metadata.xml
index a721ce060..3634ef874 100644
--- a/dev-ml/mirage-time/metadata.xml
+++ b/dev-ml/mirage-time/metadata.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/mirage-time</remote-id>
-    </upstream>
-    <use>
-        <flag name="unix">Time operations for MirageOS on Unix</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="unix">Time operations for MirageOS on Unix</flag>
+	</use>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-time/</doc>
+		<bugs-to>https://github.com/mirage/mirage-time/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-time</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-unix/metadata.xml b/dev-ml/mirage-unix/metadata.xml
index e213abe98..188ab9f7d 100644
--- a/dev-ml/mirage-unix/metadata.xml
+++ b/dev-ml/mirage-unix/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-unix</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This package provides the MirageOS `OS` library for
+Unix targets, which handles the main loop and timers.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-unix/doc</doc>
+		<bugs-to>https://github.com/mirage/mirage-unix/issues/</bugs-to>
+		<remote-id type="github">mirage/mirage-unix</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-vnetif/metadata.xml b/dev-ml/mirage-vnetif/metadata.xml
index 6d156933b..59cf6b270 100644
--- a/dev-ml/mirage-vnetif/metadata.xml
+++ b/dev-ml/mirage-vnetif/metadata.xml
@@ -1,14 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-vnetif</remote-id>
-  </upstream>
-  <use>
-    <flag name="stack">Vnetif implementation of mirage-stack for Mirage TCP/IP</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="stack">Vnetif implementation of mirage-stack for Mirage TCP/IP</flag>
+	</use>
+	<longdescription lang="en">Provides the module `Vnetif` which can be used as a replacement for the regular
+`Netif` implementation in Xen and Unix. Stacks built using `Vnetif` are
+connected to a software switch that allows the stacks to communicate as if they
+were connected to the same LAN.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-vnetif/</doc>
+		<bugs-to>https://github.com/mirage/mirage-vnetif/issues/</bugs-to>
+		<remote-id type="github">mirage/mirage-vnetif</remote-id>
+		<maintainer>
+			<name>Magnus Skjegstad</name>
+			<email>magnus@×××××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage-xen/metadata.xml b/dev-ml/mirage-xen/metadata.xml
index 7ea63047a..ca51a85f4 100644
--- a/dev-ml/mirage-xen/metadata.xml
+++ b/dev-ml/mirage-xen/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage-xen</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This package provides the MirageOS `OS` library for
+Xen targets, which handles the main loop and timers.	It also provides
+the low level C startup code and C stubs required by the OCaml code.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-xen/</doc>
+		<bugs-to>https://github.com/mirage/mirage-xen/issues/</bugs-to>
+		<remote-id type="github">mirage/mirage-xen</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mirage/metadata.xml b/dev-ml/mirage/metadata.xml
index 5e2dbfb0b..e7a2f51de 100644
--- a/dev-ml/mirage/metadata.xml
+++ b/dev-ml/mirage/metadata.xml
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/mirage</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">MirageOS is a library operating system that constructs unikernels for
+secure, high-performance network applications across a variety of
+cloud computing and mobile platforms. Code can be developed on a
+normal OS such as Linux or MacOS X, and then compiled into a
+fully-standalone, specialised unikernel that runs under the Xen
+hypervisor.
+
+Since Xen powers most public cloud computing infrastructure such as
+Amazon EC2 or Rackspace, this lets your servers run more cheaply,
+securely and with finer control than with a full software stack.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage/</doc>
+		<bugs-to>https://github.com/mirage/mirage/issues/</bugs-to>
+		<remote-id type="github">mirage/mirage</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/mustache/metadata.xml b/dev-ml/mustache/metadata.xml
index 97dc89242..ff2931447 100644
--- a/dev-ml/mustache/metadata.xml
+++ b/dev-ml/mustache/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rgrinberg/ocaml-mustache</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Read and write mustache templates, and render them by providing a json object.
+Contains the `mustache` command line utility for driving logic-less templates.</longdescription>
+	<upstream>
+		<doc>http://rgrinberg.github.io/mustache/</doc>
+		<bugs-to>https://github.com/rgrinberg/ocaml-mustache/issues</bugs-to>
+		<remote-id type="github">rgrinberg/ocaml-mustache</remote-id>
+		<maintainer>
+			<name>Rudi Grinberg</name>
+			<email>rudi.grinberg@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/nbd/metadata.xml b/dev-ml/nbd/metadata.xml
index 560dfe855..19adb82a2 100644
--- a/dev-ml/nbd/metadata.xml
+++ b/dev-ml/nbd/metadata.xml
@@ -1,15 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/nbd</remote-id>
-  </upstream>
-  <use>
-    <flag name="tool">command line helper for serving and mirroring disks over NBD, and getting information about the disks exported by an NBD server</flag>
-    <flag name="unix">Lwt_unix implementation</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="tool">command line helper for serving and mirroring disks over NBD, and getting information about the disks exported by an NBD server</flag>
+		<flag name="unix">Lwt_unix implementation</flag>
+	</use>
+	<longdescription lang="en">This library allows applications to export and consume block
+devices using the NBD protocol (as used by Linux, qemu etc)</longdescription>
+	<upstream>
+		<doc>https://xapi-project.github.io/nbd/nbd/index.html</doc>
+		<bugs-to>https://github.com/xapi-project/nbd/issues</bugs-to>
+		<remote-id type="github">xapi-project/nbd</remote-id>
+		<maintainer>
+			<name>Jonathan Ludlam</name>
+			<email>jonathan.ludlam@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/netlink/metadata.xml b/dev-ml/netlink/metadata.xml
index 1b255a143..842d79f72 100644
--- a/dev-ml/netlink/metadata.xml
+++ b/dev-ml/netlink/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/ocaml-netlink</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">The Netlink Protocol Library Suite (libnl, see
+http://www.infradead.org/~tgr/libnl/) provides APIs to the netlink
+protocol, allowing you to interact with network devices in the Linux kernel.</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/xapi-project/ocaml-netlink/issues</bugs-to>
+		<remote-id type="github">xapi-project/ocaml-netlink</remote-id>
+		<maintainer>
+			<name>Rob Hoes</name>
+			<email>rob.hoes@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ocaml_intrinsics/metadata.xml b/dev-ml/ocaml_intrinsics/metadata.xml
index d9584e431..067b5b7f8 100644
--- a/dev-ml/ocaml_intrinsics/metadata.xml
+++ b/dev-ml/ocaml_intrinsics/metadata.xml
@@ -1,11 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Provides functions to invoke amd64 instructions (such as clz,popcnt,rdtsc,rdpmc)
+when available, or compatible software implementation on other targets.</longdescription>
 	<upstream>
-		<remote-id type="github">janestreet/async_ssl</remote-id>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/ocaml_intrinsics/index.html</doc>
+		<bugs-to>https://github.com/janestreet/ocaml_intrinsics/issues</bugs-to>
+		<remote-id type="github">janestreet/ocaml_intrinsics</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/omd/metadata.xml b/dev-ml/omd/metadata.xml
index 4e95d066b..3d7f298d1 100644
--- a/dev-ml/omd/metadata.xml
+++ b/dev-ml/omd/metadata.xml
@@ -1,11 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocaml/omd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This Markdown library is implemented using only pure OCaml (including
+I/O operations provided by the standard OCaml compiler distribution).
+OMD is meant to be as faithful as possible to the original Markdown.
+Additionally, OMD implements a few Github markdown features, an
+extension mechanism, and some other features. Note that the opam
+package installs both the OMD library and the command line tool `omd`.</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/ocaml/omd/issues</bugs-to>
+		<remote-id type="github">ocaml/omd</remote-id>
+		<maintainer>
+			<name>Shon Feder</name>
+			<email>shon.feder@×××××.com</email>
+		</maintainer>
+		<maintainer>
+			<name>Raphael Sousa Santos</name>
+			<email>contact@×××××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/pbkdf/metadata.xml b/dev-ml/pbkdf/metadata.xml
index d5235e07b..924ec0f1c 100644
--- a/dev-ml/pbkdf/metadata.xml
+++ b/dev-ml/pbkdf/metadata.xml
@@ -6,7 +6,14 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">An implementation of PBKDF 1 and 2 as defined by [PKCS#5](https://tools.ietf.org/html/rfc2898) using [mirage-crypto](https://github.com/mirage/mirage-crypto)</longdescription>
 	<upstream>
+		<doc>https://abeaumont.github.io/ocaml-pbkdf/</doc>
+		<bugs-to>https://github.com/abeaumont/ocaml-pbkdf/issues</bugs-to>
 		<remote-id type="github">abeaumont/ocaml-pbkdf</remote-id>
+		<maintainer>
+			<name>Alfredo Beaumont</name>
+			<email>alfredo.beaumont@×××××.com</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/pcap-format/metadata.xml b/dev-ml/pcap-format/metadata.xml
index 39e9c8c14..c3c2259ec 100644
--- a/dev-ml/pcap-format/metadata.xml
+++ b/dev-ml/pcap-format/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/ocaml-pcap</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">pcap-format provides an interface to encode and decode pcap files, dealing with
+both endianess, including endianess detection.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-pcap/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-pcap/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-pcap</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/pci/metadata.xml b/dev-ml/pci/metadata.xml
index 784a8e785..973463c14 100644
--- a/dev-ml/pci/metadata.xml
+++ b/dev-ml/pci/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">simonjbeaumont/ocaml-pci</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/simonjbeaumont/ocaml-pci/issues</bugs-to>
+		<remote-id type="github">simonjbeaumont/ocaml-pci</remote-id>
+		<maintainer>
+			<name>Simon Beaumont</name>
+			<email>simonjbeaumont@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/pecu/metadata.xml b/dev-ml/pecu/metadata.xml
index 97ab8e76f..2ce1744ff 100644
--- a/dev-ml/pecu/metadata.xml
+++ b/dev-ml/pecu/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/pecu</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">A non-blocking encoder/decoder of Quoted-Printable according to
+RFC2045 and RFC2047 (about encoded-word). Useful to translate contents of emails.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/pecu/</doc>
+		<bugs-to>https://github.com/mirage/pecu/issues</bugs-to>
+		<remote-id type="github">mirage/pecu</remote-id>
+		<maintainer>
+			<name>Romain Calascibetta</name>
+			<email>romain.calascibetta@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/polly/metadata.xml b/dev-ml/polly/metadata.xml
index 08de9a72f..cc6dd4585 100644
--- a/dev-ml/polly/metadata.xml
+++ b/dev-ml/polly/metadata.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">lindig/polly</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Bindings for the Linux epoll system call. The binding avoids
+	most allocation in the event loop by iterating over all file
+	descriptors that are reported as ready.</longdescription>
+	<upstream>
+		<doc>https://github.com/lindig/polly</doc>
+		<bugs-to>https://github.com/lindig/polly/issues</bugs-to>
+		<remote-id type="github">lindig/polly</remote-id>
+		<maintainer>
+			<name>Christian Lindig</name>
+			<email>christian.lindig@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/psq/metadata.xml b/dev-ml/psq/metadata.xml
index 14405eed6..fec9fb0b1 100644
--- a/dev-ml/psq/metadata.xml
+++ b/dev-ml/psq/metadata.xml
@@ -6,7 +6,15 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Typical applications are searches, schedulers and caches. If you ever scratched
+your head because that A* didn't look quite right, a PSQ is what you needed.</longdescription>
 	<upstream>
+		<doc>https://pqwy.github.io/psq/doc</doc>
+		<bugs-to>https://github.com/pqwy/psq/issues</bugs-to>
 		<remote-id type="github">pqwy/psq</remote-id>
+		<maintainer>
+			<name>David Kaloper Meršinjak</name>
+			<email>dk505@××××××.uk</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ptime/metadata.xml b/dev-ml/ptime/metadata.xml
index 21ffb848f..3b61f34bd 100644
--- a/dev-ml/ptime/metadata.xml
+++ b/dev-ml/ptime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,7 +6,31 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Ptime has platform independent POSIX time support in pure OCaml. It
+provides a type to represent a well-defined range of POSIX timestamps
+with picosecond precision, conversion with date-time values,
+conversion with [RFC 3339 timestamps][rfc3339] and pretty printing to
+a human-readable, locale-independent representation.
+
+The additional Ptime_clock library provides access to a system POSIX
+clock and to the system's current time zone offset.
+
+Ptime is not a calendar library.
+
+Ptime has no dependency. Ptime_clock depends on your system library or
+JavaScript runtime system. Ptime and its libraries are distributed
+under the ISC license.
+
+[rfc3339]: http://tools.ietf.org/html/rfc3339
+
+Home page: http://erratique.ch/software/ptime</longdescription>
 	<upstream>
+		<doc>https://erratique.ch/software/ptime/doc/</doc>
+		<bugs-to>https://github.com/dbuenzli/ptime/issues</bugs-to>
 		<remote-id type="github">dbuenzli/ptime</remote-id>
+		<maintainer>
+			<name>Daniel Bünzli</name>
+			<email>daniel.buenzli@×××××××××.ch</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/qmp/metadata.xml b/dev-ml/qmp/metadata.xml
index d4b0d7732..fc71a33f5 100644
--- a/dev-ml/qmp/metadata.xml
+++ b/dev-ml/qmp/metadata.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/ocaml-qmp</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xen-org/ocaml-qmp</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave.scott@×××××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/randomconv/metadata.xml b/dev-ml/randomconv/metadata.xml
index 0f5d9b870..ba622827a 100644
--- a/dev-ml/randomconv/metadata.xml
+++ b/dev-ml/randomconv/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">hannesm/randomconv</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">Given a function which produces random byte vectors, convert it to
+a number of your choice (int8/int16/int32/int64/int/float).</longdescription>
+	<upstream>
+		<doc>https://hannesm.github.io/randomconv/doc</doc>
+		<bugs-to>https://github.com/hannesm/randomconv/issues</bugs-to>
+		<remote-id type="github">hannesm/randomconv</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/rpc/metadata.xml b/dev-ml/rpc/metadata.xml
index a93809759..3ed6a77de 100644
--- a/dev-ml/rpc/metadata.xml
+++ b/dev-ml/rpc/metadata.xml
@@ -1,16 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-rpc</remote-id>
-  </upstream>
-  <use>
-    <flag name="async">Async interface</flag>
-    <flag name="html">html documentation generator</flag>
-    <flag name="js">Bindings for js_of_ocaml</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="async">Async interface</flag>
+		<flag name="html">html documentation generator</flag>
+		<flag name="js">Bindings for js_of_ocaml</flag>
+	</use>
+	<longdescription lang="en">`ocaml-rpc` is a library that provides remote procedure calls (RPC)
+using XML or JSON as transport encodings, and multiple generators
+for documentations, clients, servers, javascript bindings, python
+bindings, ...
+
+The transport mechanism itself is outside the scope of this library
+as all conversions are from and to strings.
+
+This is a dummy package installing the main library components.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-rpc/rpc</doc>
+		<bugs-to>https://github.com/mirage/ocaml-rpc/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-rpc</remote-id>
+		<maintainer>
+			<name>Thomas Gazagnaire</name>
+			<email>thomas@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/sexp_pretty/metadata.xml b/dev-ml/sexp_pretty/metadata.xml
index 418a0ad29..2b479d507 100644
--- a/dev-ml/sexp_pretty/metadata.xml
+++ b/dev-ml/sexp_pretty/metadata.xml
@@ -6,7 +6,11 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">A library for pretty-printing s-expressions, using better indentation rules than
+the default pretty printer in Sexplib.</longdescription>
 	<upstream>
+		<doc>https://ocaml.janestreet.com/ocaml-core/latest/doc/sexp_pretty/index.html</doc>
+		<bugs-to>https://github.com/janestreet/sexp_pretty/issues</bugs-to>
 		<remote-id type="github">janestreet/sexp_pretty</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/shared-block-ring/metadata.xml b/dev-ml/shared-block-ring/metadata.xml
index 393a3ec73..e4c6bd7b6 100644
--- a/dev-ml/shared-block-ring/metadata.xml
+++ b/dev-ml/shared-block-ring/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/shared-block-ring</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This is a simple queue containing variable-length items stored on a disk, in the style of Xen shared-memory-ring.</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/mirage/shared-block-ring/issues/</bugs-to>
+		<remote-id type="github">mirage/shared-block-ring</remote-id>
+		<maintainer>
+			<name>Jonathan Ludlam</name>
+			<email>jonathan.ludlam@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/shared-memory-ring/metadata.xml b/dev-ml/shared-memory-ring/metadata.xml
index 7cd2f0428..79b80613e 100644
--- a/dev-ml/shared-memory-ring/metadata.xml
+++ b/dev-ml/shared-memory-ring/metadata.xml
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirage/shared-memory-ring</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This package contains a set of libraries for creating shared memory
+producer/consumer rings. The rings follow the Xen ABI and may be used
+to create or implement Xen virtual devices.
+
+Example use:
+
+One program wishes to create data records and push them efficiently
+to a second process on the same physical machine for
+sampling/analysis/archiving.
+
+Example use:
+
+A Xen virtual machine wishes to send and receive network packets to
+and from a backend driver domain.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/shared-memory-ring/</doc>
+		<bugs-to>https://github.com/mirage/shared-memory-ring/issues</bugs-to>
+		<remote-id type="github">mirage/shared-memory-ring</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
index cb6c50f93..d8ce6fb86 100644
--- a/dev-ml/stringext/metadata.xml
+++ b/dev-ml/stringext/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">rgrinberg/stringext</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/rgrinberg/stringext/issues</bugs-to>
+		<remote-id type="github">rgrinberg/stringext</remote-id>
+		<maintainer>
+			<name>Rudi Grinberg</name>
+			<email>rudi.grinberg@×××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/systemd/metadata.xml b/dev-ml/systemd/metadata.xml
index e4a496827..31ef5b383 100644
--- a/dev-ml/systemd/metadata.xml
+++ b/dev-ml/systemd/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">juergenhoetzel/ocaml-systemd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Jürgen Hötzel</name>
+			<email>juergen@×××××××××.org</email>
+		</maintainer>
+		<remote-id type="github">juergenhoetzel/ocaml-systemd</remote-id>
+		<bugs-to>https://github.com/juergenhoetzel/ocaml-systemd/issues</bugs-to>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/tar/metadata.xml b/dev-ml/tar/metadata.xml
index 76d46cfa2..715ccecd3 100644
--- a/dev-ml/tar/metadata.xml
+++ b/dev-ml/tar/metadata.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-tar</remote-id>
-  </upstream>
-  <use>
-    <flag name="mirage">Read and write tar format files via MirageOS interfaces</flag>
-    <flag name="unix">Decode and encode tar format files from Unix</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="mirage">Read and write tar format files via MirageOS interfaces</flag>
+		<flag name="unix">Decode and encode tar format files from Unix</flag>
+	</use>
+	<longdescription lang="en">tar is a simple library to read and write tar files with an emphasis on
+streaming.
+
+This is pure OCaml code, no C bindings.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-tar/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-tar/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-tar</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/tcpip/metadata.xml b/dev-ml/tcpip/metadata.xml
index ee477510c..77eba9961 100644
--- a/dev-ml/tcpip/metadata.xml
+++ b/dev-ml/tcpip/metadata.xml
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/mirage-tcpip</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">`mirage-tcpip` provides a networking stack for the [Mirage operating
+system](https://mirage.io). It provides implementations for the following module types
+(which correspond with the similarly-named protocols):
+
+* IP (via the IPv4 and IPv6 modules)
+* ICMP
+* UDP
+* TCP</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/mirage-tcpip/</doc>
+		<bugs-to>https://github.com/mirage/mirage-tcpip/issues</bugs-to>
+		<remote-id type="github">mirage/mirage-tcpip</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/tls/metadata.xml b/dev-ml/tls/metadata.xml
index ec20f745d..a56f291fe 100644
--- a/dev-ml/tls/metadata.xml
+++ b/dev-ml/tls/metadata.xml
@@ -6,11 +6,34 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">mirleft/ocaml-tls</remote-id>
-	</upstream>
 	<use>
 		<flag name="async">Async laye</flag>
 		<flag name="mirage">MirageOS layer</flag>
 	</use>
+	<longdescription lang="en">Transport Layer Security (TLS) is probably the most widely deployed security
+protocol on the Internet. It provides communication privacy to prevent
+eavesdropping, tampering, and message forgery. Furthermore, it optionally
+provides authentication of the involved endpoints. TLS is commonly deployed for
+securing web services ([HTTPS](http://tools.ietf.org/html/rfc2818)), emails,
+virtual private networks, and wireless networks.
+
+TLS uses asymmetric cryptography to exchange a symmetric key, and optionally
+authenticate (using X.509) either or both endpoints. It provides algorithmic
+agility, which means that the key exchange method, symmetric encryption
+algorithm, and hash algorithm are negotiated.
+
+Read [further](https://nqsb.io) and our [Usenix Security 2015 paper](https://usenix15.nqsb.io).</longdescription>
+	<upstream>
+		<doc>https://mirleft.github.io/ocaml-tls/doc</doc>
+		<bugs-to>https://github.com/mirleft/ocaml-tls/issues</bugs-to>
+		<remote-id type="github">mirleft/ocaml-tls</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+		<maintainer>
+			<name>David Kaloper</name>
+			<email>david@××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/tuntap/metadata.xml b/dev-ml/tuntap/metadata.xml
index 271e2046e..105127cab 100644
--- a/dev-ml/tuntap/metadata.xml
+++ b/dev-ml/tuntap/metadata.xml
@@ -1,11 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-tuntap</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This is an OCaml library for handling TUN/TAP devices.	TUN refers to layer 3
+virtual interfaces whereas TAP refers to layer 2 Ethernet ones.
+
+See &lt;http://en.wikipedia.org/wiki/TUN/TAP&gt; for more information.
+
+Linux, FreeBSD, OpenBSD and macOS should all be supported.	You will need
+to install the third-party &lt;http://tuntaposx.sourceforge.net/&gt; on macOS before
+using this library.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-tuntap/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-tuntap/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-tuntap</remote-id>
+		<maintainer>
+			<name>Vincent Bernardoff</name>
+			<email>vb@××××××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index 15bf21728..50c6bb86d 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <description>co-maintainers welcome</description>
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocsigen/tyxml</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">TyXML provides a set of convenient combinators that uses the OCaml type system to ensure the validity of the generated documents. TyXML can be used with any representation of HTML and SVG: the textual one, provided directly by this package, or DOM trees (`js_of_ocaml-tyxml`) virtual DOM (`virtual-dom`) and reactive or replicated trees (`eliom`). You can also create your own representation and use it to instantiate a new set of combinators.</longdescription>
+	<upstream>
+		<doc>https://ocsigen.org/tyxml/latest/manual/intro</doc>
+		<bugs-to>https://github.com/ocsigen/tyxml/issues</bugs-to>
+		<remote-id type="github">ocsigen/tyxml</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/uri/metadata.xml b/dev-ml/uri/metadata.xml
index 57acd8357..01730e29b 100644
--- a/dev-ml/uri/metadata.xml
+++ b/dev-ml/uri/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,11 +6,19 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-uri</remote-id>
-	</upstream>
 	<use>
 		<flag name="re">This is an OCaml implementation of the RFC3986 specification for parsing URI or URLs</flag>
 		<flag name="sexp">ocaml-uri with sexp support</flag>
 	</use>
+	<longdescription lang="en">This is an OCaml implementation of the [RFC3986](http://tools.ietf.org/html/rfc3986) specification
+for parsing URI or URLs.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-uri/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-uri/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-uri</remote-id>
+		<maintainer>
+			<name>Anil Madhavapeddy</name>
+			<email>anil@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/vchan/metadata.xml b/dev-ml/vchan/metadata.xml
index 19eeb5aae..07445614d 100644
--- a/dev-ml/vchan/metadata.xml
+++ b/dev-ml/vchan/metadata.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/vchan</remote-id>
-    </upstream>
-    <use>
-        <flag name="unix">Unix support</flag>
-        <flag name="xen">Xen support</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="unix">Unix support</flag>
+		<flag name="xen">Xen support</flag>
+	</use>
+	<longdescription lang="en">This is an implementation of the Xen "libvchan" or "vchan" communication
+protocol in OCaml. It allows fast inter-domain communication using shared
+memory.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-vchan</doc>
+		<bugs-to>https://github.com/mirage/ocaml-vchan/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-vchan</remote-id>
+		<maintainer>
+			<name>Jonathan Ludlam</name>
+			<email>jonathan.ludlam@×××××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/vhd/metadata.xml b/dev-ml/vhd/metadata.xml
index 909764cf1..8c8513b8c 100644
--- a/dev-ml/vhd/metadata.xml
+++ b/dev-ml/vhd/metadata.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-vhd</remote-id>
-  </upstream>
-  <use>
-    <flag name="lwt">provide an Lwt compatible interface to the library</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mirage/ocaml-vhd</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.orj</email>
+		</maintainer>
+		<doc>https://mirage.github.io/ocaml-vhd/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-vhd/issues</bugs-to>
+	</upstream>
+	<use>
+		<flag name="lwt">provide an Lwt compatible interface to the library</flag>
+	</use>
 </pkgmetadata>

diff --git a/dev-ml/x509/metadata.xml b/dev-ml/x509/metadata.xml
index 973e19557..91bc0b3e0 100644
--- a/dev-ml/x509/metadata.xml
+++ b/dev-ml/x509/metadata.xml
@@ -1,12 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer type="person">
-        <description>co-maintainers welcome</description>
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-   <upstream>
-        <remote-id type="github">mirleft/ocaml-x509</remote-id>
-    </upstream>
+	<maintainer type="person">
+		<description>co-maintainers welcome</description>
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">X.509 is a public key infrastructure used mostly on the Internet.	It consists
+of certificates which include public keys and identifiers, signed by an
+authority. Authorities must be exchanged over a second channel to establish the
+trust relationship. This library implements most parts of RFC5280 and RFC6125.
+The Public Key Cryptography Standards (PKCS) defines encoding and decoding
+(in ASN.1 DER and PEM format), which is also implemented by this library -
+namely PKCS 1, PKCS 5, PKCS 7, PKCS 8, PKCS 9, PKCS 10, and PKCS 12.</longdescription>
+	<upstream>
+		<doc>https://mirleft.github.io/ocaml-x509/doc</doc>
+		<bugs-to>https://github.com/mirleft/ocaml-x509/issues</bugs-to>
+		<remote-id type="github">mirleft/ocaml-x509</remote-id>
+		<maintainer>
+			<name>Hannes Mehnert</name>
+			<email>hannes@×××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xapi-backtrace/metadata.xml b/dev-ml/xapi-backtrace/metadata.xml
index f658b3840..f2f479017 100644
--- a/dev-ml/xapi-backtrace/metadata.xml
+++ b/dev-ml/xapi-backtrace/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/backtrace</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/xapi-project/backtrace/issues</bugs-to>
+		<remote-id type="github">xapi-project/backtrace</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xapi-stdext/metadata.xml b/dev-ml/xapi-stdext/metadata.xml
index 2b8c3392c..e9ef0d387 100644
--- a/dev-ml/xapi-stdext/metadata.xml
+++ b/dev-ml/xapi-stdext/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/stdext</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/xapi-project/stdext/issues</bugs-to>
+		<remote-id type="github">xapi-project/stdext</remote-id>
+		<maintainer>
+			<name>Jonathan Ludlam</name>
+			<email>jonathan.ludlam@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xapi-test-utils/metadata.xml b/dev-ml/xapi-test-utils/metadata.xml
index 70ada5d58..32ea0e379 100644
--- a/dev-ml/xapi-test-utils/metadata.xml
+++ b/dev-ml/xapi-test-utils/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/xapi-test-utils</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Rob Hoes</name>
+			<email>rob.hoes@××××××.com</email>
+		</maintainer>
+		<bugs-to>https://github.com/xapi-project/xapi-test-utils/issues</bugs-to>
+		<remote-id type="github">xapi-project/xapi-test-utils</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xcp-inventory/metadata.xml b/dev-ml/xcp-inventory/metadata.xml
index 58f4c1358..ecb3b0716 100644
--- a/dev-ml/xcp-inventory/metadata.xml
+++ b/dev-ml/xcp-inventory/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/xcp-inventory</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xapi-project/xcp-inventory</remote-id>
+		<bugs-to>https://github.com/xapi-project/xcp-inventory/issues</bugs-to>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xcp-rrd/metadata.xml b/dev-ml/xcp-rrd/metadata.xml
index 9024faf70..bd49d243c 100644
--- a/dev-ml/xcp-rrd/metadata.xml
+++ b/dev-ml/xcp-rrd/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/xcp-rrd</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xapi-project/xcp-rrd</remote-id>
+		<bugs-to>https://github.com/xapi-project/xcp-rrd/issues</bugs-to>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xen-evtchn/metadata.xml b/dev-ml/xen-evtchn/metadata.xml
index d19b9659b..c970d3c67 100644
--- a/dev-ml/xen-evtchn/metadata.xml
+++ b/dev-ml/xen-evtchn/metadata.xml
@@ -1,14 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>lssndrbarbieri@×××××.com</email>
-        <name>Alessandro Barbieri</name>
-    </maintainer>
-    <upstream>
-        <remote-id type="github">mirage/evtchn</remote-id>
-    </upstream>
-    <use>
-        <flag name="unix">Xen event channel interface for Linux</flag>
-    </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="unix">Xen event channel interface for Linux</flag>
+	</use>
+	<longdescription lang="en">Event channels are the Xen equivalent of interrupts, used to signal
+when data (or space) is available for processing. There are 2 distinct
+implementations:
+
+	1. a Xen shared-memory + hypercall protocol for kernelspace
+	2. a binding to a set of libxc functions which access /dev/xen/evtchn
+		for userspace (see `xen-evtchn-unix` opam package).</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-evtchn/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-evtchn/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-evtchn</remote-id>
+		<maintainer>
+			<email>dave@××××××.org</email>
+			<name>David Scott</name>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xen-gnt/metadata.xml b/dev-ml/xen-gnt/metadata.xml
index ad55fc537..87c5cd354 100644
--- a/dev-ml/xen-gnt/metadata.xml
+++ b/dev-ml/xen-gnt/metadata.xml
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-gnt</remote-id>
-  </upstream>
-  <use>
-    <flag name="unix">build the userspace library</flag>
-  </use>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<use>
+		<flag name="unix">build the userspace library</flag>
+	</use>
+	<longdescription lang="en">These are used to create Xen device driver "backends" (servers)
+and "frontends" (clients).
+
+This library can be used in both kernelspace (via Mirage) or in userspace
+(on Linux) via the xen-gnt-unix library.
+To see a concrete example, have a look at [mirage/ocaml-vchan]</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-gnt/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-gnt/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-gnt</remote-id>
+		<maintainer>
+			<name>John Else</name>
+			<email>john.else@××××××.com</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xenstore-clients/metadata.xml b/dev-ml/xenstore-clients/metadata.xml
index 83e2a0934..ec425a1b2 100644
--- a/dev-ml/xenstore-clients/metadata.xml
+++ b/dev-ml/xenstore-clients/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">xapi-project/ocaml-xenstore-clients</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">xapi-project/ocaml-xenstore-clients</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+		<bugs-to>https://github.com/xapi-project/ocaml-xenstore-clients/issues</bugs-to>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xenstore/metadata.xml b/dev-ml/xenstore/metadata.xml
index bd5a462c2..3c9e34c67 100644
--- a/dev-ml/xenstore/metadata.xml
+++ b/dev-ml/xenstore/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>lssndrbarbieri@×××××.com</email>
-    <name>Alessandro Barbieri</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mirage/ocaml-xenstore</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>lssndrbarbieri@×××××.com</email>
+		<name>Alessandro Barbieri</name>
+	</maintainer>
+	<longdescription lang="en">This repo contains:
+1. a xenstore client library, a merge of the Mirage and XCP ones
+2. a xenstore server library
+3. a xenstore server instance which runs under Unix with libxc
+4. a xenstore server instance which runs on mirage.
+
+The client and the server libraries have sets of unit-tests.</longdescription>
+	<upstream>
+		<doc>https://mirage.github.io/ocaml-xenstore/</doc>
+		<bugs-to>https://github.com/mirage/ocaml-xenstore/issues</bugs-to>
+		<remote-id type="github">mirage/ocaml-xenstore</remote-id>
+		<maintainer>
+			<name>David Scott</name>
+			<email>dave@××××××.org</email>
+		</maintainer>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/xmlm/metadata.xml b/dev-ml/xmlm/metadata.xml
index 10aa1be47..7532c42d1 100644
--- a/dev-ml/xmlm/metadata.xml
+++ b/dev-ml/xmlm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -6,7 +6,21 @@
 		<email>lssndrbarbieri@×××××.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
+	<longdescription lang="en">Xmlm is a streaming codec to decode and encode the XML data format. It
+can process XML documents without a complete in-memory representation of the
+data.
+
+Xmlm is made of a single independent module and distributed
+under the ISC license.
+
+Home page: http://erratique.ch/software/xmlm</longdescription>
 	<upstream>
+		<doc>https://erratique.ch/software/xmlm/doc/</doc>
+		<bugs-to>https://github.com/dbuenzli/xmlm/issues</bugs-to>
 		<remote-id type="github">dbuenzli/xmlm</remote-id>
+		<maintainer>
+			<name>Daniel Bünzli</name>
+			<email>daniel.buenzli@×××××××××.ch</email>
+		</maintainer>
 	</upstream>
 </pkgmetadata>