[gentoo-commits] proj/musl:master commit in: dev-libs/boehm-gc/, dev-tex/luatex/, sys-libs/talloc/, net-libs/libnfsidmap/, ...

[Anthony G. Basile]

commit:     73143eb75a00ebea8a96f3091a22b52d45700b3c
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 28 07:28:01 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Feb 28 07:28:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=73143eb7

Update metadata.xml and make repoman (partially) happy

Package-Manager: portage-2.2.26

 app-crypt/gpgme/Manifest                           |   2 +-
 app-crypt/gpgme/metadata.xml                       |   5 +-
 app-crypt/shash/Manifest                           |   2 +-
 app-crypt/shash/metadata.xml                       |   2 +-
 app-editors/emacs-vcs/Manifest                     |   2 +-
 app-editors/emacs-vcs/metadata.xml                 |  37 +++--
 app-editors/emacs/Manifest                         |   2 +-
 app-editors/emacs/metadata.xml                     |  35 ++--
 app-emulation/qemu/Manifest                        |   2 +-
 app-emulation/qemu/metadata.xml                    |  91 +++++------
 app-emulation/wine/Manifest                        |   2 +-
 app-emulation/wine/metadata.xml                    |  51 +++---
 app-eselect/eselect-opengl/Manifest                |   2 +-
 app-eselect/eselect-opengl/metadata.xml            |   9 +-
 app-office/libreoffice/Manifest                    |   8 +-
 ...2-r99.ebuild => libreoffice-5.0.3.2-r99.ebuild} | 178 ++++++++++-----------
 app-office/libreoffice/metadata.xml                |   9 +-
 app-text/hunspell/Manifest                         |   2 +-
 app-text/hunspell/metadata.xml                     |  13 +-
 app-text/texlive-core/Manifest                     |   2 +-
 app-text/texlive-core/metadata.xml                 |  23 +--
 dev-db/libiodbc/Manifest                           |   2 +-
 dev-db/libiodbc/metadata.xml                       |   2 +-
 dev-embedded/u-boot-tools/Manifest                 |   2 +-
 dev-embedded/u-boot-tools/metadata.xml             |   5 +-
 dev-lang/ruby/Manifest                             |   2 +-
 dev-lang/ruby/metadata.xml                         |  22 ++-
 dev-libs/DirectFB/Manifest                         |   2 +-
 dev-libs/DirectFB/metadata.xml                     |   5 +-
 dev-libs/boehm-gc/Manifest                         |   2 +-
 dev-libs/boehm-gc/metadata.xml                     |   4 +-
 dev-libs/libedit/Manifest                          |   1 +
 dev-libs/libedit/metadata.xml                      |  16 ++
 dev-libs/libgamin/Manifest                         |   2 +-
 dev-libs/libgamin/metadata.xml                     |   3 +-
 dev-libs/nspr/Manifest                             |   2 +-
 dev-libs/nspr/metadata.xml                         |   5 +-
 dev-python/numpy/Manifest                          |   1 +
 dev-python/numpy/metadata.xml                      |  23 +++
 dev-qt/qt3support/Manifest                         |   2 +-
 dev-qt/qt3support/metadata.xml                     |   5 +-
 dev-qt/qtcore/Manifest                             |   2 +-
 dev-qt/qtcore/metadata.xml                         |   5 +-
 dev-qt/qtwebkit/Manifest                           |   7 +-
 .../files/qtwebkit-5.5.1-disable-jit.patch         |  15 ++
 dev-qt/qtwebkit/metadata.xml                       |   8 +-
 ...-5.5.0-r99.ebuild => qtwebkit-5.5.1-r99.ebuild} |  55 ++++---
 dev-scheme/guile/Manifest                          |   2 +-
 dev-scheme/guile/metadata.xml                      |  17 +-
 dev-tex/luatex/Manifest                            |   2 +-
 dev-tex/luatex/metadata.xml                        |   5 +-
 dev-vcs/cvs/Manifest                               |   2 +-
 dev-vcs/cvs/metadata.xml                           |   5 +-
 mail-client/thunderbird/Manifest                   |   2 +-
 mail-client/thunderbird/metadata.xml               |  15 +-
 mail-mta/exim/Manifest                             |   2 +-
 mail-mta/exim/metadata.xml                         |  42 ++---
 media-gfx/fontforge/Manifest                       |   2 +-
 media-gfx/fontforge/metadata.xml                   |  26 ++-
 media-gfx/sane-backends/Manifest                   |   2 +-
 media-gfx/sane-backends/metadata.xml               |   4 -
 media-libs/libdvbpsi/Manifest                      |   2 +-
 media-libs/libdvbpsi/metadata.xml                  |   3 +-
 media-libs/libmpdclient/Manifest                   |   2 +-
 media-libs/libmpdclient/metadata.xml               |   7 +-
 media-libs/libopenraw/Manifest                     |   2 +-
 media-libs/libopenraw/metadata.xml                 |   3 +-
 media-libs/libv4l/Manifest                         |   2 +-
 media-libs/libv4l/metadata.xml                     |   4 +-
 media-libs/mesa/Manifest                           |   2 +-
 media-libs/mesa/metadata.xml                       |  52 +++---
 media-libs/netpbm/Manifest                         |   2 +-
 media-libs/netpbm/metadata.xml                     |   8 +-
 net-dialup/linux-atm/Manifest                      |   2 +-
 net-dialup/linux-atm/metadata.xml                  |   1 -
 net-dialup/ppp/Manifest                            |   2 +-
 net-dialup/ppp/metadata.xml                        |  11 +-
 net-firewall/iptables/Manifest                     |   2 +-
 net-firewall/iptables/metadata.xml                 |  10 +-
 net-fs/cifs-utils/Manifest                         |   2 +-
 net-fs/cifs-utils/metadata.xml                     |   3 +-
 net-libs/liblockfile/Manifest                      |   2 +-
 net-libs/liblockfile/metadata.xml                  |   5 +-
 net-libs/libnfsidmap/Manifest                      |   2 +-
 net-libs/libnfsidmap/metadata.xml                  |   5 +-
 net-libs/libtirpc/Manifest                         |   2 +-
 net-libs/libtirpc/metadata.xml                     |   8 +-
 net-libs/miniupnpc/Manifest                        |   2 +-
 net-libs/miniupnpc/metadata.xml                    |   9 +-
 net-libs/webkit-gtk/Manifest                       |   2 +-
 net-libs/webkit-gtk/metadata.xml                   |   9 +-
 net-news/newsbeuter/Manifest                       |   2 +-
 net-news/newsbeuter/metadata.xml                   |   2 +-
 net-p2p/transmission/Manifest                      |   2 +-
 net-p2p/transmission/metadata.xml                  |  11 +-
 net-print/cups-filters/Manifest                    |   2 +-
 net-print/cups-filters/metadata.xml                |   7 +-
 net-wireless/bluez/Manifest                        |   2 +-
 net-wireless/bluez/metadata.xml                    |   6 +-
 net-wireless/crda/Manifest                         |   2 +-
 net-wireless/crda/metadata.xml                     |   7 +-
 sys-apps/attr/Manifest                             |   2 +-
 sys-apps/attr/metadata.xml                         |   5 +-
 sys-apps/busybox/Manifest                          |   2 +-
 sys-apps/busybox/metadata.xml                      |   8 +-
 sys-apps/findutils/Manifest                        |   2 +-
 sys-apps/findutils/metadata.xml                    |  11 +-
 sys-apps/hdparm/Manifest                           |   2 +-
 sys-apps/hdparm/metadata.xml                       |   8 +-
 sys-apps/iproute2/Manifest                         |   2 +-
 sys-apps/iproute2/metadata.xml                     |  10 +-
 sys-apps/kbd/Manifest                              |   2 +-
 sys-apps/kbd/metadata.xml                          |   8 +-
 sys-apps/keyutils/Manifest                         |   2 +-
 sys-apps/keyutils/metadata.xml                     |   9 +-
 sys-apps/net-tools/Manifest                        |   2 +-
 sys-apps/net-tools/metadata.xml                    |  14 +-
 sys-apps/pciutils/Manifest                         |   2 +-
 sys-apps/pciutils/metadata.xml                     |  14 +-
 sys-apps/portage/Manifest                          |   2 +-
 sys-apps/portage/metadata.xml                      |   2 +-
 sys-apps/sandbox/Manifest                          |   2 +-
 sys-apps/sandbox/metadata.xml                      |   2 +-
 sys-apps/shadow/Manifest                           |   2 +-
 sys-apps/shadow/metadata.xml                       |  14 +-
 sys-apps/sysvinit/Manifest                         |   2 +-
 sys-apps/sysvinit/metadata.xml                     |   5 +-
 sys-apps/tcp-wrappers/Manifest                     |   2 +-
 sys-apps/tcp-wrappers/metadata.xml                 |  13 +-
 sys-apps/util-linux/Manifest                       |   2 +-
 sys-apps/util-linux/metadata.xml                   |  25 +--
 sys-apps/xinetd/Manifest                           |   2 +-
 sys-apps/xinetd/metadata.xml                       |  14 +-
 sys-auth/polkit/Manifest                           |   2 +-
 sys-auth/polkit/metadata.xml                       |   5 +-
 sys-auth/skey/Manifest                             |   2 +-
 sys-auth/skey/metadata.xml                         |   2 +-
 sys-block/parted/Manifest                          |   2 +-
 sys-block/parted/metadata.xml                      |  13 +-
 sys-block/thin-provisioning-tools/Manifest         |   2 +-
 sys-block/thin-provisioning-tools/metadata.xml     |  20 +--
 sys-boot/lilo/Manifest                             |   2 +-
 sys-boot/lilo/metadata.xml                         |  16 +-
 sys-devel/gcc/Manifest                             |   2 +-
 sys-devel/gcc/metadata.xml                         |   3 +
 sys-devel/gdb/Manifest                             |   2 +-
 sys-devel/gdb/metadata.xml                         |  17 +-
 sys-devel/llvm/Manifest                            |   2 +-
 sys-devel/llvm/metadata.xml                        |  22 +--
 sys-devel/m4/Manifest                              |   2 +-
 sys-devel/m4/metadata.xml                          |   5 +-
 sys-fs/dosfstools/Manifest                         |   2 +-
 sys-fs/dosfstools/metadata.xml                     |   8 +-
 sys-fs/encfs/Manifest                              |   4 -
 sys-fs/encfs/encfs-1.7.4-r99.ebuild                |  44 -----
 sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch      |  10 --
 sys-fs/encfs/files/encfs-1.7.4-r68:69.patch        |  31 ----
 sys-fs/lvm2/Manifest                               |   2 +-
 sys-fs/lvm2/metadata.xml                           |  23 ++-
 sys-fs/squashfs-tools/Manifest                     |   2 +-
 sys-fs/squashfs-tools/metadata.xml                 |   5 +-
 sys-fs/udisks/Manifest                             |   1 +
 sys-fs/udisks/metadata.xml                         |  14 ++
 sys-fs/xfsdump/Manifest                            |   2 +-
 sys-fs/xfsdump/metadata.xml                        |   5 +-
 sys-fs/xfsprogs/Manifest                           |   2 +-
 sys-fs/xfsprogs/metadata.xml                       |   5 +-
 sys-kernel/linux-headers/Manifest                  |   2 +-
 sys-kernel/linux-headers/metadata.xml              |   5 +-
 sys-libs/efivar/Manifest                           |   2 +-
 sys-libs/efivar/metadata.xml                       |   2 +-
 sys-libs/gdbm/Manifest                             |   2 +-
 sys-libs/gdbm/metadata.xml                         |   9 +-
 sys-libs/gpm/Manifest                              |   2 +-
 sys-libs/gpm/metadata.xml                          |   5 +-
 sys-libs/libcap-ng/Manifest                        |   2 +-
 sys-libs/libcap-ng/metadata.xml                    |  18 ++-
 sys-libs/libcxx/Manifest                           |   2 +-
 sys-libs/libcxx/metadata.xml                       |   8 +-
 sys-libs/libnih/Manifest                           |   1 +
 sys-libs/{efivar => libnih}/metadata.xml           |   8 +-
 sys-libs/libraw1394/Manifest                       |   2 +-
 sys-libs/libraw1394/metadata.xml                   |   5 +-
 sys-libs/libseccomp/Manifest                       |   1 +
 {sys-fs/encfs => sys-libs/libseccomp}/metadata.xml |   8 +-
 sys-libs/libutempter/Manifest                      |   2 +-
 sys-libs/libutempter/metadata.xml                  |  10 +-
 sys-libs/pam/Manifest                              |   2 +-
 sys-libs/pam/metadata.xml                          |   3 +-
 sys-libs/queue/Manifest                            |   4 +-
 sys-libs/queue/metadata.xml                        |   1 -
 sys-libs/queue/queue-0.1.ebuild                    |   4 +-
 sys-libs/slang/Manifest                            |   2 +-
 sys-libs/slang/metadata.xml                        |   5 +-
 sys-libs/talloc/Manifest                           |   2 +-
 sys-libs/talloc/metadata.xml                       |   7 +-
 sys-libs/tdb/Manifest                              |   2 +-
 sys-libs/tdb/metadata.xml                          |   7 +-
 sys-libs/tevent/Manifest                           |   2 +-
 sys-libs/tevent/metadata.xml                       |   7 +-
 sys-process/lsof/Manifest                          |   2 +-
 sys-process/lsof/metadata.xml                      |   7 +-
 sys-process/procps/Manifest                        |   2 +-
 sys-process/procps/metadata.xml                    |  19 ++-
 sys-process/psmisc/Manifest                        |   2 +-
 sys-process/psmisc/metadata.xml                    |   8 +-
 www-client/firefox/Manifest                        |   2 +-
 www-client/firefox/metadata.xml                    |   9 +-
 www-client/midori/Manifest                         |   4 +-
 www-client/midori/metadata.xml                     |  13 +-
 www-client/midori/midori-0.5.10-r99.ebuild         |   6 +-
 www-misc/htdig/Manifest                            |   2 +-
 www-misc/htdig/metadata.xml                        |   5 +-
 x11-base/xorg-server/Manifest                      |   2 +-
 x11-base/xorg-server/metadata.xml                  |  22 +--
 x11-libs/libdrm/Manifest                           |   2 +-
 x11-libs/libdrm/metadata.xml                       |   9 +-
 x11-libs/libpciaccess/Manifest                     |   2 +-
 x11-libs/libpciaccess/metadata.xml                 |   5 +-
 x11-libs/vte/Manifest                              |   2 +-
 x11-libs/vte/metadata.xml                          |  11 +-
 x11-misc/slim/Manifest                             |   2 +-
 x11-misc/slim/metadata.xml                         |  15 +-
 x11-terms/rxvt-unicode/Manifest                    |   3 +-
 x11-terms/rxvt-unicode/metadata.xml                |  33 ++++
 ...de-9.21.ebuild => rxvt-unicode-9.21-r99.ebuild} |   8 +-
 226 files changed, 1091 insertions(+), 743 deletions(-)

diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 1fdc662..e4c4a1f 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -2,4 +2,4 @@ AUX gpgme-1.1.8-et_EE.patch 356 SHA256 dcf67057447f1f6316ebad2b61340bc24086eb470
 AUX gpgme-1.5.5-error_t-provided-by-argp_h.patch 550 SHA256 7784cc1d1068d4c57d296dc9839351b83cb222673d6e78e97e8355662cae3786 SHA512 fb425bd0f244de111c8583b33bc84911159260aced69b83a9409cfbd8e954cb21ce3dc1b8c45ca8ac4b179444ae2500ac8c2e41323d68b914965e6e8d7f97b3f WHIRLPOOL fa66b97bc5b5bc83039c357f07f24f0701666d91eb4a9bf14f21dcc57baec02523f3805ae39d236578c73cc8e660322fa83d442dbf60c82620dc1fceac3d8bd6
 DIST gpgme-1.5.5.tar.bz2 976383 SHA256 0b3d3d5107680c594777aae65882a1ff6dd1ba629a83432e719c8b82a743c207 SHA512 a01b84c1ae2a7c647b2de793fc05d39c4bf4a2d1b7378934e437857823f11ca9e9c1f3b32302d69a3a84d0be1fee1e1c86874355031b8fa6b40f4ad56ecc72ad WHIRLPOOL f3ad4282a254cf1ab8d01184df787a773fa7963a42157da93bee11430263fa86166f12f051e2b11d13be99ce1f0939d565cb02a8fba93ab6afed73ca7b2c0041
 EBUILD gpgme-1.5.5-r99.ebuild 1033 SHA256 963d60a557903192365c40b1a289730312e10d5d55904ade7a7557d787890912 SHA512 03c97093750cd50b55afd071dca8372110606ad2e954270293ff14e2aeefda5357f0f9377c548cb1b3539c28d5275340f31406a388832b4f1ed2ac16f806ff28 WHIRLPOOL 800a8fee944dc24a38cafc0eecd9cf444558ffd8ceac39d15ddf6cc803acbeab2fb5c0a014b3953bae6c5e9c02dfb7cd4d481216afcdef6f4915a157598721f5
-MISC metadata.xml 235 SHA256 457ae31679e09fa587eb1ce494f8bed85d9057e2a1c2b72462b4c02186067e26 SHA512 49cfc0288e90fe1a8a71517d5964b727212b84603afc37faec0101ca947631e288aba3e1c84b7b33b4e24509d0e798fe9d2d6aba1a1209c16cadc8b7b18d9908 WHIRLPOOL de990675240b800437b9549239a7a2f4707bff47793a70a03828ff1af0b43d237f2284d426cf284f156fd15beab1ad59961d0033e2542d309878fe6f6864e423
+MISC metadata.xml 315 SHA256 2090c9e52f91c000c11e53d0215dd327d8274ab13f3a4930340a608afe10c5e8 SHA512 502b5daf04f1b706514aba7d18cd454e1e99f63462159d3f5baebd1617bfa4760c7ea6fae9b7624fae2bc5943f8950211c6f4b326b6b62c3cf7eba4fc1255334 WHIRLPOOL dfd45c75e635ff36c55dd60b7c31a59ea22792fc07f6ba4cf493e99a4d55c3466e86cab704736a6b1547b9fb0b30670e839150f163643b1ebd9d98d6af814576

diff --git a/app-crypt/gpgme/metadata.xml b/app-crypt/gpgme/metadata.xml
index 780611b..89e9849 100644
--- a/app-crypt/gpgme/metadata.xml
+++ b/app-crypt/gpgme/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>crypto</herd>
+	<maintainer type="project">
+		<email>crypto@g.o</email>
+		<name>Crypto</name>
+	</maintainer>
 	<use>
 		<flag name="common-lisp">Install common-lisp files</flag>
 	</use>

diff --git a/app-crypt/shash/Manifest b/app-crypt/shash/Manifest
index 8275758..bf2b8af 100644
--- a/app-crypt/shash/Manifest
+++ b/app-crypt/shash/Manifest
@@ -4,4 +4,4 @@ AUX shash-0.2.6-missing-includes.patch 483 SHA256 c00017237b6f6176424f9738ec7d97
 AUX shash.bash-completion 993 SHA256 5f3d0bb5a202ba3365c81945ec2f0318893f1f372f11c8b4d7bc524888d8d228 SHA512 6b646fc5de7bc8279d49541f7375f6212e314fef3c9bc2a992d38e0b78031d9476ae396bdd527f39380bdb0342c8d27e46e4a01e3c1f5877c3fbd8ad49346393 WHIRLPOOL 5e693b82a794a482365797d1f72adca00015a5302b6b12da0ab91dd06bc15357eee9942766c000278af6b5574f3f5f564cba1d37189b0c0571615f796912286c
 DIST shash-0.2.6.tar.gz 105641 SHA256 6abf13eb1c3b4b6ef0f07e5425d10ed2abaad1d08c327647feb3506e76ced9dc SHA512 340a59bd16b3e5069a076b56f8fe24d2306a6ddd5e6ad564c5e17a992d8e279a7109ba39bd5caa8438a0e85b4f94cb0878228f7aefe38221ff6efa80df64086b WHIRLPOOL 8b809f5fddc98def54907fee8af424937c747f341dd0eaa6fd0c1057858c4dce7d117dfbc729cdd951c53e68a363d3339e9db4e2de1677620bbb9a94a810e8a5
 EBUILD shash-0.2.6-r99.ebuild 953 SHA256 d98a2af712acef32d9eea91bf28926b3817a14e942fa7b87f700c433c133ce2e SHA512 995dd9a66ec9e79d9f340ebe77bd49e9defc1fab07a61c6376077a0a8af9d286da4703e0b5a1dc41a24357fdc8ea37e19cb606907b2d66ab1e50fecb98ae2f4f WHIRLPOOL bd2ed920428fe28cd6f037b6f1592a09573ff2d6c9cefd746a190cea389e6d5a2d01fdacb718a7d53efe15f8b1c5232bf50393b5a2d5a724b148c0e2a0ccddf8
-MISC metadata.xml 423 SHA256 c700cda1fdc97248759b263259be6f558ebaaca339417f227bce282e1bfaf0f0 SHA512 24491d06bd39df6f4ad1d85a121f2a62b65db3a1b12db01ad9f390c752a8663483828dbd467d6eea8f8d585c2acd621c91d4a6c75b073cf9ae57fe72c0bb3b92 WHIRLPOOL f59da151f4f0f459f69004df56da565079a31ed08b2833fea10cd66a431a4cf0f45a5664622751ba8d801c45c900a498d34876c5fcb270f8ff53cf6a01a5ad42
+MISC metadata.xml 437 SHA256 7c03f43673bb700e0bc1063720dc80df195304f74a397d8175192ec6e705bb88 SHA512 5402bd757c9295e1e6ac0239552344a3e117da528d11db153e6a1a805e8aa5627493d22af1f7a87a7ef7a33170b5d08c9f344751deb9e1e8303e66eac096f13d WHIRLPOOL e086a413a8a5bc1d1fba9a2a4717d83af4137a40f17ff969a5536a26fbd342c8a58b3418933fc42770ffae3c60812ab2bd044951de17a52566441a9210b26282

diff --git a/app-crypt/shash/metadata.xml b/app-crypt/shash/metadata.xml
index c6d4395..3b9877f 100644
--- a/app-crypt/shash/metadata.xml
+++ b/app-crypt/shash/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>swegener@g.o</email>
 		<name>Sven Wegener</name>
 		<description>primary maintainer</description>

diff --git a/app-editors/emacs-vcs/Manifest b/app-editors/emacs-vcs/Manifest
index 2da090a..860f7f9 100644
--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@@ -1,3 +1,3 @@
 AUX emacs-vcs-musl.patch 2344 SHA256 2e4072282384a42646e1beb50cc1354e24ceab67128e41ebb23549f2466545fe SHA512 d581f5c964d6ae3a2b31acb5c60469086ab36404ea853403cc9b7137e8941f09e77be0966153f0d960fe2cfc3238b6a7467c9648ba00e1610eb4c29086187c56 WHIRLPOOL 58dd2cb23ad0c34eb8ee97bfa5b817ef1d0e102b7b49dd3451ddf5406318f28ea21ea8ce76a6461980ebf69780d02e266b2d928502151b703177985505f2ef2c
 EBUILD emacs-vcs-25.0.9999-r99.ebuild 11393 SHA256 b958ffd8bd98203d4955a1f759a34dbe3507452b92e9fc237fbab07ef9e3a3ab SHA512 f054ade0f75927f84f4cfe56da174ed95ece1201e9f881d3e27bf9cb1f686f8e38468524ea0e9a8da64e40f8c31056522d14a2a87a4848241b8ee08a58a63602 WHIRLPOOL 4972d500d65e7511b8f36da020a39cd33af7065f3cfb29de53c837a5dfc844fa6e6ab9628c53afd6dfec896498fcb4cd488322e3b4440c110acbaa2a3f38944d
-MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
+MISC metadata.xml 2670 SHA256 129bd3ca2fbed47b5d81bd2a50d530f05b1b229d3b5a349f1e21be70dde67f7b SHA512 9bd16b563f4209e245a53ceb818e8218f73d5702708e5caaf6b3359a4adbcbf124545c15b7c411f112520e744af35c6a3e62a6e051e896e8340320a66c9be153 WHIRLPOOL 78f70608e03d44a03eb108a57d9f13b589b99e393e53d6602ff3a97f5f7864d0936f31242328ef63ab2dbcfcf49292cf7b5e4abab155f016ae6a05133b8a9391

diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 88ecff5..a42a18a 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+<maintainer type="project">
+  <email>gnu-emacs@g.o</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
 <longdescription>
   GNU Emacs is an extensible, customizable text editor - and more. At its core
   is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
@@ -17,30 +20,32 @@
      available separately.
 </longdescription>
 <use>
-  <flag name='athena'>Enable the MIT Athena widget set
+  <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name='games'>Support shared score files for games</flag>
-  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+  <flag name="games">Support shared score files for games</flag>
+  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
-  <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
     notification</flag>
-  <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
-    version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
-  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
+  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
+    (<pkg>x11-libs/gtk+</pkg>)</flag>
+  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+  <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag>
+  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
-  <flag name='source'>Install C source files and make them available for
+  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+  <flag name="source">Install C source files and make them available for
     find-function</flag>
-  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
-  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
+  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
+  <flag name='xwidgets'>Enable use of GTK widgets in Emacs buffers
+    (requires GTK3)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index f3925a4..857fb67 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -7,4 +7,4 @@ AUX preload.c 1868 SHA256 3498abf641e809c06bf6a265d54880e93ee31f7abf81210856b6db
 DIST emacs-24.5-patches-1.tar.xz 3744 SHA256 dbcad232dff47e5540fff33351d76a92165e3d379a9c1fe52c04268a1ae245f8 SHA512 0c17546211493a521eec026e05722ebfa0988d2d97c916f8ddbe4d54220fbb6256cb8ad76769a8832fe7028051ecfe04d8ac46da71d7c5a6d2906b57466496db WHIRLPOOL 29cbd3513a62b025994918c6fbf86d70e282dfc0b1fc70639afcf356946e7c46ecc099a552e3735346d6b13c494db93246605eff002c34f1d0859ac04f1025fe
 DIST emacs-24.5.tar.xz 39759804 SHA256 dd47d71dd2a526cf6b47cb49af793ec2e26af69a0951cc40e43ae290eacfc34e SHA512 89dee4c3aadb6e505c523f84c65b5e40e5bf28a586cc8a4518a59581c22972f942bb6f3c772df0d5b2685c3e78247c545c6bb2576e981d1ef0f9298c18ad1677 WHIRLPOOL 3d9f8fb840f4c846246e642369f967ba0ec357c7cf718ed865523a3cd39605ba14b8c15fc9ae3f076c27e5b6e41fcb681d15f1c6ffc5934430c0a2bf47c233a3
 EBUILD emacs-24.5-r99.ebuild 11260 SHA256 82ac069c0fedd92bddc59eb3565d1f2c22305f7e4bdfa88c375fdf32a456952b SHA512 25274aa922cfb7d9bfcd30b2fb066295b3ecf3af320a9f713b70143d619689f86d900e980dc594ffd69306d9dc96b7ed02f485e6596a5849469c68cc33ab5672 WHIRLPOOL b9f28e2758e7ab1739ef99362eb93d03f593761195fee85e4d426f394580c8a653cddde68f43eecba85e6214eb44490d297300a293610d754e531077b25f22fd
-MISC metadata.xml 2489 SHA256 21b3602d37aa25bca31b05ea810b37ee2192f4e53b8f8daeb814d9dca59d03d7 SHA512 4f3d663cd61253ae3390c55c5974dd3cc22dbf1306a823c3cb71794d09eaf28d7727c7e24f66f02dbd8d3845894f3a8cafa5ddaf330c1bbb7f99d8130ece077c WHIRLPOOL bcefdded503fa9cebea943952d3f56847002cb5ddc10f5adbd774301b648d1b12a09da7e493694f9cbbb19e8b53b66132cbd2e0141ded41b226415cfdbbcf8f6
+MISC metadata.xml 2576 SHA256 2ea79bae728183789a3619b7d1e02422125237513dcc8ab2c7e3580011d4ff59 SHA512 e1af4c39ed9ff2ccad79bb0401809ed433fb30836270ddc76937bffcc3688b32e5d8dc29f23c0c01facdcaa069acf73fa0b75e33f26dc075cd79afb49f46c37c WHIRLPOOL 3dce181c54e30d66ed75abad7ced29949105a435f0b1f669c95f267466d97d6da92b3f3d200c4d711c7633dcadef1a5fb2e8d9a71288999db693fcb669c724dd

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 88ecff5..f98dc36 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>emacs</herd>
+<maintainer type="project">
+  <email>gnu-emacs@g.o</email>
+  <name>Gentoo GNU Emacs project</name>
+</maintainer>
 <longdescription>
   GNU Emacs is an extensible, customizable text editor - and more. At its core
   is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
@@ -17,29 +20,29 @@
      available separately.
 </longdescription>
 <use>
-  <flag name='athena'>Enable the MIT Athena widget set
+  <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name='games'>Support shared score files for games</flag>
-  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+  <flag name="games">Support shared score files for games</flag>
+  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
-  <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
     notification</flag>
-  <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
-    version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
-  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
+  <flag name="gtk3">Prefer version 3 of the GIMP Toolkit to version 2
+    (<pkg>x11-libs/gtk+</pkg>)</flag>
+  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+  <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag>
+  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
-  <flag name='source'>Install C source files and make them available for
+  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+  <flag name="source">Install C source files and make them available for
     find-function</flag>
-  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
-  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
+  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
 </use>

diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index 9fdb00d..4a4e97b 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -14,4 +14,4 @@ AUX qemu-binfmt.initd-r1 7023 SHA256 3572c110c6f217754e638796400a5901910a2e61b88
 AUX qemu-kvm-1.4 68 SHA256 8b1adf198129f001e75a2311fc420c168094d1084d2163cdf6a32b3b23c96137 SHA512 706fab4d155c410acc292e67fb354ce7dcd17f7e33f2ca8c9c44035ea128f8d36f89e27cf87ebe22721f5676be9e7f2ae5484fd000183c8ffd7854e02eb3d120 WHIRLPOOL ef795330b592cef8e3d92f52a77eb77a671e6aa1a47d07531917b5c1c09e72e5df1a44aea939b086e0a3c5ef2a5cea9223556a46ceae73e55300475c42f07067
 DIST qemu-2.5.0.tar.bz2 25464996 SHA256 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 SHA512 12153f94cc7f834fd6a85f25690c36f2331d88d414426fb8b9ac20a34e6f9222b1eda30b727674af583580fae90dfd6d0614a905dce1567d94cd049d426b9dd3 WHIRLPOOL 8f5717989d8d234ecf1763ee386b2e1f20c3b17918de130c6dae255e4523a230b2b01a759eba25e4b9f604c680d9b868c56f58bd71b7c6c2c22a2e46804435ef
 EBUILD qemu-2.5.0-r99.ebuild 20028 SHA256 aeca48b0f3004f6d41077db6a763ef43c900cecf59d0f9d3ec6eb028846f0560 SHA512 31101660cd608272b6d6b24081ca095f3eb2fb2a33a2174fe62bf86fe006db6deb56590ae8a784fc69e3dd4f19c7a96035d38506f8a3d07e27397d710cf9e85c WHIRLPOOL 457f88c5e474183df7ae41a8d6c0ad49e76a6fdd69c59591c62f750c426e3998628f0770303536102d87509cfc2578813799e4052e09fb688460fa7bf424a2c4
-MISC metadata.xml 3774 SHA256 45d220d5c3fedecb5c318e2ab1fa796391f5fd3db09e4ef218b3bc7cb3cb10e1 SHA512 90b16206b5398b4044132d930b417372e1d305a93b062c895bc3b46ae64a19aa96d2471b5838f960cca7c6c30ce58571f332731f02eaeee17e4204469c5d6330 WHIRLPOOL f5498b8cb14aeeacdfd1da30c26ceca282bba3042a6288496d624d91c3c26c1bed34c42374db04e06378c8efd78010d3bef76c41c1aa529ccf17cec513ed1fa8
+MISC metadata.xml 3925 SHA256 d1c219b7da0cbf77919cd1e055acbb3f6788a574fd802c98a43c89a411697b36 SHA512 3ff45d1c8ede12b4eedc7d01f39777b76a1cbd0ba9364299dec99d4b4a05cade5784d6f6e50197d5b5ae1f1b8e831c49da195eb53263c49b7d16aec8ee28b6e6 WHIRLPOOL bc25783fac0f3f13318834cc535404af9af20de16c7aeec222e59dc2ed7740ac5e767b329a5bcd6356d0cbae2428e278515f1446aa8ecb87a873bf4dbe04bf41

diff --git a/app-emulation/qemu/metadata.xml b/app-emulation/qemu/metadata.xml
index 87667db..d036967 100644
--- a/app-emulation/qemu/metadata.xml
+++ b/app-emulation/qemu/metadata.xml
@@ -1,57 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>qemu</herd>
-  <maintainer>
-  	<email>cardoe@g.o</email>
-	<name>Doug Goldstein</name>
-  </maintainer>
-  <use>
-	<flag name='accessibility'>Adds support for braille displays using brltty</flag>
-	<flag name='aio'>Enables support for Linux's Async IO</flag>
-	<flag name='alsa'>Enable alsa output for sound emulation</flag>
-	<flag name='curl'>Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
-	<flag name='fdt'>Enables firmware device tree support</flag>
-	<flag name='glusterfs'>Enables GlusterFS cluster fileystem via
+	<maintainer type="project">
+		<email>qemu@g.o</email>
+		<name>Gentoo QEMU Project</name>
+	</maintainer>
+	<use>
+		<flag name="accessibility">Adds support for braille displays using brltty</flag>
+		<flag name="aio">Enables support for Linux's Async IO</flag>
+		<flag name="alsa">Enable alsa output for sound emulation</flag>
+		<flag name="curl">Support ISOs / -cdrom directives vis HTTP or HTTPS.</flag>
+		<flag name="fdt">Enables firmware device tree support</flag>
+		<flag name="glusterfs">Enables GlusterFS cluster fileystem via
 			<pkg>sys-cluster/glusterfs</pkg></flag>
-	<flag name='iscsi'>Enable direct iSCSI support via
+		<flag name="gnutls">Enable TLS support for the VNC console server.
+		For 1.4 and newer this also enables WebSocket support.
+		For 2.0 through 2.3 also enables disk quorum support.</flag>
+		<flag name="gtk2">Use gtk-2 instead of gtk-3</flag>
+		<flag name="iscsi">Enable direct iSCSI support via
 		<pkg>net-libs/libiscsi</pkg> instead of indirectly via the Linux
 		block layer that <pkg>sys-block/open-iscsi</pkg> does.</flag>
-	<flag name='ncurses'>Enable the ncurses-based console</flag>
-	<flag name='nfs'>Enable NFS support</flag>
-	<flag name='numa'>Enable NUMA support</flag>
-	<flag name='pin-upstream-blobs'>Pin the versions of BIOS firmware to the version included in the upstream release.
+		<flag name="ncurses">Enable the ncurses-based console</flag>
+		<flag name="nfs">Enable NFS support</flag>
+		<flag name="numa">Enable NUMA support</flag>
+		<flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release.
 		This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
 		When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>
-	<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
-	<flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
-	<flag name='sdl'>Enable the SDL-based console</flag>
-	<flag name='seccomp'>Utilize <pkg>sys-libs/libseccomp</pkg> to enable kernel filtering of system calls to prevent malicious guests from doing damage.</flag>
-	<flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
-	<flag name='ssh'>Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
-	<flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>
-	<flag name='static-user'>Build the User targets as static binaries</flag>
-	<flag name='static'>Enables both 'static-softmmu' and 'static-user'</flag>
-	<flag name='snappy'>Enable support for snappy compression</flag>
-	<flag name='systemtap'>Enable SystemTAP/DTrace tracing</flag>
-	<flag name='tci'>Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
-	<flag name='tls'>Enable TLS support for the VNC console server.
-		For 1.4 and newer this also enables WebSocket support.
-		For 2.0 and newer this also enables disk quorum support.</flag>
-	<flag name='jpeg'>Enable jpeg image support for the VNC console server</flag>
-	<flag name='png'>Enable png image support for the VNC console server</flag>
-	<flag name='usb'>Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
-	<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
-        	devices to another machine over TCP</flag>
-	<flag name='uuid'>Enable UUID support in the vdi block driver</flag>
-	<flag name='vde'>Enable VDE-based networking</flag>
-	<flag name='vhost-net'>Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
-	<flag name='virtfs'>Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
-	<flag name='xattr'>Add support for getting and setting POSIX extended attributes, through
+		<flag name="pulseaudio">Enable pulseaudio output for sound emulation</flag>
+		<flag name="rbd">Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
+		<flag name="sdl">Enable the SDL-based console</flag>
+		<flag name="sdl2">Use libsdl2 instead of libsdl</flag>
+		<flag name="spice">Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
+		<flag name="ssh">Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
+		<flag name="static-softmmu">Builds the Software MMU (system) targets as static binaries</flag>
+		<flag name="static-user">Build the User targets as static binaries</flag>
+		<flag name="static">Enables both 'static-softmmu' and 'static-user'</flag>
+		<flag name="snappy">Enable support for snappy compression</flag>
+		<flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+		<flag name="tci">Enable the TCG Interpreter which can speed up or slowdown workloads depending on the host and guest CPUs being emulated. In the future it will be a runtime option but for now its compile time.</flag>
+		<flag name="jpeg">Enable jpeg image support for the VNC console server</flag>
+		<flag name="png">Enable png image support for the VNC console server</flag>
+		<flag name="usb">Enable USB passthrough via <pkg>dev-libs/libusb</pkg></flag>
+		<flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB devices to another machine over TCP</flag>
+		<flag name="uuid">Enable UUID support in the vdi block driver</flag>
+		<flag name="vde">Enable VDE-based networking</flag>
+		<flag name="vhost-net">Enable accelerated networking using vhost-net, see http://www.linux-kvm.org/page/VhostNet</flag>
+		<flag name="virgl">Enable experimental Virgil 3d (virtual software GPU)</flag>
+		<flag name="virtfs">Enable VirtFS via virtio-9p-pci / fsdev. See http://wiki.qemu.org/Documentation/9psetup</flag>
+		<flag name="vte">Enable terminal support (<pkg>x11-libs/vte</pkg>) in the GTK+ interface</flag>
+		<flag name="xattr">Add support for getting and setting POSIX extended attributes, through
 		<pkg>sys-apps/attr</pkg>. Requisite for the virtfs backend.
 	</flag>
-	<flag name='xen'>Enables support for Xen backends</flag>
-	<flag name='xfs'>Support xfsctl() notification and syncing for XFS backed
+		<flag name="xen">Enables support for Xen backends</flag>
+		<flag name="xfs">Support xfsctl() notification and syncing for XFS backed
 		virtual disks.</flag>
-  </use>
+	</use>
 </pkgmetadata>

diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 7dcc72b..5b1741f 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -12,4 +12,4 @@ DIST wine_gecko-2.21-x86.msi 20871680 SHA256 f01fafa6d7aab995c38add77315c4cbc2f3
 DIST wine_gecko-2.21-x86_64.msi 21646336 SHA256 bc370bdc899f66d98f31c4d410a6952aa82c0c9c0a0ec27f2a11243c9b412c3f SHA512 2a48a7697beba4e45816a9eff09e181de353d8c93e02a70108fa77d27136cd5cd75b21c42caa7702a09f86544669ae2bbfc6975b1fc0d7fcb20150a4bc4ea514 WHIRLPOOL 2fce9b9a190a52c173551d47428dd8b8dc54d5878682733e0006a3f06f216cd9f47a88ada49f92fa5697ece8b2942a88f937bd2722b4cb85d2c35c19bda29b85
 DIST winepulse-patches-1.7.8.tar.bz2 49140 SHA256 0fd31ea7fec8817561a7b304bbfad6bdd014eb566b0c533e15773064bca555ad SHA512 18c88d4da37714d0216c01929eb92c99161fdf7024d8516512fc2585bc8d5a700fb1b5eb9fb667149e104305f366c867973f41b688a04f63e7cce76f5d85389a WHIRLPOOL 60dfeeb1d51c9ea7730ff1e9263d44fbcf3509e6ae68df1e3d30d965999f19525979f64617494bb1c3e1712c7117f30bebfbcbc75b1b08ba1f1e033720b0cacc
 EBUILD wine-1.6.2-r99.ebuild 12826 SHA256 4f302089b05c65462b349de65c089fa34284f54c026991bbd15e182ad7058e3b SHA512 8a6b8682e7bfa5630708700d163ec8b88d3fe7689d39b0656f9c1659498b350591639c317c3fad154b996cff68318ed34e35e848e5dd4acdf523f8f94c90724d WHIRLPOOL 0c3f9d00311831694fba9f617429b7d329a3c20e62b0619aff32389b2a0e6fb118d3e8a55ae4490955bcb782236b797f91654d378dcfc69b37d5d6c07301abc2
-MISC metadata.xml 1953 SHA256 2becaaae79e9ffafcc9684186dae88d35e8f539dd4df27905ff142ccc0967b05 SHA512 f0d2e74db8ea4ec5b054096dd5e1aa14b4bb2cb42e8ab0fdb09ebfd409be16fad40846eaac258fe09d97bedfd0923333c64726627c47b514ec4cb6ab9b6160b7 WHIRLPOOL b8792b59de097d4c9491c5b778ac0d9630766e1b57f804359a9765f2801c3d1071ce95fbb0bb2797d273c2e1cdd0c76bd30cff0dc3d79c426a3b4c56a1f8b0f0
+MISC metadata.xml 2940 SHA256 f8f0316d044fd150f3d7b71eea33527ed166814f90056a7e5705189408bd741a SHA512 1ff4ea522bc8e8e2503beb0cf295cfdcc6667ab89484dc0da6d22f2352fb33c3e88345ea2be2f9546f6afbba4b63089e053bf54bcccd4a0b077a67eed24a4109 WHIRLPOOL cf7bf627dc2dbaa31ac97206a4f40b8f30d2c376ecb4ad6aa65ef09a155b8be50e2d56c429b67c81e589cf1cd50d60cbe32b02bcb0ec6a656b1584819b2e6205

diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index 86bc416..6efa58c 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -1,27 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>wine</herd>
-<longdescription>
+	<maintainer type="project">
+		<email>wine@g.o</email>
+		<name>Wine</name>
+	</maintainer>
+	<longdescription>
 Wine is an Open Source implementation of the Windows API on top of X and Unix.
 
 Think of Wine as a compatibility layer for running Windows programs. Wine does not require Microsoft Windows, as it is a completely free alternative implementation of the Windows API consisting of 100% non-Microsoft code, however Wine can optionally use native Windows DLLs if they are available. Wine provides both a development toolkit for porting Windows source code to Unix as well as a program loader, allowing many unmodified Windows programs to run on x86-based Unixes, including Linux, FreeBSD, and Solaris.
-</longdescription> 
-<use>
-	<flag name='capi'>Enable ISDN support via CAPI</flag>
-	<flag name='custom-cflags'>Bypass strip-flags; use at your own peril</flag>
-	<flag name='dos'>Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
-	<flag name='gecko'>Add support for the Gecko engine when using iexplore</flag>
-	<flag name='mono'>Add support for .NET using Wine's Mono add-on</flag>
-	<flag name='opencl'>Enable OpenCL support</flag>
-	<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
-	<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
-	<flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
-	<flag name='realtime'>Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
-	<flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</flag>
-	<flag name='samba'>Add support for NTLM auth. see
+	</longdescription>
+	<use>
+		<flag name="capi">Enable ISDN support via CAPI</flag>
+		<flag name="custom-cflags">Bypass strip-flags; use at your own peril</flag>
+		<flag name="dos">Pull in <pkg>games-emulation/dosbox</pkg> to run DOS applications</flag>
+		<flag name="gecko">Add support for the Gecko engine when using iexplore</flag>
+		<flag name="gstreamer">Use <pkg>media-libs/gstreamer</pkg> to provide DirectShow functionality;
+			For versions less than wine-1.9.2, uses experimental patch which may break some apps</flag>
+		<flag name="mono">Add support for .NET using Wine's Mono add-on</flag>
+		<flag name="netapi">Use libnetapi from <pkg>net-fs/samba</pkg> to support Windows networks in netapi32.dll</flag>
+		<flag name="opencl">Enable OpenCL support</flag>
+		<flag name="osmesa">Add support for OpenGL in bitmaps using libOSMesa</flag>
+		<flag name="pcap">Support packet capture software (e.g. wireshark)</flag>
+		<flag name="perl">Install helpers written in perl (winedump/winemaker)</flag>
+		<flag name="pipelight">Apply Wine-Staging patches for Pipelight/Silverlight support</flag>
+		<flag name="prelink">Run prelink on DLLs during build;
+			For versions less than wine-1.7.55 or hardened, do not disable if you do not know what this means as it can break things at runtime</flag>
+		<flag name="realtime">Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
+		<flag name="run-exes">Use Wine to open and run .EXE and .MSI files</flag>
+		<flag name="s3tc">Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
+		<flag name="samba">Add support for NTLM auth. see
 		http://wiki.winehq.org/NtlmAuthSetupGuide and
 		http://wiki.winehq.org/NtlmSigningAndSealing</flag>
-	<flag name='udisks'>Support dynamic storage devices using <pkg>sys-fs/udisks</pkg></flag>
-</use>
+		<flag name="staging">Apply Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet
+			For versions less than wine-1.8, this patchset is unofficial.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">wine-compholio/wine-staging</remote-id>
+		<remote-id type="sourceforge">wine</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-eselect/eselect-opengl/Manifest b/app-eselect/eselect-opengl/Manifest
index 1c4a957..429fd66 100644
--- a/app-eselect/eselect-opengl/Manifest
+++ b/app-eselect/eselect-opengl/Manifest
@@ -2,4 +2,4 @@ DIST eselect-opengl-1.2.7.tar.xz 8292 SHA256 1f0d3e293c25cf9359421a7a0595278f5fc
 DIST glext.h.85.xz 66344 SHA256 f9db24b274581782726b7ece26825bc6dacc10871f24e712cedc5608720f40e0 SHA512 55fbee9cacde8a059ab1c25fbd5652d2879ac57423d2be7a1e947c5f4e82c2e1ff957441a39545958859435b88e69783e4f116dc3364f03378519df7476f121d WHIRLPOOL 493c86294f7bcade1e8ca427eea0f01cbd7a8e4f21a2f678f896af7fac06f8b6d04ceb8e93f2aacfaae6457a0368aa0c911dea90b31076cf77ae72fb492b3676
 DIST glxext.h.34.xz 7368 SHA256 cb22353fbd8f87ffea19b4758194af3a38796c41f93058eeb0fa237cce9a77b7 SHA512 525fe3e7d654ddc38dbbcf1b26c2e84099b502d993a176352386b10229fabf1a9ee60686c41d1486f77bcf08424119658b26ebd90d2260a66bc21bdc55340279 WHIRLPOOL 92901129f724e90a53ee602c3a7fb633ba190ad48bd098f5784eb1069e79c8fec4227fae1c59afee728e5e11776c6ff33fee6b5c5eb97b819b082de0713140d8
 EBUILD eselect-opengl-1.2.7-r99.ebuild 1612 SHA256 a6b5f895e22564d7192eb22d22cea0084f67f7f513dfdb9b3e767f8f2b31442c SHA512 23a15030341b4cc95c5b26f89a18cdacb704c62f712effa3411a3ff58ce296a4b7fb9feb43e75f9468d08b6f4012673dd32123421c74de9e3dc607663c1c4de4 WHIRLPOOL 81c53a62ea98d4c3e405155572823c0bec7d9f4379d170d28a281c143542712aa17954a3571e9ba1183180685a03b20e358ba6414d540b70c319f3256e0bd18d
-MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840
+MISC metadata.xml 437 SHA256 be5d3905f8c2870a3c70fec22ab5ac1e3c3eb1495a01f6b5be8875c62378a2ee SHA512 4e1c5f16407ad8a0eb5212d6396bd708047da78f3a97a395b80f60cb21f375f308624f01a8b2bff28ad8bdfca04ac2a3f573f3d5c0f679fdad30b4c0b2751552 WHIRLPOOL 77f4f3d42cc884232b31d1abfe1956e0f09e0cf90de8d6eb89b1ae33e8d355b2896281744ed64774472c738f7368d9d3909134169a6b37f1940135f9851db4ff

diff --git a/app-eselect/eselect-opengl/metadata.xml b/app-eselect/eselect-opengl/metadata.xml
index 6b9cda0..dfe0fc0 100644
--- a/app-eselect/eselect-opengl/metadata.xml
+++ b/app-eselect/eselect-opengl/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+	<email>x11@g.o</email>
+	<name>X11</name>
+</maintainer>
+<maintainer type="person">
+	<email>mgorny@g.o</email>
+	<name>Michał Górny</name>
+</maintainer>
 <longdescription>Utility to switch opengl implementations between various providers.</longdescription>
 </pkgmetadata>

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index b510a4c..cfa86d9 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -17,8 +17,8 @@ DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555
 DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f WHIRLPOOL 8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a WHIRLPOOL 60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
 DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305 WHIRLPOOL 95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST libreoffice-4.4.5.2.tar.xz 164472672 SHA256 3aeb4f08918c6ca6ec12fc47c2be690d2180c2e41cc3136b6ed36185b89cec0d SHA512 15abecb02d8ca478cb7d006834c8670b9e42d3e5d8ec772e9a1d805dbd2ef1145092d1d4e3a6531f21eeb75210c1354e91c4d3abeec97103ad4c3092b7b7273b WHIRLPOOL a06c9e520e6f2b40c90cb703689527faf9ed6dbe0c0c3810ad276933daa21d56465c286d3de0fe6d5330be7968ae77cff1d30151d62fb34cc7fb57535e82edd6
+DIST libreoffice-5.0.3.2.tar.xz 167009360 SHA256 77f9c9569c1199d914f38afa01547c1874535c56ad74b19614a0afc3ad66d4bd SHA512 fe49577d26c2241a2e7d6f2e8faa25cacf77dc94dbe76f7dbbf1b208295695298d24842c73444b284e9af2a323b7536cce6727ffab0431ac22d80691a9902e62 WHIRLPOOL 2a907729d9f2b436a0206f558022d9ace69d494106e3c76f9c141d1202438ca7c662eca102595e8143cb4c70cece44447f99b1093e813249433684725f3287d0
 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-4.4.5.2.tar.xz 1876044 SHA256 66044aaff17cdf4d523ceea00197381bb50d4cb86359be83016a838c27761681 SHA512 0d75f41fa3a7593c621fb3cd6e7f94fe24cb5d5251e05f9e67f58e6603853cceb2b4df2cb28228e7bf464d053b5ce068bcae752bdf6ba977fdde20882540c869 WHIRLPOOL 2715278ed374f8850ccd79e94682cc003b69501c7863c84b3dc609b0377277fa523bc8eba41d8045bff344b1cc70f08171f8acc1aebb47914a4ac190ee66bc49
-EBUILD libreoffice-4.4.5.2-r99.ebuild 19241 SHA256 c9e2b5c17a32d9115e9eeb6fb76204456931a5b3e0bcd129c7624c0657c71bf8 SHA512 4012ddd5c00ba4d153a081224fa6be3e4f918795595bf03b5b3f23532d4e7624e00c085991fb17d38ed7bbf98c3917bfd97c53274e0f1780626ffa9d28b7b34f WHIRLPOOL 2fd0356dda6b9c57d0900a61198f0baff56fa4cff81ea9010b9f5509ac9969c874521e347d59fdc1da17ef313be480b058107dae3a14596c214778acb7add5f6
-MISC metadata.xml 1170 SHA256 94d12aad619c0489c65857246c536b65ae98f1cd7fd698fc0cc3a59972887c6e SHA512 3baf086b2cb75fd88d1044df055e443d46824041d9741172769707f25b7e284ce96dd16292454c1321e0078546dd694770c4111669a4ad394cea7c5e4b5e1a5f WHIRLPOOL 4c326355000a944206b8b85a8a40f7467fb6012d38b2934c8534003e4a4c20046363fd6fa07f189a5cf082887771e581a28cf2910d78a1158f11be37324f7c87
+DIST libreoffice-help-5.0.3.2.tar.xz 1882292 SHA256 7e5535b8bd9be88170abdef187d3cf16d2cccdb1fdbd4404a22f1cff55bd953e SHA512 73de5507b0e7994a189d5580ad7bfdf842e9a3a10cc0a9bbe39eb11f20e47fa7016f6cf6748ad7c35260587cfc7078eaac6055b439292068a9d9783509bd715d WHIRLPOOL 1e7c79250a407c0eac5f1538290dfe1f04b22799bc04a295cd6dfbf0405dc4478283dea09ede52adf25077729852c11f9f74e98f257c47a8a30b350d83d532ac
+EBUILD libreoffice-5.0.3.2-r99.ebuild 18462 SHA256 64bff2afbcd3e70790a871f16e55d34404ac251c7b898ed0309b3abd6dff28f8 SHA512 8b6e2f243c0b43bbb54ca03cdcb5eb475350e34e470a4d69a27f210fadfb55241f8a912b7c30099545d0e2af000793c14d6bf125184293fb7a286476d090192d WHIRLPOOL 4a45450277a927513eeebe543a214ff7a4e8860e009e4ebc334ca6493bc05da8245da32f49593f3a9dd6cbf583b2fbcd0c5ab905266e2162da6f5f83f95c08de
+MISC metadata.xml 1274 SHA256 bd4493db2b60fa26fdc8101687d92cea7760d19676f08a8c36b820755a1f8c6a SHA512 c25b674ddedf86ab66c6cea0e40822b658fab3e281f31d7e0ece4311c2edd7a1f1bee0ea20fc1e35224c8000443b38320be104fa26ce3cfa95df26ee5927aab1 WHIRLPOOL f5d25cc64f3dc9cbb92a84bcabb828c582e97617a34fd655c6ede9d0422a1e3e5d00bc87e37f2128d7ba394d51af2c42b6e0ee9ec255ad563b53e71f4675393d

diff --git a/app-office/libreoffice/libreoffice-4.4.5.2-r99.ebuild b/app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild
similarity index 79%
rename from app-office/libreoffice/libreoffice-4.4.5.2-r99.ebuild
rename to app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild
index 09ab94a..04e7437 100644
--- a/app-office/libreoffice/libreoffice-4.4.5.2-r99.ebuild
+++ b/app-office/libreoffice/libreoffice-5.0.3.2-r99.ebuild
@@ -9,7 +9,7 @@ QT_MINIMAL="4.7.4"
 KDE_SCM="git"
 CMAKE_REQUIRED="never"
 
-PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 PYTHON_REQ_USE="threads,xml"
 
 # experimental ; release ; old
@@ -27,10 +27,10 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
 # PATCHSET="${P}-patchset-01.tar.xz"
 
 [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit base multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
+inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
-DESCRIPTION="LibreOffice, a full office productivity suite"
+DESCRIPTION="A full office productivity suite"
 HOMEPAGE="http://www.libreoffice.org"
 SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
 [[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}"
@@ -58,22 +58,28 @@ unset DEV_URI
 # Really required addons
 # These are bundles that can't be removed for now due to huge patchsets.
 # If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
-ADDONS_SRC+=" collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-ADDONS_SRC+=" java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement of rhino
-ADDONS_SRC+=" odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
+ADDONS_SRC=(
+	"${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
+	"${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code
+	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
+	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
+	# no release for 8 years, should we package it?
+	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
+	# Does not build with 1.6 rhino at all
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
+	# requirement of rhino
+	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
+	# not packageable
+	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
+)
+SRC_URI+=" ${ADDONS_SRC[*]}"
 
 unset ADDONS_URI
 unset EXT_URI
 unset ADDONS_SRC
 
 IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome gstreamer
-+gtk gtk3 jemalloc kde mysql odk postgres telepathy test vlc"
++gtk gtk3 jemalloc kde libressl mysql odk postgres telepathy test vlc"
 
 LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
 # Unpackaged separate extensions:
@@ -90,7 +96,7 @@ unset lo_xt
 LICENSE="|| ( LGPL-3 MPL-1.1 )"
 SLOT="0"
 [[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
@@ -101,14 +107,14 @@ COMMON_DEPEND="
 	>=app-text/libabw-0.1.0
 	>=app-text/libexttextcat-3.2
 	>=app-text/libebook-0.1.1
-	>=app-text/libetonyek-0.1.1
+	>=app-text/libetonyek-0.1.2
 	app-text/liblangtag
 	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.4
+	>=app-text/libmwaw-0.3.5
 	>=app-text/libodfgen-0.1.0
 	app-text/libwpd:0.10[tools]
 	app-text/libwpg:0.3
-	=app-text/libwps-0.3*
+	=app-text/libwps-0.4*
 	>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
 	>=dev-cpp/clucene-2.3.3.4-r2
 	=dev-cpp/libcmis-0.5*
@@ -122,7 +128,8 @@ COMMON_DEPEND="
 	>=dev-libs/nspr-4.8.8
 	>=dev-libs/nss-3.12.9
 	>=dev-lang/perl-5.0
-	>=dev-libs/openssl-1.0.0d:0
+	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
+	libressl? ( dev-libs/libressl )
 	>=dev-libs/redland-1.0.16
 	media-gfx/graphite2
 	>=media-libs/fontconfig-2.8.0
@@ -159,7 +166,7 @@ COMMON_DEPEND="
 		x11-libs/gdk-pixbuf[X]
 		>=x11-libs/gtk+-2.24:2
 	)
-	gtk3? ( >=x11-libs/gtk+-3.2:3 )
+	gtk3? ( >=x11-libs/gtk+-3.8:3 )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
@@ -172,7 +179,6 @@ COMMON_DEPEND="
 		dev-java/commons-httpclient:3
 		dev-java/commons-lang:2.1
 		dev-java/commons-logging:0
-		dev-java/tomcat-servlet-api:3.0
 	)
 	mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
 	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
@@ -215,7 +221,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cppunit
 	>=dev-util/gperf-3
 	dev-util/intltool
-	>=dev-util/mdds-0.11.2:=
+	>=dev-util/mdds-0.12.0:0=
 	media-libs/glm
 	net-misc/npapi-sdk
 	>=sys-apps/findutils-4.4.2
@@ -241,27 +247,6 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-util/cppunit )
 "
 
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
-
-	# from 5.0 branch
-	"${FILESDIR}/${PN}-4.3.5.2-remove-bashisms.patch" # bug 525454
-	"${FILESDIR}/${PN}-4.4.0.3-telepathy-build-fix.patch"
-	"${FILESDIR}/${PN}-4.4.1.2-add-kde4-open-url-script.patch"
-	"${FILESDIR}/${PN}-4.4.4.3-improve-KDE4FilePicker.patch"
-	"${FILESDIR}/${PN}-4.4.4.3-fix-KDE4-FileDialog.patch"
-	"${FILESDIR}/${PN}-4.4.4.3-cleanup-IsNativeControlSupported.patch"
-
-	# from master branch
-	"${FILESDIR}/${PN}-4.4.5.2-fix-KDE4-listbox-regression.patch"
-
-	# musl fixes
-	"${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"
-	"${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"
-	"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
-)
-
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	bluetooth? ( dbus )
@@ -275,18 +260,31 @@ REQUIRED_USE="
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
+PATCHES=(
+	# not upstreamable stuff
+	"${FILESDIR}/${PN}-4.4-system-pyuno.patch"
+
+	# musl fixes
+	"${FILESDIR}/${PN}-4.4.1.2-fix-includes.patch"
+	"${FILESDIR}/${PN}-4.4.1.2-linux-musl.patch"
+	"${FILESDIR}/${PN}-4.4.1.2-musl-fix-execinfo.patch"
+)
+
 CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
+if [[ ${MERGE_TYPE} != binary ]] ; then CHECKREQS_DISK_BUILD="6G" ; fi
 
 pkg_pretend() {
 	local pgslot
 
+	use java || \
+		ewarn "If you plan to use lbase application you should enable java or you will get various crashes."
+
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		check-reqs_pkg_pretend
 
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-				 ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]] ) \
-				; then
+		if [[ $(gcc-major-version) -lt 4 ]] || {
+			[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ]]; }
+		then
 			eerror "Compilation with gcc older than 4.6 is not supported"
 			die "Too old gcc found."
 		fi
@@ -296,7 +294,7 @@ pkg_pretend() {
 	# install on clean system)
 	if use postgres && has_version dev-db/postgresql; then
 		 pgslot=$(postgresql-config show)
-		 if [[ ${pgslot//.} < 90 ]] ; then
+		 if [[ ${pgslot//.} -lt 90 ]] ; then
 			eerror "PostgreSQL slot must be set to 9.0 or higher."
 			eerror "    postgresql-config set 9.0"
 			die "PostgreSQL slot is not set to 9.0 or higher."
@@ -313,7 +311,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	local mod mod2 dest tmplfile tmplname mypv
+	local mod
 
 	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
 	use branding && unpack "${BRANDING}"
@@ -325,38 +323,21 @@ src_unpack() {
 			unpack "${PN}-${mod}-${PV}.tar.xz"
 		done
 	else
+		local base_uri branch checkout mypv
+		base_uri="git://anongit.freedesktop.org"
 		for mod in ${MODULES}; do
+			branch="master"
 			mypv=${PV/.9999}
-			[[ ${mypv} != ${PV} ]] && EGIT_BRANCH="${PN}-${mypv/./-}"
-			EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
-			[[ ${mod} != core ]] && EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-${mod}-${PV}"
-			EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-			git-r3_src_unpack
-			if [[ ${mod} != core ]]; then
-				mod2=${mod}
-				# mapping does not match on help
-				[[ ${mod} == help ]] && mod2="helpcontent2"
-				mkdir -p "${S}/${mod2}/" || die
-				mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* "${S}/${mod2}" || die
-				rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-			fi
+			[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
+			git-r3_fetch "${base_uri}/${PN}/${mod}" "refs/heads/${branch}"
+			[[ ${mod} != core ]] && checkout="${S}/${mod}"
+			[[ ${mod} == help ]] && checkout="helpcontent2" # doesn't match on help
+			git-r3_checkout "${base_uri}/${PN}/${mod}" ${checkout}
 		done
-		unset EGIT_CHECKOUT_DIR EGIT_REPO_URI EGIT_BRANCH
 	fi
 }
 
 src_prepare() {
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python 2.7 enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
 	# patchset
 	if [[ -n ${PATCHSET} ]]; then
 		EPATCH_FORCE="yes" \
@@ -365,25 +346,26 @@ src_prepare() {
 		epatch
 	fi
 
-	base_src_prepare
+	epatch "${PATCHES[@]}"
+	epatch_user
 
 	AT_M4DIR="m4" eautoreconf
 	# hack in the autogen.sh
 	touch autogen.lastrun
 
 	# system pyuno mess
-	sed \
+	sed -i \
 		-e "s:%eprefix%:${EPREFIX}:g" \
 		-e "s:%libdir%:$(get_libdir):g" \
-		-i pyuno/source/module/uno.py \
-		-i pyuno/source/officehelper.py || die
+		pyuno/source/module/uno.py \
+		pyuno/source/officehelper.py || die
 	# sed in the tests
 	sed -i \
-		-e 's#all : build unitcheck#all : build#g' \
+		-e "s#all : build unitcheck#all : build#g" \
 		solenv/gbuild/Module.mk || die
 	sed -i \
-		-e 's#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g' \
-		-e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
+		-e "s#check: dev-install subsequentcheck#check: unitcheck slowcheck dev-install subsequentcheck#g" \
+		-e "s#Makefile.gbuild all slowcheck#Makefile.gbuild all#g" \
 		Makefile.in || die
 
 	if use branding; then
@@ -398,6 +380,17 @@ src_configure() {
 	local lo_ext
 	local ext_opts
 
+	# optimization flags
+	export GMAKE_OPTIONS="${MAKEOPTS}"
+	# System python 2.7 enablement:
+	export PYTHON_CFLAGS=$(python_get_CFLAGS)
+	export PYTHON_LIBS=$(python_get_LIBS)
+
+	if use collada; then
+		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
+		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
+	fi
+
 	# sane: just sane.h header that is used for scan in writer, not
 	#       linked or anything else, worthless to depend on
 	# vigra: just uses templates from there
@@ -439,7 +432,6 @@ src_configure() {
 				--with-commons-httpclient-jar=$(java-pkg_getjar commons-httpclient-3 commons-httpclient.jar)
 				--with-commons-lang-jar=$(java-pkg_getjar commons-lang-2.1 commons-lang.jar)
 				--with-commons-logging-jar=$(java-pkg_getjar commons-logging commons-logging.jar)
-				--with-servlet-api-jar=$(java-pkg_getjar tomcat-servlet-api-3.0 servlet-api.jar)
 			"
 		fi
 	fi
@@ -546,7 +538,7 @@ src_compile() {
 	# it is broken because we send --without-help
 	# https://bugs.freedesktop.org/show_bug.cgi?id=46506
 	(
-		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
+		grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die
 		source "${T}/config_host.mk" 2&> /dev/null
 
 		local path="${WORKDIR}/helpcontent2/source/auxiliary/"
@@ -556,7 +548,8 @@ src_compile() {
 		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
 			-dir=icon-themes/galaxy/res/helpimg \
 			> "${path}/helpimg.ilst"
-		[[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list is empty, something is fishy, report a bug."
+		[[ -s "${path}/helpimg.ilst" ]] || \
+			ewarn "The help images list is empty, something is fishy, report a bug."
 	)
 
 	local target
@@ -576,17 +569,17 @@ src_install() {
 	make DESTDIR="${D}" distro-pack-install -o build -o check || die
 
 	# Fix bash completion placement
-	newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+	newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN}
 	bashcomp_alias \
 		libreoffice \
 		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-	rm -rf "${ED}"/etc/ || die
+	rm -rf "${ED}"etc/ || die
 
 	if use branding; then
 		insinto /usr/$(get_libdir)/${PN}/program
 		newins "${WORKDIR}/branding-sofficerc" sofficerc
 		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN}
+		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
 	fi
 
 	# Hack for offlinehelp, this needs fixing upstream at some point.
@@ -596,14 +589,14 @@ src_install() {
 	doins xmlhelp/util/*.xsl
 
 	# Remove desktop files for support to old installs that can't parse mime
-	rm -rf "${ED}"/usr/share/mimelnk/
+	rm -r "${ED}"usr/share/mimelnk/ || die
 
 	# FIXME: Hack add missing file
-	insinto /usr/$(get_libdir)/${PN}/program
-	doins "${S}"/instdir/program/libsaxlo.so
+	exeinto /usr/$(get_libdir)/${PN}/program
+	doexe "${S}"/instdir/program/libsaxlo.so
 
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-	pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
+	pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }
 
 pkg_preinst() {
@@ -613,9 +606,6 @@ pkg_preinst() {
 
 pkg_postinst() {
 	kde4-base_pkg_postinst
-
-	use java || \
-		ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
 }
 
 pkg_postrm() {

diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml
index 757568b..2c92bb7 100644
--- a/app-office/libreoffice/metadata.xml
+++ b/app-office/libreoffice/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>openoffice</herd>
-  <longdescription>LibreOffice is a fork of OpenOffice.org. 
+  <maintainer type="project">
+    <email>office@g.o</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
+  <longdescription>LibreOffice is the successor of OpenOffice.org. 
 This ebuild allows you to compile it yourself. Unfortunately this 
 compilation can take up to a day depending on the speed of your 
-computer. It will however make a snappier openoffice than the binary 
+computer. It will however make a snappier LibreOffice than the binary 
 version</longdescription>
   <use>
     <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>

diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 4d34476..19ee570 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -4,4 +4,4 @@ AUX hunspell-1.3.3-error_h.patch 1218 SHA256 bf3f74ccf7809e3d4ba454a2e8fa0a2b404
 AUX hunspell-1.3.3-multibyte-chars.patch 1866 SHA256 1a2f0c6fd79894fa5f556c1715bc4bd05f2409b1d778bc2f597e3d44dc64f457 SHA512 a5b3b2a7b93bf5c5cdf446ae4a85e88e6bf1244c05437df29734241507e715f18ca5967de708f20ab569b55c646f85f4277c1112c867321edfd105a946c7bf9c WHIRLPOOL df9418af8941e8cba06a6b4b63369324fbad358b4c4bface9385f720ac91881150cd832e3c0f5665bc35ae5cd02da9c978233d1254d0ff45370516db58997563
 DIST hunspell-1.3.3.tar.gz 986081 SHA256 a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c SHA512 7599981d002a4a032c41c83f6287243a4942b0e25c408049a3ba86c16f63ce964800a3ac325ace0402b0d7256690c4a4151a66f19a8f58cc455af0498bb1af04 WHIRLPOOL c10f7f7b326ce886bd031da29e9e04a1f4a5914f24cbe75061ed539958e7a8efaa4d4ea16f2b17437c63d97d6f558a27c092bc43c9f56c75078667d5344402f8
 EBUILD hunspell-1.3.3-r99.ebuild 2410 SHA256 e9280f331ab8caed264660bb6d93216136ca7cbace9bb87e7762cef040772658 SHA512 b1425bcac32a2c64b121d5125fd8bb1f9375ec655ec4b6f4a5dd5681e221635c7c3f1d8bf9f46fa61bd8d40bf6be5e72630a01abd730abc07dfdd33e01a40efb WHIRLPOOL d901ab0a5c5a8c712b69cbcfe843ae9d4b0f6411de99c6b68b6c40056fb5f7b1174ac82159e883d8d59fb5d71024116ac35c1edf5bf9f269acddd473417f253b
-MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7
+MISC metadata.xml 527 SHA256 22730719dfe8b3efd34889cd496f6c0508544433cf315e27aa49550a31d55bed SHA512 1defdc87b33619dd65f0852224aa0e86ed6520864e6cc3cac5b74f340ba325a7c6448c30574170bdf64b45288a2eab747e4cb205eab90e70a4ed9b5e468a8671 WHIRLPOOL 88188a8ea882fd7acd487bcae87e4c891597d5883d0c625f928c8c24e7ebcefc537ff28df46f5140ff2d38171d74753183d69a859721f785e88bed3460ff99b2

diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 4538a68..9ffc5a6 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/metadata.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@g.o</email></maintainer>
+	<maintainer type="person">
+		<email>elizabeth@×××××××××××.me</email>
+		<name>Elizabeth Myers</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@g.o</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 078aac9..894a102 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -121,4 +121,4 @@ DIST texlive-module-typeoutfileinfo.doc-2014.tar.xz 760 SHA256 58197a027f6a5fff7
 DIST texlive-module-web-2014.tar.xz 512 SHA256 a84abe3fcd211f003db7013a2362dc2776f8843359de9f9ec060b7a5af3a0a3f SHA512 978857a15afdef62db6686f4cdd9d33df3db0c24657e319bccfa2797bf335ee8d2556aa5e2cc5402554de59d8fb1d3836611104ee1f063be248a7213f1389ce7 WHIRLPOOL f66c6fe56dca20695eaf06fa3944dcbdc70e62999455a05515ccadd262dc24e3a2826208ff8d4b461aba542a3d60245769f3c7284e71df9dac9f99686a443988
 DIST texlive-module-web.doc-2014.tar.xz 11580 SHA256 e0aae3d6cb0823adeb31c070511b069068b295480fe8d4db65f7142411df7805 SHA512 809e7685522bad25a7975b6f604f9f2279005a7a5a63a7937f71ab4ace0fa2978b69812fb0892db7b6cae842b5bfb5c1133a9cf542456a65238427fbf5c526c9 WHIRLPOOL 476ff1866a87f586066b82bb4f2796edd94b921e5e3438f9e32965697d20fa6fe00ec0acdb3018ae5d5e92d0d9573081589371429b520e52156f58c221cfae9c
 EBUILD texlive-core-2014-r99.ebuild 10798 SHA256 a35dcd213f930d6d581a897d4438f25285f9e34f3a16274b3a3e2bf888e29c51 SHA512 2ad38110c72424deb38cc4a22a5ea8ab4702ba7ddb1e84ef604f20a30ec659ddab0959d614b46c63c9d66306fddadd92d6da41d979e1b092552c4a66f047df6f WHIRLPOOL 29291f6a1d2ddf4887a6f51ef3d701ac06c3ac3505bc57f49c0d8fdf16498c32f8faa946f1143795447a96651f78d59ecc679b628b9266dd008c46bbff443f2e
-MISC metadata.xml 448 SHA256 ddaca86e81c2eaf01ff5e7d613777a6c2231ed0f09646cb303e23b0e90c08d02 SHA512 c414f498afa7c6effabb5c21f85c1fca64271e9d8a429e15e86661c8b7f12adac0beb6b90c74a7309cfe9d20e639c818dc2a2045b4c315c0924583f0e71dca4b WHIRLPOOL d0537703ae9ac1a072795b05ee90b1e06d4f1dcb61b0e5adbac05f91db442a44846f909e63840518790d765c71b9a6314f58602d1489cb482ca7b7826cd88ee1
+MISC metadata.xml 677 SHA256 aa591377474a0b25ff0049bc61e139944e0707b90b037013fbab7c515d8617c3 SHA512 7b82f8e7023740f6d43393e8994f6a968350656a94dbd15ab7daafb58d338f601177e87e96f3b80ce0f6ad9abfecb7a6fa669a0cd21d65b79d2c5f6ae74cf87e WHIRLPOOL 315dd59da62894a6e5c167d1958c8f512700d496c9c769dc030bebe773bfc804c9c2ae144abba3b9d46513cff20fef1d66d9a6665a00361dd0bda92fd8d0a906

diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index 68edcb8..0104ffa 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>tex</herd>
-	<maintainer>
-		<email>aballier@g.o</email>
-		<name>Alexis Ballier</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer type="person">
+    <email>aballier@g.o</email>
+    <name>Alexis Ballier</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>tex@g.o</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
+  <longdescription lang="en">
 		TeXLive core binaries
 	</longdescription>
-	<use>
-	<flag name='xetex'>Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
-	</use>
+  <use>
+	<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
+    <flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
+  </use>
 </pkgmetadata>
-

diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index 09499c4..9c69faa 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -9,4 +9,4 @@ AUX libiodbc-3.52.8-musl-remove-wchar_t-check.patch 747 SHA256 c3664c3decc488e02
 AUX libiodbc-3.52.8-runtime-failures.patch 2033 SHA256 84909ef0bbd8a862c9ed83ca73f22fa7bf75107eeb35d36d87a9b8413c9da66d SHA512 a6b921a85bf4076cf5af8744987cdd98ebc570043344e681def5a83e677e64ddc6457f86c135b33162f7248de6c9897b65978699582e0ad71cb9e696f6270142 WHIRLPOOL 2dd19d56ad6ba8ff6688769f22c2afd25d275fe0c75c9824b1b8c3e1d575ead75be6b180b5e7c2e40301a29a381db6a29ff8a94c6ebde1a7cab28a21cbc4a108
 DIST libiodbc-3.52.8.zip 1188493 SHA256 f96cee2f04ab01b3c32297262ebf97b3faed1e49688399e656e8e4743ed72a0c SHA512 76da1e69a6e7ab1b7ba103547070c5dfe7c40fa88d82c243640d862c93c19e731d5a35d0575038491a148bb1d1cb7c5168dc30bf3f9600b31f4e014350f16551 WHIRLPOOL b6dafe709c3dff771ef43f023e62f528d92f9f9b05f0b986942826a2ded16e3cc2ccdae1606b2c31931ee487d01c25a173488c5e6d6c1ddafddb8f6be7dd326b
 EBUILD libiodbc-3.52.8-r99.ebuild 1801 SHA256 d49f6ddbb20972023e28167acf0fa64badf1727a844847ecf90c15848afb760f SHA512 683824976fbcdd7ad49539fefe58ee2c321cea8707fed3503b86bee1eea6930a6a304ecfcad1a11ecbbaef1651ba23d21ecd611322fa7f3605908edf0771180b WHIRLPOOL 153d232bcf294e05d4e9778d718690e79802e23004892bf32de746964676678656cd9b9f2a44d534af5edb0835a9f1ce2273de8f26b53c4e50a1b645be7d8605
-MISC metadata.xml 293 SHA256 7582da44248963f2a330103077bd8d0ea471890d8295a536ebc29fe9af7af609 SHA512 37ee49b9df67bb1de1e310a5089d666bc91aae728ed6b38cf8eb0a4883c8d3a9ce348e45e0c3cdb10e0564bee010e1ed4d6a03f90a5ee16846310322f862e358 WHIRLPOOL 1cb9ca189190906ca761704646ff9b299078aac7932aa136400d95c1e8b40daa30b69a870b16957abd4a990a246b46e11d8346630dabd3926669c4a30d9168bb
+MISC metadata.xml 307 SHA256 91115149f74e8161068b8f482d27edf0e8027db8a794a8d88354127795bb2ee0 SHA512 7182423230416c98bb5812e33a3af22804aac24f5c6456f5b2cff14a24c4ffef2d16093afa0d1c366e6dc583dfafe3490adb23afefeafc673a708a43dec10e10 WHIRLPOOL 02dbf5a9e5b3d02a32563c3379a33c55fa1c2ac6fd1b75953e112b1310a08385cea3ddbe9e6181bde763fd9ef313e413ed249621353b4fa2743c3ab2bff5806d

diff --git a/dev-db/libiodbc/metadata.xml b/dev-db/libiodbc/metadata.xml
index ccf439c..298c436 100644
--- a/dev-db/libiodbc/metadata.xml
+++ b/dev-db/libiodbc/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
+  <maintainer type="person">
     <email>olemarkus@g.o</email>
   </maintainer>
   <upstream>

diff --git a/dev-embedded/u-boot-tools/Manifest b/dev-embedded/u-boot-tools/Manifest
index d638d5f..f15a40c 100644
--- a/dev-embedded/u-boot-tools/Manifest
+++ b/dev-embedded/u-boot-tools/Manifest
@@ -2,4 +2,4 @@ AUX u-boot-tools-2015.04-musl-support.patch 1132 SHA256 a76b667d2c53151e28ad1e83
 DIST u-boot-2015.04.tar.bz2 9471487 SHA256 0a1a70df586655f527befa6f12e184e96ed61b126e5a567382321b17200f5d60 SHA512 e50a3d7e44bf588a7cf8e28cdf3342bc38bd1bf55231d579c2501b75386cfff0fbc7a34648d893971e0095510c9d582b7180427832cb78470b4e7af2ce0e3646 WHIRLPOOL dbfd4b13b82505ef94e8b394ba260684ee18c881bd84adfc841194ce6a4b967c8514cedfcac6777045a50b940e3a1882af667e152dc0fc0d3b9254a7dfca89d0
 EBUILD u-boot-tools-2015.04.ebuild 1015 SHA256 bce3a8289d663e8301ce26861a77e5454421b2fa31b067e22ee3ea14cf348569 SHA512 fb9c881e000d51de5d799c4576b552fddbb90ed427eaa5a695003e175daa50182688f56b29bb88343ec6e600e0e921ce96b3df4f703d10eff7abaa27c80f9730 WHIRLPOOL 11c9a786f22da21c62e76e5e7a13ad3469a82d8ee189ef55826d40b61fac5f588c73755ee2cdda02fad59a9b00cf5c362be23dcff585b16c153dac504009f50c
 MISC ChangeLog-2015 5985 SHA256 42713615155e36eef4d72dfdb4200b01ef285a4343145e8cf57d3a4023c290d8 SHA512 dc39ecc02c08703c4315f19e6d02fa5fb15b464d366a790ed9edaf8cff4fd3e30e810c32a9244cce452a010383479340aac4b0c29ce766abf8cc54d77d8eb20f WHIRLPOOL e55bd174beb38ad6f55f0a4a487af10c3d3321f198a0d7ea281fd8e1aeb57c034a6ce53a7b44c97b975cac6514e3223b688cd432db7e540d11bd9aa680125302
-MISC metadata.xml 165 SHA256 fb7ede94a0633f77d601e3e81580eac1624a3bca14401a49d94082579507ba0a SHA512 2be6b57c8e55824d56afbe9ab641639e6e1b4cf73bf2795c2778e373777ad545b5211e06510f13703583e7bb18817f623bc00dddbc8c52ad5f100f085e5dfddf WHIRLPOOL 7fe27fc76b523efadbe65a61c187e78592bc1563423791709914a6263c587a8843c75e19c64f989c7fc8a105c6433a874116ec670df3a27b930634d7e14fb1fe
+MISC metadata.xml 247 SHA256 751aa1f012df292bed9716a5c6a7e64114b695d2ba0c0572fc7e87fc3bbcebc5 SHA512 15df289e0f962f564551f61ada3cfef0311f6af639887def780bf5ad3be105515c8d24c950ff340ed35d89b9cd994af3540322b684c5dec3b43ec6bb0041aa4e WHIRLPOOL b6c074cf39f6ec1e2d085151836db47f9a4d71bcc9cc3296889bfa10172c7f07837ca79c8613f9c483b1332683e78eebe88e0a433a7caf801fc7ccac2552cd53

diff --git a/dev-embedded/u-boot-tools/metadata.xml b/dev-embedded/u-boot-tools/metadata.xml
index 9211408..71b1461 100644
--- a/dev-embedded/u-boot-tools/metadata.xml
+++ b/dev-embedded/u-boot-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>dev-embedded</herd>
+<maintainer type="project">
+	<email>embedded@g.o</email>
+	<name>Embedded Gentoo</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-lang/ruby/Manifest b/dev-lang/ruby/Manifest
index f75c6d9..8565f6a 100644
--- a/dev-lang/ruby/Manifest
+++ b/dev-lang/ruby/Manifest
@@ -2,4 +2,4 @@ AUX ruby-add-asm_ioctl_h.patch 338 SHA256 82fa2b35c1a1ae05aaf7e849bd7b6068951f65
 DIST ruby-2.0.0-p647.tar.xz 8301008 SHA256 9f793880df1209ea4e5c10ee9d8ef79caa0e73ee769f745f1c191505255e2847 SHA512 38fd2ad631588a0e8adf9a7ae01cb5274eca4fd794c5ed7030e5fae9e53cd8920eaac9d388c73b844a154c7eb56fa6fed8e2ee5df5617efd624b6a568ea4953b WHIRLPOOL c8ec19ed900e6578f1f6e08d1e2a5c015cfa6e81379fb0437a1167ffb8bc56561d02b4b5b35a674039f7adcd2c43b222b89e139cb0ea702e8bfec886872c8e6a
 DIST ruby-patches-2.0.0_p647-r1.tar.bz2 3341 SHA256 7d82403fed6216baed59ac1fbba888e2b9a4a9cb742ffd01531753bae07ab6b8 SHA512 40d07275a391df3e0a7a0c2705913c8120a548e223032dc39993f8f873c8d0639646cf728dc95f1400352a13766623ac6d69a1b1ff03183df6fabf32946dd7a6 WHIRLPOOL ed7ea6b1c1fd3570ea85b885f7455d8273cff2a9db2540c9e89faca867bd5eed2b4de52c7d21a96bb33ae0beedce113c68bb6c8cee4688650ff5169bd9c265fd
 EBUILD ruby-2.0.0_p647-r1.ebuild 6412 SHA256 793e794ac8333125eba8bace90d0dae825ba66f64088ae07f8aa019079668ff1 SHA512 3052910cd789ec498bfc9312944d18b69517313ebb18e193094503c8d510c132da3225895fa52bffc1c5320c5e21d27199052ad88df74b521d9ef1a41c56ceb9 WHIRLPOOL d9aa2192d62c7cd29857c10fedb8f0750503d6b9b6ea4d61a162721155b3552cc56f9090a40f16b41f58389102d3bc28b1e0ca13cfd5a1530fcef4ffe426807a
-MISC metadata.xml 995 SHA256 b802a8c15353181ea4a0f93666e89dbf1cc3f01947311ef9a8cb1663281f257a SHA512 d9aac8c61fcec88cb5ab856bc9f2f16b5e428d8df610b5d56edc6f908ad178790423c1fdebd23e3ff3b210d78389e775b684e9c2a973d86cd701dafa81b51442 WHIRLPOOL 2a28317957c87d390479e4a6ac8ab121200dbaa2bd7de98f58031c17e670c8f096a2c8d9909cc2ca0d02b437ca0b1c61a789a66b39b32ffd731454c2a6e4b65e
+MISC metadata.xml 977 SHA256 fc9d7cc6e682821e89141cdfcb007bc889c6cc522f662631e28dc280935a6624 SHA512 274ff4d66139d0e4fb91f339b834e77938e51508e712a5005fbb67e6b16fa04879cbb30ad6ee61cd60b16f01b6e311deee461dbb15ffcd1d9b45119484295750 WHIRLPOOL 44dbd829673c75af5459d1e440aa53be46e8ebc95d91faf0af31b9ad8608dac920d9dc13c11ca24af1646a31d0c5fa6800669fa7ba34c709814dffde226b4418

diff --git a/dev-lang/ruby/metadata.xml b/dev-lang/ruby/metadata.xml
index e46ab14..249178b 100644
--- a/dev-lang/ruby/metadata.xml
+++ b/dev-lang/ruby/metadata.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>ruby</herd>
+  <maintainer type="project">
+    <email>ruby@g.o</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
   <use>
-    <flag name='rubytests'>
+    <flag name="rubytests">
       Install ruby tests that can only be run after ruby is installed
     </flag>
-
-    <flag name='readline'>
+    <flag name="readline">
       Use the <pkg>sys-libs/readline</pkg> library to provide the
       readline extension, used for instance by the irb tool. This flag
       is meaningful only if the libedit USE flag is disabled.
@@ -16,15 +18,11 @@
       readline extension will not be built (and irb will lose line
       editing functionality).
     </flag>
-
-    <flag name='yaml'>
-      Use the <pkg>dev-libs/libyaml</pkg> library to build the psych
-      extension, available since Ruby 1.9.2_rc2, in alternative to the
-      bundled syck-based parser.
-    </flag>
-
-    <flag name='rdoc'>
+    <flag name="rdoc">
       Install <pkg>dev-ruby/rdoc</pkg> after installing Ruby.
     </flag>
+    <flag name="jemalloc">
+	  Use <pkg>dev-libs/jemalloc</pkg> for memory allocation.
+	</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-libs/DirectFB/Manifest b/dev-libs/DirectFB/Manifest
index 8da7aac..3622b18 100644
--- a/dev-libs/DirectFB/Manifest
+++ b/dev-libs/DirectFB/Manifest
@@ -9,4 +9,4 @@ AUX DirectFB-1.7.6-union-sigval.patch 633 SHA256 eb3c49a77564c4090ddc0e4c6f77124
 AUX DirectFB-1.7.6-use-PTHREAD_MUTEX_RECURSIVE.patch 705 SHA256 abe846e122d0fb03474ff6cc252a46210356da57142f8315f0740360fde5fcd5 SHA512 9836d39692d809fb5a4a30fbab0663d8e64cd7406b9df685d632190d134cff9969f4b7e418c8469f27e5bfaa4d25402004e306138c1685398990f73f66c3c09c WHIRLPOOL bc5a457f4e3b827f72943308bffb6fe24b7f5c4a90e77c355f57c71df68aa5d3adf9c3218267d45a1bf8330bdc990c2833785bf068253e636339037dcba624a0
 DIST DirectFB-1.7.6.tar.gz 5975444 SHA256 44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1 SHA512 18cf1aad6c277a6de147a9b0aff1cd7408ddd7c7159ef21dab9a548db7399c681603624e7820b186a29e03edaa7737350a61e2abaec572887e9cc56658bf85a2 WHIRLPOOL 2868906bbd2b4e681c6702f164f7ba4f01a0f538aea0c744c6e77ce32b274a967232ef0046ec21b74c9c53c4824182e632159cca5ea0c7c27292cb258257d6a8
 EBUILD DirectFB-1.7.6-r99.ebuild 7027 SHA256 b656e9d3ed6e20ed996942d22241009d800a84edc146bdab3b6d876058f591bf SHA512 04b8cb967c76736fda8f6363ec4b1900abf2a6d6d22888da0370d07ef5cc9d31e04a663da3271a34cd95622e560313161b1e64e352d39d4dc39bd2e42f8575b6 WHIRLPOOL 93e462d970f11536e987c61bdfbb75f8812a076ba59273603290eee6a1cfae94731a0f6d25fc71eaf11f8794acdf7679090beac9ff1108d89b88969b1219873b
-MISC metadata.xml 1851 SHA256 d554b7954117c98106bc96875aebe5f8a88c38fcb356a55b1784c3eb3579005a SHA512 348db55422f923d22fa9ec8f73fcb0c492e412f5177e4e5109bca76a5d3daf03fa346af7c04183cbb1c1b8aea6472eabd7b2e4ea74ec7c4eb2751e2185764257 WHIRLPOOL bd9a0c7ce4fef1fa7ffd54652bc8fa5083cba5f63f589fa3675a49e923fd3003a63f145e1d9d53fdf1cf58d02f321c25f079b0e47137ecece7e0bc1a4ecf7c24
+MISC metadata.xml 1948 SHA256 8c46dc85065e07ddc1ea910bd0e200b2a2ac27aafd469004499b08aa09eb3f41 SHA512 6d1dc07a903d8554fda072001ffaaaf685ee1363fc820626c3c271965f7589409c3a95567bc8b4b820bd643c752e570b8a4be9cb938da1ca53b6ac6643800dd1 WHIRLPOOL 4d6d55477d23f66578502858d614601384d03bb7cec90e5dfdf90ebb67ed3e9c3869a917800614aa9dd655316282e1b2afe9245c11ce36688d034e134564c50f

diff --git a/dev-libs/DirectFB/metadata.xml b/dev-libs/DirectFB/metadata.xml
index 4145b86..aaac930 100644
--- a/dev-libs/DirectFB/metadata.xml
+++ b/dev-libs/DirectFB/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer type="project">
+		<email>graphics@g.o</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<longdescription>
 		DirectFB is a thin library that provides hardware graphics
 		acceleration, input device handling and abstraction, integrated

diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index 7ce4666..54f6415 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -3,4 +3,4 @@ AUX boehm-gc-7.4.2-getcontext.patch 517 SHA256 f27464a770418089d89392deec74083d9
 AUX boehm-gc-7.4.2-testsuite.patch 280 SHA256 49deca5f89cbff93bab243bad4a0cb8f7b0fd89dee04a9a15ea83cc165dca113 SHA512 1977fb9e618a744817021e3c1191ad5016b1cbc1abd799283b0f28e76618318dbaa09af14f09964e7e3c5dce4f07ad82f1102e2da986ff14bc06d89945a16fae WHIRLPOOL 8b4a53ae5578230504e76d4a84427b452d3ab9b80247501a1a94c26a4008c704a0efc35c97053274d4d18a7dc29fa45176a889fccf15707e9976aab1897dbd73
 DIST gc-7.4.2.tar.gz 1082597 SHA256 63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72 WHIRLPOOL 139fb9fbaef30f30f54940d99832b2eb936015620f59ee51b58a45e12d03cb9b05d75d8f91a6d706bafad9498894e77a7205d64f422bf2a4b64be2e9a8a13d90
 EBUILD boehm-gc-7.4.2-r99.ebuild 1138 SHA256 f2c0c13dd8f2503dea8d8a14e9d202aeff3a16e2035121abcc912396c7ca6141 SHA512 3f2d1a037b9ab59c6146f502906b78c1225f2739be7cd11a95942ff021739e823fc68573162bca6b875be60aa9e90399f4632cb003e419f02e368c78a95cfe99 WHIRLPOOL 624d0dc7e08457652744bf9e15e2b4287ae3763bc5415f200f14988d4e31985390e91ba61115ff85c8fe05f258fcd6388e416cefc5d82ba46e2b46e254a9975a
-MISC metadata.xml 323 SHA256 89f79fff509fba289ac7cc3d2771227d296068554e21ed81292a91962a22772e SHA512 5b8ceb484d6e4d64b80690b33e49720d2f6c49e73cd7669caeef71c5730e5acb24c74437512321af3abf63a2b1e0d907a0335ab46a89332023758f4ce157c6e4 WHIRLPOOL 4068508aab2a8466c423cd24184d9b96c9ecf73d26cdec4735990daf495a1e49050bf8333a458f63c51b4bd06e2b56702db443048c3caa931b444e6c00769c1e
+MISC metadata.xml 351 SHA256 aeeb8c1ee65025a998b2ee4182e2407291dcba187664620a36d104272427b3ba SHA512 30c02ac236d260a75459a10e247d78299881ee4746c477055a7606f1a2d78b6fb781351282695fcac315fc764d0bb5545b545bf9d859b8eb74c544b4035bd060 WHIRLPOOL 0666f91926db83dd392fe0cef7260be272c3fdb7ba1aeed90a17bf2d79dc988013cba1ac3a2b0b2831fce55683d28b8dc5a438a7146c9a0baabfbf150e1f5745

diff --git a/dev-libs/boehm-gc/metadata.xml b/dev-libs/boehm-gc/metadata.xml
index 89de980..ce9a075 100644
--- a/dev-libs/boehm-gc/metadata.xml
+++ b/dev-libs/boehm-gc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 	<email>sera@g.o</email>
 	<name>Ralph Sennhauser</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 	<email>patrick@g.o</email>
 	<name>Patrick Lauer</name>
 	</maintainer>

diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 409e542..c8292b3 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -4,3 +4,4 @@ AUX libedit-20120311-3.0-el_fn_sh_complete.patch 7724 SHA256 8fb2844923c3750c9b8
 AUX libedit-ncursesprivate.patch 497 SHA256 e1fc9f5c3ffe5e5ba4117bc6b1c615e6f3e5ef82dfcebece16aaa5d571abb8a1 SHA512 41175b20f7b925e347db008d5e8a535b8326cd2c010a67b9db3a59131fce77a7791b7940e7eea9d68e82dbd3731efaa503d4bd218d78b29f946152dd56bd9b14 WHIRLPOOL df6b644fdaa70ec62997c2bd353ad757e6aafda7c17b4926ad3044d4f1d02deb379bd84946f5cea08c63eb4ba346752949f5b0a1577bc046dbbb4c4221fdf239
 DIST libedit-20130712-3.1.tar.gz 483857 SHA256 5d9b1a9dd66f1fe28bbd98e4d8ed1a22d8da0d08d902407dcc4a0702c8d88a37 SHA512 9fb3173a65ea2cd2ffa9af0666aa3e227b7d6be26f3e84f30ea3449b0c80fc5e91b618e939f7047bf885b96689ede93733f7eba614d4fdd1a4baff3f130b432e WHIRLPOOL 550553af1cf3bbd863ef4ce86ef5fd7adf257a7f5946ad186a104c5920d0f58216c135d496d52fd2d6ad51a1fb954bb87719d731aa0eebf6980d1c15345d6034
 EBUILD libedit-20130712.3.1-r99.ebuild 1462 SHA256 a2c7f48ebc2a7912afa6c671fb94995413b3c74eb69c3c8958fc8edd9462c9b2 SHA512 2eb3850d32446fb8cfabbf2095ee6810090d915a857cd2cee7ffe788103afe5e537fa1d80680f50ad0402e9a4cebf4135a53846a062745975a163811bcd51523 WHIRLPOOL 23bf9c951a356747afd1c7c83589bc2a288e672998be49d180b2ba34460bad6f66c31b9997206a8dec0a3db5ddc5c2af29b4372801fa70720b3c954959d21cdc
+MISC metadata.xml 636 SHA256 ec3560e3314a6a4b29d2786e993a52e900d30f36bb2248f2842d8a4b1399db81 SHA512 c335a652424f91f1ae79f907870bcd826cee21365b594353b3c52fb7fef51f637e9a65275c11f033b6bd7b6d918733904efc320b547999ee5b88a7b36ccb9389 WHIRLPOOL 753aa219f31fcade9ab32787ec1528b2e4ac195a9058baad7612fa8c1773375701b37dc1761e9ef86107697245c51414f18ad9cc0d3484d403e205969007c1f5

diff --git a/dev-libs/libedit/metadata.xml b/dev-libs/libedit/metadata.xml
new file mode 100644
index 0000000..21c1553
--- /dev/null
+++ b/dev-libs/libedit/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>bsd@g.o</email>
+	<name>BSD Project</name>
+</maintainer>
+<longdescription>
+GNU Readline is cool, but BSD Readline is cooler :)
+Thus here is libedit by the NetBSD folks!
+The glibc/bsdlibc stuff comes from the debian tarball, thanks to them too :)
+The patch is handcrafted with a few ideas from libedit.sf.net and a few ideas
+from the debian package.  This patch aims to be as small as possible (so as
+to make future cvs snapshots cake).
+</longdescription>
+</pkgmetadata>

diff --git a/dev-libs/libgamin/Manifest b/dev-libs/libgamin/Manifest
index 3e28cef..2a14f73 100644
--- a/dev-libs/libgamin/Manifest
+++ b/dev-libs/libgamin/Manifest
@@ -11,4 +11,4 @@ DIST gamin-0.1.9-freebsd.patch.bz2 4635 SHA256 fcd1a6655d1c7cd86db6102931a4da1c2
 DIST libgamin-0.1.10-opensolaris.patch.bz2 16955 SHA256 9cb1bde5a34888ce4de4c4894c7d31dbfdbfb3279007b9eddf2da35510f6a9b5 SHA512 fd1cfc5a6b5ba429622f8d426cfba0e3c1c05c3677fb58c53af39b4030ae56f3f71caf63eb5ecb16169c2f7e8c79a32d7d440857c2c7fd3a259cf8312a9b2004 WHIRLPOOL 3efbf3781a55f44f383e573db4a3b3df731e9f77608d73db4ff3027eae0bda6abb6eae022c094735c0d8d2a85e224a980436d8557f9350bb1558b40d99280701
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD libgamin-0.1.10-r99.ebuild 4061 SHA256 4a309ff64993ee78ef757487a6c2eeb9b23201744b1db70906eaf7279889b4c4 SHA512 34fea1f9327fd1b75e6d0c123d75801d6d0f0963c7ddfc057c780fc4e9682c5ba5aee5ee80c71cecd1504d6c1cd76e1bf1efb5e8244d267e00289aea7e37d4ad WHIRLPOOL caf86538b138ae0ab10f71969f05694fed401e45956144b8e5f13153f29f364395b6be2a7ae6d1d50a1a91e87f4df720fbd931898f80f9af01f02771a9f790d7
-MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
+MISC metadata.xml 224 SHA256 154bec891472fe5526579d16d7e5e5e9eb3f352512a17555a459aa6029bcbbb2 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 WHIRLPOOL 541aeaf2a7c858734aaae366846865ff70e6c898204bbfc9f39f58fbdb53d9b37dc8c898c23870859a9d4f5596e7898e21874c9ef529a447953a35e4d7bc13e5

diff --git a/dev-libs/libgamin/metadata.xml b/dev-libs/libgamin/metadata.xml
index 8c86806..fb76b94 100644
--- a/dev-libs/libgamin/metadata.xml
+++ b/dev-libs/libgamin/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
+<maintainer type="project">
 <email>freedesktop-bugs@g.o</email>
 </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 2cbeb3b..d6e3dcb 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -7,4 +7,4 @@ AUX nspr-4.8.9-link-flags.patch 995 SHA256 f986c69ff6250f54eb291339ab5503e73cc5c
 AUX nspr-4.9.5_nspr_config.patch 445 SHA256 7414eaac7630ba3aa9f3c44b439471abb195c96796f78cf5ddfd4e10c68389e8 SHA512 3d3dc60b4bb4a6b469e992239ca7e5702949880bbe3e603691bf7cab199a80e6b9fd89aa3184c26d99185b43785f6f2f7a9a16e061080e13ca02146dd2f172bf WHIRLPOOL d807bc98ca6f47d943f0b6f9a4d33dee387eddf9ae4a9d6a8863697d96c82ae1560d871b76c866b6a85b4eb1d31e9e9f1ce59caa4f66c02bd68a913f822d5a16
 DIST nspr-4.10.10.tar.gz 1134164 SHA256 343614971c30520d0fa55f4af0a72578e2d8674bb71caf7187490c3379523107 SHA512 60e035c4bd037bbf4bfacc97e2b1097ea78a179969fccead6a964069d826e917f07aaa35a26f123b7297521910728c11e27556fc9bbc09e385c1e8aef9dbf376 WHIRLPOOL db63a6d1e0c9d57dfa059aecf8eeff8e36d0385f598290665d525a85eb6fe173cd899bba017c82b26815d894d8ea6e728dbb7a77483036551c06c78c900d7ee3
 EBUILD nspr-4.10.10-r99.ebuild 3948 SHA256 b130c4dd9bb23095ee8f9323854e79f56a177d6fcd2627f44a73b9a1938db2b2 SHA512 c57f37ed48b4f8663953cbe5c6374a6d47583eb256248e78b137ec6610d4adc4216e066f06f58c8b7bef5f4e24e158346f3d03b57e9a51e87cb64917f62118bf WHIRLPOOL 4a284517140cc4fc8d7a9342b64399c2fe1f59f0b2c61ef5ccb2e595d76e442ce0cff6e61a8801b7a2625d077d90e70def6fd8d1fa55ada22c56bb50cd99fd88
-MISC metadata.xml 160 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b SHA512 ed6f709d55351c1b69f2b43ada124fcc2f8969f8c3867073bb0c68aa502f16247cbcd78734a891e4d1a509d334f6805e5267d2088cd03f3408a636ad9aedc2bb WHIRLPOOL e6bf1791838158287debcc3160dd075dcdf88bc1b33060aefe4687b4451108e55b6f8021fc36f07ab85c4e37a4225444cc2804cf40bd61ba49726bbf12fa4e38
+MISC metadata.xml 250 SHA256 6482f1f0210d1b5be8fa75dfbe107df6da702461e36abe6ee77808b4118d5bab SHA512 ba5e7c1f6ee117471a3804bc54211e7f89c75e965a865f45f85015a0a28ec7d511ef9bbc196eef8245dc9259f54b04eb3563d83811a293bb946cf0977563892b WHIRLPOOL bbdc6963f21df602d4bbaec882e9ac860417eccf7528546f4ec24f13368b9b86a1b6830c51feb0bb46bb384fc1aa0e8751c4be88103f9b4895ff9ed4e1d52bbc

diff --git a/dev-libs/nspr/metadata.xml b/dev-libs/nspr/metadata.xml
index 74d9257..d9b367e 100644
--- a/dev-libs/nspr/metadata.xml
+++ b/dev-libs/nspr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer type="project">
+	<email>mozilla@g.o</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 80311de..c4ce421 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -5,3 +5,4 @@ DIST numpy-html-1.10.1.zip 9663942 SHA256 4af48eb5abf2551f01d85aea7e9a99a3009677
 DIST numpy-ref-1.10.1.pdf 5382006 SHA256 72ae03348d0375ff2f18056efd04e815cc1d27b738d0685c80f5204a496bc279 SHA512 25085eb7cb80343abffe04ee01ea93603427913ba4443fbfdaa1ef1ad07a8642c47259d0bb1cb91a9059f786c03395bba76f608c6f0a2fd26d1afec4847d885c WHIRLPOOL d904d9b2824bfb08a0eeffeb37f7d646d003c39230d950d387e2ddc8e475a117b8305a0ce3dc479be72f010b1a868f22ddfde17e6c4cd7c56630bbdf09afb90e
 DIST numpy-user-1.10.1.pdf 406114 SHA256 5180a5a1333365e474aabba9d6edd25276e79179fd708bb3989d95dc4e76215f SHA512 998bce3777944e7b366c619e968ac4b6cc4351cd2819d6ecba7f422e20b6cd4d7332a8dede4036cd12e85b24c4c3d973bd9ef2d407610369c2591fce990fa8f4 WHIRLPOOL 4b53256663840738d288d38c4151e01ecfb515ebd4f69bb4330f4c5589642b3392a0a300f3def53df6bee8746f127a3af0d284601f288f4c4292df8b6de39f71
 EBUILD numpy-1.10.4-r99.ebuild 3933 SHA256 3dc5a293dc7b327de33b254bb4b465a04c483b7fcbfc85ae5f716be9e7f7be69 SHA512 a6a2b980fb02c356ad9c7baede082bfb12c43044c19009ab2f6026e87b8490cb78ba90919ad22d55ee0ec3478ed0d774d2436852c810ad91040fddf011780949 WHIRLPOOL d61cffe8da7124401c17fc4f5202d7415290fd3976162dfdf964ff26b56042e113729a455b8930eee7c2e156dd128235bb3a628f2496af7268ca4adc69600288
+MISC metadata.xml 876 SHA256 e95b995924f4ee2df04a6ca11978b72f204bba208e5979b3e4832998a5e954a4 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549 WHIRLPOOL 464a80aaf42947fa71b62134e77f788c5782441e79d0596cdbbfc81d8641c727298fb5eef4fe835c00ecb5ba9c7bd7f123ceff5eaa98dfb3aa9c45eecc75b8c9

diff --git a/dev-python/numpy/metadata.xml b/dev-python/numpy/metadata.xml
new file mode 100644
index 0000000..2890261
--- /dev/null
+++ b/dev-python/numpy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@g.o</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@g.o</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">
+  NumPy is a general-purpose array-processing Python package designed to
+  efficiently manipulate large multi-dimensional arrays of arbitrary
+  records without sacrificing too much speed for small multi-dimensional
+  arrays. There are also basic facilities for discrete fourier transform,
+  basic linear algebra and random number generation.
+  It is the successor of Numeric and numarray.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">numpy</remote-id>
+  </upstream>
+</pkgmetadata>

diff --git a/dev-qt/qt3support/Manifest b/dev-qt/qt3support/Manifest
index 65797ee..0f77a8e 100644
--- a/dev-qt/qt3support/Manifest
+++ b/dev-qt/qt3support/Manifest
@@ -3,4 +3,4 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 EBUILD qt3support-4.8.6-r99.ebuild 1112 SHA256 5c8e9de6adf726e203e641abd7599fadfc7ddd6845c22d2d6a5df8bec6512ab1 SHA512 68d983d91d33cff2091aa5c43998b7ec0e1cac4971a9030b6fde87e3479b365bb39d3a0af74c1d5ae10cac32e38769885f82c46277b6d654bc0fde04b45e80cf WHIRLPOOL 2afece5159c68c11616d9916f87689dc1aad08af8a8c0de1c9bf2cc2b37abbe9b112f3655f6440e525fcb101825146fd135f187a84ea609dc464252aa024f49e
 EBUILD qt3support-4.8.7-r99.ebuild 1072 SHA256 63bbe62c13465d14707e3e278c7575259b71a59b9084f95d17be1c372105e60b SHA512 1066cd6f8cf109073a3cdf6be429189c60cf5a307b76ffdddbd5a51af337eeb35ede21112a82e84adc1b4b78eadd6862d5cb0b3f9f845782d494e6cf56f0b95b WHIRLPOOL 7a8f000b4eabf9d1dab50602063d30254668ba5c1b7c04950a218d3b00214c383b7836441474a9a05f73d58e6ca20b7497677af69d69c34d766b04e23fab8eaa
-MISC metadata.xml 406 SHA256 9b69df2d1422470da7bc919a570303d186cc74e404c94471789765cb6a7f60a2 SHA512 6793c43be90e7d93c0971597a4fedba2fc26fbbe7718c0944ab655ce22cb9bd93e96481b3f758b471dcd705666abbdf3e1a75faf756ae90b283172c1e15d2682 WHIRLPOOL 1ea46d494c20389eb3db0a8ba6d9abd6cf2fbd94657e7ca33527ad3be966d043957bcee9e8f6c141fd4c42aeb2a708a4c8c791df812d799809f9819373d7e55b
+MISC metadata.xml 497 SHA256 a7132694aa856761ffc6ce56c3cba8569caccf29ac795fadedb59e941b728b39 SHA512 7afd9c1eff3b0594ece2ef53c32dd842a6eefff6f67b6a92c7fc64ecf65c6b54d1c1925fd6b0dc56e7d5165412a49e83a17cace9e12431f64f6aeeda539ef4de WHIRLPOOL 519f5324299823b102950c4be0ffc994284ccda63453f4813d5888e2f9d6aea58a84c437b656c28de08cbcce433c01f78c5bdb07dca399f0545b7b9c394ca652

diff --git a/dev-qt/qt3support/metadata.xml b/dev-qt/qt3support/metadata.xml
index 258aee1..6ac3b4e 100644
--- a/dev-qt/qt3support/metadata.xml
+++ b/dev-qt/qt3support/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer type="project">
+		<email>qt@g.o</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>

diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 873192f..b48d42c 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -9,4 +9,4 @@ DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e0
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
 EBUILD qtcore-4.8.6-r99.ebuild 3005 SHA256 1e219f8808491b96890bb930b772ccee709f4358b3fc6de4d71f570d34481d8d SHA512 e4594dd5ae2618daa5cdf507be83f8d623aa1424777a88f3e879fdfc329d8d5cd0852ff34f437dacf778e43097d8d6105704b82dfea21734d21261a6d05e85dc WHIRLPOOL af04ca61624e45ae389413d1e18c8865f85421f927af11ffbd849804bdfea6c61c9cfb3ac5940bfac201c92821a2b510177ecba212635ca87efa4cfd58d51b6f
 EBUILD qtcore-4.8.7-r99.ebuild 2823 SHA256 2e2b0d1d864602a11bc81ae3eecd9135c3e867c0ac1996c77f4a47e9a992ec3a SHA512 68f207fe6abcc19015aa17475418803ee5792bf99e0f87211362b5116ebbe7e41ac73bb6daa7bd92364df42bd2610707db2eee96795f5c851f4a7a73c4f71dac WHIRLPOOL 1c0c8fb33b8755eb29d76749875643420287eb09d928fe946e575f62d6a91ba045a131edec327ed247be11609bed52b82fa3da06758709097c8d77748a5dc502
-MISC metadata.xml 633 SHA256 b8a9342f8b5306a23b156316bb8f6cbf6efc162d678d41a8e13e46916f12cf7d SHA512 3adcde8bf745bf21b85c8dd7b4b9d420d427053ed7fcbc110057aed87ce3a786e72d942c11d81de87bda04c5e2484ff410641ea147a2748867e969da828e6957 WHIRLPOOL 30fce13f3de4d40391ca081df75d94b6e88e352d0c0b0c10b2e2942462e0df6491b1bd15074dce27bf6cebf7f9d0381ca17cf22cfc982e06bfae4e2d278fc1ef
+MISC metadata.xml 724 SHA256 a5817aceda69b91e2bd5be332bcb73697da737da1b77b6e50acc8bc61c06c44d SHA512 97a3fc3efe3d2ec69ad3d9b79606a56a5e4722bef617db7f06b68d17e6ac1cd4da3cd4f8495f5f4b3870c0a5423d99300b1d09a11db232beb1862b0353ad2786 WHIRLPOOL 84217bea2b1d55c1614573abd410b3b703c559447c202d4e8266752683ed3d64757892b2928cadfb1e7aba582e08fb34a3b44dd03e34293ffe1c5ded58c138ce

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index 9b12987..3856b33 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer type="project">
+		<email>qt@g.o</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>

diff --git a/dev-qt/qtwebkit/Manifest b/dev-qt/qtwebkit/Manifest
index d9bd284..8d3d57b 100644
--- a/dev-qt/qtwebkit/Manifest
+++ b/dev-qt/qtwebkit/Manifest
@@ -2,6 +2,7 @@ AUX qtwebkit-5.2.1-disable-gstreamer.patch 766 SHA256 06b0aa301aadc5fb601beb6758
 AUX qtwebkit-5.3.2-use-gstreamer010.patch 926 SHA256 444964b7af1ace629efb160efb434ca15e44ccd2c44ed8643019449b42268d3d SHA512 bc88474a7b3c8b4f86748e6913a302a5d7cc0b7837233aeb27904ccbcb8e25adef6f6e4ee039b0b161eda43c6504bb7cbf053d272884e9ab869279e962942dac WHIRLPOOL d3fc6a3dd0504cd9efb738fc39780a47b0d3c4875c54cb0c585a2b7f76da9083b3856ae5b74f0f3e4290471ff19e99bc24c1d6932aee7bf38a96636b12c68274
 AUX qtwebkit-5.4.2-system-leveldb.patch 703 SHA256 e0c5a2eda2b75e8c426752cf49dca55a89301edbcc2ce29d2e1f09690889e959 SHA512 c617d5e98fb2f2b2fa47a56af2b2daf1d37eec31054e69d36aa7fac00cc1a51dacaea3c4836564b63a9b881f843d543c74eeab3e9c272f90a8cd1330db3a0bf6 WHIRLPOOL 4c904c4506332eed4ee94c3c848be4751930ed1d33937afc913717cd4c568f170439cbc3e188a38034a603b76a72e533e657d92dbbe3a71a9bc75b6f8f9001d7
 AUX qtwebkit-5.5.0-fix-backtrace-detection-musl.patch 963 SHA256 191811606733d24b368bb25a4b0b737a504b1b78b5bb6ef88bb0450be1b6ff16 SHA512 5cfe5f73e9f9017a73034e45355a4e8772c43b6beface7e7964df54e396eb04e5ca2e39dd3e8e1e7ea2cc0893dc620d8cf65d72703e5fa94786957dbe2af3bd7 WHIRLPOOL 005fc53e8ed1e02bdd88ffa3189b28db063dc4695c3277f65f0a459b343a85a378b517e8328f6e9762e9c5b4868fb768531fe24943bed1d25949d6a0e8b01fb3
-DIST qtwebkit-opensource-src-5.5.0.tar.xz 33483864 SHA256 17964996347d040a68b0c378a84b4b3874f1289c0d561b6868f7668402d9eeec SHA512 6255ec8d3a6fc067b25bf4f19ecbf256be339969a973768337d5452457d77030c229634d6be944d96ffbbdc3603ca00497ff8fac8bcf1b7051dad31612742d3e WHIRLPOOL 5866fa4d6cf002f083a88af19db1b2d517e6bf54e942c0d7c708bc4ef808071b1ab62d0ff85fe8baa0ac9bcc9b451e52a9911bc25d16d8d70e9a0825252293e2
-EBUILD qtwebkit-5.5.0-r99.ebuild 2989 SHA256 4911597479777dcafe6bc3230977a1949014149af0438d6ea3049297a66923f9 SHA512 6a3046b679451df67077b5ad20a259e13874a92e110ef1d780670a442bb69fd569dd808008c0ed7ba5ff6159046d1787a97478bda721a8b15a6dd98e956b55c6 WHIRLPOOL 2b59df14ef64b306a03e21eb6a5795cb2ab368f137edb5198a146147536a32d34db3b6d45f71c06035b9ee0011fc55b56585355effbb5428d68054eaa60365b0
-MISC metadata.xml 923 SHA256 f43643c520efe9e8b82c6a88223d296f0262a98eaa3dd6c87e4a8feac64c42e8 SHA512 6ac6e707a39e61540595d0522ca8e2d453e57a8c68071f8ce5b957389786b47f4b5c67b1572c5a8e36a54399e8cf4eed594280c3e6d60b02db52906b02d982f7 WHIRLPOOL 6eebe81091163c3ef908b0ebb6af86d6f5e6614e3f649e25f2dfff2a816e660ca660cb60767e3138251e22488326bdf9fa555db0b559e1bd1da033b99f2789b9
+AUX qtwebkit-5.5.1-disable-jit.patch 460 SHA256 d4f64d992bdfde58d87bfb3fe131200bda55324ddbc9a7204d26f9df6dc14ec4 SHA512 d9af937475bed746a0e47698b432370488b644a5aeeb008eaa201f4d264fe9f52525345b47757eec08b2adc8dc46d15a044e6ff5e49420f897f1bb416ca06749 WHIRLPOOL 5515613b1fddd09a5b05200dea5b843d875b4bd1e9e42d139fba77e47db15ab7967e2d9c21cc0194dac2f63d01d91d10c5ec48f4201801e2e41eed65f11cd7ec
+DIST qtwebkit-opensource-src-5.5.1.tar.xz 33489924 SHA256 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 SHA512 a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a WHIRLPOOL a54eabaf72fdd4ffba4317b0c64b57da239605f0d1c8020be4282c0ce802727fd9321c4da14f9cb977419bedc97a4ac44cbc34e7003ff80ae31cfd983a577dc9
+EBUILD qtwebkit-5.5.1-r99.ebuild 3162 SHA256 7c0fbe90445d289249fede7c15fc710359b58cfa1edbb363a56f515a7c481a9d SHA512 113739843636170ee4f1f3c23ce92f91e39eedd95b29becef2a5df842478a65a47e847671a171853d8b7bf421ccbf16cc8cb2251f0e319035a667bd01a4a3787 WHIRLPOOL 717d283181a8c733abc34183bb6d89933e62231712c29b5fc9fda01cf3cf599432678ecaf653a711ffd7293ee1c3578159ace020067b73ae22ccd8303eea7ffa
+MISC metadata.xml 1313 SHA256 0605f518e0777628f9976865a7c937bd0206954f2da0725e569608ea18d17e93 SHA512 ef2dce2348d143978b87e262da505adb5f3d09e13800c0ba8602b7ee8453ccd39ac77ac9795731367fd4dbce80f2c12a3eb0e4796321665ba6d9d176500a181c WHIRLPOOL 126a21713c1a2d449a1fc710b9cf23b220d3c55b3ece950b0c71cb4a8230f7436cff86a5ef93135673e96d32281e47178106f552b7de250253f05daedfb2ff82

diff --git a/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
new file mode 100644
index 0000000..40e58f0
--- /dev/null
+++ b/dev-qt/qtwebkit/files/qtwebkit-5.5.1-disable-jit.patch
@@ -0,0 +1,15 @@
+Allow disabling JIT for hardened.
+
+Author: Magnus Granberg <zorry@g.o>
+Gentoo-bug: 562396
+
+--- a/Tools/qmake/mkspecs/features/features.pri
++++ b/Tools/qmake/mkspecs/features/features.pri
+@@ -70,6 +70,7 @@ FEATURE_DEFAULTS = \
+     ENABLE_INPUT_TYPE_WEEK=0 \
+     ENABLE_INSPECTOR=1 \
+     ENABLE_INSPECTOR_SERVER=1 \
++    ENABLE_JIT=0 \
+     ENABLE_JAVASCRIPT_DEBUGGER=1 \
+     ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+     ENABLE_LEGACY_NOTIFICATIONS=1 \

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 0ca02a9..68b6e35 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>qt</herd>
+	<maintainer type="project">
+		<email>qt@g.o</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<use>
 		<flag name="exceptions">Add support for exceptions - like catching them
 			inside the event loop (recommended by upstream)</flag>
+		<flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag>
 		<flag name="gstreamer">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:1.0</pkg></flag>
 		<flag name="gstreamer010">Enable HTML5 audio/video support via <pkg>media-libs/gstreamer:0.10</pkg></flag>
 		<flag name="multimedia">Enable HTML5 audio/video support via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="orientation">Enable device orientation detection via <pkg>dev-qt/qtsensors</pkg></flag>
 		<flag name="printsupport">Enable printing via <pkg>dev-qt/qtprintsupport</pkg></flag>
 		<flag name="qml">Build QML/QtQuick bindings</flag>
+		<flag name="webchannel">Enable integration with <pkg>dev-qt/qtwebchannel</pkg></flag>
 		<flag name="webp">Add support for WebP image format</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
similarity index 56%
rename from dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild
rename to dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
index e63a930..b805d72 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.5.0-r99.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.5.1-r99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,12 +9,12 @@ inherit python-any-r1 qt5-build
 DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
-# TODO: qttestlib, geolocation, orientation/sensors
+# TODO: qttestlib
 
-IUSE="gstreamer gstreamer010 multimedia opengl printsupport qml udev webp"
+IUSE="geolocation gstreamer gstreamer010 +jit multimedia opengl orientation printsupport qml webchannel webp"
 REQUIRED_USE="?? ( gstreamer gstreamer010 multimedia )"
 
 RDEPEND="
@@ -23,11 +23,11 @@ RDEPEND="
 	>=dev-libs/leveldb-1.18-r1
 	dev-libs/libxml2:2
 	dev-libs/libxslt
-	>=dev-qt/qtcore-${PV}:5[icu]
-	>=dev-qt/qtgui-${PV}:5
-	>=dev-qt/qtnetwork-${PV}:5
-	>=dev-qt/qtsql-${PV}:5
-	>=dev-qt/qtwidgets-${PV}:5
+	~dev-qt/qtcore-${PV}[icu]
+	~dev-qt/qtgui-${PV}
+	~dev-qt/qtnetwork-${PV}
+	~dev-qt/qtsql-${PV}
+	~dev-qt/qtwidgets-${PV}
 	media-libs/fontconfig:1.0
 	media-libs/libpng:0=
 	>=sys-libs/zlib-1.2.5
@@ -36,6 +36,7 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXrender
+	geolocation? ( ~dev-qt/qtpositioning-${PV} )
 	gstreamer? (
 		dev-libs/glib:2
 		media-libs/gstreamer:1.0
@@ -46,11 +47,12 @@ RDEPEND="
 		media-libs/gstreamer:0.10
 		media-libs/gst-plugins-base:0.10
 	)
-	multimedia? ( >=dev-qt/qtmultimedia-${PV}:5[widgets] )
-	opengl? ( >=dev-qt/qtopengl-${PV}:5 )
-	printsupport? ( >=dev-qt/qtprintsupport-${PV}:5 )
-	qml? ( >=dev-qt/qtdeclarative-${PV}:5 )
-	udev? ( virtual/udev )
+	multimedia? ( ~dev-qt/qtmultimedia-${PV}[widgets] )
+	opengl? ( ~dev-qt/qtopengl-${PV} )
+	orientation? ( ~dev-qt/qtsensors-${PV} )
+	printsupport? ( ~dev-qt/qtprintsupport-${PV} )
+	qml? ( ~dev-qt/qtdeclarative-${PV} )
+	webchannel? ( ~dev-qt/qtwebchannel-${PV} )
 	webp? ( media-libs/libwebp:0= )
 "
 DEPEND="${RDEPEND}
@@ -77,22 +79,27 @@ src_prepare() {
 		Tools/qmake/mkspecs/features/{force_static_libs_as_shared,unix/default_post}.prf \
 		|| die
 
+	qt_use_disable_mod geolocation positioning Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod multimedia multimediawidgets Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod orientation sensors Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod printsupport printsupport Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod qml quick Tools/qmake/mkspecs/features/features.prf
+	qt_use_disable_mod webchannel webchannel \
+		Source/WebKit2/Target.pri \
+		Source/WebKit2/WebKit2.pri
+
 	if use gstreamer010; then
 		epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch"
 	elif ! use gstreamer; then
 		epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch"
 	fi
-	use multimedia   || sed -i -e '/WEBKIT_CONFIG += video use_qt_multimedia/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use opengl       || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use printsupport || sed -i -e '/WEBKIT_CONFIG += have_qtprintsupport/d' \
-		Tools/qmake/mkspecs/features/features.prf || die
-	use qml          || sed -i -e '/have?(QTQUICK): SUBDIRS += declarative/d' \
-		Source/QtWebKit.pro || die
-	use udev         || sed -i -e '/linux: WEBKIT_CONFIG += gamepad/d' \
+
+	# bug 562396
+	use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch"
+
+	use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
-	use webp         || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
+	use webp || sed -i -e '/config_libwebp: WEBKIT_CONFIG += use_webp/d' \
 		Tools/qmake/mkspecs/features/features.prf || die
 
 	# bug 458222

diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 8a638ca..d42a462 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -5,4 +5,4 @@ AUX guile-1.8.8-makeinfo-5.patch 2361 SHA256 f1bfbe27280f6105735a2b4f0cf7883a9a8
 AUX guile-1.8.8-os_dep.patch 440 SHA256 e4b54c94aa2087495dc0b4a93e004cc053e5018bbb556c8ea5b674977ea31a52 SHA512 df1681a3e311de4c3f7d4097ab4f92990d1a36f4f47507e967252039479822be9a82d64d483b0f1025c3ecf0ff070d8c7a30ccc4ef0d19db0895f5b9622019c7 WHIRLPOOL 412b0509fdc78b8bd28ee6236c94ed213c95b1da4a666ac1cfef824746ab7dae5cc10bc159d38070c8a17e3363b8f289f27bb6804f50870936ba939116b88a13
 DIST guile-1.8.8.tar.gz 3956654 SHA256 c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 SHA512 ede6feb90cd419d8763feb8c5169275490a653919573c4dfced025b74cf591072b3a10ffb9a3f6ee3fe7b0a0956ffcf434e0859b421455c8349cea56bf427db0 WHIRLPOOL 104810030b5dae16805595a5b398e5a7e600771b64b08d5ff686036e2f273dcec3829a16e4cdb1dbb9db5813f2e225476f83e0535a789bc570fc2fc15a76dbe2
 EBUILD guile-1.8.8-r99.ebuild 2887 SHA256 e41d065f3078343f312b15e604b32ebce47be2498741d60ad56892761355085d SHA512 c431c0de268aa5ecdfa86eb910e954cffebe4dc408c8107ebbe6011c64f9250617541a70a07ebbf5bffc86d0ae5025ebb3f470c689f4815c59403ca5bb653cd3 WHIRLPOOL 1e6844b0ee7f5d8a85d039d1a5459051c840363b840ac81785bc6fb5802b58c88efbc8ccf14f0a736f8704fd0b319faf2a01e92115e5b24b03e759e7b36a3111
-MISC metadata.xml 939 SHA256 bec92c2558ecc371364a598a582a19b43dff9a809fe732d150e9b209b76f17ca SHA512 ca2dd2db48025f250b4ddaeea40a6119c00bdbc7c6d8167f274fffa9155ae64083a3ccb1cff272abd3cdfc108f555f9f04beb10532ce7174db50ce96d0a4f1eb WHIRLPOOL 75f94d8db3b573829322c06a6a388775cb9b6302624c345f492a650b6ac644d2a48021b16b436786e138eb8753f9ed3354df4e5944bd92f2a3b7b4819ff91155
+MISC metadata.xml 1040 SHA256 a39b8cf38ffdbf8a5d6e2a302ee3b661bb7680f15c51f93ae9ac40eab70ca72b SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3 WHIRLPOOL 6003d8faba29536e6a44b854082ce41ae28fea03552809f6ad7b34023755f81b8156148fc7616c8ba7a9ee8eb917de257434f87084b66c6e0107afcace974f52

diff --git a/dev-scheme/guile/metadata.xml b/dev-scheme/guile/metadata.xml
index a3d993d..02c7884 100644
--- a/dev-scheme/guile/metadata.xml
+++ b/dev-scheme/guile/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>scheme</herd>
+	<maintainer type="project">
+		<email>scheme@g.o</email>
+		<name>Gentoo Scheme Project</name>
+	</maintainer>
 	<longdescription lang="en">
 Guile is a library designed to help programmers create flexible applications. Using Guile in an application allows programmers to write plug-ins, or modules (there are many names, but the concept is essentially the same) and users to use them to have an application fit their needs.
 	</longdescription>
 	<use>
-	<flag name='debug-freelist'>Include garbage collector freelist debugging
+		<flag name="debug-freelist">Include garbage collector freelist debugging
 	code</flag>
-	<flag name='debug-malloc'>Include malloc debugging code</flag>
-	<flag name='deprecated'>Enable deprecated features</flag>
-	<flag name='discouraged'> (implied by deprecated) enable merely discouraged
+		<flag name="debug-malloc">Include malloc debugging code</flag>
+		<flag name="deprecated">Enable deprecated features</flag>
+		<flag name="discouraged"> (implied by deprecated) enable merely discouraged
 	features</flag>
-	<flag name='networking'>Include networking interfaces</flag>
-	<flag name='regex'> Include regular expression interfaces</flag>
+		<flag name="networking">Include networking interfaces</flag>
+		<flag name="regex"> Include regular expression interfaces</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-tex/luatex/Manifest b/dev-tex/luatex/Manifest
index f3b2870..b6a0509 100644
--- a/dev-tex/luatex/Manifest
+++ b/dev-tex/luatex/Manifest
@@ -7,4 +7,4 @@ AUX remove-zlib-version-check.patch 938 SHA256 5c569bab0ccecc38e89f0bfeeaeabb921
 DIST luatex-beta-0.70.1-doc.tar.bz2 1048489 SHA256 4f1d24777725a606efbf5d7a59064245c46fb29b8066236c6b48fb423a595606 SHA512 eb4de91a80a6afccf5cca5cb05d5c1378a60ec35763e5ef5e9dbadaa2a276758a446e01d66e76a78e91442274778c10c73458b513af903e7221d90beb644afa9 WHIRLPOOL 97142a3a3c23d01f3b21963690f7362edf0c7f0de1ad77295361122a81c92459cb2ecd36baaea3588b7ad4f8b81c5dfa81d22df7a5529cb5b8b2b39fe6ce84be
 DIST luatex-beta-0.70.1.tar.bz2 8181155 SHA256 c641a4ba1535ede6ee8e2a958d8c4b436f5979c5be6f3f51d3dec5b4df6bb6ed SHA512 e04a9b96f349bf9036ef4c01746dee96ebf245cd4da6b719f546223e05cb98fb844e20878a64f80f42c77e220fac01ee2d97ad56939c1fb3af44faab53c603cb WHIRLPOOL 63dfdf182d3f1aadd6fc802e424b3791eda4df7eb8d707ad719d2ad0f97946b365316f6b9caed2362d5827280e9ddf2e750c8beeb61277dac72bffaed06a4fc9
 EBUILD luatex-0.70.1-r99.ebuild 3626 SHA256 9bd5bfa58565b7c52a240e195cee3a5b6285ffbf05f2046f5c8935470eb114df SHA512 806d5b55947d7c41defbb89af65e6723a851f2a7c0ab4c603bc4329f9833f3e577bb7e91c344f20cd4f25766a08f8bba8d03d6b6e15a9f2547aa621305615380 WHIRLPOOL 9fbc5060c778ed603cb716ea86e9cc201c29aabb4dbe2f722bad4ad9248caef6a45f0746645ef735b1c5632a425ee32d1d86e97c1993593cecace0f2f4c02e0d
-MISC metadata.xml 336 SHA256 126018a4822f911e52afe63656a10f2a7b0b938ea106f2a2caef00bdc18a845f SHA512 d998dbfe23cbb7f60db7b876e8ac3d039281ad9568aeb45a494774eb65468392523cdfc1b5cc8b621fc9a2f2f7f33dc3e351d1cf902f9ecf3f122534ef4767e0 WHIRLPOOL 3350c9964adc178cb58ee77019669fa51899cd71734ae1ff8f4646d1f9e141973c9f686f43e5995f1a7258d92bd173176dc0d9c3d8bcc09b96c37a0b7a0fb4a2
+MISC metadata.xml 425 SHA256 9b879fed8cecdfbf714206f555603d5e2fc6f32608013002b7629538eb42b5f3 SHA512 9442b997ff504c7aef4e129b3c3fbc5212e6b7838b53059cfd16764bff66b025d39e6c9565f932295118393b8b648a489066d85e6bdb5e09380ec02a384addd9 WHIRLPOOL 2fb229e3f3d2d5a9e5f5c59275fd2596c8f4d04650f15f994a4c23d20eb947193eab0c41c1217e90a0f8730c90093168c1eb865811d61b89d18453129a05a680

diff --git a/dev-tex/luatex/metadata.xml b/dev-tex/luatex/metadata.xml
index 1d2fc95..c4cc707 100644
--- a/dev-tex/luatex/metadata.xml
+++ b/dev-tex/luatex/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>tex</herd>
+<maintainer type="project">
+	<email>tex@g.o</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription lang="en">
 An experimental pdfTeX extension that is to eventually
 become its successor. It is developed by a subset of the

diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 6c01438..34428c2 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -17,4 +17,4 @@ DIST cederqvist-1.12.12.pdf 1252423 SHA256 211c5792d24bfd5694f23bc217a161d880bfb
 DIST cederqvist-1.12.12.ps 1262208 SHA256 0e14189614e2c5ead49bfe0ecd187239f8adc3e66371b49d52163be821e44cab SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2 WHIRLPOOL fb1616ca734e51a626713e7e78786ecbff18378966c2c131f6992df248096d38e850123449d3a5a6aa111ee209f90ef48848da7366b21cb6befeccf07ce54ab6
 DIST cvs-1.12.12.tar.bz2 3197171 SHA256 9fb9176d268b9019768fc57dedc2920c28fbeda5ba224c2348550d4f25043edc SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb WHIRLPOOL 74257976cdb957e86fb9fb7e54fc8c0b7210f72136ce05327203d935195e7a3bdda0c1d616dc04cb1d6495cb038ca7275e88488eddb5d936c1cfceb94583278c
 EBUILD cvs-1.12.12-r99.ebuild 3062 SHA256 98a287f0c3a8832add2781b9fe6c25670e3f3bd4a1e0a49f7b37974cd0dc3460 SHA512 564fb49f482c3726f27f13d73f622453b894bd216198e39a1753977b6488f8f2371cffb0b5126c7471f4260deb3c4af10d847a9876d43ef0c765785d8022ac44 WHIRLPOOL 52a815104ebab0b3ca8d8bf7b60eab95efccc1d7faafa56e955bd497a3e67aa24257e9be0b9fce0bbcd9f20a437d2208186c3c8f6415eec12fb23999b4e8a9f0
-MISC metadata.xml 234 SHA256 ce7beba20d6099be006550fb74bb9e74628a9d6967c7ceb096ab99959df47a02 SHA512 a3496fff78817806f0d26ead02e33ecffa0461ae98d6d5cc1f4e2720668acbba89393516a25135bf779d46d8fd0b13c4ee83d31c825e5a199647533da746f613 WHIRLPOOL 6bbde883caeeae98119e6d7dc741843c5087f4e2629d65afbe02a778579b9fc58b24c8485ffadf432bc768e3f91998cdf5dfd819157ab5ca33fe3b157441ffbf
+MISC metadata.xml 331 SHA256 abe97ea27dc3dd970b0bdc5c6a13f144e677da4714992b73a082f0a0cb319904 SHA512 c698a58813dd993a32389cd8ddc4bcc76d4cf6a435c62ee78e1b4f5c3908ba8b55b9a3338b870b3287195d1f480401ee05f5531ca01827e8626e6d77201f2f03 WHIRLPOOL 653ede8acb3ef3f658064ca7622d28f9ccdf3a2152eac9db55c1d8f528aa869b2027159d546ea52dc27fc7e14b9d39580a9a83813d74992a05914321c0d49b7a

diff --git a/dev-vcs/cvs/metadata.xml b/dev-vcs/cvs/metadata.xml
index 4432750..4951492 100644
--- a/dev-vcs/cvs/metadata.xml
+++ b/dev-vcs/cvs/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>cvs-utils</herd>
+  <maintainer type="project">
+    <email>cvs-utils@g.o</email>
+    <name>Gentoo CVS Project</name>
+  </maintainer>
   <use>
     <flag name="server">Enable server support</flag>
   </use>

diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 5a3352b..0ee80b5 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -81,4 +81,4 @@ DIST thunderbird-38.3.0-zh-CN.xpi 466412 SHA256 8c3455bbe76b167f94f1b1f7c836aafd
 DIST thunderbird-38.3.0-zh-TW.xpi 466661 SHA256 fd10d148424c21731b877104ac50628c973348f8bc813573130503d08a0e045e SHA512 c183b8421a73253650e1d2e3bda3465aac42e0f3ecebdbaed3814218540b1f40e865ffe6028c8b2277c47241e85d9b67887fcc3b754328fd7323e8242d53b69e WHIRLPOOL 30b01926c975b7a70484ffe6a341fed0af039f9237cdc653cbe50ccc339b770236bf9e89789c958196ecc60f1d68fcc8f22aa6c26e616904d10d417229f8b1e3
 DIST thunderbird-38.3.0.source.tar.bz2 204361602 SHA256 9f3cb19a5ceabc5e8fa31f782b6d92720a77ef2c2d6c7b63b3d792cde491c961 SHA512 622731a3a6d40fabcf709e08ed20f8faf0d79a26229ab59c5a39d12b4445e090a7968055cc4804d829d6918f6879f1d47e3d453eefca58c8b68486bce20f21ea WHIRLPOOL afd0b9c0b4c1644e62329b744ad4ebd01d50e342f24d65bdc6f0634a910c6edae9d0e14b5307d51d6f2673969c962a831bb62109607ba01bd787409b5685246a
 EBUILD thunderbird-38.3.0-r99.ebuild 13301 SHA256 431ed662c7ed2f660e104d331763834a73ba38acff2bde2d658e9c541393f8d3 SHA512 fd5cd5200fbdfdee825e931c4bb8e5f96f7315d7b5449f8cb76b98b0650b7d331fbee41aa517790df2d0956aa6ea89652e46d4425787583f8fedf6965e658291 WHIRLPOOL 2d207ea175d20d97d72768bef3744ec5c6b11e5b7134a52bc321bdea39faf6fbf6b7e3ec96b335a1791f5dd150820c56aea7375e70131b77da14c87362346905
-MISC metadata.xml 1499 SHA256 9e77bf6b427591dfdb3ef9962bbc1f2cf06c56c40481fb01ff4dde58b384ada5 SHA512 9b221808f226c1e1cc0cebd0abdf3b262eaed0c3392e8302fd1933141bf95840ab40bb1869b998d51d59a85fb83709963a21c114406c2a720f89d09bc0838d39 WHIRLPOOL c0398b529a65726b321968da4bbab0c156f418a01be51d2b7533589e726a93c28200035c4e664dbea4b90622d285f68464d4774e53e5c72d8292a1910233f36e
+MISC metadata.xml 1589 SHA256 41c9d002f7dd607196cc53a05d619dfdd6b0e15ae876de52910cd693c30885b6 SHA512 93bab1d8f995368025a38d55e120293d7c466c8662cd140f71147f7558b06d9a76ed3dc0dbe430278418faee6a23b693d2a637b8924aa74a68c331b99bfb2d09 WHIRLPOOL e454f291a362fab82bfab48baba2bcff0a70247a522de4d03b1d1985a3362936ee1714b3a2cc4171dc30445155f39119eba2c5c72712ac2de9da7a0695649187

diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 71406ae..d71e1a5 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer type="project">
+	<email>mozilla@g.o</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
 	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
-	<flag name='crypt'> Enable encryption support with enigmail</flag>
-	<flag name='mozdom'>Enable Mozilla's DOM inspector</flag>
-	<flag name='lightning'>Enable app-global calendar support
+	<flag name="crypt"> Enable encryption support with enigmail</flag>
+	<flag name="mozdom">Enable Mozilla's DOM inspector</flag>
+	<flag name="lightning">Enable app-global calendar support
 		(note 38.0 and above bundles calendar support when this flag is off)</flag>
-	<flag name='custom-optimization'>Fine-tune custom compiler optimizations
+	<flag name="custom-optimization">Fine-tune custom compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3)</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
-	<flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
 	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>

diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest
index 9e3aa95..df624cb 100644
--- a/mail-mta/exim/Manifest
+++ b/mail-mta/exim/Manifest
@@ -21,4 +21,4 @@ DIST exim-4.85.tar.bz2 1784150 SHA256 13211f2bbc5400d095a9b4be075eb1347e0d98676f
 DIST exim-html-4.85.tar.bz2 467069 SHA256 fd91946369626e74842a0799b93d0d9e4a201fe640af84e1b5349fe6ff204167 SHA512 8214576300827f79c0880e2d2163f71d7f1b3fe2aff714b591a011e48816965de5a773c3509137b085fec3d4d2128931f8398768c24dad6c92b7df27cbcafe74 WHIRLPOOL a7edffd7124c4920708616d3e59c0db5159dee5f7e4fd62ce29fdba769d39781a3826d4e3e39cdc97669941bb9a5c977defe280feb73cbe159b23df4cb6fe95f
 DIST system_filter.exim.gz 3075 SHA256 3a3471b486a09e0a0153f7b520e1eaf26d21b97d73ea8348bdc593c00eb1e437 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 WHIRLPOOL ce68d9c18b24eca3ef97ea810964cc1ada5f85b795a7c432ad39b5788188a16419101c92fb52b418738d760e1d658f7a41485e5561079a667d84d276c71be5a4
 EBUILD exim-4.85-r99.ebuild 12277 SHA256 9320f7b93c2565386839054b3804a16125c078e744d6cc551e8e579f4aa35a85 SHA512 b98a3721fcf0d144ada88ab9a3761fe85cf19ffc04259f678d28822cb9c2f94c4b2271265f60db59919b3e547e88848797d172088d820f75c1107ee182c78c0c WHIRLPOOL 3fdea090d6f61748fdf86036377682d675b7e18dd92f096e9eca7f503f491184ddec5f3475d80077d9cde8697b0fb30c8505795d32d3e00e3182f169558986b0
-MISC metadata.xml 2299 SHA256 a2985b24eb4e06b72f5c3a77403fd36e511112d789c584c391f344f547b21bcf SHA512 a7d4c9faf6240b5795e1da7df99f918bf438b1bf93fbe9ce12269b0f48000beb622dfad2489337f35b42c342605cd19359edf4e581794fc33f76a4cb0d035568 WHIRLPOOL 7eb7ade4038826e0947df620a65044acd2167b32126963c3f28336050680b05e4dca211588b722e7fb8273e13e171690a5ba0114182047e0690c43fdf244b71f
+MISC metadata.xml 2482 SHA256 ec45d3ec75d244d4e842d76157f927deb78c933d01fabbefd1dc3f3a1666494d SHA512 dcda0d8164098a41d7defa30b84b36bfdc6fc1fecce2dc680aa22341f67be9dad281bdee0b6f9028459b4a62d4f3a83a16bd1cdca99238b114532c7b06f5c25f WHIRLPOOL 5bdfc907c3fe72cfa3846a183737de42315ebee92e168835347a419366049daab2b9ad236bc24889828d96dac8cd6d44711ccbe8de895ec9da909f5ec1c4d72c

diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index c94ff4f..8a96bf7 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-mail</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>grobian@g.o</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>net-mail@g.o</email>
+		<name>Net-Mail</name>
+	</maintainer>
 	<longdescription>
 		Exim is a message transfer agent (MTA) developed at the University of
 		Cambridge for use on Unix systems connected to the Internet. It is
@@ -16,30 +19,31 @@
 		quite different to that of sendmail.
 	</longdescription>
 	<use>
-		<flag name='dcc'>Adds support for Distributed Checksum Clearinghouse
+		<flag name="dcc">Adds support for Distributed Checksum Clearinghouse
 			(DCC)</flag>
-		<flag name='dkim'>Adds support for DomainKeys Identified Mail
+		<flag name="dane">Adds support for DNS-based Authentication of Named Entities</flag>
+		<flag name="dkim">Adds support for DomainKeys Identified Mail
 			(DKIM)</flag>
-		<flag name='dnsdb'>Adds support for a DNS search for a record whose
+		<flag name="dnsdb">Adds support for a DNS search for a record whose
 			domain name is the supplied query</flag>
-		<flag name='dovecot-sasl'>Adds support for Dovecot's
+		<flag name="dovecot-sasl">Adds support for Dovecot's
 			authentication</flag>
-		<flag name='dlfunc'>Install local_scan.h header to compile separate
+		<flag name="dlfunc">Install local_scan.h header to compile separate
 			dlfunc libraries</flag>
-		<flag name='dmarc'>Adds support for DMARC</flag>
-		<flag name='dsn'>Adds support for Delivery Status Notifications
+		<flag name="dmarc">Adds support for DMARC</flag>
+		<flag name="dsn">Adds support for Delivery Status Notifications
 			(DSN)</flag>
-		<flag name='exiscan-acl'>Patch providing support for content
+		<flag name="exiscan-acl">Patch providing support for content
 			scanning</flag>
-		<flag name='lmtp'>Adds support for lmtp</flag>
-		<flag name='mbx'>Adds support for UW's mbx format</flag>
-		<flag name='spf'>Adds support for Sender Policy Framework</flag>
-		<flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
-		<flag name='proxy'>Add support for being behind a proxy, such as HAProxy</flag>
-		<flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
-		<flag name='redis'>Adds support for querying <pkg>dev-db/redis</pkg></flag>
-		<flag name='prdr'>Adds support for Per-Recipient Data Response</flag>
-		<flag name='tpda'>Adds support for Transport Post-Delivery Actions</flag>
+		<flag name="lmtp">Adds support for lmtp</flag>
+		<flag name="mbx">Adds support for UW's mbx format</flag>
+		<flag name="spf">Adds support for Sender Policy Framework</flag>
+		<flag name="srs">Adds support for Sender Rewriting Scheme</flag>
+		<flag name="proxy">Add support for being behind a proxy, such as HAProxy</flag>
+		<flag name="pkcs11">Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
+		<flag name="redis">Adds support for querying <pkg>dev-db/redis</pkg></flag>
+		<flag name="prdr">Adds support for Per-Recipient Data Response</flag>
+		<flag name="tpda">Adds support for Transport Post-Delivery Actions</flag>
 	</use>
 	<upstream>
 		<bugs-to>http://bugs.exim.org/</bugs-to>

diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest
index 9155ef2..40e1b14 100644
--- a/media-gfx/fontforge/Manifest
+++ b/media-gfx/fontforge/Manifest
@@ -1,4 +1,4 @@
 AUX fontforge-20150430-intelligent-execinfo_h.patch 1180 SHA256 0459b390b0d889558ed8af8af0fa2bd9cab2fd780b64633e89e9350eecdf87cc SHA512 f86fcc7fc44c0ea03d11a75fbab1d8db37fd13829d0c8d31cefb3d0ad8bec3b3190af8bcce4d84491df8c200920c1b0734911a27a86b4a6d2fe8f0003ff03832 WHIRLPOOL 3311e115294d63d5d9f37d1b83a619ebd15260bd34a4382ed9988226323caa10b8879e5a41f9db9347c9d8ceec2da9c9bc957482e1d7b8d5584d3e60623ee7bb
 DIST fontforge-20150612.tar.gz 125037727 SHA256 0f4ec68a648f7f845d54d1e87cf5fb246a16d528b74e9e1a9b815418510022d7 SHA512 01a38bdbb55ba3b2638b55caa2f768ba691fdfa730afd843df0cf62417db5465731ed968c5ab7c026622264e20c20fdfd8ec0ceb50da71039588797fe18393b8 WHIRLPOOL 6662bc52669153ba46e562fbcb287f5bff59eeeec7fe9afcd65918f892282650ab4be4f279fe6fab95f02f36caa753900693532ece439bee114e774e0da3f855
 EBUILD fontforge-20150612-r99.ebuild 2810 SHA256 3b114ee1f9d80b093383fda2cab95e5e04eb0c70405ce41682ac56d7eca32300 SHA512 5bfca1da0c969108c2ae21de7c92cbbe14f54eeef2e5770a6c0eac3f4b39deb36e28cb4c27d26d060a1eb59fa85530d92d5075204b7347ad4ef0c337564d4e0d WHIRLPOOL d4bbd6a2624e76cf69a08a74b511b8d619a8c8dcfa338d30a3b629bddc53737b886fa5910a4027e3fbae1ca7e327e13212fd1f1232aa70907ac15b115ec642a5
-MISC metadata.xml 762 SHA256 0d44db011fd5b4156017de597f4afb5cd5409a93a94cd111659ca0652aec098a SHA512 93b0e2edf50dd8fe1a869e27daa6eba0c491e5989ec9470d589e4ae05f0757f91acfb749744a8bb7aefd05f3d62a4f2bd93a65f48cfbf3241bd5571c88252e23 WHIRLPOOL ab0d71136bcb13ec864e218b55bd8992461e1a53b08535170341b90484d3fc2a7bd70379d865515c1bdb4398e1338b8da033f56b8b47329cd8b94490f841d5fc
+MISC metadata.xml 1782 SHA256 620a89b7a0b6535cecc0759af630b13aaeb525d25f2039f4c3bcd7cb53fbb33a SHA512 51c82bf41ac26c3b859cd019473ee04a6f5559a0f9774826747eefcbaf93b9a424473f4455511e78f19b701354b27c45195d637efbcdcf0a125e44f33c71e307 WHIRLPOOL f00a5761851851fb04266676aa2f2d9f9b0135ede3d1bfa54d718524f6c650c3d79fdd14faf0376328862fc0549c9d7e1b09adf454c65915aa85446d37035a21

diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index 8b121b2..6f5d8c4 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,22 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>fonts</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>floppym@g.o</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>fonts@g.o</email>
+		<name>Fonts</name>
+	</maintainer>
 	<longdescription>
 	FontForge -- An outline font editor that lets you create your own
 	postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
 	(bdf, FON, NFNT) fonts, or edit existing ones. Also lets you convert one
-	format to another. FontForge has support for many macintosh font formats. 
-</longdescription>
+	format to another. FontForge has support for many macintosh font formats.
+	</longdescription>
 	<use>
 		<flag name="truetype-debugger">Enable truetype debugger in
 	fontforge</flag>
+		<flag name="type3">Build in support for type3/svg fonts containing
+	multilayered drawing with strokes, fills, images, etc. Type3 fonts are only
+	supported by postscript printers (not by most windowing displays). They are
+	capable of more exotic images than normal fonts but require much more effort
+	to support.</flag>
+		<flag name="pango">Enable pango font rendering</flag>
+		<flag name="pasteafter">Controls whether fontforge has a paste after command
+	(Useful for making words?). This is kind of fun, but it isn't useful for
+	normal fonts.</flag>
+		<flag name="cjk">Controls whether fontforge understands the gb12345 encoding
+	and installs cidmap package to edit CID-keyed fonts</flag>
+		<flag name="tilepath">Controls whether fontforge has a tile path command (a
+	variant of expand stroke) This is useful for very decorative fonts, most
+	people won't want it.</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">troydhanson/uthash</remote-id>
+		<remote-id type="sourceforge">fontforge</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest
index fb38f61..17b06ba 100644
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@@ -10,4 +10,4 @@ AUX saned.confd 76 SHA256 197e44ba1f438a18f5f7d9f5858feb19c1ece4286d82a5e63caf9b
 AUX saned.initd 411 SHA256 4dd4e7fa07bf2ab2d4f5753156f5df0ad2277523f6755b0eab3d2db3480989e2 SHA512 ec9c11c84dc405981fd854f99007a5fcae5403685894acd1d1108fc772147a54d9fad9103dcff708765efff644e972260459c19fe439af17db76562dc1b5ba84 WHIRLPOOL bec23753fc557a36a6990ed565519bb62e1bc9a6bd81c0c16cc956cd6dbc1c6fd661775b8c8bf05faa1f5bbbef2406498094a0adc48c9fd81e89f4531669c4e8
 DIST sane-backends-1.0.24.tar.gz 5778749 SHA256 27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d SHA512 1e9f962bb9d27f17067eb662dabfc0a1aa0d06e16bec4bd28868124b468578d82f14f6d2c1f5de63d2cec57ca4584ec12d3b2c2b1de20f1199aece581453ebc5 WHIRLPOOL 19b939c920a3c157044c85a941debdc664d8781562fa3fc04f061b9d216b089be80edfd43479069382adf13e68160518fdbd5c84a5f4c506a46f8521d4ed2a1c
 EBUILD sane-backends-1.0.24-r99.ebuild 7662 SHA256 0d631f5ab4b58cce3c28417c02da0382f91281823202a41bc3f03a64f0ae709c SHA512 679a7ceaf6c4d621baafd2e5de968eb3f59a07cadc3d42a7f457662aee847dedc19e0213a6486223067e2cffe860ac83efadfd64c0d25d3fbab49634c26d2133 WHIRLPOOL 32840ad2b7900da0ddeaceb3256dd881f5e1318c20e92393e25acb21d34de2b42cd2f6feaaa8380ab56ee64ea79c5b0388dab7998ca2c974091abbdb6526996a
-MISC metadata.xml 233 SHA256 c5f5ebf692f6c9e98fb12ac750be2e67f8b316b820dc6d36dfa3f22fead02ca4 SHA512 76ddd2dcdfdb17b98cd96ee032935125b95ee8b78722c1049b9beaef6cf482760c6bd7791d77ef5ca52c4185a5c01222a5f874c033ec3788cce2b4906ed18682 WHIRLPOOL 30cd038d04c297199c5d1d340f3612ce5e4226c099e1272b6c3257c2f9ff61cac32b577ffbcbdee7f888f8ededa9fa6d5aec6801249b2db53586531788f39229
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630

diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index 95a1b7f..097975e 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>teiresias@g.o</email>
-  <name>Chris Brannon</name>
-</maintainer>
 </pkgmetadata>

diff --git a/media-libs/libdvbpsi/Manifest b/media-libs/libdvbpsi/Manifest
index 48a11ef..5b9d717 100644
--- a/media-libs/libdvbpsi/Manifest
+++ b/media-libs/libdvbpsi/Manifest
@@ -1,4 +1,4 @@
 AUX libdvbpsi-1.2.0-musl.patch 239 SHA256 4cf3301597bf520ef62750275f29273df553516230d73b0150d08c706fbcb727 SHA512 c81eecebd0bca9320bd2cf906e78d828b5463c4cc04f93e3ce1e20b9e31c33b51eb38961865495ff044983ca648d83d19041caf13d0abd8fc39192cf8f118de8 WHIRLPOOL fc103b1466b7288c8e83d38789765e0d29805772d9a0254a1fbed5641553bc83515a5270b10bfe171764f8abf0b865c9076fa4af9a1f77d4a502afd90926b5eb
 DIST libdvbpsi-1.2.0.tar.bz2 461372 SHA256 36d9b233306e48b58999e87864253b564e20932ed46a485e44ef7058f1f927e8 SHA512 951db13f5645d4d6a160719fc6ac97fd31a32d5d17cb8e26db94702e65b6fac3d4e7a99c3c417e09fe5ce33f3b0c0ef86206c77b36816dcd8a3bd5b0bb4a9684 WHIRLPOOL 103c602d65177a973c073e09b62765ac28ad30eddc1ad9c3a1dc70d6c93e41599f97c2c0fa6c99f7309e51b7d2aee9d2bb5e3cdcfb2b44929105cfc2cc4f66b3
 EBUILD libdvbpsi-1.2.0-r99.ebuild 997 SHA256 861ab14fb33c3204162238b12aae9da55f1b12fe3983dc13da86c6ed32650916 SHA512 f7e0f8b4855bc5fd335a624bb65abc79dc707455c14772e633d12ddb9a3e0f71182f24c5c238a015cca53dbdedc0eef5cba5897762ac434f016f7a6ccb38c9cd WHIRLPOOL 20f07eafae81a310923155e08966854cc10377f1a8b7aa259c2dba43e2fe490b264cf74cb8e80ac7eb4c38ba9cff4f472f164934555a1512ae55ef86bf784a7c
-MISC metadata.xml 220 SHA256 2356fe6e618f7034ca8cb3c804d7c4deb01252923d4935d311a599b38a8ac69d SHA512 11887006742f5262b96ea78a744d514f7be4a6a6ad87ca559c9cf50064ecc3595c491a0560048488bdd55f8c893dc98c47bcf58bfc8095fe2e36fa0b4bc0cba8 WHIRLPOOL 4dc0d924816d068d26f95efd1a66735fdc9eb5f8c0347aad7a169978fbee2a26fcb04d6995a982ba1dbab7b9cb80a3431c81cf7d40f890e823f29e67bce36ab4
+MISC metadata.xml 212 SHA256 1de5b77b4ff39f75e4d7c47828c9010d16af3e949ccf9e06e936ba0fa082eeb0 SHA512 ad3eb85555c559c56e2fc097ed106671a78bb16ea63253de1786772a1b914833c2af673da087899e1b06f5db150c283cccb81fe8591c257f91913f2ae22a039b WHIRLPOOL 4b7d234f23500c9490aad41bad148d212555278a8454d0d151d3909c44188fa640a752f237a0f7cd5560892091e736581b4ce6a1fe472e446434bc75c46b6580

diff --git a/media-libs/libdvbpsi/metadata.xml b/media-libs/libdvbpsi/metadata.xml
index 2677d84..d76dee6 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>media-tv</herd>
-<maintainer><email>lordvan@g.o</email></maintainer>
+<maintainer type="person"><email>lordvan@g.o</email></maintainer>
 </pkgmetadata>

diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 4a69595..29a6432 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -1,4 +1,4 @@
 AUX libmpdclient-2.9-missing_headers.patch 425 SHA256 5c67b0fe86223661ad40022a40321e6f2779bd2d984efb2f889645cb9d605266 SHA512 a43aba9b23a4aa06066ddd84bc606a4fd5b64ef3a4815f5bf63b67d02394ef22c76e36da23b5d9678fb9c17aebf7441eaf1483b0c3e285b7f43d3b186666d7e3 WHIRLPOOL 2f4a01ff43f986359d8bce29041dc2d06e7e3c30befde1766c5f9361914a40169ed72189dfe490813376594a6a4db52111186aacf90558f0bdca456cf5b9ccea
 DIST libmpdclient-2.9.tar.xz 253992 SHA256 7cc97ba560e91addafe5975f7e7da04b95d6710750e47b3367fa0d8c3b7699ca SHA512 7e6af51e31a3319e6681dfe5199fda1b2c1482f6aa6854af7c7f02c999fbbeae4f369c9b157abf95402c7f022d155109454b243549185ba791df5b2457baaba4 WHIRLPOOL d4d78a83bfa300be8df37e321c3b8ed535bd7342acc1ec371a2aa59a76efde79a9c4531bc8052c5d0c2c423d808f23b2e5d3b92ccf5c9dec4f2a120b615a4992
 EBUILD libmpdclient-2.9-r99.ebuild 1031 SHA256 20d41659f5e78e1a3cfc856d273a88ef6b73160353b2ed50831122e80b6996b8 SHA512 b9f2dbbaf3014a56dc91ee54c0faa43d6236d9bba84a02759afac6a8771f11c9093076fcf0474ab71c989dc3423e7ad7380828f32faa64bbd61b3f0c34aeeaa5 WHIRLPOOL 2cf5f6fef059dbef4531e268d1555a94150f075149cb438cfa898ef65e00c510171f42c62b0b4ed9cd78b56bf22ee1d378fe61e7cd4ad1bad9623ff1c4eb1881
-MISC metadata.xml 255 SHA256 424482131b9475b8217fb609dc705806689e6927c93a7e6428437e30bde46f1c SHA512 d9bf9555ce80d32a1f3440e44cc1dfbadeeeb442e0722fa8bd6b90fa8cdcf31f7be8cb31acee92a94ae6ec63e79ea325917e2965b3dd6b34831651ad097fc57f WHIRLPOOL 9524e80335c42df064511f211bc84b8943626e5c98fdb2b186cac973bc980e406d378f2bbfac1616ff9134fe3e250872087437460e1f28350d3ac5f96b69bcfb
+MISC metadata.xml 362 SHA256 3ace0ad6a9c2ddd0d5359d6f604aeb990237fb2ede9c63175863bb9557732364 SHA512 6a848bed1e14de066614e40cf0dcca2910675dfc8877b5b8de0e640f1b420b8397547354265a9bdb96828a548c749dc2ee302d0c6fa0252ea2b85ceba1671932 WHIRLPOOL f9333a03057bebbe9d3e2fd0b3617bb8e98945639344bca49c825de6989cf3bcb406cec9806bddcf87d615c5f348d692276046afdada54c0450cfa87b72483ff

diff --git a/media-libs/libmpdclient/metadata.xml b/media-libs/libmpdclient/metadata.xml
index f939777..f7badfa 100644
--- a/media-libs/libmpdclient/metadata.xml
+++ b/media-libs/libmpdclient/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sound</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>angelos@g.o</email>
 		<name>Christoph Mende</name>
 	</maintainer>
+<maintainer type="project">
+		<email>sound@g.o</email>
+		<name>Gentoo Sound project</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest
index 8bfc038..d41dd64 100644
--- a/media-libs/libopenraw/Manifest
+++ b/media-libs/libopenraw/Manifest
@@ -2,4 +2,4 @@ AUX libopenraw-0.0.9-jpeg-9a.patch 589 SHA256 6cd4b7abe8752890b57a4cf2987435c026
 AUX libopenraw-0.0.9-rename-posix_close.patch 994 SHA256 54a3859edd21ad4662ca07e9e6467b1e0a1a815d72f33224d6d51ebd6cf461fe SHA512 a7bc0887a24522ea03ff6ae63fdbb7fecb5fdd13f7881904a9afe15d86167cf39b468d4caddd49551117b51ecd5d91671438cdf3251869a8a0d593542062204e WHIRLPOOL e37c786db74058b0005b7f5c3613b1538b379519bd1f0a45ebf359815214c2de8842b65ebfddd9ac35399f619ea88f2883751664962c4179219a5dd529bf6d7e
 DIST libopenraw-0.0.9.tar.bz2 478687 SHA256 49fd1adf0a0228c7a17a79bf98d8d03664195feae1e50f4ddd1b20162626e18f SHA512 88d475d27719212686a0a5a08da04d6879fd456ec8f7531f401217df97f4f3d4c52dc8c4fb1c6ca88c12d6a67ecd516b151c5e9dceba9cbfcd13150fe81d6db5 WHIRLPOOL 52d407b1d443fe7c38c59274b3267feb4dffeca9114a39cad925c346ae21d1378cbceba4ce1973657073f8890bf50a18c476ba3451d806fe7f50824bb935c559
 EBUILD libopenraw-0.0.9.ebuild 1245 SHA256 b8c2184472dc0875c4b8806dfa64ff61306524049a85824f499a8480c5f45359 SHA512 3606ddb443edc46415eea81f2ed739e32ac9cfa99bde0cbad294c7c5c32ba5031cb758f2274924e56bff228f286fb4bf400920938e42dde068b19aab52f0f556 WHIRLPOOL 4a7837a84dfb930dd07a8be74d2535eb77cc2c7478df0f127b9f4fcda5fed4a3caf09418653101b64b303b6dce83fe576fb7a976d8475679d1be7e1adf889dcc
-MISC metadata.xml 234 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97 SHA512 eed880663c66280f6688f896bd6b82d600cac0063eb79da7b1be0fe3bf866e7289edb389a505dfbf45bd9c7e5282748dadd7bf3477759788c1024300796545c3 WHIRLPOOL 79028c7efb93b6255351aebe7f35d1587d07ec1405e8fbee4fd874e42e57e6d10368b0f4ab60c89e115493a094f36af8be1bc2fe79fc2d34daae83dc0f8d7b16
+MISC metadata.xml 224 SHA256 154bec891472fe5526579d16d7e5e5e9eb3f352512a17555a459aa6029bcbbb2 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44 WHIRLPOOL 541aeaf2a7c858734aaae366846865ff70e6c898204bbfc9f39f58fbdb53d9b37dc8c898c23870859a9d4f5596e7898e21874c9ef529a447953a35e4d7bc13e5

diff --git a/media-libs/libopenraw/metadata.xml b/media-libs/libopenraw/metadata.xml
index 8c86806..fb76b94 100644
--- a/media-libs/libopenraw/metadata.xml
+++ b/media-libs/libopenraw/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
+<maintainer type="project">
 <email>freedesktop-bugs@g.o</email>
 </maintainer>
 </pkgmetadata>

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index d3fb157..a6609c0 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -4,4 +4,4 @@ AUX libv4l-1.6.2-off_t.patch 603 SHA256 ee7cebd020b29a7ed9a92fb2ff5be76d37fd7146
 DIST v4l-utils-1.6.2.tar.bz2 1148309 SHA256 d3d6eb1f0204fb11f3d318bfca35d5f73cc077f88fac7665a47856a16496be7d SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2 WHIRLPOOL bd1b825354ca52e62e8c5f83d43bfd2cec63611c65d6b2709a7274fd15ae0fa21345d2b95a073c0b3a33b7c94b304562f1efcf112e1357a58515bd0d6f37f396
 EBUILD libv4l-1.6.2-r99.ebuild 1669 SHA256 0a1698c817fabaa210e27fb0bf8a592b556048cd604fe34fb418446585a32ee8 SHA512 a5b27c60d4f16e92f11fdb576eb1f2df3622e837f8c6e6fd541468292edb6e6b30dab9ceeb914d5b89854d3a16cf2b9d283ae71b0b5cf27f2540aee166f08edd WHIRLPOOL ff6f0bd05b656caafd7ad1a502f5bd6a18438441f01524019fea6f5134271cd7655ac8fd10b7c8c39ef1bc3989289ce8fb37403df686f14c1cc848be1a4d1f68
 MISC ChangeLog 14089 SHA256 8a391e108dc68ef56ec624d5e70dd0ebaa0e785a4be52691e8b981d468d4874c SHA512 5c1487b3a326874cbc59c5a0c0d7e08bea3fbead61fe10ca66ff7df1f32bed52933b698149896a4da1dd05e4ed87d209d0bb24ee57f0f4a448bdb09db0c2dd7e WHIRLPOOL 987d5c2af58ee15aac70bddf0fe39fb09ac5f0cc9cfcd0ac84a8836b21dcd78550d2691a85e5100d1880d47b447dce9c8b0dfa2a9b707979b5697efa1be9c85d
-MISC metadata.xml 1135 SHA256 3aa2704309b6a8c6c1d407871f5765ae9a35875f83ea140f24d67639f1926c1e SHA512 e051f1b40363405e66d863331f965e643722474eb83250a998a4d920b86ab615d217e1aff251651b2b70aecf938708a5d7669fab21e8586b5c95472edf35042a WHIRLPOOL dd1ccf47f383388c51c6ac1e904a05e569dcec6473728c5464d6424aed5676c82d498126958254c14b70dbaf3ef7be1a23bc36d098dd7e50ff3a07c502455fa6
+MISC metadata.xml 1125 SHA256 1be1fac7b283729b4f1ebc9f53d12d21c6fe65839e7981794633ef8072209558 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7 WHIRLPOOL e777f9b89fcb3b6626b5ca250606186f60b1f7433ccd3ccbad08fcff88d3b9b66a1ce41a7cca2684e926aa66fb180f29c3be4705e5c4bc893b3a019854213bd4

diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index 1e04bfc..e0bdc27 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-tv</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>tetromino@g.o</email>
 		<name>Alexandre Rostovtsev</name>
 	</maintainer>
@@ -25,4 +24,3 @@
 	application transparent libv4lconvert conversion where necessary.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 98a9217..ca24f64 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -9,4 +9,4 @@ AUX mesa-10.5.1-fstat-include.patch 1008 SHA256 4d44da3882ae9ae7c5d255189e5ca865
 AUX mesa-9.1.6-fpclassify.patch 618 SHA256 b02df9b6850d46d251dd51213800d6608195487d0bc91aac79df75616b7bd6d4 SHA512 e7f61451bb05caaeecbe19b24d3c44cecd54a3f10d40701973cf061dc5396c7dc0220c19396e73d5f8d8a8febf34789333476cca62566667d827ed5f68155d4b WHIRLPOOL 4df278e552808cf8656c1319518cd8e37ffd3189e482efae6401dfd43febe733a8e57135d1d4886906fc37b495762c92ca24e5a5f98fe7af59df405e54a4b946
 DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c1f731d0d4b5efb5231063fb6a5b SHA512 bbc027c4146c42aaa160990f5281c71a342d32c10ba56f91da1a60dd4cb7d620ff49b72553d24bc1d87470e2baf9be81b5bdee9abe49d6acc57902fccb9e2e5f WHIRLPOOL 7fa32e70c6aabb84a06f2f852f77eac839aea08726c442742b3d3abdb94a0fd9f033439ab0cb16865f4ee14e1538cb86937856bbdfd1f9090e8e7c43eac52e03
 EBUILD mesa-10.3.7-r99.ebuild 14707 SHA256 5d7bc944628f494641d79bb39559d0e459f89770f7b2691d79c2f6420d3b7ab9 SHA512 ed82955c3d2741a73ec3082680e5c93b9708a3c159bb836e01298e88cdfc9028591d0050d8ef76dfeb4304f7c0c53e38aee5c130094bbff5d3b93ab609d26391 WHIRLPOOL 26430225f044f046f0229f62f3c3541f169c87b5141973edbc8ffbd6fa57231ba2479ab0d42be0b61ba4ae9dce140277099c20228da2ead18a7b0fd8d2b54423
-MISC metadata.xml 1674 SHA256 f0f164517f72cd4039af02bfad25eff79fa4d2112a5ea80859283ef825988a9c SHA512 f0964d1023805ad6beee2a6e168d7c1539e0180096397fb075dbcdb66d0b035fead201a8ad7082683c1305b8b53de3803418ef10b56fafdcb0f9af0980110892 WHIRLPOOL 557c7fe953399423774d885f726f446ae9181222f54053d7d282c568b4b4786c6b7332ea381fac664d304bd9257d195ed7fa3da3c4242e0a34bfce8dd99432ef
+MISC metadata.xml 2031 SHA256 c73e1a9bc99045751417552228181f11eee19a5c654968ea353c50c3da96daa3 SHA512 b79ddf5ebd7832ff173528eda54d828ef2164b128386a586fa8e4f56edb3831316b67c5a89c7f575dce99ff83e52776d1fd324734853c5cb546bf58adbb014d0 WHIRLPOOL cd73d9e2cad9d61d68d46ecefb1b56fdd35adeb79cefcb8f150af203bc928e420fe673b4947d0c6e3a46d63e2aa2d88085edba229c387ab98a0b0bce59cf20c2

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d5ef123..88120e5 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -1,26 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
-<use>
-	<flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
-	<flag name='classic'>Build drivers based on the classic architecture.</flag>
-	<flag name='dri3'>Enable DRI3 support.</flag>
-	<flag name='egl'>Enable EGL support.</flag>
-	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
-	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
-	<flag name='gles1'>Enable GLESv1 support.</flag>
-	<flag name='gles2'>Enable GLESv2 support.</flag>
-	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
-	<flag name='opencl'>Enable the Clover Gallium OpenCL state tracker.</flag>
-	<flag name='openmax'>Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
-	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
-	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
-	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
-	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
-	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
-	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
-	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
-</use>
+	<maintainer type="project">
+		<email>x11@g.o</email>
+		<name>X11</name>
+	</maintainer>
+	<use>
+		<flag name="bindist">Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
+		<flag name="classic">Build drivers based on the classic architecture.</flag>
+		<flag name="d3d9">Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
+		<flag name="dri3">Enable DRI3 support.</flag>
+		<flag name="egl">Enable EGL support.</flag>
+		<flag name="gallium">Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
+		<flag name="gbm">Enable the Graphics Buffer Manager for EGL on KMS.</flag>
+		<flag name="gles">Enable GLES (both v1 and v2) support.</flag>
+		<flag name="gles1">Enable GLESv1 support.</flag>
+		<flag name="gles2">Enable GLESv2 support.</flag>
+		<flag name="llvm">Enable LLVM backend for Gallium3D.</flag>
+		<flag name="opencl">Enable the Clover Gallium OpenCL state tracker.</flag>
+		<flag name="openmax">Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
+		<flag name="openvg">Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
+		<flag name="osmesa">Build the Mesa library for off-screen rendering.</flag>
+		<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+		<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
+		<flag name="vdpau">Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
+		<flag name="wayland">Enable support for dev-libs/wayland</flag>
+		<flag name="xa">Enable the XA (X Acceleration) API for Gallium3D.</flag>
+		<flag name="xvmc">Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">mesa3d</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 29d510a..973c72d 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -10,4 +10,4 @@ AUX netpbm-10.66-test.patch 347 SHA256 fb95a101811a6e8b983d6f82130e511658831e6ad
 AUX netpbm-10.66-wordaccess_be_aligned.patch 942 SHA256 3a0c8120c69cd6f6f53dc51ec15944d17486e7d6d7a4cffc5a69fb2b94f863b1 SHA512 b3b33b0e32c7bcb126104f0f100b56cb811c1ce5051be854a93d0227d9a684e440dd9e0787dfe3f4cb12df1fef5b2e6d1ecb6c3a49d630a32595a026ae1fb482 WHIRLPOOL 2288bf481ae97df10b56d89a022b16659dadafdf0c207bc4a5ac501f029d0b4633999691f2849f8f1692be5d9370944e6e1a501dcb082482f0b8bb9cb843ea97
 DIST netpbm-10.66.00.tar.xz 2575356 SHA256 7fe94f38e139be194e9e384e8d9c9747f2fe08c18295bba93c55a41c5bbf63fc SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af WHIRLPOOL fa937fccd2da9068a268d6a5729c8093baacc3025ab2382902611dadab985247fdacf3433f6e15407b081478b93b772237c41363f37340ea6c93c169357dd0cf
 EBUILD netpbm-10.66.00-r99.ebuild 5732 SHA256 a25308c0bad8df8f1395c028d33fc7df280967c1c702536844e1a71a24cdf593 SHA512 8e44e6baefba2cf43872906a62d3bdfab19c096556db9a74af1e23f288188e089e5324186c243ed1470dedd59edf1d4055efd74bcf5e00540ba2884b5c037170 WHIRLPOOL 62fe403f2d09d6e376da31701436a0452ee18c30506b885c606ba18f9c381b09631231009a2c52840f0a39ffd7dc867afa6c6896b8eae723117c5ffc867a0aa7
-MISC metadata.xml 261 SHA256 e04079912e263782a8c0e4f115e49ff3694535ff2efef7b7fff85cf8d100102b SHA512 e7bcb8f689bd7da37e414a3f33b125d52a5ec0d376e821edd58d352ffb502098fbe8b7d24c0eb073822e41a55c280f84558ca4314dd37ac20adcf6471bd712af WHIRLPOOL 9aa2223d48bacfa917affeb56dc180becb54fc612e69ce6d26496d45cc42fd1050e2a40c77957ee7f37b3e2665adc0c95f08b60fab1787d3292905f0a4c8092a
+MISC metadata.xml 434 SHA256 c4381dbe1764d8ce6fdc2fbc9630eb0d5d769f1fe39847dadbfeb8109dc218b7 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f WHIRLPOOL d41b9d9b4a1d9a438e94bf2e3bbac905f142ca6b718d0020db37af25bdaaaff9899729fb82dd3f266b19ee949b850d521cb8995833201b64607ff49708dd3e6c

diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index 8674333..ca3e23b 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>graphics</herd>
+	<maintainer type="project">
+		<email>graphics@g.o</email>
+		<name>Gentoo Graphics Project</name>
+	</maintainer>
 	<use>
 		<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">netpbm</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-dialup/linux-atm/Manifest b/net-dialup/linux-atm/Manifest
index d2372f0..fa9438c 100644
--- a/net-dialup/linux-atm/Manifest
+++ b/net-dialup/linux-atm/Manifest
@@ -3,4 +3,4 @@ AUX linux-atm-2.5.2-mask-on_exit.patch 486 SHA256 4daf19533f682b93c1040b90d80540
 AUX linux-atm-2.5.2-remove-SYS_poll-hack.patch 654 SHA256 5d167f63b7d57b4165cac106b83568bc8bc9a540cf25f79f8f071b0b36fbab2c SHA512 6347356b3f160e62fd8b2578503c29f920bfa404a73553f9cde35f2bdde2d001aa5df490c3a348decff1e915ab34e99989aa0ea517a8c31fb097e108d51ab0e8 WHIRLPOOL b818c13ffa1d44ebb06d6484f0497dff914fa4570b5c15a07b3d83efa16faf60a311195bb46e6e5802fac65d639d7758b67ce8296b955e6222ded6d92b41055e
 DIST linux-atm-2.5.2.tar.gz 1082256 SHA256 9645481a2b16476b59220aa2d6bc5bc41043f291326c9b37581018fbd16dd53a SHA512 0a50e91513e4e1f882dc6f4792dc032e89497ff745c0eaea0c0c848b0f84e40d19e038e4ab5aa70c1f915c28a9f845340c332ac5c3ae838b8f539466e10a0a08 WHIRLPOOL ddff2b022bd94a64662e2feb8588b0b7a1d33380aaca91888d57c90602ec777f8db308f62b33846f9b2f40dfd7d6b40ca4ddd9d430e1c6bc8a36cdbb4e370771
 EBUILD linux-atm-2.5.2-r99.ebuild 1060 SHA256 2a3b9a148a0101f084801dcf929628ed4ecf8f0a3638b298f1fd162715c7b3a5 SHA512 dec99034975a8e019e2b0701729b5c0df7699044139847602c8f3b3879e79979e1a326d0ba90f68b2a16ae877b93a7947750e2119fe3d7ea22ad8938acf35653 WHIRLPOOL a64d261484aa5702eeba2f4c27bc97d8e8885af3d4a3d4ae8748a28ef14e41f2e594667856efe16dddedf0a36e628129098bc1225064ff423135dd6d889b16cd
-MISC metadata.xml 300 SHA256 e314700d28526216302aef8a8dbac4a08b208a6d2420341cfe70ad398de5f53a SHA512 67c47018a7b1326a4f860cbd40a63462c6086721992770a2bf640c8ae7fcb2ceca4b5404305a780b9afad7bf95f018c71b37834d4df2a59d8441f0b4ebfea776 WHIRLPOOL cf1ce2540ce06650c2ad73c0ddc47422428c783739aab3a7c5e32805f2b628dd0e9516bb4c99914d6994ea31f31519c866e88a372d9c0e1be2e6f1e9be103df8
+MISC metadata.xml 274 SHA256 41c0af44b56f2c0662adbfde0249bbcabcbf0791350e5de60cb731bb414eda22 SHA512 81b00453ccffb628c4268f9d387a84328206de79ec15448fa3e0ee026b765eb95f7f5f768cc0fd970590b57b2cd9bb290764f445a0703b8b4d0e87d96bbf9aa9 WHIRLPOOL ec512f2ceb1d0d1d229c099d96da720784a79b715d49713bc69f8ed627f0976f5a44e2878958b142e22a3b6a63b069097af57608dd072e4e4265c47e7bbb7206

diff --git a/net-dialup/linux-atm/metadata.xml b/net-dialup/linux-atm/metadata.xml
index cf1b28e..34c6567 100644
--- a/net-dialup/linux-atm/metadata.xml
+++ b/net-dialup/linux-atm/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-dialup</herd>
   <longdescription>Tools for ATM.</longdescription>
   <upstream>
     <remote-id type="sourceforge">linux-atm</remote-id>

diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 8200ad6..1ea2d2f 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -7,4 +7,4 @@ DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7
 DIST ppp-dhcpc.tgz 33497 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644 SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738 WHIRLPOOL 74e5e0d7f9bc52d1b9cfeff83fe74c2b38cc10c60636cd9c0f5d67d61dc7da56dbf2bcc84afa29444546792876cb36afbc853a6515ce9b3d83d6de98eacedd1e
 EBUILD ppp-2.4.7-r99.ebuild 7034 SHA256 2e5da5c46173eaff782b639bb1b49f4206b817fa3fba1fb7496ec030877128dc SHA512 fc2b3cc3d2e267d9636e326e0ad8c45a414e879f5d7452b6218904d27a99b5a2c4c193d46ed22d6dc04b32f6e48c21198a9dc21ec523f7427eae1bd2f97960cc WHIRLPOOL 2327bb37ce7f23c4d975ce715651ccb433e591e30da7f34f465c0e9fe82d4c0fcff743a127752d948d28e3d0499ca1a9e452970e35aaac4166076bc214cef351
 MISC ChangeLog 48359 SHA256 7fc888cc470be8f7d8fb3dc93e5f47663040b3a7b831714a6df5a3a9709e7b59 SHA512 21979dedf9368f3b3135b54dd7ce8db70c105461bfdd2b1c2c8c3d1986bc6285a19621cfcca52a4130e0d32997a89bf3cdbcb232159987689689c14bd81145b5 WHIRLPOOL 597664594efeb789dcefd0e7ea0b722a53463910757c57994c3b13516d338c86157a3d819fd7367c63155e78bacb96192079753f2b184c88beb65319534d3fac
-MISC metadata.xml 1437 SHA256 ead1d034656325de6aebce34890880e837b002baebcc9064218913b0b1796216 SHA512 1113d280079f4ba1ae4d12106ffeb6bda6c4fa72a8514df2522b7f3db556b4931f4960d4567ac093558cd266de0eb3cdfd1c955047b7ab12bd9a8b7588f2f143 WHIRLPOOL 02f4409c8e891ada907f775a6c68f65ab5a0d5eaae6bf20d4323cf592cd91cadcb5124f08c030327f77df079f9e57e5a695f59d19b8226f7453553de6db9c9fd
+MISC metadata.xml 1649 SHA256 9792ff1d071c342fa42832e9b5341a40102885c7801b7f9604c956d048f95864 SHA512 728cc22f75a18d16595d2139622b0a7d1fac65b7149d5a9144acf17ef72201bbfb3d4f15990b15bf9cab1bb05af6525d366f2c2484ee5b7b3fc04dbf463d5b2a WHIRLPOOL 1eef54aba8dac6bfccb83cdef865ce297c2faacde3b9226a92a633b68f7a470b5153554302ab5e23bd2fa0e41f22691bf5093b52de94a25a93ecbf403085d4ef

diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index a80d7e9..c5184cf 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -1,7 +1,14 @@
-<?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>
-  <herd>net-dialup</herd>
+  <maintainer type="person">
+    <email>polynomial-c@g.o</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>base-system@g.o</email>
+    <name>Gentoo Base System</name>
+  </maintainer>
   <longdescription>ppp (Paul's PPP Package) is an open source package which
   implements the Point-to-Point Protocol</longdescription>
   <use>

diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 540a664..c80c777 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -10,4 +10,4 @@ AUX systemd/iptables-store.service 240 SHA256 14965fd0f3cd4285e77ea1e3d9975a818b
 AUX systemd/iptables.service 130 SHA256 c404c54c98521817aca75b96774a24684e0c7ed2fc8de2ced78f4ae4d8a6b99d SHA512 87114ccc7eb079d1ed43d77be35cf4c91702ca960883a4bbca5dfcf74aa6f086e44f4a4251441ac3a277c93eb10e7482157caf2d62bbf2a7f5327947ede25bef WHIRLPOOL 844296866dfe2fe6b1207c99d2f938f4c87a37592e95576f9504fe056fe82fc29878b9aa1a204fa31d6711fbe7ba5cd48f7a639e4839bbe366e6220246a0d3c3
 DIST iptables-1.4.21.tar.bz2 547439 SHA256 52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0 SHA512 dd4baccdb080284d8620e6ed59beafc2677813f3e099051764b07f8e394f6d94ca11861b181f3cce7c55c66de64c1e2add13dc1a0b64e24050cd9fb7aea0689b WHIRLPOOL 475541d1b2b7fe4ee8fa3b537274ef082aab8bfd262201ee14cd53577dfac6f591445cc6d64ed93b226a4b71d54ae1b9ab4cbb378b5440861a585f770f0db200
 EBUILD iptables-1.4.21-r99.ebuild 2428 SHA256 106e7046e9977b4c69be158b04bb541ec4514b063b80308f860094b920eca726 SHA512 8c45d4c8d0c3ed6d813ba20d41a5a672f5b318b124015d30b5af0035587e96ccd9d62cfc680a097928df965653b1b6b620515153335109d936e0bca70a0a5646 WHIRLPOOL 3dfd8107fa7bb492e224e2966c40928d59ee728f7db5e663ba8fcae4e2f98e38a3f10c5c0582416d235f788b7d3108824fb10be0847b96960e7375d4b024cc17
-MISC metadata.xml 1069 SHA256 91c6679d742c254b368f9a18cb42a3d29f90a9b691dda61967152b629e2abaa2 SHA512 395b2b3b812cc99d31ea812ad2e42fe52e9fc3e5fcd17db18b95b1dba09495bb5124760308ba46a463b47cb089d587819600d5883a313314a865628fa00f6907 WHIRLPOOL 6e1e2717c19802d94f155c6841a0b7cef10ad38cd338e3e5ba8eab671b433c547fbe816a234f8e02ad1a0bfd6f69695ff643f3ca62a99a6d51be8108eb79e9ce
+MISC metadata.xml 1450 SHA256 12a59ccb10431b7760a10a4421f05fd3763eb14c91d27239f04d9bcacec548ab SHA512 3cd157fddc3a2aeca4ba563509b021ae52f02e23a721488eaf47b2aa701e6fee5ab8432603ca9999e6854b4d8a69950cf1a156104ee5db35f9232302326601f1 WHIRLPOOL 4d48988fd6ec8b53a643206c939789a773ab59253506c4659b83f7d563bd558924845dd04bb03702dff160cc49f72a319fa68b7e1e49988022270eeac7cfe82c

diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index ed96e3d..92f454b 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
- <flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
+	<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
+	<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
+	<flag name="nftables">Support nftables kernel interface</flag>
+	<flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
 </use>
 <longdescription>
   iptables is the userspace command line program used to set up, maintain, and

diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 46585ed..904b808 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -2,4 +2,4 @@ AUX cifs-utils-6.1-hardcoded-path.patch 1513 SHA256 2a0415b1452f3033c8322ed102b9
 AUX cifs-utils-6.1-paths.h.patch 200 SHA256 3998b247b3a2658a637755db8ebf800eee75b3650ca0e114513e5a68fe71939f SHA512 8728a3a7ccc5837faac7e0380c32f8855e71013b6175117f22b1acfdd321363ab7529141e5f3d3e75a60fd0366adc3e23b8b59672fada77e201261d8bcb45ee3 WHIRLPOOL 4a99f745e65632cbbbc4d4c28028bf81fcb5f57076f46a93f1a53143c640007b08f59addbbb062807b2992350137ee54914b75f9e045596fcb0da1f879ca87ad
 DIST cifs-utils-6.4.tar.bz2 392809 SHA256 38fc63926af435dae4ebcf4406275580a692d9fb9ee3e32170317cf2ba68e6e3 SHA512 05860ceed1e83b4f4da689d2fc1c1b48fddc0ca53ba52fc6cf26a277d6a884f5780060725c5df1401a665ac35ec5a170262ee62f61095e4a8d76348888182614 WHIRLPOOL 335262eb329860318750fcd081dc2c082f36c75a32e5e596a45b51e73b08be7ee66133c2e4e2bc3089631d3909018abd9c2f36f79d82cd9ea7f6fe2530900f72
 EBUILD cifs-utils-6.4-r99.ebuild 2875 SHA256 94ad6c06a51e56e5247c4a4a8d545c81bf62e292702b89873c90833674385d50 SHA512 3c75e807b03aad8bc2920781a3d9bcfde909ab038d0898ef339554228e5d7046988c0c283ae0d546a8763c0193fb9fe3963debc997a963ee1438b959fe7e8dfe WHIRLPOOL e5b57071b8b83aee3af992b08d7f74392b3c00a3150fc80f3ef750eb7e9da49a9358b42072b503f7afb64cfa5cc764ca4f4a0b61fba2a9eddcf9c557afd7335f
-MISC metadata.xml 894 SHA256 8d598e43e3e8ffcdca076aeecc8d7748574b9b10b0edcb7f29870c5765dac849 SHA512 351c7e517aeaac819858716a196364f033aa384d70dd8128a2e92d4b300ea451416cace7bcb8feeeffeb57264042d02fd814be3fdc8fc305b86f57e51158724f WHIRLPOOL ae8a5e246350bf67577855da35d3d100bd0485f4885cb2f46ca7a0ec3cc3eb6020a188bb0d08793f231adfd7c0b2fef6fe66d5c61a009a6c3aa4989df35d1299
+MISC metadata.xml 889 SHA256 89bba935346607875e91cba58f764b546785ddfd0959a1da29332a8413285576 SHA512 979960233f0941ecbfa1cadd79fae28898cf8f8333225483808cd25b84d0395d9a7dbc84a5912c2dedb38269d62b7d7f4a647b5d12e47b7706368b3640d90c66 WHIRLPOOL 6d0c66bb0c9349a25c87b051f91ee70dd489ffa89bc343922cc90f9961c343d56a8c596b08565576530a297a5f36e1cc65f8500b8af1570e7975ff0176e4db34

diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index a31a339..d511758 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
-	<maintainer>
+	<maintainer type="project">
 		<email>samba@g.o</email>
 		<name>Samba Team</name>
 	</maintainer>

diff --git a/net-libs/liblockfile/Manifest b/net-libs/liblockfile/Manifest
index 3f401ed..5053ff4 100644
--- a/net-libs/liblockfile/Manifest
+++ b/net-libs/liblockfile/Manifest
@@ -4,4 +4,4 @@ AUX liblockfile-1.09-no-ldconfig.patch 665 SHA256 77e595b67a0a5c2eb7b9a769b87428
 AUX liblockfile-orphan-file.patch 613 SHA256 5e058b5c370a6256947ae664c9f44ba0eee59d0c80dd062a032fc9ec5a216859 SHA512 e42d5db372211a1c685c75b68542ecc0a9aa0810620cfd82fc0e76769120a058c691d04d6217ec428f956b0c0789a61fd08bca793260edf081e711e7d8626b0e WHIRLPOOL 126933d4cc8977142c0b614d6711fde427bbee088fb465a0fe74f516a814c54bef789a304e7b9db1584cf87c86bd12bf02bffa97b227017a340de64cc10c8f73
 DIST liblockfile_1.09.orig.tar.gz 32178 SHA256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f SHA512 8577f8bfa9c78983d6a409bc449be0d981e599a6a5f2fc8b43f76a238810ec5e3c180e27280719398f31041ed837fe8ba61df208ce77db77a354453e4579848a WHIRLPOOL 4365bd4f90207a97ec8421f60bcf2d61c4565eecc9435fd920b31ede3e182856783d21ad466632ea8d18e0378f3401637185235ef90e50d6bc10d093ae4d8a42
 EBUILD liblockfile-1.09-r99.ebuild 1257 SHA256 b8349009c3a63c751e2b95c469b29dea7c2fd554efe89259563a05616a632267 SHA512 b2d3f2bef785d6e7936c9f1124ce36b45bb9d3fadf45d68b3eca16af72f345e467a772c8255781944e509c69b09ddc2eb9be9766987dca2aa2919f33762281cb WHIRLPOOL 60eca8e07c9cedb13f289757337eac2a7a7a28f7419720edbc654a98c4e8dfe61e464d1518e0e8f83f5d831db4eac3f7a9762d6e4bd075d0207bad1967d2db4c
-MISC metadata.xml 161 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32 SHA512 77001eed8032a3b919c30d8dd9314951d3471528e770ef5ad840060e217037f5e1f0eb2cf4c5f90cb2d58e9598c8a38619a1301f890d6dd734900ab6273fb6ec WHIRLPOOL 0d251627fdbf63b5c090313d5bbf3e45acf630331742dc930a0136cc382b7720fe4099c64fd439fd31fe0eed48a4199d6e31692dbdedd34f803f9e2567d46975
+MISC metadata.xml 240 SHA256 f0e0bb7a24c4b1ff6b6a8a3e9315245c298499c03fbda429c0f775ec6a5396af SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db WHIRLPOOL a7adfcb24489ae67a43a59d8350a70b20874fb03de95681c5b516a741d95422560a433f641de5a7222cf5d3500333e215055ec0cb3844e7abc6d6a836de97357

diff --git a/net-libs/liblockfile/metadata.xml b/net-libs/liblockfile/metadata.xml
index 51f94e3..9a6d80e 100644
--- a/net-libs/liblockfile/metadata.xml
+++ b/net-libs/liblockfile/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+<maintainer type="project">
+	<email>net-mail@g.o</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index 623ec42..4616d09 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -3,4 +3,4 @@ AUX libnfsidmap-0.19-getgrouplist.patch 3459 SHA256 214f347663610a63f56659da0f50
 AUX libnfsidmap-0.21-headers.patch 438 SHA256 755314afbbdc82d2cb2e5f0114a3d6eae0d0978da859f215bb858e44a11296ff SHA512 55cc2dce6df5c215d2ba270324a2dabdd7c798d88dfe1f6ac01a7bfcddc1b9a23bc031fac2006682596f3984f0ce9782c8584e3b8e02a1b491ac978a69aca926 WHIRLPOOL 0ea374b911ba5209b621a363eff287647fdb8d3d98106276f143cb9fd03578c8c477482195876d8f751dcf59b9c1ecf8121f405caae4e0134f23a48cbcc86861
 DIST libnfsidmap-0.24.tar.gz 328720 SHA256 59501432e683336d7a290da13767e92afb5b86f42ea4254041225fe218e8dd47 SHA512 1283a4af1bcf3c6f941ab294acc0b2b4bd9ca947f2d3c2e866717478ba2e7a2190a5467b71d7e9136c5c83de564c4892f9e3304323ae17e3988af2e40c43982b WHIRLPOOL 7f9e81dec91429c09b24325bdf077d800b608bb87eeeb5d4334fa3dbbd50a4acf482162716c19c5f5175e48bf129dbf4611c1d6be933097753eeaab834192bae
 EBUILD libnfsidmap-0.24-r99.ebuild 1214 SHA256 29a791cbb57c4ebf390deb938d4cc3e520044ad189fea0c0fda4dcabcdaf15ae SHA512 375b1360e72635a6bbb12cab0d99687c18e4d3909521dcf01599ed77f56808ab01e751ec91148597a7fb1b224b8bc9a8b03b682c9d7e1788e35b644527232ed4 WHIRLPOOL f72bae2c111421409d62f2a52499e2418d8ea9dc7d8d7395d28c098dc2ef960f15b673008458e63d289b34bb7fcadb0bb2fd9ab32993a1dd973874a900c51457
-MISC metadata.xml 159 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b SHA512 9645bd7d570c2eefd7f14adf726c056a6295d45263f143e365a3fd2e8e6128392eb5fa1103b3a3bb60a622b4595ac7fe3ec19430184210ff63e86d5f03635704 WHIRLPOOL 1d62390192bf65ac30d67f3c0a872536dd8e6a5a0d8d978e5e8f83f09e44907abf16825066c9976e8be482398385737a024837da3c544eaf912ec2710318e289
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/net-libs/libnfsidmap/metadata.xml b/net-libs/libnfsidmap/metadata.xml
index ca66751..56c1244 100644
--- a/net-libs/libnfsidmap/metadata.xml
+++ b/net-libs/libnfsidmap/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 36a4cd9..3b844ce 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -9,4 +9,4 @@ AUX libtirpc-0.2.5-stdarg.patch 667 SHA256 2b31b1148af9d96c9a9e6f609c0b5b0342495
 DIST libtirpc-0.2.5.tar.bz2 459094 SHA256 62f9de7c2c8686c568757730e1fef66502a0e00d6cacf33546d0267984e002db SHA512 9f8afa1acb04a2c2c558018f2528f8caaa79994a2af2abeed947f914145872ef72988b241e11925c799db0de9ec51fd9baecd2b08150240b22f91e2e55a45194 WHIRLPOOL a2b4f1c4825f2b774c2290cccd9d552bb7566ec9eb5988d3ab619d7870a907600f67e7af39fbc3e245606db8534f114c990145789c383206d3a9cf96cf043d8c
 DIST libtirpc-glibc-nfs.tar.xz 8948 SHA256 2677cfedf626f3f5a8f6e507aed5bb8f79a7453b589d684dbbc086e755170d83 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba WHIRLPOOL 06bcf3fd4e424a86071e5c4ddeb89aa571c862e765aae9382d9f9a55ab72cd1c623490555c1a9bd3380a2d04ecb10fb47a75a7dddf449d4368a1a01617226858
 EBUILD libtirpc-0.2.5-r99.ebuild 2018 SHA256 b4df6736e714a256720092b5e633f2a333674f1378f644522eb04d84b9863967 SHA512 58e3d66138f3fff2326cb3d13ea57ca30b0e5fe20d9134261b1ded38d4aef10feee5aea02cd127b146f048a4f07e10f058b13de6ef26648919f1092183189607 WHIRLPOOL c64f92481c25b49812e05a4758899a898503bbafd1afc022f789c582552fe7520ee0bf7a0c7014a5f6d7adfb3cf69c01f179664c0427ee7154ad9e60c9f759bf
-MISC metadata.xml 159 SHA256 562c59615c028ffa088de789b3a792fd4cbbbfe71628ddd6a55d3b176becbc6b SHA512 9645bd7d570c2eefd7f14adf726c056a6295d45263f143e365a3fd2e8e6128392eb5fa1103b3a3bb60a622b4595ac7fe3ec19430184210ff63e86d5f03635704 WHIRLPOOL 1d62390192bf65ac30d67f3c0a872536dd8e6a5a0d8d978e5e8f83f09e44907abf16825066c9976e8be482398385737a024837da3c544eaf912ec2710318e289
+MISC metadata.xml 335 SHA256 02e9487e791e2d6aa99e74025dd90a6c54d86c73d530c96316e93f7552e1439a SHA512 d6dd857293827907e545dc6e8631d06682d20e13442f8ce6cbd2e2a789d885c8a788f4ed1d062a8c54c4165d22eb096279d4c2f598e462a57faaf8bec1e9777b WHIRLPOOL 6a802fc6b1fdd5bc815c4d2d41de0cba5cff351cdd1fa80021c02233b3facf21674d94ec7b822c2d514e5e1c721cf3ae2b88c885afdce8a7b60d2e63da71183c

diff --git a/net-libs/libtirpc/metadata.xml b/net-libs/libtirpc/metadata.xml
index ca66751..36e84cd 100644
--- a/net-libs/libtirpc/metadata.xml
+++ b/net-libs/libtirpc/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
+	<maintainer type="project">
+		<email>base-system@g.o</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libtirpc</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 05fbea0..4170dc1 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -1,3 +1,3 @@
 DIST miniupnpc-1.8.tar.gz 70624 SHA256 bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c SHA512 8eedac9ad473fc952ca8896fe534d6da6b1b234e8b6f35f721394d4c71aca84ed287ca6c4f0455b50d97a45e4cd34e27d99a6813386e0864781364aa607e13d4 WHIRLPOOL 5b76ccbb5ed7daa9bb0d481b424b7c31a5f6dc85c5c812ba10175a29aefc0d3924f3db2aa8c3529d1241be59d67d1d4c702d27aad2de8c8a07fecf3857d73169
 EBUILD miniupnpc-1.8-r99.ebuild 1201 SHA256 2af96cbf410dadc35a1b0e5c2804a09da3ed5d6a837dcc3925d381316c923604 SHA512 f36a7fb1d5724fda4a62df2c64ea116fc6c63693ca1311ab18399e1b5f9b9c31c794df8bc07193593218be056b6510f06889d14121936488c95079594d26aeec WHIRLPOOL 48bd51a1aeae6c65fd61550f0a451cf4d88a59234fda98eda76f4632ce9e21bd6ebf85a416b255f6b2f48040d447f707f03470b8de82b961418fa931da5f7f5f
-MISC metadata.xml 338 SHA256 3de89305fee04e6757c25966f3edb3ed3a5c1d19ff8f95452286cee3fa8a9b51 SHA512 2acb780e7cdbbcb8e7c6d6ca4573adaa015cd5ba00dbbcae0b40c46517f6b7c1c7e1b72c3f5b7514308a47bbbd3af59bb853ecaac1c0319913daa401a7f078e2 WHIRLPOOL 5c25922c90a8d9393a23c131889ce7fd5b0fdf03a7968e225e05c11466ca2d8fabcad6f055423d9225798393a9b315c84838e83770ed59b3d9d89b7f761c5f80
+MISC metadata.xml 448 SHA256 2b269b3fd58c1af75ee2047c957a00ffd35f39c6b9e169a82002e0582d533e52 SHA512 c121219bdbf8ed436042e611e7f0bde7301418e2959bb1bffed61477e580e3f854931813924db0946c1af2b7a7048df4961f6f69e7252178a59b37a29514255c WHIRLPOOL acece58f22d56121a3ecc34ed77caf6cb2fcf228bccc568d4ff918955de584619d3f08e34545ea5ae671ed60d18742c68acba403eaa41d47d09ec59fbcf9be6a

diff --git a/net-libs/miniupnpc/metadata.xml b/net-libs/miniupnpc/metadata.xml
index f38aad4..1924c6e 100644
--- a/net-libs/miniupnpc/metadata.xml
+++ b/net-libs/miniupnpc/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
 	<email>mgorny@g.o</email>
 	<name>Michał Górny</name>
 </maintainer>
-<maintainer>
+<maintainer type="person">
 	<email>nikoli@×××.us</email>
 	<name>Nikoli</name>
 </maintainer>
+<maintainer type="project">
+	<email>proxy-maint@g.o</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index d1330e5..4abfd63 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -11,4 +11,4 @@ AUX webkit-gtk-2.4.9-remove-execinfo_h.patch 1374 SHA256 9a6cea9456c7d38b280be1d
 DIST webkitgtk-2.4.9.tar.xz 9840740 SHA256 afdf29e7828816cad0be2604cf19421e96d96bf493987328ffc8813bb20ac564 SHA512 5dfe5c31e0fcbab5e468a18e08918a439b214dcd620386fa32d35e9110e479b552a4b0b88a1bb8574b34445d5cc5219be349feded32fc1d2791a6c6279d61f98 WHIRLPOOL 26141cd12878bc8136ecffc1636fdcb037f342e5c27c8c557117564af9d1673af84c8c4fd10d3fdbe890bdf183791b18a210f57de9750422959a45c60390076c
 EBUILD webkit-gtk-2.4.9-r200.ebuild 9285 SHA256 8585b0e59c31696aa9486ff25ef278a43d0a4d75d28faed2dbce31e60be09178 SHA512 9e5af9413736d8da7eeaa9e5f4ca07dc757f7249623aec3eaa4d2401992451ac5eca77861171e93d9d56d19e6c521910a8d42c5fbf6a7cd9ab0bc0020066a686 WHIRLPOOL 5e844692c665e08cb8fcef250b0043752ac71f5019069a253ae2a552d570827f727505b6da143a17236a47bfec65bd4545ef6e05837219d15a2ddbe67026a6c8
 EBUILD webkit-gtk-2.4.9.ebuild 9759 SHA256 82f509817636144fdbeb1f499d34673c7d5178ec171d379279a77b10815fb4bf SHA512 4d04b16ab3c546a9363e452681345b8a989da971b0e8cc1a8f55088e9e3f30fc12a5806d43186421ad7b11bda1268bf2dfc1a7d75972e8451d3c6d53af639314 WHIRLPOOL b191db4c9d7365b88eba0106bc6c5a360a826b1236cdfaf440353db551124488c94bd3a6c35f84b83c0ff6a1831d95dbe9c259138ca8174fa9a88d1ba240e93c
-MISC metadata.xml 610 SHA256 23faf3368df312d51e2dd38d6e7695410deab694bc12558cbe9751067575df11 SHA512 ac78b2e8a719247f5294c045ead7731cd42fb7200ea5a6a450ac18abd3a79fc888045e2c7f98bf984dd2a9484fc352ebc06e6b1c7a0bdd75a65a825e71c09188 WHIRLPOOL f2c88de8a7889cd3cdbb66f498067f85a5e6ce0c7b3732299ad9373e39ac332abe5d3da93f8fbe1e5f63b44306f9def006a3e34349eaca12ee9fb3b7a7368ea1
+MISC metadata.xml 717 SHA256 0b14a37b119705ad7c50e3857d51674eaade8148fed94caf07ca2afd5282fa58 SHA512 996dbd54e6670cde58d6fca941fd6d1a11a054e42791e1b451005c2c6b5b46d14454869cbc9e4911e5b7c0119b8a04096c95ac7c20f8389ab9cd866c9947b365 WHIRLPOOL 531accd99228e552b04a9644b470db00f9c633021a438bc1895e517e848ea73ce807ddb5225df5fd3f74af19b80e86ab83ae83c8254de4a6b246dea3f7cc1803

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index b49dc03..3d3909c 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer type="project">
+        <email>gnome@g.o</email>
+        <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
   	<flag name="coverage">Enable code coverage support</flag>
-	<flag name='egl'>Enable EGL support.</flag>
+	<flag name="egl">Enable EGL support.</flag>
         <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name='gles2'>Enable GLESv2 support.</flag>
+	<flag name="gles2">Enable GLESv2 support.</flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
   </use>

diff --git a/net-news/newsbeuter/Manifest b/net-news/newsbeuter/Manifest
index 2a494a9..0942124 100644
--- a/net-news/newsbeuter/Manifest
+++ b/net-news/newsbeuter/Manifest
@@ -1,4 +1,4 @@
 AUX newsbeuter-2.8-musl.patch 1774 SHA256 01bc5b5d231181215eb051db9d9717e05f94578db70b9889606a8d2d027664ba SHA512 479b243faf6b39b3473ce16e0ade892e7055613387bcecef8e3bc900733a270cd2c4a6e3493e1244047079cadabc0a9eb20b2e97d4eecfbf964adf56f0db94eb WHIRLPOOL 73950da6b97f6d5617dd57d52bf27569b3be8c9f473e40360e648ded4a160cc887bfce11e98587784f7722d07a57c4dd66a82f8d17baa3353446199663a7b0a5
 DIST newsbeuter-2.8.tar.gz 431299 SHA256 c872a068ec7792680b11126230dff240dee72acdab8f153016ba5ef83c8a7804 SHA512 b87c8118c4b450fe774dda73f83f485fada48e7dc308cd4c61e650b6e04a52b62eee075426d02aa5521edefced0ec09b599a51086ddee40408e063e94c6b259a WHIRLPOOL ad278481e885845f09f766aadfdb52b75c970f28f0c1b24ec27508efd4647768de91509a0ed3d57c4b009817ead546e0d1ac8a45815ab73dc619724eb7a49756
 EBUILD newsbeuter-2.8-r99.ebuild 1212 SHA256 22bd58f47b8a227e0c7ee75551335cc8fac56aad5556faef63b9e17f82eacc5d SHA512 9d6167fee234ab196b36927a2af0f4673027ae2469234c7436dc2449dd8516cf87abb42df3cad9cdf7358c1199466397e7c6d9b5aa2d761227907908aae42fcf WHIRLPOOL bcc5078757754891bcc9eaa0d788d6d7d3e433929add7583512e5f5095eecb604184424e7bbad6c6b5e7a9f250b5fdfc9397fa9e9dac497a15aa8ba8f033f233
-MISC metadata.xml 405 SHA256 72d5989efe3e9aa0fc0102ce2a3cd62af3a3b40beaeb42d9321149ca02387a15 SHA512 62694bdd8d3c988d48945c6ae926e20509fcc660d2584a69adcafad2c6abaa810364603ab5ca3b79cac128a2cb31486cac4b9b2903117ae73bf6e283145289dc WHIRLPOOL 6c5473ea7fe0652e0c8890ec81e4043e2b55b1cc46054e8c6b7a1575a190669b33d6012c9e30e1574696d562936684fa1ba086309355265fe47d948af7a1517f
+MISC metadata.xml 419 SHA256 8e7a6a1f34eba23d7cf4bfe17de7d555ffa62fedc38779a7ccc160082b4c8057 SHA512 9dc097fe23fdc18591c9f796caf4f9855ad2a2c779e2253806fd78edcfabc613fa0cc018a88b64c9d137b9cc4056f952fedc4a67ee62314190a099fd6a124c21 WHIRLPOOL 6048bd54ea392036bcf9c846bd5f9d17bb36b0d77adcb5e6b4975e5cde1b668c32e63771ad64ccdb94b3414cfebd49d2767ab1e0f994a30bf52983b7ed815748

diff --git a/net-news/newsbeuter/metadata.xml b/net-news/newsbeuter/metadata.xml
index eb32917..8a4fa59 100644
--- a/net-news/newsbeuter/metadata.xml
+++ b/net-news/newsbeuter/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>radhermit@g.o</email>
 		<name>Tim Harder</name>
 	</maintainer>

diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index 88f2dc7..9c679d0 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -6,4 +6,4 @@ DIST transmission-2.84.tar.xz 3077836 SHA256 a9fc1936b4ee414acc732ada04e84339d67
 EBUILD transmission-2.84-r89.ebuild 4196 SHA256 76286cc6734826e4cffd938885b8a119a6af2c842709992900cfdaa0913053ba SHA512 bcb1d283127896fb8526041c18b29359d56a60faa86b158783bbaa84b685b455c36ec5a41cf374d67961e8aed24f0a8a5186c922adda952301876b7b02ac4ff7 WHIRLPOOL 76e81a9c3093ddf510e9c351952c992943d83a4bf917226e4aa90a7c34971d693793763d6d7c3d73ff9a790342bff24aa18dfcfbd33403835db569b54b197793
 EBUILD transmission-2.84-r99.ebuild 4543 SHA256 40c805bc5caaaa600d04686040f9a711d433a15df347e47623a1c4730d011eda SHA512 3fac2de9cb2cabad77ccb0f605829728ac6e701c133d2e772e42c248d2776506e36f98b2fd9b4041ff75d75bedb9656c1a5a7f3bb7620efb45aa8b6e768edc64 WHIRLPOOL 005839d030a0d21eab1d4448968feef5650fd98d3f1a61c7d4be9272434c4a8ee73932d0af33e6ad15a8e7d34e95a3d7c9fda31fb7c54f3c8c791f7653132ad5
 MISC ChangeLog 44842 SHA256 9f1b3498aef31c65535f11e481362070f5cc5bb449cf9c946b28ad3ccfbd2457 SHA512 6f7d44abcec4edfc0f2930906a65a1409d9039a335cec9dead774a363f10d13e9e0eeb9f28165ccc6d174adc26ef977447a88e937801ee767a622b731399a670 WHIRLPOOL 794195cf1eb37646c42a55583a0722014258aba1f0ae55d1d017fb2e8d07bb3bda9208bf5b671bfe1d0d5389fc2100436a49790c0855caf9c2f48a9bee222008
-MISC metadata.xml 566 SHA256 ee4ef67c4bf912c1b5e529965fc45eca1f41dbebf76bcf785c8fc7b38a602633 SHA512 60ee8ea3d363fa60f5a1f94ec9d8fe7653465cb2fc3de8c92d6945f5cb01468f7af580149ceefeb8fdd866af7b5ae2143b584853bf3aa5fcc69408a21e4566eb WHIRLPOOL b3b4ed16faa68d7abb0519e025607c55c68a1ba0462992ac1e8b3e7f775dca278039391041097abcb1063b6cc5fa3f8741ecd76587fb3533c437d780ce4b0423
+MISC metadata.xml 670 SHA256 af52a8a2a0eefebe130d9c1b3a9b26f37eda22f47658c0c273e81d958dc9e519 SHA512 fd019672e7913836704edd9d67eca4ab420dcac27a817a0031ed5556c1c1ba0b25bfc74a35c18d3dde2de8ca735871978d96927bd0a65894021bef5ce66f59c2 WHIRLPOOL 900f910cea94c94000175a837d65b98b36d44ff09ae6920b67b3773104a83f7d5dd7d10231beffbb57807440efdab9acc0563dc4ab2caade87f52a5e5ba7fbbe

diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 6bccb48..aa8b895 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>net-p2p</herd>
-  <maintainer>
+  <maintainer type="person">
+    <email>floppym@g.o</email>
+    <name>Mike Gilbert</name>
+  </maintainer>
+  <maintainer type="person">
     <email>ssuominen@g.o</email>
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
-    <flag name='lightweight'>Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
-    <flag name='xfs'>Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
+    <flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+    <flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
   </use>
 </pkgmetadata>

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 2e58a4c..c4345bc 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,4 +4,4 @@ AUX cups-filters-1.0.71-poppler0340.patch 1887 SHA256 8307df77f0780f607351627d02
 AUX cups-filters-1.0.71-remove-c++-pedantic.patch 2353 SHA256 cadeca2d9a09f17b932e8a46b297d480aa39ee9a39b924eb5402da429e69b6e8 SHA512 9dd3766fefe121c1b6ad12fe2454ae7ddd37a9b2245b450270a1969aa5cd25b99623cbf7a9798102a3507a80542eb7a68adc257a28b5c7d59201ae7920ba3c8b WHIRLPOOL 5d85e18df386018a647ce0ec9cff4db25ed62d2b04bf808f4930593ff53c380b55d114500d9adb7bb314c4ff8e50b88b07e757cee6d04b45f0ef70294c163ee0
 DIST cups-filters-1.0.71.tar.xz 1339116 SHA256 3180aa209c383402822e568ccef8e1ca43f51e30b3af2039c34ebae919a69c1f SHA512 dc243e88d535c8d7e7fd53074b1093a46fc22742504efa09096d2b216846df875e4d914f25d2f726034692538cfdf1b713bc1ef44d199003a21e242b99f44a01 WHIRLPOOL 4afc7079594563f57af81501192cc0cba19db6cd5c10a9544339858a343e245b485e528fbf80eecd711341b23b8321bde817c49db7ddd2f0b801da2b4b9c580d
 EBUILD cups-filters-1.0.71-r99.ebuild 3403 SHA256 feb6c09fe6c28b11697a99607256c0abdd8eec05dbde472d7cf309fd6c433abb SHA512 3ec05fc56890f53c0353f4c76c38e963e99bd1476a8506aa32e8b1e72c3c182bc7cf9bb89d4769c52b4ab8bdea23858cdc1a02f29a6cd14b73a05ff67de2aad9 WHIRLPOOL 616bf845e9335c95aa27cdc4f7f0028e6a6b20bbb6f3291d1b0cfc7c05ed682b6f7a82c40d4cb7d39714fb5162f114fa4154a03e11c7235d67a2e1040842f75e
-MISC metadata.xml 290 SHA256 07d21bc9b73af41131dc35b0b30829bb124443a931df199fad5720fd0c6ecb82 SHA512 8614acef9fc5a0d78a7c65ce34d79189c2496946a4bccb215b9404abdc0c821ee89f3a89892e2c320359063fc43750c9e9581b7fb732d9d710ff7bb2dd6229db WHIRLPOOL a0ef99c415a6e3dea7f7c0f2349ea67ce76e8361f36d1f8c828d136ebf01e4d3a5b1038aba6aea92843ab67bed68c38a0a841f3620e7d46aa205360694e682ba
+MISC metadata.xml 388 SHA256 e6d81781e525db646b450d65e577deb38f334bda19e16e10eae7b370fc94be17 SHA512 47682ad0bb63942ebf5d7f831a64820623c8bb5ff1df623e8942bf05a1f45ebc10af70e614a0ca4d79619ed02c6d7e7af79a692ad23f37c23ce1b04c2410f14d WHIRLPOOL 41d058fe2405f9a4a1a88b875f7555991b35354ca9cadcb18aa60ee035269ba940f4313d6be7730eb58b090eecf7edca4f78327fa1f4036b1ff22f13982e7cbb

diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index dec732c..e607fdd 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>printing</herd>
+  <maintainer type="project">
+  <email>printing@g.o</email>
+  <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
-  <flag name='foomatic'>
+  <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
   </flag>
   </use>

diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6967e83..7febf2d 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -11,4 +11,4 @@ AUX bluez-plugdev.patch 469 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a4
 AUX rfcomm-init.d-r2 661 SHA256 e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa0c81205576bc1d09 SHA512 ec3968c79bd4b0ac57f4a0fd2f286b3380951af183c68ae9c9b57339d74931d98984b3594c9e10db9f61eb2160e214572a4bae8885cd4ff9192dbbfc357d20a5 WHIRLPOOL c37f516e2485c21d4613b821d53c2f2782ffa50a1cc4263ea8bd44c064088651c05c4880edd397fdc20b0c5f0805bef6a06ec0606748f16cd67dd7e35757fe34
 DIST bluez-5.23.tar.xz 1426660 SHA256 cdabd38d7ac8dd392a77ce7d76d5c120b277e4115040ba5d3ab91c05ab37f2c1 SHA512 5cbb5c34963c5b70badab618018eda5017b44d240c3a47b4bbaf88e41b67617c5a299a21509a917ef3bb91be79032aa10837138283b6510e2829a6be1554ef92 WHIRLPOOL c3049637a97c80301307fa8ce7618763df706223d103e6a79c41eecc68203bcd0f999f8f523048acac6f07884ce4ecbc0ef9e2f80bbdafacbbef289fb9531fc8
 EBUILD bluez-5.23-r99.ebuild 5520 SHA256 b257a7aaad8f43b8997570b42131d9c9086ec8dc9b574eb51829b75118edfb95 SHA512 1fa9bab18bf825dec4dd3cc4df68f5b7d9713f0709e307d11215b14e864a5eb822d8a09f5b30d9aa6298d3fda743ff55ffa2b4cecccfd3e4979a667277a392f8 WHIRLPOOL 1d0cc853a7355a47b06dab2a56aed1ad41f50e2396a6f3f63c9a3c91167fb14e3c782e8eecf5166b712b3625dbdcd2502825d4832d6958914cbd07d277ced323
-MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
+MISC metadata.xml 1009 SHA256 2c1e87879382a493a11c72412ae6a4e03cbbc630fad8e409e9c7091ba6c5f982 SHA512 68cad4ca9dcda52180cb5dadd69fa34e6ab38c2474f8e66ca62ef5f02799c4ac4ba25f972fc94c92ff93daa7371a6f1d06705018fe87cdcbe5fe2e8e7be29134 WHIRLPOOL 2b44c74d582c5c8bd0c2c8ca0c82e1af2ce5b0fa43c2e0ef28307d5df95fb1603cf2f95a6d0e31fd04f5fc3c79ba11fc3f557f4fd1c128f2e751e227cb071526

diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index de19c8b..b765ca4 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/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>
+  <maintainer type="person">
     <email>pacho@g.o</email>
     <name>Pacho Ramos</name>
   </maintainer>
   <use>
+    <flag name="extra-tools">Install tools that upstream doesn't install on
+    purpose by default. All this tools shouldn't be used. Then, please
+    notify upstream about you still need them to let them know the
+    situation.</flag>
     <flag name="test-programs">Install tools for testing of
 			various Bluetooth functions</flag>
     <flag name="hid2hci">The HID proxying makes the keyboard / mouse show up

diff --git a/net-wireless/crda/Manifest b/net-wireless/crda/Manifest
index f6fc8a6..8cfb742 100644
--- a/net-wireless/crda/Manifest
+++ b/net-wireless/crda/Manifest
@@ -2,4 +2,4 @@ AUX 0001-add-missing-limits.h-include.patch 548 SHA256 b3af448d4b5d6dedd305691fc
 AUX crda-1.1.3-missing-include.patch 231 SHA256 82fa9006d037b42df124d334a48bf06ec75d3b510eb7c464033798c05daede9c SHA512 d24f11a36e798e1da7951efbcd3925d7728a2519c75ff289bfaadc92090f17fb5b9b21010ad960fadfffe6c949b63eddc2b8282508fd5947486f31495cca2afc WHIRLPOOL 73be5658dec27b0fb079aafde7087cbcbaeb5bdaf66d29ea2d4a4cd7f689d1305a8ff95292ab3807271882b76fc3aaee4078df110cc1762d470252816d17d6dd
 DIST crda-1.1.3.tar.bz2 38697 SHA256 aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0 SHA512 4ec37d3d51f5988af79c2eaadc1bce344f20d4d9833533838d308533ee02cb12d5ed193391679ae1231c8afe61b21defdb368614a6238f99fdc5824f6819cfed WHIRLPOOL bbcb31277b664243f9e494c494152cf0ebcb187360ba48aa07c8e96c83dd91098bc49f1edf0b196a9bf4071565ac389b2907fcc73e348780aa890e066895c282
 EBUILD crda-1.1.3-r1.ebuild 1682 SHA256 0c18fc45a5a95f1a15f7a89fa030b57ea2a3559c418e143d214bc90652993f04 SHA512 22d9505cc622a6edf361094ae8fb8a630080501ea46cd7c619b7f20f2764a8bec20a225fc0b15c786351269ca4add58285f15abe28bad2a5ad88a01250b0f463 WHIRLPOOL 5023c18396a5333e319f9228c878fa19d11f13431acc8769267a6529b2df149ce86223cf8acd4ad9ddc4b339b94bf2dae882c6fd28901a194962f27ccbc29ff5
-MISC metadata.xml 434 SHA256 a3ec7036405666bbb6082583502a79d55f066bcad3f1dc382eff959986acb41d SHA512 4bdab4b4019296a1575331290ea2890c6b1fdd540011d7533a77e3781f511c06496bf7666c490c87ac725a0bef9e0936cdb8b434c24eee9709bd70329a4cf2c1 WHIRLPOOL 15a207c0e8c3cad6eca1f821ca90b2ab14454075662bd93dc4af5f7c9eb62d94d986103b8fb0a2f1094a3ba79c339a7d55c0609bc548313bee3a250622c866db
+MISC metadata.xml 461 SHA256 e405c5707c4c635837c2f559ce50ba3bc0eafcbad29d9ee3849a9f04c17ed99c SHA512 b0dbb806b5c4db7d14e5ae5b74a483731fabcfb0942930eb57c4937355735dd9af04272b9ae2368ff647f992c68f2d964f4b900e71da762495bc9058f5a876f8 WHIRLPOOL f9bfea3ea5c9ca06e26d1376340050619d572c65758f1442e21d1185af4979d86d262d7f9729a581f81d953f1c1a056c57e0aaf1b9c23c2f612473ca552cf9d5

diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 784df93..147730e 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>gurligebis@g.o</email>
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>zerochaos@g.o</email>
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name='gcrypt'>Use libgcrypt instead of openssl for key checking</flag>
+		<flag name="gcrypt">Use libgcrypt instead of openssl for key checking</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 49b046b..359c038 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,4 +1,4 @@
 AUX attr-2.4.46-ifdef_cplusplus.patch 746 SHA256 5642592689dbbd7547514a9d76ae69adb81d81c205dc6c7671ea94c4ddd99641 SHA512 36a3fd04e006877cdb6c3185a12b3239f1cef307420f9df43074852cf9a3979976144df12a966323f32c298e6901b137b2d030e8dd04f9227016829453543b17 WHIRLPOOL 00ef7704488e1953fe833798c573cdf037f3eb16d4fbbc2ca92e818e2f52fb95f627cccf1f9093578602ee0ef8902374d1dd03062e1ee6d21873b48c97aa60ca
 DIST attr-2.4.47.src.tar.gz 343692 SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 WHIRLPOOL a012f7a0225e63d4d195fae7027e64c0c92edb039622bfdec611b2facbcde83eb5fc921ecfe95c50f54f7c9b518f57a0555dcedc148cc8ff6e73371668a40557
 EBUILD attr-2.4.47-r99.ebuild 1869 SHA256 e3f06c40d987c5a0111dc32f87ca3b5f61162e38266ab72c95d03cf5c9ea69bb SHA512 299ee7104a75d5edf086017f471a7cd69224e36dbf5b1ef2cb57743a7260163f3ec38835007fadfe5cd33ce463e1b3568baf5a3d21d336cec35d594ef607fea8 WHIRLPOOL 050be6291794309d26987def58c449be9482d656ded63d3f98c6d8cb1895f10d8809e5606b34b1a8a5d037231c2046896a18c29326ba49fc2de46d56f3f10b76
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9454b50..b38784f 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -19,4 +19,4 @@ AUX watchdog.confd 232 SHA256 786d9497ad55c29d6fff231709e71ecad94f2ee1de3b45b461
 AUX watchdog.initd 229 SHA256 b9dd1284af20bf43198807c8d17829fc12e0c39ca3b6f4f7f766c5cd6b581997 SHA512 fddd3dfa9ab4fe324c7d4c683a60062ceb068b7648e21950758af8993606db6fd92bbcf3326f56c4b5b488e61ae50b8620cf94645600734ba43ed3cfc3be3070 WHIRLPOOL d18af9faa3dbec43928933a9a1e5f525a4cd72eab7441dab0d3185e7336848f8694d807d9a43feb4a39af51ba1e2350d3ccd93f0d3c0ad58bac321c42a5f3af6
 DIST busybox-1.24.1.tar.bz2 2068803 SHA256 37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d SHA512 3afc757ebaae61ae13c2c69097ee734717434f9e658eb77093a8b7b49af3326cbca2d723483ff84a1da99544b822fd2b47d9a97c68f09962e11754e5daf124ca WHIRLPOOL 5e827d08d737caac832e7e5923da624094ff27ee2edbb46dadc339e95edba65378a8fa3db412682724476a2092eee41a804f8f36c2eec0b9f883f5ba855f3ad0
 EBUILD busybox-1.24.1-r99.ebuild 8806 SHA256 78cb413fffb1bf9b9da50ed3373672b07fea7ac40ced778e52710f0a1f365834 SHA512 6d8b480c5dcc9c45cb0d3572799962eba8d024e94dbf97d593ff7e8cd17fa878fb729ed243bcd4382e75e80c911991f116c0ba987e1700651bfe4a09e1cc2434 WHIRLPOOL 6840d74b1150bb75209144e9062d52be49c9b46d8f5f45e69ce8996d3f2e867ae1eda9f4c470d7641bf4066c883b7589ae0414843aebd1ceca900fa2286e364c
-MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
+MISC metadata.xml 872 SHA256 1cf483a8d55e8cbe20edb30261276d71e0ba0a1b06d73621f849496d1f6c4a17 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07 WHIRLPOOL 91b126a39ecd6937e6058814b88043e9fbbf7b434854e25a4e4a7ad8e666de37978b8bac0c8dca0255096a42af9afed412bb5bbccdffaf03ba75c2fd2e4b3428

diff --git a/sys-apps/busybox/metadata.xml b/sys-apps/busybox/metadata.xml
index 72850fb..66da662 100644
--- a/sys-apps/busybox/metadata.xml
+++ b/sys-apps/busybox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>embedded</herd>
+<maintainer type="project">
+<email>embedded@g.o</email>
+<name>Embedded Gentoo</name>
+</maintainer>
 <use>
 <flag name="make-symlinks">Create all the appropriate symlinks in /bin and /sbin.</flag>
 <flag name="math">Enable math support in gawk (requires libm)</flag>
@@ -10,4 +13,7 @@
 <flag name="static">Make the system rescue shell (/bin/bb) static so you can recover even when glibc is broken</flag>
 <flag name="systemd">Support systemd</flag>
 </use>
+<upstream>
+<remote-id type="cpe">cpe:/a:busybox:busybox</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index a3b698b..fd752e6 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -6,4 +6,4 @@ DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e68
 DIST findutils-4.5.12.tar.gz 3236073 SHA256 df859eebad68c216204363f163c0e4200208ce7348f3658564a120e32e4f63de SHA512 d909ca2d3629f871e6f79e99cf547f76ea73dad773972923c177267c272a7c82e308cca22e5c8746e6aca33dee8110f1af390fbe2abf93544e5917e6475ab2f8 WHIRLPOOL 046ef3394c0834800139c1c5a6c9caddbbf36190d27bb28bd2afa212c00bbbef6c959441f2afc36c058d3cee279d3b6c971192ff442e796ee7e72edfb76b2730
 EBUILD findutils-4.4.2-r99.ebuild 1439 SHA256 54565a9da76fa50f6af16fc8aec6ff7bb0696ee689ba8be72143b09fd8802176 SHA512 cfa4339cd8315c208ceb2e72ad488661936e9aace744eae6b037984cf9351eba8d0269bb6832f11f096e795354b57143489246a7279df9a00764b7363f131b43 WHIRLPOOL 150b650ac57083e2f52d1b7c4eabd6c820e2547d383347197485bea3d27bc50deb1144b33cb27b6c21f74445b21c7f1afb1f57127161730f7100e44755bd4cf9
 EBUILD findutils-4.5.12-r99.ebuild 1453 SHA256 969c9c10bedc2e2906917f7867212e629c2c482ca23705c1c7a61bd03671509e SHA512 4b9c1a712dc43dc2a707587dd6a299021e13cf0d9c5cc7f7a7390752b4e6da486fbb1f45fa5ce81ed321514713a47c88de7186c8791a152880b1906f08d99408 WHIRLPOOL 05fcc0cc44e61614b0dae52771956d5c650a8a89ccc49083ec73afe26e9549a59ba4c6c7ae62341a247fc04bce17a6f54cb9fee75207d1de98aa915af5abb4a0
-MISC metadata.xml 247 SHA256 c1aace970507b192985f753f5b6d6b4f909284fa2e8c9a6492c9d29651476bab SHA512 e42648aa29d9aaa1125770a5f89c68ede330e90c64562942f8cb64d85471cc8176f2ae10c1dad00230b4fcad3a65eae92676c6fd8a43c1bf8985e9ee8ac8fd29 WHIRLPOOL f8eb5d248383ef10b836b0a9ffa9154bb8f38d001813ca727ffb0d07ffa9234eee323894831b01144017cb8b43400dd910b685babf75ebe10a2615dc94999e08
+MISC metadata.xml 332 SHA256 bd5bf452b35ee08d601bd151e4685f73418e5f48ff246e751233dd978b2c444f SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00 WHIRLPOOL 888659b8fd180da51e5185fe47c85e78c014bb4ece4836f7a765aa193c46919e53c6b2383f9c24005cfea97746dcbff5f11d9aee44304e05a4c56b1615637431

diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index b122af8..b385831 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
-	</upstream>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+	<remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index f3703fd..d112865 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -3,4 +3,4 @@ AUX hdparm-conf.d.3 872 SHA256 37c95ff723fa578e9039613d09dbf790d99113a318c065422
 AUX hdparm-init-8 1469 SHA256 434beee81ba04c96fcd03e6b37a4578c2c25af2c1007368469c48dd37523d56e SHA512 f81100a4f06670639ac8c079a72028dbb0c1b6e5436e6c745c339612ad3287223d3307a40609625dd6904f737816e162af82ecc428d4405678ff0130d0f9752b WHIRLPOOL f0bb17c90466727a0a179928275a1abcfe6f669703a98a803395fe61de90aa7cc4c83b7f510cd1bdf8f44235cfcffe3c6b6a4182d7cfb6594be1b0f8936bab51
 DIST hdparm-9.45.tar.gz 129410 SHA256 23b01caa56a995cf0897877b6aff98ea622a5df255bc2894b1a7693387f38669 SHA512 2692382f16fe9a87b7c9673bea44b8a9512b2449aaf18090f09c9e761fadc153f71d9779d063218f6951797649c0758f97242b7327da6653ea53991bf3da9eb8 WHIRLPOOL 6c424e265b7845afeff26f87654fbefe7d563404f2dee59f976594a87b375124262864305a14655bf5379e77e21bea0d8fb179e099374d7e8f952199f569ee58
 EBUILD hdparm-9.45-r99.ebuild 1056 SHA256 26233ec696fea4fe99bc3a8d6f61d9c2f08b969cb45c4a456f2520e44beb23cb SHA512 a0d36f73aa8b315ee349a613a902cc7c9b34387ec0a88ba64ecb3bfd547cfa0f737638162135e80b35276f50b2ec24e0b725400560ce12b147ada3ed64a678c6 WHIRLPOOL d734671e7fdb152159ad8cc11e03f315f21ab27a301ccb9de7522a17607a092d83b509cecb46d7cf4e53c72ff5e7971a6274d41b17fdc57c8ddb88fee6207eb6
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 326 SHA256 7be17151b3f5f5c65b8edad44e9c49ac62d306f856a257b67e0f01a1d6b1796d SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287 WHIRLPOOL 0c72b42d0ce47a7985115e1f65cd3a25bee06d41807b746e32966d69de586d4a84e22ffba08d1fbe0f0526d80074d8433813652e4512cadee0bbc847dac19e1b

diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index 96a2d58..dc7b624 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">hdparm</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index cc44db1..2db1a34 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -4,4 +4,4 @@ AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 1910d28fe0aa89ba71cd30bb38b
 AUX iproute2-4.3.0-musl.patch 2989 SHA256 bf10609ba7dcb04cb134745dd7af4c8c66d6b667400dd30abb3325ebdfd446fb SHA512 8cf23bca01b111e2dfa26e944de151b35d6278833066276e603cd567f8084c16ee5b0dd527dd0626828f3099ae5907bdef4783672bfe23605f43ce9c3b4c2182 WHIRLPOOL 40d5bdb8dcd84e43a6798584aba35a11d1b5a79e54dcf80da0f465041330c5a76c2c4297fd78aa2a272181954407b404030bb9cca4dc74e4f7b36b5f98775cd7
 DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
 EBUILD iproute2-4.3.0-r99.ebuild 3813 SHA256 3c366171d7b245005a97f4f484f922f203e7f505a88e64c4fa83fb373a810853 SHA512 f288a18ba5e6e176310870229f864d7a4c366041342eb27bdd1a887bc6ac88f3e5c3b4951ba8dd2fe82322a96b3a9b427b432291ed4fb947469de478408d9fdf WHIRLPOOL 3faf3dddf082333e8f16d9b62832a0f4e44d02d9ec7890e7cec5945179aa59f97a68cc9c5b715af557688c5054c32bab1fd9ba5747f5e672788034b3cf17ab69
-MISC metadata.xml 317 SHA256 45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512 2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872 WHIRLPOOL 73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09
+MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1

diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index eab1d3a..0fa0b4c 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
-	<flag name='berkdb'>build programs that use berkdb (just arpd)</flag>
-	<flag name='iptables'>include support for iptables filtering</flag>
+	<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
+	<flag name="iptables">include support for iptables filtering</flag>
+	<flag name="minimal">only install ip and tc programs</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index c6b617e..3990da1 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -7,4 +7,4 @@ DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904
 DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849
 EBUILD kbd-1.15.5-r99.ebuild 1221 SHA256 c06e81423bcc222bb2b59913f3c4b6485cec106ba52bf8115448a15238ac52b5 SHA512 afcb55f95bc9bb004a83f91245ef2d436b9eebcb8ba3ae3935a12d4eb98d4857e0a6aed66797501fc53d49af2bddac295025cb4951a5d267962fc80e8210922d WHIRLPOOL 7e3316431c4b8a10a644ec99f3e23830be8fb7b759e9f40c1a923e1034733fc7842e61dec3485e97e2728ce5fa69ae34798b5596e33635eb5fe0e69600059017
 EBUILD kbd-2.0.2-r99.ebuild 1520 SHA256 786bb5ef7317bb5a3ac208d6f33002fe59387649c73d36d85ea9a18bc36acced SHA512 e5068082e06839f407ce553dde8b3cc0013cb0b8b855fcd009f895c4dde8ac7fcda876dc20ea246fbe7a10e7c26d7454b28773a8a4f2372016bdfe701f4de5dd WHIRLPOOL b8f8a57861cd48b87095ed713a94c6977c97c72e689ad9a165b92fbdf73bef68aa1798d7356199edca820bccc1e093e13adce63db49378f8acf53f749737a7e4
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 321 SHA256 1462f761b68587fc7326d39bcc0cd09d6ec204d7a4b3fa56183c018091599122 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 WHIRLPOOL f83457f54b220ab31efe8775b16a54a78710f652c8dc5d9d4421a9f9e13f4d663a16b1023efecfff28126ada8af20990e6690fec99b2651130daf1de3cad3347

diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index 96a2d58..994903f 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+	<remote-id type="freshmeat">kbd</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 033aaee..063da03 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -2,4 +2,4 @@ AUX keyutils-1.5.5-makefile-fixup.patch 879 SHA256 b68e7fab7293c680e5f44f3b11662
 AUX keyutils-1.5.9-UINT_MAX.patch 368 SHA256 6d8743f250bc23b3bda40f7ac319824345421d399294faaa8c6afc5dba604d12 SHA512 bf81128dbe5939ba88b884b68efcc08552ee5ef7ad9239d173e10e36a02c6a41f7fdd2093ed4111aacdc21cfc38b8a25feb226ce9849344b9fbf417b6791cb25 WHIRLPOOL c2f170df1176f7408b6123e2c69f9db3151b54e1638d4ca426402bd8e104f320921b17f6e1848389e94cef194ef80411999e11edf279fa8961416d773847859d
 DIST keyutils-1.5.9.tar.bz2 74683 SHA256 4da2c5552c688b65ab14d4fd40fbdf720c8b396d8ece643e040cf6e707e083ae SHA512 d4ee1dabb87844e18bfd8d094a5bc9ce792c96720b71e77961b6c36bb1addb9acea2a7004ddfba1d09b167af908368162312e5c3656b22a6266955bb57b887e2 WHIRLPOOL 0509cce076a32d2f319f596506d4aaeb83e1853ee6337e6a3041e6957e9098f4482ae56a9c6455605b72b3f34701a890e9be666b6fdd752ff14a3d3564dcba19
 EBUILD keyutils-1.5.9-r99.ebuild 2400 SHA256 ebf6b00892e437f12753db3d4914312eca1cfd84f72f99dff3da1eca655b1a37 SHA512 cdbbb086349787b5a76b5f9e746584dab95e912298839e92b800e431f90aec26575ab25942bad335b6374d05d84c4527dd336de4f2ef3a88e1d8e7e1187822e5 WHIRLPOOL 91de2851905f006226d2b309a922fd8ffa556a70cc74c52cb46786a7c9b6b78decaf20ede22bf604c727348ceb413909d8886ba36678145a6c314cf3f209b5f6
-MISC metadata.xml 227 SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8 SHA512 1e52da091741cb67f6a61955ebf0c314c3634d5cab187a27820fa76f36307cb9c404271360de061f9b2076dfa1e4f3fadb46a3834ad9fc6685fbc437e5c7c789 WHIRLPOOL 0baafc1e244b376dc66e10952a10ec634fabb384431da1bec9be95bb344109c7943c6e74ae249070a9c5ee93410714e2c9343a65e01309bac7918239b6492820
+MISC metadata.xml 329 SHA256 4ce73c4d5d41f458fc9039b8da317ba512dcc468f39b9db038e5d6416707179f SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4 WHIRLPOOL 19cd1cebebe165ee3cde545b131693f98c677790b8cc07404639880f9c4c83576e5db8080af03f7e7409d0aa4b03b4053de460e6d30ae3ebbc8e645d984e1b56

diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 035bc6b..9590fe1 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
-  <email>robbat2@g.o</email>
+<maintainer type="person">
+	<email>robbat2@g.o</email>
+</maintainer>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
 </maintainer>
 </pkgmetadata>

diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 7519cc1..cc6e35c 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -2,4 +2,4 @@ AUX net-tools-fix-header-assumptions.patch 3462 SHA256 bea5145e5a69bcea835bcb9a7
 DIST net-tools-1.60_p20141019041918-patches-1.tar.xz 3352 SHA256 12e79c866c532ba75c0367397f664799f90ab8901bc906429b67939e8e6b354f SHA512 139f8c2990e5be44c17c2c5c4a900d2d2a8cdb5c067a8fe822b20b964045a24bc1138f7656291bc4db80ecddaa24e2e2655c018925d7b214651284443df550f9 WHIRLPOOL 3e33a3d5e0209360c7d90e4741a1b2be662e3c9d1c8a1f8a7283bff98642934fd26da296c5ed4a064915fa1a1006ee8f94fedc07d86bda48ed9624fc9946d190
 DIST net-tools-1.60_p20141019041918.tar.xz 197684 SHA256 22d1fb8acfa0b1e92d3c5dd3f544770b107df72f32f5b16232e65045c5efd2d0 SHA512 5fb02e181f3fec0a62a8ec8f1e6b0549d711d70d292491a2721d7f19f1a3b07d41fd0c8f503809435cd1a1b1999bcf5690402acc51f06ac6d626e11fef590e2e WHIRLPOOL c34f0c7363cc445e2457ccbf796947b60f74a063ed299840f755c6c023b8eb2cd46cdf42e1f9ca7530170e0b32dd14477e64ce50ec089e4a8b5d3e6bf65456ec
 EBUILD net-tools-1.60_p20141019041918-r99.ebuild 2777 SHA256 af0e18135db329fe0a9aeab44d2a4ceff21e0f7b272eaf6d3592a980c6375c2d SHA512 4761dde76acbc92115039434535099241ef609c4ba0ed560049cf9c1b0363f8bab10f129f42f18de4e57ecf0a2250c5e587bc10aec156848625b1c763415fd6a WHIRLPOOL d6567d21d6541a6b8c64de48c5038191c4e04581058e3fc2359dd16e7827fa25b22c15cb6cb06afcf465869113546f320bdda8f5834176474dc771653440312a
-MISC metadata.xml 283 SHA256 cec36850384943bdbf7c366908c2e7e0d68c0c906fa9eeac1796effedb58c8a0 SHA512 3b33e18dedba7de9ab348a5e0546c7732eb74b998a9ee652390c53e44cc2dbc2ced2d54b47827ff20cff868836b02527eb14d6d6a6c32e62af30c36b1d5288c3 WHIRLPOOL bfe91370d53ddd42093b42aff4c92f063103eaae98b16de2f3d5e2fb54b2e61e8c43f72b93c4f7503bfbd38aae05343339e5ab69fde5935ff588be87a4516acc
+MISC metadata.xml 793 SHA256 2a9d27804bddb600311bd8d4edf07afaacac012b6a7a793169ed5bd483573b28 SHA512 f253af424192fc88818ddf125a7f2b6bc6ababe6bdd875db0fad0779aaae31a02062cc12788074ec1bf4063cdd20c15ca3f1a464af8b1f18f0b708672575e9ea WHIRLPOOL 8decaf2b8727ce6f5499c818f254db3b8291b04e73774d2b706179bb9fc39d9fdeb2b49c4e3d0e4afdcd32e3a0195ebceffe1b3d51dd894d50bf07828b6990b6

diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 0c72e81..d539cc5 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
- <flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
+	<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
+	<flag name="hostname">build the hostname and dnsdomainname tools</flag>
+	<flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag>
+	<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag>
+	<flag name="slattach">build the slattach tool (for working with old serial ports)</flag>
 </use>
+<upstream>
+	<remote-id type="sourceforge">net-tools</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 33b454b..b27dce1 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -4,4 +4,4 @@ AUX pciutils-3.1.9-static-pc.patch 373 SHA256 81f8c664cf844adfe2238f6dc584100340
 AUX pciutils-3.2.0-io.patch 311 SHA256 aec9f72d5c7eae1e7a7ccc5c433322e2c3ff04237b1049cfe22cd952a3fac548 SHA512 9acea1ac1f6d87a647c1c69b084726930535ebcb75e79d5fc750dc2862c6cac0a89187febfd215bdc9bd6f75f2a809c02e7967a35eb288167db0a8a780864f99 WHIRLPOOL bcef00c8f4a079ced8e2354bdefee56fe5c33a60cdb0aaa72bd63528e3e792a22ad49fb894a88bdd46639419af89b9228600788a501684295259dcae6c379287
 DIST pciutils-3.2.0.tar.gz 357003 SHA256 84e705bff712b128a942117565a3506bd4b8bf841d397c1962c6255169762f71 SHA512 ce619bca35c529f947b883858164584db9fd16be05b44bd20d7f30b73246076b8c80a9e0ff3f7b2c27366a08043488ccfee98dd3cb43e3c5ee8962efaa056fd1 WHIRLPOOL fda9efb423ba444b460986b82b89feb3e5940d63774377eab4dce6ed1a1c690824192ca25d04a4f34960412ddedbdb9c874dace2256ccd1dede61ee99618b418
 EBUILD pciutils-3.2.0.ebuild 2279 SHA256 baaee63528064e053068e03eec6210d68d533105fa2e4bd9fbcf5708c3135257 SHA512 03962535e2124984ecf9b02c50ee1b81f5f42bf0b529ebdcc47081bc441cd9cd01927b39ba7e8de79f12022efe3ee8580761b41199591ec20e616545f88a929f WHIRLPOOL 6e4c81b708b84ce1642079632f06c41bc1a576ec043371d33fb20af4cfe18abbfb6f4c03beb579969664bfd035b3ac0b67730d4f5fb050546528c5a61387dbff
-MISC metadata.xml 345 SHA256 2e1f814fd8995f54e2d029e18f0f8f4b742f7383ce3448697994c4a57e498254 SHA512 d075e1944952d3d6c5316c46247003159782dd2e18d449048bc34bfd7f2f307fc287e9a9803f6f1399898c22d4faee294c013241d9b709b887c14b7966c52be6 WHIRLPOOL f1bc3329686d73cc96c8d4bdf5d05451e555aeda3bac9c3a5e2b1b5fa33294b39eff6a1ef5b945d8013c41dbfa188a38a62d205a7ce58ef1cac55828efa5941e
+MISC metadata.xml 524 SHA256 11eae8d518033f12d6fd34b5624e1271900450dce2755cba0879d3c116155dd0 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020 WHIRLPOOL 499344b03bb97ab85fab18cc15c64318c047f58930b0d0bb545a8b29230639dcf8d7e13746e6fbb62d32d7f89e4d03c958a5271b5521977ab29459d7e573efa8

diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index aa9db86..739960f 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<use>
-		<flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
-		<flag name='zlib'>Support compressed pci.ids database</flag>
-	</use>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
+	<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
+	<flag name="zlib">Support compressed pci.ids database</flag>
+</use>
 </pkgmetadata>

diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 14976fe..6149f57 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,4 +2,4 @@ AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd1
 AUX portage-2.2.26-fix-check_locale.patch 810 SHA256 d055958fe52fbfb4d628b11c3a52226f0ce07895d951efbf285d55b0bac455a1 SHA512 33b4d497788de9146abe9a99e4c788c94e8e5e4e615ae7bf18ed415407d4bf0398fb972d938a78f3fff1edfee425f2d672e9868e58efb15cfcccab65cfb5152b WHIRLPOOL 3477eb51320b13de03038e5cf1987f00cce03d65467148ffc23728540de09fde94128cc25986fc40688206059d2ca84734ba4a7379583f68511a2c5f0f0aff23
 DIST portage-2.2.26.tar.bz2 977277 SHA256 7f57aa704c58ea47f031f177203dc7b335e01e7ec1e809437ea9e46e3f9263e5 SHA512 fd1a5e5d028d52ba82bbeb7f87bf331d0c1d8c7f5a3bd450c668dd742e99185b6d2b21944f5d7788fe941c99736744b08157ca30145f0964ea60a7c2c435d601 WHIRLPOOL 0469f4c5609146c57eae4baeb8488b95c04f336a5511460ee44d15746339fd43a7c2d61b58528845d77a6a0b21e46c2afad19a9f05e94ac8dc6180032d71f298
 EBUILD portage-2.2.26-r99.ebuild 11703 SHA256 32a5b9852ff9620a1b1191baa2b54e0fb6b6abc8bad8944f0a9d6757e249a058 SHA512 b83b69af04617c925c4be8cd9d0a18c7d62c3b9d5b127d4451245bc8f6bcf24c6e3d16228c5e198f3969fc7049178d0f9a9c0cf669c09a4e2c61d4d2d5fc2e14 WHIRLPOOL f598ce0601676f3f0e7b84045e909b1158a33b3da58f3b4e7d3d19febb79f0794aab1ed6804b956b695d48d62462b65c9c18b8602ecd1380d522dfb234d357e7
-MISC metadata.xml 1002 SHA256 fc87597788bb707c98546201df63e6c4ecbbd22f74b0258d447336b80bd06dcc SHA512 db96daddb29c78919b6dccd88549d5f3b567ba834314663a2ac6c571a2e143ba3dd409e81f378d4b0f40c49d8eb42038b521579a88493a0054e94226d233ebe1 WHIRLPOOL 9d872e9fe5e3384d7270f0dd7b648c23e5858d620e9d530ee895570b145c351c265d0852f32a22c73f625ae2cd7de1641ebdca5ea2c293c5c37e5976f62eaa1b
+MISC metadata.xml 1017 SHA256 78bf0d7e87b917ab6eb9c43835c9c688dc3c5ab0a1043608448e12e6bad715bc SHA512 40315f8375409a6e8b86b2d11dc33b28a019911348d66f05fdd1194a4f0859f3f2ebf9c6922b795194669d992901c1fdda4cd147100979a7f661915c4094fd35 WHIRLPOOL c2817f5c0005da6f1bf0ecb8d1bde9a6b9379e3022b9e456ee5e932974493a0454166e0113092aae7de2725b0718b3cd10e05ba25012b321644403ab0677c166

diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index 68283d8..4d95e14 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -6,7 +6,7 @@
     <changelog>https://gitweb.gentoo.org/proj/portage.git/plain/RELEASE-NOTES</changelog>
     <doc>https://wiki.gentoo.org/wiki/Handbook:AMD64/Working/Portage</doc>
   </upstream>
-  <maintainer>
+  <maintainer type="project">
     <email>dev-portage@g.o</email>
   </maintainer>
   <use>

diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 8a1341e..0face3a 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -15,4 +15,4 @@ DIST sandbox-2.10.tar.xz 417068 SHA256 019d6a2646b3a5f9b6fc3fcb6ff99332901017eb8
 DIST sandbox-2.6.tar.xz 366356 SHA256 95615c5879dfc419713f22ba5506a2802a50ea0ce8a2f57c656354f2e50b1c4d SHA512 32ba7fb675c67fdc8bc52da1db7ed6878e5fea8753accb30d9aca00f708e0dde03287b5962caf5ef031bea6934d6ef3e18404b015c70ebd551d3fd8109ad2371 WHIRLPOOL bab2d015fb0de92a2266408ca7941c8fb66b599179040cfc727ffce5b2424a9722dc55ba89d198e3361044d8cb357314205488d2a980c7b8af063fd8940f0c03
 EBUILD sandbox-2.10-r99.ebuild 2893 SHA256 f712e1579b98cd446eeb6d0bd64f6e6520d75b320461443c88c3b607e25b622b SHA512 ca0012cbcf7d30e4904f98637c634cff54daeb6738794cb45eb4ac6503e59ef030170bf4e8e81cb22698062bfe7f34ffb5b31d6313600598fd9371b2088fbab7 WHIRLPOOL 725300847146e0bafbb6ac29d8083bc711e3acdd584f24b38ed4c5bb1bf5b1539cc627c2707217118c7f5edd148289c6dfadf036fc66039ef43af15952093d7b
 EBUILD sandbox-2.6-r999.ebuild 3391 SHA256 c4756c9265bc272f82bb6ad7221e15c3d28c9987ec5fb53e9957f02b44dcbf8b SHA512 a7b34f6fab52348f6024d2b719e01067d88c7b30fff4d73b361a5d24042c401e2b65ad3039256dd0c033ee2e3528e39d5988b0a40ec523eadb4a5da679b72503 WHIRLPOOL c80cc5e94914c56e528492cdb042bf79c8cc33d664a19aa38e981d8e453245412b5b4439e4374f1d7d023b0ec050abd641f675a718172012017f0b065e9112b5
-MISC metadata.xml 316 SHA256 488f8a1ba1e1d07a159d22ac198aefee5dfa9ded04de2969019f177161abef1b SHA512 2b4ddea0bb5a40cac834a09b89624049b8561a4a4f648b4d5072c413d4eca78b5cc24859664fa746be36c8b60188e88f2ae38c2c5af30d91dc6273c0f85de278 WHIRLPOOL 64ed27fc7abb1b3b82621f6bb91f03d0070933d0423f9d323ac803354fc6acf2182df1dd85a083fa047d63561a5e92d44287ef4935a11a733244d4393edf8f6f
+MISC metadata.xml 331 SHA256 593acb3cb5d82507c93a39cc745aebf1aa453683a039ff7d7f9d12ad9ed042a4 SHA512 f112b562f8b2a1022c0f4eac7a0e55369046d1d7d6052ab1514d841c968fc8cb33e9c337326db23a5944f3f43a676d4743dec4413ddd6e7f5c6cf63c82969675 WHIRLPOOL 0e306bda54e820ed6883b47ea0e305c5a361a88047b8f6ccd1ba621e1ef7bec08809019e638949e05e892e3d3eeffe48568b6e31e1db8071ca9932b0ea2d9f2e

diff --git a/sys-apps/sandbox/metadata.xml b/sys-apps/sandbox/metadata.xml
index 9e13eae..ebbf830 100644
--- a/sys-apps/sandbox/metadata.xml
+++ b/sys-apps/sandbox/metadata.xml
@@ -4,7 +4,7 @@
 
 <!-- portage lacks a herd.  correct this when we have one. -->
 
-<maintainer>
+<maintainer type="project">
   <email>sandbox@g.o</email>
   <description>Sandbox Maintainers</description>
 </maintainer>

diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 47d0d74..eb63cbb 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -18,4 +18,4 @@ AUX shadow-4.1.5.1-fix-struct_in_addr-collision.patch 418 SHA256 91ebfec6ab1bc82
 AUX shadow-4.1.5.1-include-sys-socket.patch 439 SHA256 10889b8a8c168d708a8997bac6564c50bbcb2ad9d6ccca5412965c9b0d5860ac SHA512 eb526b3e932ebc599ca6a42c0a1aab9a9de8f8bd3ff7278ccddb1552c216c642be50e61e9cbc40798d027cbb944682fccf40cdc2b16fbefc65d60bcdafd56939 WHIRLPOOL 79ae6ded499296dc91fdeb4d25240f210902f202444f3ca44c935fe7a20d228fcdf9da2509cd68d85953a4fd1b457d38d325481713c97b68e5b7c112ca65fa8f
 DIST shadow-4.1.5.1.tar.bz2 2193325 SHA256 aa32333748d68b58ed3a83625f0165e0f6b9dc4639e6377c9300c6bf4fe978fb SHA512 c3bc605de1ca5b774b80d0d92cef5d4c0d5b4a206acadcf5a819f195453093bfe7990d7e32b98799180847ae4fadecfc7876c8ee7297f343acce2230d805d02c WHIRLPOOL 08751597b5b57057f0a3141be97204df49fada25adf0a9f43106a4099ce1b06fec6e90592e43ff1d789bf0a7e16a40b45f29830879ea5c71e9f5a1a81e7a7357
 EBUILD shadow-4.1.5.1-r99.ebuild 5315 SHA256 62908768e6ef0da9948c4c80bc7193b36bf8751d84d6424e6596e847a9f58239 SHA512 9a14a651c9a2baec762a5d338451092a5f07c714c659f5c0d603abeb5d61f8624d47ca801f22fe83980f551f530a555bee7e165666b74997be3b95efb43bfcc5 WHIRLPOOL 228fd1aedd45928939a06c71776f25191d105ef9ca4ffb9d5d0766128bed6a837891d226986d7a16f1ca644c6da1838b9f89fec4f7d4c20c58f242d8a53de897
-MISC metadata.xml 374 SHA256 1675a5791603e79e431df63215162737553fa8018360b026739ac3284bca54b2 SHA512 0bb65b45fa94ddea89f7e0a879fd996b3f363b3e58eb6cbd71251fd79416667f103af4bac0c87f3ba240e0ce3f323c77ce7be9f6ea92c13d619ff8cef8797add WHIRLPOOL e7f4f5d975440fe71dbb35dee4394aa808fce7b5e58ac64d162418a47ed99cb002c7622563be4f6800967d6b8530d29dbd895e431c78f75a5cdf490b8c1afc45
+MISC metadata.xml 496 SHA256 55c5379b93de7156306ab9ca4faf583ed980fb44e54a93a2b3205809064864ba SHA512 215b26da296047412916f28820a83d79aa06c17da5e9b892a3525ce83436c0353056d1d7931b99ec10a0ec027b20d21f636563d0e5d8e44ec74fd3097972a7d1 WHIRLPOOL 23f30101524c63ff9325c01c088cbb6a8a09d1151a74a7e34d8e3f289b437ac05dfc4c6dc837131f8b202e766965d97f06fe81da631081431f013c6db519404d

diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index 5979227..958844b 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<herd>pam</herd> <!-- only for USE=pam -->
-<use>
- <flag name='audit'>Enable support for <pkg>sys-process/audit</pkg></flag>
-</use>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+ </maintainer> <maintainer type="project">
+	<email>pam-bugs@g.o</email>
+	<name>Pluggable Authentication Method maintenance</name>
+ </maintainer> <!-- only for USE=pam -->
 <upstream>
- <remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
+	<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 2aa20da..71353bc 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -9,4 +9,4 @@ AUX sysvinit-2.88-selinux.patch 1041 SHA256 e987ab6e478e5b3987ae1c6e338cfc66ae35
 AUX sysvinit-2.88-shutdown-h.patch 1626 SHA256 642585158e6fbb185ed53804be2eeea85c037726ed19beb51a9ffb594e63ca0f SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe WHIRLPOOL 6500d8be6313190e5ccf8ca0fe3d51ef879458f59e7ebe1849f666f3c20ffdea21d73f2951e978ac0bf7dce1f47be0113e129db784fdabb6f4407e4d78a3cb0d
 DIST sysvinit-2.88dsf.tar.bz2 105551 SHA256 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf WHIRLPOOL f4809e19ea2c72c733d3c09a4964d7a6e67b091d1f1d9ef276515b2f138148bfbf516034d3fb1009289f9520f2fbe9e29687f432bba06fb437ebd6e2b9ef570c
 EBUILD sysvinit-2.88-r999.ebuild 3430 SHA256 f475afa4de57de238795c580639b0f841b05f75b20e6cd7b1e8052b4b26d8743 SHA512 0f318cd38732fa0c968ca112342bcee413661df7f8e3334e3ca4d25af430a850e0fd57de0860a9ee63334fec28fb741e28d0308b42073159666fdfed8517d493 WHIRLPOOL 0a80ba5b1ef215168ffcee674793e1fc75f2fb0aa353cb17627456028e48c8be4a28997a6887378358454a3d0224459781dde63061344242576101233ec68290
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 81f8008..581b965 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -5,4 +5,4 @@ AUX tcp-wrappers-7.6.22-remove-DECLS.patch 475 SHA256 d7fadcd9d60955e971402033c0
 DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 SHA256 0ff28337c5effe4f91e7ea43ddd65fc629c06922326f5ef2804f70943be64fb3 SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8 WHIRLPOOL 4a22c083d3bfe18af020ea48663ab3eb5a77d613665bbeb935daffcce64641d66f5c32a88ef4e4dbf8b4edfe9d71bfc4e35601451d065c10806ea726430d2aa8
 DIST tcp_wrappers_7.6.tar.gz 99438 SHA256 9543d7adedf78a6de0b221ccbbd1952e08b5138717f4ade814039bb489a4315d SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac WHIRLPOOL e04861d03a49dd6d6d5cd9eba86732a40e79deff39d981a5e883bcfae4979c6e1c2a388eabd84691927b159e606a5649073473a717cb62c12cbd8546d75635bf
 EBUILD tcp-wrappers-7.6.22-r99.ebuild 2710 SHA256 fa2e755e7219bc2095e9384e5e44abded40b41206867a63d346291fc2bbf44d1 SHA512 6ca803e03ea8e44caaedf31f6068931bc1415ca7978b35cfa0b2c2b5da9993d2bfd78e70acac6518f83c50888c5d63970972da56baae21137cd059c57bf55cc4 WHIRLPOOL 49aedea96f174a5be1a765a901cdcced6f6976acaba3b66f158cc07decf608f9b17523d0c65a2f607694b60cf3e45d7758075dc18690559883b412d6c82cdd25
-MISC metadata.xml 349 SHA256 81a5bdc0c787284f58b68dd7e3db3cfe6652b336d03698826dd86a705626b725 SHA512 b3c8aa5ea459990ef57ffa5b66e230ea6cf7aa8acd3481183f2dbe7394d98add0a2712cd5b74fd494ca0372e79097c3e2d712514a5f20815c7673372351f5755 WHIRLPOOL 2c28eb2f649bb90041c36b7c9b5fe5ec5826382a59a13f64846bd99746172bdea5daa8d3c025d74402ec9d8beb8a675ec536405b2b223aeffd9122d9af8342cd
+MISC metadata.xml 440 SHA256 7cf7feea8b3221313ae2b674c64fa6bbf24cac03d83c120f22d2d4ba996c8bf9 SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5 WHIRLPOOL 9b7be91e1cd0f47d2ea6045ca653c1de5c23503342ec3cbf28e55fe9e8cad629277fafb9cbc77ea8fdbfcd320047067b773b9596682b485635ac6a4136305e4f

diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
index 1cecd60..aedbb1a 100644
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ b/sys-apps/tcp-wrappers/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
- <flag name='netgroups'>
-  Support matching NIS (host) netgroup names via the @netgroup syntax
-  (if you don't know what this means, you most likely need want it)
- </flag>
+	<flag name="netgroups">
+		Support matching NIS (host) netgroup names via the @netgroup syntax
+		(if you don't know what this means, you most likely do not need it)
+	</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 87e1075..13d7286 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -5,4 +5,4 @@ AUX util-linux-2.25-remove__SWORD_TYPE.patch 663 SHA256 29eb73d4a14352176bcc81bb
 AUX util-linux-2.25.2-runuser-bash-completion.patch 1372 SHA256 a3eebac8c53b3bf6e29e15e161ba460fdafed840647f49de93cf8e20856f10ed SHA512 d7a90f709480065eceddc9c0ca2186a12b941c08130d3bee69286e1cd13ef228bff6991373ce30eacbb29f4ddad8a1afdf6551652d5ca21063e0ab7211aa44da WHIRLPOOL ef5446ecee7ae1d932fe62a0a321cab55df0ed24d7ab98abf2d8cba9fbd47bd2524fac22c0a0d4ebdcacb642ece273ce97e76f763ed816eaa3df95a76579caba
 DIST util-linux-2.25.2.tar.xz 3703644 SHA256 e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6 SHA512 cf8c5bde78f844425150c2a81bdecb87aa57bcd5cebd177a78160835627f58037fa2cfe4db26fd8f35eedb3beb499a91492a297a27d065465e2ea0c6218dc387 WHIRLPOOL dd1685f2e694bf3de95acc3ba3170d231426c18c3395a867c815bbd3ab5ee0f07567b49d0ae083ce669c89db711e39fd2b990bc7321985ec2279d78816ec5258
 EBUILD util-linux-2.25.2-r99.ebuild 5154 SHA256 de6c07cae77e538e565283397df35afe5bfb12b6f27cc729a2b0b3501facc3d4 SHA512 21cd38ea994c4bac604cf3b9c39acb05ddcb12a1cf3bd2dae2abaca9a40faef9bfc6689b9cbb9ff16d2153dc78efb06ab179749bc507f5fcbd21b2f71ea1cc75 WHIRLPOOL 85931f239429777eb8125d1bddec507df0746176a15fc0864a0122f3c36244d13985e9e40689a61936ac1e78928436c45a9c77f641e14b5674b0ff347c15b44b
-MISC metadata.xml 846 SHA256 7fef382903a74be1395de2940640987cb09f84b4925bb9e19cbd803cad7041dc SHA512 47cbc59784221810ee0815e8078bb1c89147e6c69c9efa7ca3dddc66265225f98c698ca58d2a0406141aa3a069d68079c6dffae7f18cf1bc2a0b94ecf54ca6ef WHIRLPOOL 653bc6ee4435225a16ce7d662793af9bbe389185b831feeb43094b334a4662a593b5c92089ed71ed8108f6fc8768c46182f3a7f6210cfc6de14238b3c3088862
+MISC metadata.xml 1026 SHA256 fc6ac08a869c4555266d169487375ce91c49ff85fdb1a2bdf6ad5cb2676bdb79 SHA512 190010c1b4a7e2ea7c1825eb9226dc071582e042b43380473b2c5a163bf1cea41c55da9e96314ee0769636af91906ca6c86c17dc4754769256c9e6e525eea5c7 WHIRLPOOL 1700705274ea217a4e7353989f8e3dc0ae900fe87893fefb3cd1d357d1ae83f55c476de338b6bdae573767578740501b8ec9bdd45a603226594ff3f478c7d180

diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 785ff9f..c2ad0f9 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
-	<flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
-	<flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
-	<flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
-	<flag name='fdformat'>build fdformat (floppy disk format)</flag>
-	<flag name='suid'>
+	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
+	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
+	<flag name="cytune">build cytune for Cyclades-Z multiport serial cards</flag>
+	<flag name="fdformat">build fdformat (floppy disk format)</flag>
+	<flag name="kill">build the kill program</flag>
+	<flag name="pam">build runuser helper</flag>
+	<flag name="suid">
 		install mount/umount as setuid so non-root users may mount/umount devices,
 		and wall/write as setgid so non-root users can notify other users
 	</flag>
-	<flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
+	<flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
 </use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 06b58d2..94c139d 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -8,4 +8,4 @@ AUX xinetd.rc6 846 SHA256 6aeb4ec9b8ccc062b5ee8c609830c05cee3ed790fa90d7b2d8cf82
 AUX xinetd.service 192 SHA256 a14e390a742c2981fabbeae99bb2f22ea412d30c4857f34e3eed2ae72c26fe5c SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0 WHIRLPOOL d9f7d1e5c21b271e0b511ac7acac827ed954fc043ba5f6c7c125e387ff69635362cd739b8fa772f8b6e817d36c368cb7187ad78ea520c27f571b42f91e003a48
 DIST xinetd-2.3.15.tar.gz 309774 SHA256 bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa WHIRLPOOL 5bcf69b2cfac3b3713648da666e4c98d62caea4c506be9dc5cc84f1acdc643812460a158b092705274d7452d394d3f2c03b5635f135f5d900bb6a5406f0350c2
 EBUILD xinetd-2.3.15-r99.ebuild 1621 SHA256 1ee482232c0b344ea77041a2a024ac152a8416954de705c6f84738985f8f3c34 SHA512 97ce036bdbceb09510d2ecd38212d028cea9acce340f133eac997eedf7d17f0974f661189a6c38aaeb3139d7da486dfb18fbc949de7c0da099b8cdaaa36d1f6f WHIRLPOOL 129498634008b80451757cff6406278a017f10296674b9ce4d92ff762ee854b71b54f9ec45a7eddada8d64313dff1baf6ae6a5931adf18f94fb08773a07b5f24
-MISC metadata.xml 223 SHA256 4e43d08b836aef8907db5fad1cbc4209be6052ca799d7bc23777057a04856d5b SHA512 a52575783cb26bcc449e17445e4f8ca6412530e94feb4881b5931cdbd5d7d25570f6995b58629adb1f9c9077e60a71234e4e32c3b02d26b0e3b5251646960313 WHIRLPOOL eeffdd673a1c8f6357c703a221af81061d7edda923b5cd30048cc16fab7ee947c76fc906977068ec109fcbda9547fab2428d92282e395094ee3a9358b9416f3c
+MISC metadata.xml 401 SHA256 ea8c266cf998f413166f3779f3a99fad22920f8e70608603dad6ca3b7c295303 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb WHIRLPOOL 0ab4029e1c2f9f624ee4b26920a444247e6586bf7947e67e8f05042c1e1ceb87e638e09df30950078dcd017c5c4ea528e7e3e1a073aaa9024c4118ae1e69c1e0

diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index ec64a32..e143258 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<use>
- <flag name='rpc'>support RPC services</flag>
-</use>
+	<maintainer type="project">
+		<email>base-system@g.o</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="rpc">support RPC services</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">xinetd-org/xinetd</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 87641e8..31f6821 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -4,4 +4,4 @@ DIST polkit-0.112.tar.gz 1429240 SHA256 d695f43cba4748a822fbe864dd32c4887c5da1c7
 DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81
 EBUILD polkit-0.112-r99.ebuild 3424 SHA256 efefa359d9a7532552a15adf3a87cbf6b07e9f23b13221cdd518c841e656b02a SHA512 82435a7ddf17fc4cc320b6fb74002dde0ecbdd3ec053f4aa2a9a18888325024a547232d28af1df4be406ce45d896d60c9a29c126881d7b2d97ec6e3c645490aa WHIRLPOOL 78e567239a79bb51310489f6c70ed392d36144f65d606983990e5b1dd3bf44ab88f12caf6b4894219e4dc396075697f66669d24a38068cc90f885cafcf87ca7a
 EBUILD polkit-0.113.ebuild 2793 SHA256 32a23500bcc9864665ce15300246da3798712ba7eb133b4295cc5287c6358dcc SHA512 771f3e9f62fec8d2cf4d69c643b3d30c68aa18b59eecdea670b00ff6439af57a20472224a825561155e9b0a8bd0d638447c7edfdc2c98a543e50ff0b7e5b56c8 WHIRLPOOL 0cce90b3ce2acffd2625414329d887ef8fe2a56bf7bf0e7b51c991b016fbf82f893ffc7816a55d47d73d3de0e4a4094f5266cb9eb7730837637d355f6b46b301
-MISC metadata.xml 379 SHA256 ecde37fb639f16a58cccb842e5e1c5ab40359a62045c3d622f4960cd6c3da42b SHA512 6d0bfcbf0e5123e4f088b0d8b6f8558c7a5f62b0dde794b61c03466790d4064071dcb2b47350f197049f5c2e34aa762cf0f1829a2bb6de646c46f2f5bfb8264b WHIRLPOOL c457da71156bb08f89f6a0479334d1a665c011987d084f1a49a23b4b6109b929c75b1d29bfd149e22921de19f159c7d2fc46de6f2c94541f9b93b1d676e0a92a
+MISC metadata.xml 368 SHA256 6534d248e3385826f0d340734e1242c15261786e32db74d12499062ecbf2bddc SHA512 c7c83834285eb494682f56460e5a494a368dff4e9c9dbcfe7ad367a403e812dd64f0bbbf49b26f8f9e8f83c3c40ddeaf7489c8e632a0149e0be056be04aa031d WHIRLPOOL 90d3f192e593775dc409984aedf177315af40991781d84f080e3f0864d0107c7320c76fcdd48ca2a5d5c2415650c0b1dcceeb9026f0b4409a10741a77daf5880

diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index d553f2f..cc3a0b4 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>freedesktop</herd>
-	<maintainer>
+	<maintainer type="project">
 		<email>freedesktop-bugs@g.o</email>
 	</maintainer>
 	<use>
-		<flag name='systemd'>Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-auth/skey/Manifest b/sys-auth/skey/Manifest
index 2b5fd9a..61396fb 100644
--- a/sys-auth/skey/Manifest
+++ b/sys-auth/skey/Manifest
@@ -3,4 +3,4 @@ AUX skey-1.1.5-ifndef__P.patch 441 SHA256 dfd20f625fd6c520cb4dffcbcd4e8c88fdbece
 DIST skey-1.1.5-patches-3.tar.xz 33604 SHA256 adabe7b286f586d2cbe1a4b15f71310b7d8e25fc3187f8a89071359d7975badf SHA512 dcef6837e563ce3f68fe4eed35f16db1636e1798219dba95c86db505b5f67034b44bc6d02e0125faa95db8a5c39e9615bfed2dc3105905e576d96cf32016bc2f WHIRLPOOL bff241ecf0f59dae810db300bd858f76e18153f1958f2154c538f42040cc1040f049442d697767cfa7346996931d81370c2551d752c52810c9b18fe9e351c212
 DIST skey-1.1.5.tar.bz2 61911 SHA256 e21bcb7c618c0bc87a72d8f0f097d7517fffa4e881a0f295ee1ce2a7dccf4aef SHA512 4cbddc7e31134d5e23801a9b07de0d05c8357aaa8dddfb8426fceead3f54e539f77204f78a08b2a93890ef2f4f807a2208080f58f80818afa1b8cd4884b1fb37 WHIRLPOOL abf141fd679deeaee3f3883cd3076620c84e8775ecacc8f87d561c1812beae55299989f37ec331633bac29e25b4b8d145dc590ef119c73a137d8790815bb13f2
 EBUILD skey-1.1.5-r99.ebuild 2116 SHA256 ff28fbd42e66ade2e9f48f652a4bc3d8cded2993c5350708c7d84becda5842ec SHA512 e68267e151380cf969bfb4099cddf77553ac996cba2c15a87776839fb19fc15512d571a2c5e5ede1c3f4f255fd88927b2407d58cff09a1922d98696209d3e09b WHIRLPOOL 62877c00f7d9843bae810c5a3b34f7de557d03e466f0c32f219a8469722bb64a6da023e082269b83939680fb43c36c657a69695e9dc1dd4811aca9dec623c670
-MISC metadata.xml 1418 SHA256 786262fdf7d44c395db41d8d273aa75a4aa390abd30348a2fa835e7a8eb64ffc SHA512 e1d9008e9ebf868ecd9d45704c4ae2c907e35550cbbc96ce9a757f90e80f6881bd7a4a26355fdc2fed2ae487dd6557e18c5426654e5373dea1863c379875a2b1 WHIRLPOOL 2783acc5a7b3f0361279dffe3a8fc8ec23afb97af5a2b30208e0ea1642a8cbb00282def5d25f358616f478c04ffcef37393ddecac0cafc8edb9f54606f62b974
+MISC metadata.xml 1432 SHA256 a291b68f13eda0fce9f8ae67619877c1e66b750fd61f38dbb8fbc1e4abe2176d SHA512 8fe776255ff049ae9c16ee0ff157761114ca4fcc777d103e707557ef5f18fba9d65e63a77f24219e27d267cd76839abf128210969dc4330d66920a2ee574aabf WHIRLPOOL 174360e0598007cb5399e8135f646f547b7df603d2548d897e386d732e1a742288a80dd2717e27bf1f608ec1e3d56428b5db15ddc2ae78e3afcb282b34d886fd

diff --git a/sys-auth/skey/metadata.xml b/sys-auth/skey/metadata.xml
index 31fc6f4..93a2420 100644
--- a/sys-auth/skey/metadata.xml
+++ b/sys-auth/skey/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
   <email>ulm@g.o</email>
 </maintainer>
 <longdescription lang="en">

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 358cafa..d211419 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,4 +3,4 @@ AUX parted-3.2-fix-includes.patch 257 SHA256 f87c9290e861b969f4520a1af84ebf4b8f5
 AUX parted-3.2-po4a-mandir.patch 275 SHA256 327ffc2ea942a58a63cf6dc21d041965ee76b3b7d4d01b36a0654dcb6b0a92ae SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872 WHIRLPOOL 643013b78ebd6dbd93a60e7fc46215851bcd9d3166f0df308fa9d1a3927772cf1d63d2ba0da737983b3fbb0ff125f946d27662808e6233f6c60bdf4f7425898d
 DIST parted-3.2.tar.xz 1655244 SHA256 858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 WHIRLPOOL af928177b893150ac6d5e0efcef542b6fa0df6b135f975078f7d8d5f7a4b109ef4c1f8eeaf6afc5c34448ff662ce4cbe5289e084f4ec05257666503a0cd3c93f
 EBUILD parted-3.2-r99.ebuild 1424 SHA256 194bdb7d16ee41340a859fc1d8e9621943db8ea294660af05e4b0aa8ef493457 SHA512 5e72c2363a4578cf16eb476f1e8aedd39b353750223151d6e07a0ff98feee2e8af82e9732e35790531d63fdfc9fdf968f5e11b07d2da6397f75c0d479abe3a84 WHIRLPOOL 6f1dc64779807e27132d77b56a2be138b0b98e1d10c303f24aeb2c41b3c41a2e391bc4258da0cebe4ecea3ac182e23ed2a74545c407b169a30eb1c03e55b1106
-MISC metadata.xml 654 SHA256 6e27cdd8e0c516256079e3ad9606e7b660a3fe223e3d769c3a5fc265f5d13bd2 SHA512 4e99dbb6bacc84d5dfccf4f56cd474aa5cd9368f23989b71d38101913702f5670af44f41947158b07662fcbee3ddfc36eb8cdf8c3899387a8cf4efd4c24c6ccf WHIRLPOOL 49366ca8e059614582ec750bd215ef79b2090cb615e85d1d5e5d4093c135ff9a4513862ecf9827318163a622df035855b0795ab6405427c4d48712fe2080e0fa
+MISC metadata.xml 754 SHA256 2d42fbc8cd3794d340cfe11cacec0dc085d47263a3e35f754481dac0838a52d9 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184 WHIRLPOOL ca7ca6b6e54835e668d6db0a043e3e8e10d61da933a7ba7bafd799b5f6c995c846bb0fc587a46eb32024876f2642a913e6f1f88164e1dec876702895ed22561c

diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 57a6769..2011c01 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/metadata.xml
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>livecd</herd>
-<use>
-	<flag name='device-mapper'>
+	<maintainer type="project">
+		<email>livecd@g.o</email>
+		<name>Gentoo LiveCD Project</name>
+	</maintainer>
+	<use>
+		<flag name="device-mapper">
 	Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
 	</flag>
-	<flag name="debug">
+		<flag name="debug">
 	Enable debugging as encouraged by upstream: [The default configuration]
 	includes --enable-debug (by default), which contains many assertions.
 	Obviously, these "waste" space, but in the past, they have caught
 	potentially dangerous bugs before they would have done damage, so we think
 	it's worth it.  Also, it means we get more bug reports ;)
 	</flag>
-</use>
+	</use>
 </pkgmetadata>

diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 0fee6fb..b249c1f 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -2,4 +2,4 @@ AUX thin-provisioning-tools-0.3.2-Remove-ambiguity-between-boost-uint64_t-and-ui
 AUX thin-provisioning-tools-0.3.2-strerror_r-returns-int.patch 1384 SHA256 b604495e13eeb02bbf9c3970053249f57f54fb5af8a1565e75563d434dd42ca5 SHA512 93edbfe491bc491946c47a62ac2020b65b70e5196dc475a99ca001942a0869ff7c4e5a017172d2e5530c6dfc48a5ac8565d6a27134e3a54cd14601ff6ffe7574 WHIRLPOOL 39afca367a4592da272cf9639f276fb2350e9ada3902a37f77297c9dd3020f997598e05eabda00a28e592ab081356c7b195239c48c33a7e80382ffc41e9c4b4e
 DIST thin-provisioning-tools-0.3.2.tar.gz 175049 SHA256 1b9d8e9269cffe06f3c87214d35436225e12599debefbf1a50194c69cc3404ca SHA512 d6e18c303769b39c5bd48ef30d2819adc57d2d87b3c9b56d5d72468fb35f9b7b2309d35c6c12eabc36d653dd85338b9ad2fca9eed5c738a87b932b71f3a6da4f WHIRLPOOL b1bd87aa1995ba0616001837247c962c492d0029cb8a89b97aa326eb63d8a89113905f5d34490593e0cfcca33ef074e02a50679d22c3b1859d8fe5b97368c608
 EBUILD thin-provisioning-tools-0.3.2-r99.ebuild 1489 SHA256 7cd94d475a27243363579266113ea739aa42f25deda72ad63a5e0d0b6c80547c SHA512 120c03e0879113710d87f14b91f85f06362d1f01521e88c8cdddef24ad39bac99113622e3a13578bc32e7cdcc785e4e106c1ccf987b95c411db9efaca8f73085 WHIRLPOOL 61d8fa61e9cfdf3062ead6009c06ec5d6277ec1e1bbd37227596668c34859481a9c25e6293a4ec3751b93ce6bdb162a5b164a3afba72694e134baf62352a59ab
-MISC metadata.xml 457 SHA256 8283b979ca234301828c060894ba654b7731811ccfb860dde7cba90dafd05ba8 SHA512 838f6d3e2514c91dbcef049b0dd866fc71c8a0040c1bbb128a2613063f298d40dfb63391de97016cc768811c0cc19e93b89ff8c2061f01cc044048a8c090e1ce WHIRLPOOL 254971786e417e803815d12032e5ebcdcbe533f719acafbdb0b8dd75521f33e085f5f4a501379a8e95e739656290f12a37ed29c3a4ba03e98cb57dc5c32d1698
+MISC metadata.xml 520 SHA256 6dd783de6d9d74a70f8e92b2ab847808c8051c706cf5ad7f97b6834daa39fa93 SHA512 d7302b86126a546e5e2ea585ba5e570000ca03f673b506a617e9220894de9b632b44e36570c761f4f1a7ea14f1cf1df050f939bc2d868fa549b1d0a5e4be2414 WHIRLPOOL cb6c0f926dfc270f19641e7a0acaf7872eb7da54e0e1d3d9808ac943c0ceff3ee0b3e412a2fe70498e474ecdec78095501610b09fd5c542514590d565d9d02c7

diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index 659c8f5..dafa005 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<maintainer>
-		<email>robbat2@g.o</email>
-		<name>Robin H. Johnson</name>
-	</maintainer>
-	<longdescription lang="en">
+<maintainer type="person">
+	<email>robbat2@g.o</email>
+</maintainer>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<longdescription lang="en">
 A suite of tools for thin provisioning on Linux.
 </longdescription>
-	<upstream>
-		<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-boot/lilo/Manifest b/sys-boot/lilo/Manifest
index d62b99b..389f540 100644
--- a/sys-boot/lilo/Manifest
+++ b/sys-boot/lilo/Manifest
@@ -5,4 +5,4 @@ AUX lilo.conf 1722 SHA256 1cc9e4828e7b61f7c0ebf6655d7d6be3b584461308b568267f3c1b
 DIST dolilo-0.6.tar.bz2 3817 SHA256 01293874aea4cfa935d3f22fd52c8f4956e4a85b39a878df1255098825f2840e SHA512 1b59ea5f2e2ac52d62635c9f7d5fb5b2aff6757e6ea6c0950480d8a11832b872115907abe6d8fb3fa5436e2e8971d9a1dda103dc6a15db6fc310c8f4730ab936 WHIRLPOOL 7a24cf7bf4b476967a5d4ba2234ce3256ff9311744be020ef25e6227f8e86098aac89706d23df30d3f0212aa3fe313c0460d1709990b21029d93517b77f61e4e
 DIST lilo-24.1.tar.gz 773223 SHA256 a15280edacb8bca31b9163d65e61270b8c06cb9ffea74374a3a42164a13d4532 SHA512 d1375cac9654fcb3934e7e5e0533e126ff8700a48154eb5019cf62e4b89f14d2ce7a17b6324795d9b60b37ab7656bfb2c9467f6e9d3540095f5c294579e83883 WHIRLPOOL 6534b9494cce30c56f0ec700eb8288ebfdfb9e07ed631958e3f34d03d4fb42de372237dab5d07a8b8ef1c3da49b427d3777be14de9abca339dcd184fce550ab0
 EBUILD lilo-24.1.ebuild 4564 SHA256 2a25fb7bd179f31652f3cae98fadfc25467db509d86b6c5d3d8dae80f6552bde SHA512 f9d71eae845650fcdf18c91cb3b841afa198062e05cb96c7721ea6b6c7effe191ffbf7b36aab9ecf0650770a2ba813ad7c996870af24e0dabe97993cf1a33827 WHIRLPOOL 52548e76442b14d1f5b8e866fdc4ebc4b13334481b7c534c86f56e641cd9421ce0ca974f9e792a0891305503f294fc4d99112449f87e70290f5279ae0ce011e7
-MISC metadata.xml 504 SHA256 4cd65dd103dd97351619de30c8a8eab3f344cb43041a2377e3d8ef8cd9470500 SHA512 decf3fe5ba2137e315f5a7ab428dabff096d01b9eecbce6869e3f33e15f2daaffba450dea1a824ada9ac88a0c2eaaa9160234990c6e0c0e13a75b1c94f0352c0 WHIRLPOOL fc6a70bf788fb0314c8c49012a403212ca080a35ac03277ca254eb29f050276c8e0b366e3258b3ae20e3050b2a72a9f45535a4c313c2f122b413b4ec80e744ca
+MISC metadata.xml 582 SHA256 7c21cd3c98979e17fc840b788c7fc0281fd2049957ee826099097189a45f92f1 SHA512 e9c7e5bcd88fab10e756ab7e22a949d1eaa9552cfad60891ca3f47d92fb3487ec74baee67539fabf9db2c15b225ab40050ff5e3ef1d7f858723bf8ae1b80fa04 WHIRLPOOL 5912261c9f2ca72618acf5f6bb7bbb899ed10548f77afb7ed74364879eb47623f16002a6671dee111a6d1bf76e320c64601d8041619ad97faa27327f1e46cf9f

diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index 256d249..0deb765 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
- <email>chainsaw@g.o</email>
- <name>Tony Vroon</name>
+<maintainer type="person">
+	<email>chainsaw@g.o</email>
+</maintainer>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
 </maintainer>
 <use>
- <flag name='device-mapper'>Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
- <flag name='minimal'>Do not install the dolilo helper script</flag>
- <flag name='pxeserial'>Avoid character echo on PXE serial console</flag>
+	<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
+	<flag name="minimal">Do not install the dolilo helper script</flag>
+	<flag name="pxeserial">Avoid character echo on PXE serial console</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 9e546ca..b03341f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -55,4 +55,4 @@ EBUILD gcc-4.8.5-r99.ebuild 2139 SHA256 4531cbe9549980d5df32bd76395dc874b8769a11
 EBUILD gcc-4.8.5-r999.ebuild 2185 SHA256 979287614b304df1054bd5ce0f296f6ee1e7d7ed0cd8299d3810a379757d2145 SHA512 c12b551ecbe7e2ae29d19608b8c64fdbc3fc4cb6ac2fb8f95ec2f1a5a52f3dd89b7f3496375c4f22ff9fc4ac80a6503645d6cb7e045a8e6c6dd07278350b4c31 WHIRLPOOL 9616615a24bf1bbbf72e01d008c8b7635e77d8489a049e455e1cb167ae117926bf6284df220bbad7e253be7e62a5ecc09e3c31c189d6f3a6f568bd0654126806
 EBUILD gcc-4.9.3-r99.ebuild 2195 SHA256 6bbc9fb6e85d1cec054602a3af368f8b10c2f5ca8f7ddbdc17e07663283d5aa4 SHA512 934b06b2f421af49848f2cfc29e89c0f97f9e5a49d538313d8801c86c1da1871a294beefbb797681db010cfef788747ac75a9aee3e1091e6bd2d10465142569f WHIRLPOOL 5a1411b68a50d84e5878874a97126f9fd3c3b9fab58610687f3b035ce5102af7e6655e6ad549269f884c0c076a342dff299cbd40fa7d15bb0fc4bd04b7712f91
 EBUILD gcc-4.9.3-r999.ebuild 1794 SHA256 63ea5997e681bb1813bc5e81c9566c76a3f9f6179fd9aac13257c8ad79347f6f SHA512 55f06ea032ca07e45741974c1aed714c39b18b2fdd80f2a37e9f16dc18a17ec02d6958b5c61106bcd88547a52a9e94d7d4765f19034af62652ec770d15a029d8 WHIRLPOOL 974c9a10b920e3860ef64ec7bd4affcb635efa299f703f474fa03f19c6fb5e5e8d719e81c1430d0f46742bff3c7eb50478e84388b92b00fd687295bbd38c242b
-MISC metadata.xml 1992 SHA256 a0e46cb8a74a9eea1e211a24c851854a24d1a6a70299ef7d7650fc1986b4e2d1 SHA512 173a15ed9c4399ae37ecb78246d0515109ab60988664029b2335b7f5f65391e166ff905d7e92c6a4675381a4fd83630faaf1d8d8fb00675e000acc697df2941a WHIRLPOOL 08448587d2cf88db483810612d148dd3400e3768a240812be37e209f2cb34c3fb5737f7e497bd2e2f0c74f001104040045d34b461f762fa35a6e67d0bfdff025
+MISC metadata.xml 2273 SHA256 c168d808cb4641b16e3f84f135a6cf6ece6265a6bce141029aab25c9212894d6 SHA512 c4741c47b5ce22c16ca5d7b64c968fa127169f70c256d53b37e436a209a4783e6ec2d73daf5024cfb8c0ca857d2e450a62d8776c9c81e2661643b49db98249e9 WHIRLPOOL 748a731255d9594b554be8350cfccf091b79bc3d404d7c95779e2de73e9d26205ae1b0091e2573b2cc699be7283a171ead58cd8acb9b75da7d444c2dd78f0bd3

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 041c0d8..6af604b 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -9,11 +9,14 @@
     <flag name="awt">Useful only when building GCJ, this enables Abstract Window Toolkit
       (AWT) peer support on top of GTK+</flag>
     <flag name="cilk">Support the Cilk Plus language (C/C++ based languages for parallel programming)</flag>
+    <flag name="d">Enable support for the D programming language</flag>
     <flag name="fixed-point">Enable fixed-point arithmetic support for MIPS targets 
       in gcc (Warning: significantly increases compile time!)</flag>
     <flag name="go">Build the GCC Go language frontend.</flag>
     <flag name="graphite">Add support for the framework for loop
       optimizations based on a polyhedral intermediate representation</flag>
+    <flag name="jit">Enable libgccjit so other applications can embed gcc for Just-In-Time compilation.
+      This will slow down the compiler a bit as it forces all of the toolchain to be shared libs.</flag>
     <flag name="libssp">Build SSP support into a dedicated library rather than use the
       code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)</flag>
     <flag name="mudflap">Add support for mudflap, a pointer use checking library</flag>

diff --git a/sys-devel/gdb/Manifest b/sys-devel/gdb/Manifest
index fe0ae6a..9b84813 100644
--- a/sys-devel/gdb/Manifest
+++ b/sys-devel/gdb/Manifest
@@ -2,4 +2,4 @@ AUX gdb-linux_nat.patch 617 SHA256 dcef02741f402ad34c658a90b85667e93e1d3293fe294
 AUX gdb-missing-stat_h.patch 398 SHA256 88a49f997609644866ca873653b1f7cc09f75edb33b2f32ac73c7caffa1ce8d3 SHA512 8b1d22a61cb471df7052d2215dd5d67175e1732769bde90cb992d23ef97dd7153e2ab348ec184577b9491b68184f542a3f5fe8027b280b5feb38b23353568449 WHIRLPOOL b83c3a7a1825e54f8deaf7a4068b4c1b99adb9d6c1c6ef04eef47450a12f90bcd854462703e006aa049c68fa30d7b64cbbfdca6d0f5dd578f72d6704ed23f1d2
 DIST gdb-7.10.1.tar.xz 18531436 SHA256 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 SHA512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 WHIRLPOOL 02936f59d3f3f8a57966c72402f1da128dd8e10e686097ffdb3a2741cc0c1831ef27f97daa047fa006ff2ae9f79ae0480f6f0dc2d3f5904190a1dade0590c837
 EBUILD gdb-7.10.1-r99.ebuild 6371 SHA256 324e9ade09f3abc274acd5168dee9c3354b071e16c85f88f99181a09dcaa155a SHA512 766c7036a44c481609e5d65a29e0f14ed86a2317f99bbedbc6cc56937f16cfef542fc3367c6cb547f5d30c6d5ad92f5d7ad47073957024be4e0455ca0f89b8f4 WHIRLPOOL 56da3cfcf6dd71b4c93ff86f6bc3ee737c4dd105148d8cfab68f27e65ae74914497e18fc7ee4132a5caa2fab046be159f5f28452936be0a38a9451b985486cb8
-MISC metadata.xml 552 SHA256 e86791dadf315a7a079e460854bcc4a28d7c69a93694efc85014b325824b81cf SHA512 bb4901b011b63137fb7e359ff657fbe8aa2bd7d36a78be397c163a0bd37486a32bddf4929ab5a2a3b7b7d52f3c2edd69ce18d4bb5e2f56b45d43bb59cb54f686 WHIRLPOOL 214e51279eed4230ed8cba15e42581213428ff06c32ad7832b17c1af6c2eae351a843aae51d78a99486b5bbfea2369faa4aaa4b99cae1ce7a41da5748d8e2211
+MISC metadata.xml 789 SHA256 f2e0873018de92fefc1201a7fa9ed40c545e77f3365c4c63a4f7a5ae1a061536 SHA512 3b8d945ea9647f732983d254e57cd4bb224a3ceafe0f2be090ec9495393453b8f4c5dc8794656b9fe30f2f9ed20e5e6d532f071f57bc2ef40f56b45de0253e99 WHIRLPOOL 087bcb96a1fee951d96d02ba8d1536dc46e9ef8cb6f8d8e964151dc5a9bb8113b800aac052d7697c8b353903a7187e19a7f756c72f1e2533e06ad33e29210de2

diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index ab9c41a..e2ea101 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer type="project">
+ <email>toolchain@g.o</email>
+ <name>Gentoo Toolchain Project</name>
+</maintainer>
 <use>
- <flag name='client'>Install the main "gdb" program (most people want this)</flag>
- <flag name='multitarget'>Support all known targets in one gdb binary</flag>
- <flag name='python'>Enable support for the new internal scripting language, as well as extended pretty printers</flag>
- <flag name='server'>Install the "gdbserver" program (useful for embedded/remote targets)</flag>
+ <flag name="client">Install the main "gdb" program (most people want this)</flag>
+ <flag name="lzma">Support lzma compression in ELF debug info</flag>
+ <flag name="multitarget">Support all known targets in one gdb binary</flag>
+ <flag name="python">Enable support for the new internal scripting language, as well as extended pretty printers</flag>
+ <flag name="server">Install the "gdbserver" program (useful for embedded/remote targets)</flag>
 </use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:gnu:gdb</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 76b09bf..65a2194 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,4 +15,4 @@ DIST compiler-rt-3.5.0.src.tar.xz 1088352 SHA256 a4b3e655832bf8d9a357ea2c771db34
 DIST llvm-3.5.0-manpages.tar.bz2 35314 SHA256 724e752a60016dce8cc536658906d3646c600e977374e0ea692a5d0fe2d4a021 SHA512 d99d6096d7f21a81923297584fe5eeb23e0d83d4538fe376615c92fffc8aff3189999f7ab3c537b5aa5d6bc2c22c53eb05717d48c7ab99c42315b8665bac62c3 WHIRLPOOL 68ced06ee6678c5333c662eb1cc0da744c5a184b12dd059c1b77ec200b1d3cc231f270b9d9b6e177d728776894277b3f9061338aa55620c90474eb97915b7819
 DIST llvm-3.5.0.src.tar.xz 11735940 SHA256 28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03 SHA512 b4d0f325dbdb0a8f10e5fd031954ef4b1971d8f99f4e4b53834801a2b74a7acde3f77c655c8355b407424b363edfb10f71d85fc370356dc52af5c636a1bba197 WHIRLPOOL 561520823468b61c63df8e13f876b7ac586eb1e52c256e9a36370e5d46e8cef3937655c36fbb51eebd3680fab67412e7c777479477fc728e7a8f35420e573ef1
 EBUILD llvm-3.5.0-r99.ebuild 15202 SHA256 9f42e4f0476d40babc95d1acdcce051d12697ef07ed0c4ecf3f4a2e332a6f733 SHA512 b647fa654210ec4673a20bc27958cd382e590a5f311c919fe85cf761360d6375287c3362ede837feb9c1334bef135bf21ef7f771a654cfd80558b3f7d6d23f3d WHIRLPOOL 7b9327050a59cc343d2584bdbe242cda749955b0bdc4ff1b3879ed98d8cfa14b0238acd37e032e1df66eea47cc5f44a3d351323da296de3a37425618b24910b3
-MISC metadata.xml 2787 SHA256 22dc7b91c98fb4258271cc9cd4bd99f214b30f258bbdfea83dc37ac74df8d498 SHA512 4fca0d2551a889e7800c688077adf405697d05730bf66621ac53fdefeeeaddb7a8d868973edc9a6fe48e9a07734f1d43fd88229bae693fe181a7dbb95eeb9481 WHIRLPOOL 6284033d40bef02510f924ec1e6a9d3e1072bf26945fdedde0ddaf1d6d35c3d30971cdefa583a8e4d9db3da67bee04145ace15ded4cee63f534588b66633c76b
+MISC metadata.xml 2789 SHA256 17de7fd8fcb5bb970ebfe11d599025266a179160573d9b5ad73ded5ce4ad648e SHA512 8c9989cb8eb7b345b2fa92ae3c304d728bd06430e6488c645175f9d8e3b89f9851b80ac3860050a8264340ba15b7580e4bd9cb09ff40d65c7a637474023be0ab WHIRLPOOL 0732cc5e716d862a346082e4dcaa47d5609e6078fffbc46650a1641cb53cb538ac360247b5cf385ce1233f513612b1e492efaf144ce150e45ada62aec9eae418

diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 1a63066..c49dc52 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>voyageur@g.o</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>mgorny@g.o</email>
 		<name>Michał Górny</name>
 	</maintainer>
@@ -15,14 +15,14 @@
    3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
    4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
-		<flag name='clang'>Build the clang C/C++ compiler</flag>
-		<flag name='cmake'>Enable cmake support (experimental)</flag>
-		<flag name='doc'>Build and install the HTML documentation and regenerate the man pages</flag>
-		<flag name='gold'>Build the gold linker plugin</flag>
-		<flag name='llvm-gcc'>Build LLVM with <pkg>sys-devel/llvm-gcc</pkg></flag>
-		<flag name='multitarget'>Build all host targets (default: host only)</flag>
-		<flag name='ncurses'>Support querying terminal properties using ncurses' terminfo</flag>
-		<flag name='static-analyzer'>Install the Clang static analyzer (requires USE=clang)</flag>
-		<flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
+		<flag name="clang">Build the clang C/C++ compiler</flag>
+		<flag name="cmake">Enable cmake support (experimental)</flag>
+		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
+		<flag name="gold">Build the gold linker plugin</flag>
+		<flag name="lldb">Build the lldb debugger</flag>
+		<flag name="multitarget">Build all host targets (default: host only)</flag>
+		<flag name="ncurses">Support querying terminal properties using ncurses' terminfo</flag>
+		<flag name="static-analyzer">Install the Clang static analyzer (requires USE=clang)</flag>
+		<flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 935766d..7e08fb8 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -3,4 +3,4 @@ AUX m4-1.4.16-gnulib-musl.patch 639 SHA256 9508f42d238c19a778e7e992b809aa9b8dba4
 AUX m4-1.4.16-no-gets.patch 809 SHA256 6059410a6ed64f68a07aa28cc65bc1c7ee6c6528f2750f1c5ba966d82eb521b3 SHA512 eca7f8f669314fe824351e9c05fbd4d152afe2e434f083060ddc1fa47f65822f0147468260ad058890644e8aef68ec317c1003f45bcfe31d3884d62f029d9fd3 WHIRLPOOL f12bb58b7ea491f3d764224fe52426db8d847f78e9908d8e2dd8f51add9b461fd8dd0296f9c07bd7dbc8aaab29c13aa1e3d361501318c67af236627138fca3e4
 DIST m4-1.4.16.tar.xz 1005264 SHA256 d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d SHA512 1123671ab3e0b1b13a4a08035e792a93af0d7d0a5b9027982fe7b5104488a0746906068a0f4774c1f1bc2648ba1bc74d690836e90ff9391464278e4ccbc7edf0 WHIRLPOOL 0438098dab71f6a66c2b18aed2941ef9a2152a8061c2f9903373a1348b261354429806c2bd313f55c7aaa612fe4c2f7628a1fff3c80819565df2a3b664485c23
 EBUILD m4-1.4.16-r99.ebuild 1456 SHA256 bf9120b727d18a0f2d9aebd62ef3aee45c826e51516d1170b40046cc2e95a88a SHA512 7a0d2681ec0fbf13b953a96e2ad64f56d68f9ba8b46993dd658dfa3d8e0dd5cf47d7b3bdd761dda032c1b65bedc447279c78fb66f4b1452970e7ae113f6108c7 WHIRLPOOL 6c9d3c7c3bced8900ea97521c9bda68c3b0d921539b4e61783a0ad8b3372235445b5dd540375973fa872e611a8e694d6de0f108f19ad832d8d5df4cc5dbd9132
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 1ee4cd4..cf3679c 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -2,4 +2,4 @@ AUX dosfstools-3.0.27-Fix-format-string-in-check.c.patch 886 SHA256 44f80903b89d
 AUX dosfstools-3.0.28-fix_build_with_musl.patch 815 SHA256 fb8cafac2fc31b726aa5a8a74b29554a6865a6b92fb8aacf01fafc630dcc18bd SHA512 f1bc61db4f28ceb70ec30be007ca1b67616b61ec44c82cb373d83803fa8a075cc051ae77a002ed487764f2623309db6d61b5bbb9a5764d48511feeaf2ef6fb54 WHIRLPOOL 1627ff041848a67f768ec6e706f22c7dded41992499694e073107d5cad745f5c452f2d69ec4e8d3be5d0231152e96fc52a3af088e8a0900ce01cf6d0b65a7409
 DIST dosfstools-3.0.28.tar.xz 82980 SHA256 ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2 SHA512 7325a9e05f51715b358cab0a8fa8f8096422b470f1a43eecfab2adbb954e1daf6a24003121be5b3a22de5fcb3e3adffbf1551e2158852b6663fd57a109f057ad WHIRLPOOL b584aa1dee4db96c04f19b6ac46b6322c533fcadbafb09546412e4d6a7568e23abe6985389dc446dacbe2d14f36dd7a8b52fc83b93ab1f5864b4b61f14f6ffd0
 EBUILD dosfstools-3.0.28-r99.ebuild 954 SHA256 667f2342d0b8db2b51568a71157988835b7bdf15a21a5ede942332e6617768b4 SHA512 96718cff2640c6279419114e127d4b319858fd62dc9d26392e07011ecc421a5dd7e5161223def86f340af1e47720250e48fd2c7bdf4954ae7ca62fb256aa63f7 WHIRLPOOL df0b1ce733cd5669fb30672abb6487f2eaf08639162f242a16c5031bbec8c78a939e393eeb53dc0054e5d087cf1ca97e9b7fa72169e27aa759138237cce293b2
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 336 SHA256 3ade627f556b298b7ecbb4752b605e9293190a363bccf4d7a8a5b37e1bd011ca SHA512 9b4ff28a14cb214c99ee641b052685ae7557049e1489bcb7db3d237ba5f5d01583fb25d3e5b9830fbeac07935e7198b832c31355c06e9ab05fd6062025c6dffc WHIRLPOOL 78e62036184ef7a82fc4047073edc738bfac3fb4762095284df91a4bfb09937a66ca96fc31ff1d4914c024ef27dc5aebbe800bae219a7b47a56a74f91992e02e

diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index 96a2d58..7d74eb8 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+	<remote-id type="github">dosfstools/dosfstools</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
deleted file mode 100644
index d31c0a6..0000000
--- a/sys-fs/encfs/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX encfs-1.7.4-encfsctl.patch 243 SHA256 ca73c93de560460893cd125bf408f4f5fbf37e6aafb98b1e8d736e8b48aeb0d9 SHA512 c6d2c74ed14e5375c0a19b45a9beb945d3bdfe3f1a02e97d8f5b5d6008b87e5a94305249bf051aa122480df8488d874b2abd1fa35e373d5c415d99af3589050f WHIRLPOOL a77caf91c0d83dc00c9a88abbb93cf4be603a3f94e76c66864172d01ddfbcd28d04df92f5dbea5c581ca8d9143a0f9c5a66fc59ae9c575a34a19c04e985df813
-DIST encfs-1.7.4.tgz 931048 SHA256 282ef0f04f2dd7ba3527b45621fab485b7cc510c2ceee116600d0348dc2170a8 SHA512 323db9a9e7b3bc76902e0aefc6cad34974be27586651b21cc3e0550999a6313b997ad06d05a659dd7112a1f499cb60a547837d40f6a1547c9551c28ef765beaf WHIRLPOOL 7eafc12b47d5820fbcbefb45156ed3fe78aadc6d93b6f9f49ca7c5ffe8169dd8d63410d05a9249dba87bc31c0c1c504de29efdef2c89cc5b5404fb5ee5a70914
-EBUILD encfs-1.7.4-r99.ebuild 1051 SHA256 11123fff7dd23e23c424ce85b4b1f1daae9d79e0a5004deca86163df1558447e SHA512 7412cb0d002a0d53108269c2f83e471f87fce70b9e7a9d8a5f215827b8c8f4cf4fcbca3de6688b6453a36899261ed1d8bb8c89dde44b9a1a787a5a51637d637c WHIRLPOOL 821683fb533b7e1be48e8013f986f6532b21c4fbb6a53cf71876d1d58e88dc94231760a37bae19bfc5e165043ec6a12b7ab3c657a0cf3463c87db5484b515a36
-MISC metadata.xml 313 SHA256 abe6b6fece5704f3a514740324c6d3bc9a77959f4a61be0888d3115a5def3bd7 SHA512 a0dca7552f2b432de4b6520ff39688fafb87243b9b3a8458958b2db4669d6a6061628dd4a7e75cd195b357f7220c83b104b9779abfd1f3ff0fd2da86e0c581bc WHIRLPOOL 0ebf3e41f00ea50f329eade3a499a6caace811dba0af84e817a5527270b661d6dd1b6b8a2b468323d40613e688f06b80487c37a583e39341441fc7c34e947833

diff --git a/sys-fs/encfs/encfs-1.7.4-r99.ebuild b/sys-fs/encfs/encfs-1.7.4-r99.ebuild
deleted file mode 100644
index ac96834..0000000
--- a/sys-fs/encfs/encfs-1.7.4-r99.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/encfs/encfs-1.7.4.ebuild,v 1.6 2012/10/31 23:14:20 flameeyes Exp $
-
-EAPI=2
-inherit eutils multilib
-
-DESCRIPTION="An implementation of encrypted filesystem in user-space using FUSE"
-HOMEPAGE="http://www.arg0.net/encfs/"
-SRC_URI="http://encfs.googlecode.com/files/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="xattr"
-
-RDEPEND=">=dev-libs/boost-1.34
-	>=dev-libs/openssl-0.9.7
-	>=dev-libs/rlog-1.4
-	>=sys-fs/fuse-2.7.0
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/pkgconfig
-	xattr? ( sys-apps/attr )
-	sys-devel/gettext"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.4-r68:69.patch
-	epatch "${FILESDIR}"/${PN}-1.7.4-encfsctl.patch
-}
-
-src_configure() {
-	use xattr || export ac_cv_header_attr_xattr_h=no
-
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog README
-	find "${D}" -name '*.la' -delete
-}

diff --git a/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch b/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch
deleted file mode 100644
index fe11172..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-encfsctl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/encfs-1.7.4/encfs/encfsctl.cpp
-+++ b/encfs-1.7.4/encfs/encfsctl.cpp
-@@ -38,6 +38,7 @@
- #include <getopt.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <limits.h>
- #include <fcntl.h>
- #ifdef __FreeBSD__
- #include <libintl.h>

diff --git a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch b/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
deleted file mode 100644
index 0c27095..0000000
--- a/sys-fs/encfs/files/encfs-1.7.4-r68:69.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: encfs/base64.cpp
-===================================================================
---- encfs/base64.cpp	(revision 68)
-+++ encfs/base64.cpp	(revision 69)
-@@ -80,7 +80,7 @@
-     }
- 
-     // we have at least one value that can be output
--    char outVal = work & mask;
-+    unsigned char outVal = work & mask;
-     work >>= dst2Pow;
-     workBits -= dst2Pow;
- 
-@@ -96,8 +96,15 @@
- 	*outLoc++ = outVal;
- 
- 	// we could have a partial value left in the work buffer..
--	if(workBits && outputPartialLastByte)
--	    *outLoc = work & mask;
-+        if(outputPartialLastByte)
-+        {
-+            while(workBits > 0)
-+            {
-+                *outLoc++ = work & mask;
-+                work >>= dst2Pow;
-+                workBits -= dst2Pow;
-+            }
-+        }
-     }
- }
- 

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 47b0b2b..39ece44 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -28,4 +28,4 @@ AUX lvm2-musl-fixes.patch 1537 SHA256 6516f64faeccaf87641f7c29823344baea0f3af9ac
 AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9 SHA512 d9c6f6c68a83b8f391ded7ebe900009a61ff06e92eb68ccb3dcdc8f41e61bbcdf47246e523ea8cfd6e71790376b316b219d4afaf66cf11477e2b54d526b74998 WHIRLPOOL d959d8c8b5f4ef84c26f8e585fe1761ef9bfd37f590e783e937679a863982e7cc4a4e320c3e2e3bd635dbd3486c15baf7c24e1a21325521f4320e643a57fb0e7
 DIST LVM2.2.02.116.tgz 1538340 SHA256 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d WHIRLPOOL 1e89ec941882fddba62c9649be46eb5bc6c9cb899669d4bbe4a4a1023c8bf7d8264c4815ef88bb39dedcb9637815411feb826aa102e629d77b80e45e099e398d
 EBUILD lvm2-2.02.116-r99.ebuild 9378 SHA256 53b161f6ed5850ba38a9cdac1ab300da94c5fdb65f0d5f499d80918ee0d55e1d SHA512 e8e5082a83e3d12620ef5c1d71f68c9fb83a67077e6cd924b64fbacbb6e8fd7f1c86dabc04d5fe92723b9bd5e80d16548c6498f16e7ceefaab4178543467b362 WHIRLPOOL 0b7577c0156df5354f56933db3b906a0a49bec80f63664b85e55b9a108953b12b01747d7d9ced35c1be6d22403bb777965064d1a4af9a870a8f4e77817045698
-MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
+MISC metadata.xml 1326 SHA256 f7cf280b3f275f568307e2d1f9c4164e41c262d6ce044c01897e577321f86ff5 SHA512 1cb659d57327fda2d14ac27d09801df79d6ef816c0a796711068c7dc4e6c038c023473e9d6f8dc08ef82be589d5641eb513bd5a7cf7e57e9800b73df423d14ba WHIRLPOOL adce1996947e7dca1627bed56bb7bf9716214a11488d2540159b70e74ed286801a63e3176379f7981b01f6c884936f0ac1c56e93ceda117f2526e369bb7440bb

diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 74f768f..33079b1 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -1,22 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>robbat2@g.o</email>
 		<name>Robin H. Johnson</name>
 	</maintainer>
-	<maintainer>
+	<maintainer type="person">
 		<email>agk@××××××.com</email>
 		<name>Alasdair Kergon</name>
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>cardoe@g.o</email>
+		<name>Doug Goldstein</name>
+		<description>Backup to Robin. Please CC on bugs.</description>
+	</maintainer>
 	<use>
-		<flag name='clvm'>Allow users to build clustered lvm2</flag>
-		<flag name='cman'>Cman support for clustered lvm</flag>
-		<flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
-		<flag name='lvm2create_initrd'>Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
-		<flag name='thin'>Support for thin volumes</flag>
-		<flag name='device-mapper-only'>Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
+		<flag name="clvm">Allow users to build clustered lvm2</flag>
+		<flag name="cman">Cman support for clustered lvm</flag>
+		<flag name="corosync">Corosync support for clustered lvm</flag>
+		<flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag>
+		<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
+		<flag name="openais">Openais support for clustered lvm</flag>
+		<flag name="thin">Support for thin volumes</flag>
+		<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id>

diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index ff814aa..020cf89 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,4 +1,4 @@
 AUX squashfs-tools-4.2-missing-includes.patch 236 SHA256 3e88e86568146d80733d52bcdd28405e3f02120e8ca408c5fc995f37d30006f1 SHA512 8f18536e59708475d210e7a2fb4ff4dd3fa29441ea6881ddd21f1a5aadb5686647d45961de832384e356cc011fcb74ebabb8d52816a64db3adb3a9a3a37e785e WHIRLPOOL fb7eb189ddd120e291b11a927ff3ee9871d187530c49729c9fb3d0becff9cfe89e89d0e308bdddde33252caff5949c26263f18712429507b27eeef61b70ae322
 DIST squashfs4.3.tar.gz 182550 SHA256 0d605512437b1eb800b4736791559295ee5f60177e102e4d4ccd0ee241a5f3f6 SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79 WHIRLPOOL c819f416b34cc46a232b8bc385017774603f81b4a865e6b97208004c183ebad5de7d0f726be444f8cb4e1d450abed9340dab730aec0762407f034e99b39bdc06
 EBUILD squashfs-tools-4.3-r99.ebuild 1363 SHA256 1c01be5b6bfbe3cd04729b412d1818fcdadd35f84bb697ac4ac328e2b843ab62 SHA512 0c2501f31f04f96293cb0d0877a655660fe6dd66dddb79ddb7161b59b0215aec3d71eea9647be83b36d125f638520893ca1929050cdbcf3ad6ad4f640b7402f3 WHIRLPOOL 01a191cf3587dffbd688d6e037cc9354bcf11490bd28c92d40ed53961910690a87d37ff95976fbea6573b37f6d1c81deb4f8d9b89fbe6b8cb8dc087e44c2d672
-MISC metadata.xml 459 SHA256 8f8c19cd9a14822bd70aabed32919ba027bd1bd723db60eeb03c64f9dddc7f60 SHA512 a4034c66f10f7b677d23d3aea8f507075cece2a1527885954bb172927de7f154d069ea3aa93244af17a5c7b927aa7197977a32a16e034c57621ba40351cd1d15 WHIRLPOOL 72377f160f6a0234476942d16ae43edb00694ba2f05dfe3f924eb1ca1ce0a725d7d7d840f6dd704aa78976f3ef7b4727fbce124e48b6cb348e31874d6bf70a06
+MISC metadata.xml 559 SHA256 5813dae0eff3bfed9a7a40ac785726804d493f175479c1cc10ee3ea566b6eb2d SHA512 2318c516e5e76a6c802563d1e1bf60273dbfd6a6cf0944a41e5287f0c85f1b73761ba050599dfb3b2c86a53da01fc752bb4c74397c404c4ff68eb73dfedf2572 WHIRLPOOL 763a763428e1ca87f7fc653cc7984a88bac9ffb256464e7fe2258f901ab4283819998c560197aa1e558e17a3b3c4bdb480a2b9df696efadd81c4cd00a47cfade

diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 5613e68..9edcb3d 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>livecd</herd>
+  <maintainer type="project">
+    <email>livecd@g.o</email>
+    <name>Gentoo LiveCD Project</name>
+  </maintainer>
   <use>
     <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
     <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>

diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 174dca6..5341640 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -2,3 +2,4 @@ AUX udisks-2.1.6-musl-fixup.patch 1114 SHA256 aa1e5f0f798806e3136940cb8f11cddfb0
 AUX udisks-2.1.6-musl-fixup1.patch 223 SHA256 97a86c44ac43c12de4080e3c47dc597f9aff61470dea42dea80baebc6724e6b6 SHA512 b7b515e70e5f3770133de934875d039810a8232d1212279902016ee77ad03837f50a98a588ec53ed1907ff3689dd92b0a4c0f0c7d1b772a1766d2b255c101aa8 WHIRLPOOL 681bea6bdae4f59ff350669859a78c40bc65d92b30fc3e2eeb4de2af299db42dc370320de29e64679e775cd8d18d650f75447bf2b0998de377f265c0aa10c9c5
 DIST udisks-2.1.6.tar.bz2 908987 SHA256 dec5f5c85fa0f74f39336acbfba1770f9988c096be23873714543c304b09f46a SHA512 33badcf87986504cf13926f23f1ac0386d732920918871e5bdbcbd704bfcee17d9d3c5002bbdd497bf88a47f844595ad06fc2049bc805099c052943ba3750770 WHIRLPOOL 798cfae910b4cc85ebbd0b60aa987fda6bc6009fb37bba8ad3644bca497f1bb5dde04d574aab97f323dd4c4ae8dcbbc3de9fa09cbdbee45ff19a0b1fbf22b797
 EBUILD udisks-2.1.6.ebuild 3013 SHA256 e606496b78e25828a0d52040a9560b5e4b7dfa0c08a8ef86b1b6032280372574 SHA512 da895c35c505c716fed5956b4a81660985224492aa80e0ee711bd1b22db72ab0b76f993541d9879df4a20ee0cae67d4efb2648150bc64d0ac61914d21113d256 WHIRLPOOL 64c67cedef55cc6b3e5aa225f22c1839969b9e35163a4794d67f907e3b11e68beb2caca8bcf3107649d7fbb4c3a35c77b643c89348600a70a5ffb2947ef575e0
+MISC metadata.xml 724 SHA256 c9299de0b57db0c2c9c5c499b59707c15bda62d8fa511b5e14d2eeaad26961af SHA512 218f759e9b6134d83359a8f60679b07a66b7ebadc1c06ff67534961276e5274c097b4d0ba0a4aef3f21526240ccbaaaa97baad07f8d1cb45a24f3d80555cafdf WHIRLPOOL b29957dbe0b50a7fbe1b6bd3dbce5660526c131a265c7f455fd894754e3403f7aaae1941202d4da94fd6da7f26933243421bcbde88dd3c1c3e3b4611d5b7fa9d

diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
new file mode 100644
index 0000000..5074400
--- /dev/null
+++ b/sys-fs/udisks/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>freedesktop-bugs@g.o</email>
+	</maintainer>
+	<use>
+		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
+		<flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
+		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
+	</use>
+</pkgmetadata>

diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index c20265c..d5344f0 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -3,4 +3,4 @@ AUX xfsdump-3.0.5-prompt-overflow.patch 333 SHA256 80684664bae903256dd1b6355da9e
 AUX xfsdump-3.1.4-compat-musl.patch 1023 SHA256 2983ea5405e6ebee2a595345b7c519f48f1202d8d557daff6f709ced65759801 SHA512 350638c7a214f565ea1ffbe7753ed01e8d6cee873f73a45c58fc99d49122099d6e83c55fe2966b5595bcffcc2bdb895d765dfa6874f02d2b4d0d1b75e75904f7 WHIRLPOOL 34178b7e079d6125031e677e2090a7409695ab3dccfdfa76b98c7111c3ab16687fc6e6f92aeef85157644ea04815eab3070deb4c87f49360cebc3f06d50eeb72
 DIST xfsdump-3.1.4.tar.gz 848188 SHA256 570eafd0721515bdd79cb0e295b701d49cdf81e71a0a0ff0df6d4c5cc1960943 SHA512 e82885ad6b3f1d81c1cdeff56714b73651e1c74eb4ce71574875ec0bb69b3fe707b40f85f0766b21ba589d13364ecfc0bad657a9b15c428cf821f926c3d66b25 WHIRLPOOL 5677000929f260b391743207a865c7529b788db46806a62c62bb6917025194913609cc804ead23314988f44853abc57f3c86ee22d2bde365697a35b0a7e3b607
 EBUILD xfsdump-3.1.4-r99.ebuild 1180 SHA256 3c87b64acf0da936526a3fe762803f81b9b9b07d19b65c0d95d8ce17b7f6d3d3 SHA512 86c2bac6bdc8bf927eb58625303e7b05ef010f7aa7f1f744f5df59e2baa9ad576eb0086b5087f299c030322048f0dbb5c8dae2040f19e33eac83b20dd86ad606 WHIRLPOOL b5716771f8ce4d0683a22ade8cc4b093469c6624052b62574a5985e481f6e83051f2cb74a6df8a0b21b7f2c922f5b7172ade278ab178f9581d5b20ddd2fd0f28
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-fs/xfsdump/metadata.xml
+++ b/sys-fs/xfsdump/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index cdef18b..41b103d 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,4 +4,4 @@ AUX xfsprogs-3.2.2-sharedlibs.patch 2776 SHA256 a687cbd95bdd3948ab50a2d945b5c731
 DIST xfsprogs-3.2.4.tar.gz 1482424 SHA256 dde65ead82d3cbfa9b4ded9796b6d22095d7d759a22d41ae6f1a4ec458bb0465 SHA512 fb1ea5beb933b86970cac198fa4e296457f0f5b30bd72fda54452644730277929dee28f11f35a154910e4a19857455ecffdd21b3df456023e0da95e2fd0aa0eb WHIRLPOOL dec87905b5a5af053e71e88f1670470c00b94a758dbb77773adbc601db61b4efaaba306f344a4334b11680973d5153fcc7f8b5d59c4698f21d654570e8355fe9
 EBUILD xfsprogs-3.2.4-r99.ebuild 2718 SHA256 14c92893be31b7e3e62c7200911de256342408bf8c1d79c503bd3e6e049ef19f SHA512 e90664d18bf08cf7ea9fa0bfe7ae41b0cbd69956b8b1870bd6b45350f09c8833eb09f7a9cbc006b61a5192ef1a95941427ca2d20f56261e13ff66e4014d2b1e5 WHIRLPOOL c38a41a844b9aef6bc7d505d31cfa0f32d96943f31599e4ea05ab7f394c222b07fec81f9caea4f3563abec33aae85ef268f61d37711a097605c45500e8235f67
 MISC ChangeLog 27065 SHA256 a0637579839e88d27c78c8ae0d1ff4fc8459bf1001a13df17040020ebc4a8f5f SHA512 2c987b23b3f752fcbe1fa4e17df0b3714edf758ce4b807cc10ae29aac69ee8a6b27909a5c7391d38b1ae8be165f8bf99b71c564b1607044643fe5939f485dd7b WHIRLPOOL d31f96e38bcf1e8fc735c254565776fbe3dcf0fa62a7540a9dc2930c8e9debe17a6fd7951c8128f427292a2d8c5704b721d16d4cd384382bf8f3df8f382fb711
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 658926a..09acd0c 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -7,4 +7,4 @@ DIST gentoo-headers-base-3.16.tar.xz 3743324 SHA256 705c4652ac1bf78c9accec6fd8da
 DIST gentoo-headers-base-3.18.tar.xz 3776668 SHA256 12a44590e505525509556f6e973464f124f172565d3a4b29a3ff4627aa24f9a7 SHA512 6615c604e5e618d26fff5a61691f7827bb05be9790db6c9f8e16e3842bce8f056f9928f85ae5714710b75743b0d0804faba4ba9c76e934e1de22dc03ef6d5535 WHIRLPOOL 5cdd500aaac3589d6672ea365f5b29ccef207db36cbc34052f0bf1bbe35b5dbfedf3b1675079c1ec05daf1a136d2da3018b2ca91bcaeda1fe8d23e3246fda25e
 EBUILD linux-headers-3.16.ebuild 1384 SHA256 de3fdd2893e7416ec4963f7e7024c9deeda4aea548bffb84a2bd8e038c24b991 SHA512 0003f4faf8db8f488f90e29f0a3828b9f84e60b4624a1e22bcf3e5fdd5b16b103edefddfec6934ed2210a39950310641a6adb8ab665534848fa60dd2dc95d280 WHIRLPOOL 53170b90dd3718dfeb444359f275bddf13eae4c72677cd8be2871b885f51c60759652f0fe4f3efe4dae99b229507cbddaf5cb2b2670180c4194015b7c8dbd1f0
 EBUILD linux-headers-3.18-r99.ebuild 1722 SHA256 ebc98e2ba00102a97d0cdbb8fd029a6faf19f230d5814bbf27741e1b64bed5c9 SHA512 f5410f584990a0a7145b5d144d7186860a459789d44d6130d0a22304328853a114cb115f5a6d0b95fe634f2cc9c98472c20da5d69518374796457244531462e9 WHIRLPOOL 3cdbfc29de6f562b14adc65d2427f945564c8aa29d6f9b2dee969940f3139d887587b87cfa3b3fb44c431408449eeaa7d0606a7f8c9bc7bfe42aa1cb9cface2a
-MISC metadata.xml 247 SHA256 6858f34fb3375b80b0071f911f6ead887ae327e0e27ecd39be3e8ccb2609fa0a SHA512 b82456bc3441754e0f316575316497d293374ac4bb80e1b7e4b158358a3e920a6da4bb223a97412bbeba8f51ea4555a84267f4ebc8eecdb06941038efd03c47f WHIRLPOOL 96213c23913ccc5a89e2fa924701b916106c15cd24940f7bc2c8896c6a5545f840c1bd21ccc0882a928fd44628cce49c7cd8d25957ffe6c64b4755b467e6344d
+MISC metadata.xml 344 SHA256 9a1be7c7cda2e8f30ea65c0abc9b3663e8efecd6d8d383b28a55de2ff7071d10 SHA512 4dfc3a4130e5ae01c17510c693c4f2bd81fb019cf003e866c7f359213b58c6e36ed59699d6a458464e1dabd73c8f4a24eada8ced06d7ac513ec3553c0179f164 WHIRLPOOL df2e1ce9fe16c663dca50b97b9e8f3c80ada9b8feceb9381ca256a052f1c7176c56439ca61c5d734e22d04386c8efd9462758d2aa1f12d24a73425b9f1a6a6dc

diff --git a/sys-kernel/linux-headers/metadata.xml b/sys-kernel/linux-headers/metadata.xml
index 0cddf52..fcf3f04 100644
--- a/sys-kernel/linux-headers/metadata.xml
+++ b/sys-kernel/linux-headers/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>toolchain</herd>
+<maintainer type="project">
+  <email>toolchain@g.o</email>
+  <name>Gentoo Toolchain Project</name>
+</maintainer>
 <upstream>
   <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
 </upstream>

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 373124c..f22cb74 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -2,4 +2,4 @@ AUX 0.21-initializer.patch 1261 SHA256 ce6792192c9014bd0db4acbf0866f3d6eb1e60822
 AUX 0.21-musl.patch 2108 SHA256 319478e8626271f4fa17fdfeabeca84a08027d1228ac02b60169dd1a3d676deb SHA512 fb0df957015f4b34fa89786780b070df2fe9d7511882cc836d643997d83e303863d2016fb780c3a0f047b84e67093584690ab42fb1772165b2742206402e0f3d WHIRLPOOL fea636b8b89770d7d43267d5e0bb7c46ef1d76a87120a5facb6e2db20c03c9b3f784317f2c6b6d31bb800e40d33c069056c1e895e154faa67cce87b0ff7ff127
 DIST efivar-0.21.tar.bz2 66677 SHA256 04b9b9de9d9a1a013395400438a033daf4a4290f497ec5be04a120e2ac535094 SHA512 851b5e29c2dab213bb81c6ea5c5c211d36fb6846de8aa1086b0657f06917c2f93bf154aa3a4c2dda22103bdf1d67ca877f9771dc3f979c9311ca24e0bc09492a WHIRLPOOL d6cdb2e2f047a22677d046581490ee4e64a2ac0631be8e41bf6250241b2554f62ddf81226fa3970ee80ebb9ec62665ca21f4fec94cc5ebe05414b0c674ad38dd
 EBUILD efivar-0.21-r99.ebuild 647 SHA256 d49af5c546ebab7985cc32f39140e1ad77eb9063d9110a934322d4ab9d1ec609 SHA512 68e5d97b57721d33dcc704af49bcaf1a490c6bd021f325c42d9ecd565c3671f84d3d1a59c57cba58b404aa614984de13e3fcccabfd8507a8fb31b0e23025cbf0 WHIRLPOOL 0bff877b33d11c65e3b0076b616ab4a442bf793f4152b8186ab1b318c13f39c350f00caf631f25c3b8e3acb4cf6f27512b1ec4e117e2dae144f14b2d8b68b04d
-MISC metadata.xml 312 SHA256 6fb63852fa4f8d21972ff4627c67ad981bc2da2721c0dda9496ee041d32f575c SHA512 5beaf5ae393728ba4158bd61e91aaef58763078cc415d04bb4084682af9701c5a603b7762d70ee0588e343b8939619eba6a7bead4191d19db2280332e0ccefa1 WHIRLPOOL 4ee9322e45927ad75934961fdc0cda76c0e9cbe9f53a038249137b0a979047f5e3607c51b5bac7aa64a2dadcf35b2606e19863f5bc2fe7050d9c3a4b882ada95
+MISC metadata.xml 326 SHA256 5a6244b5790d2500d54b2126b086e5ec255588d5dafad49acf3673ae7b7fecd6 SHA512 3fc77bb26b1f5a787db71a84a093eee7c0a0e639906947ec30a98ac0336facd6f33a8cee71b852527b6d499c1d568b9cdb1c8b2a046ec93e23151097c85816a0 WHIRLPOOL fdb21794835f16be96117c5ae83df58064dc9d944a9335a52864389367e1e424021b043930d07091ee0f13fe1d60b8a0953b445fd705089e3a0111402fdb7c83

diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/efivar/metadata.xml
index 52ba01d..16d0108 100644
--- a/sys-libs/efivar/metadata.xml
+++ b/sys-libs/efivar/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
+	<maintainer type="person">
 		<email>floppym@g.o</email>
 		<name>Mike Gilbert</name>
 	</maintainer>

diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 3830da5..2283cb7 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -1,4 +1,4 @@
 DIST gdbm-1.11.tar.gz 811662 SHA256 8d912f44f05d0b15a4a5d96a76f852e905d051bb88022fcdfd98b43be093e3c3 SHA512 272fb65ab9ca0a21e9f0dcfb2c638457e87cbb938c65ee850123474d11f2858496f84d3fa9edca27cd91c7220160cfdb59f90bd46ddc45395514addc9fd4151c WHIRLPOOL 827f100826273fb8e6d8fdc88fffdb81e5630a7d07bdbeeb7d25759809c5165613446567b0b48bf862d4a4b231e5db921e28c9d6915e669fd0ce795f4a9f150a
 DIST gdbm-1.8.3.tar.gz 228695 SHA256 cc340338a2e28b40058ab9eb5354a21d53f88a1582ea21ba0bb185c37a281dc9 SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7 WHIRLPOOL 9d2e402b2ec00cadfc64e40d87da095f293f157386abbe9a64ebe8b7a2af9b965546805826ffe3d5c88212dec0628ab2ae3ebef91de2da7fc69d0937d03d7075
 EBUILD gdbm-1.11-r99.ebuild 1776 SHA256 bc764e80b163a99f205ceda8572205156dfeb2d8caed4248b217f517a4287716 SHA512 44950681a966bb2ed4afc3b3bb0470aa5acfc2455df1c7f7069ac4c366fdcfc839628cb6ad00e9174f65f5700d7fa5345e26940ab611a2dfa4a95ffcbd7f6ddd WHIRLPOOL 5f9eb5fb44b379f99858f21b81aeab92dee6cacb24a1fa1ebb30b70bd9b045fe75e5648ecbe2c2c7dc840673c0292b9b26fdc04815aa43e37422c3dcdca6c365
-MISC metadata.xml 382 SHA256 08df40c74ce04dcb73a182dbb283233242bd568c16b00b20c7eaa97da80c75e2 SHA512 d496626e7351cd4266055755ff7ec3c5ceff5b73ec9c2100c45ce3f7930224e651ea3b92146e9808f1026f8af43617c236e79266323037607872a7c76592a7f7 WHIRLPOOL 3a76dff01b89a3e9a4cd27f41fdc09f6a40a3dc048d7efb5f83e1ca1bbcec6af62409126b2c97f6b03cb147c2b4d4a3cc9002185c0663320b2e0b02567ac72cd
+MISC metadata.xml 471 SHA256 d1096e4a55096ffa3feec967b72fc7facdef179e2a0f229f72a4649f4b157ea6 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41 WHIRLPOOL 7dfb6740dc7b6c26edc10bb868522abfcb549bebb965daaed20e3531a23d43cde993f3b1795bf19c890fbb29a60c73b7ad5f7ee2ec35bb0f9981b0976818f5ed

diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index 07b3785..d75e86b 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
- <flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
- <flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
+	<flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
+	<flag name="exporter">enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/gpm/Manifest b/sys-libs/gpm/Manifest
index b04e267..1e8c65f 100644
--- a/sys-libs/gpm/Manifest
+++ b/sys-libs/gpm/Manifest
@@ -5,4 +5,4 @@ AUX gpm.rc6-2 655 SHA256 e692e7b97efdd79f6e92fbdaed60f7a71bfd23a82c5561b160b88a7
 AUX gpm.service 222 SHA256 85f7d7144de8b2b941ba118ff1e6c0579ed825bbb34b576814b05cc45c5a067d SHA512 d710169f06a17aa372e88952bc67d1fb91c795349e9edc37f9c0bebf3bbd6502646ac9aac12ccbb5630b1b39143976e0780b9c7325d3610c3ac1683ffda7f05b WHIRLPOOL 6a7df1311c6f742168bd6aca9ec3c2def2f9755c9fa9f24b60e22a158f366636cefa2d430c5ee30d05dfccd2a576d981c32134052d207608dcf8fa0a8b292b0a
 DIST gpm-1.20.7.tar.lzma 789691 SHA256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c SHA512 a502741e2f457b47e41c6d155b1f7ef7c95384fd394503f82ddacf80cde9cdc286c906c77be12b6af8565ef1c3ab24d226379c1dcebcfcd15d64bcf3e94b63b9 WHIRLPOOL d3d142c3aa385e2ef4b16c96e0f94c04b3666376d893c516d439737c2f3016a12fff7884a8f18b5e6b58e4ba21d82379204b18621a2f338d8ab6d478e4e1ec1a
 EBUILD gpm-1.20.7-r99.ebuild 2027 SHA256 01e11464fc315e51d7ee578ab2b7d14b04b161a2b4c5430f18d37468f8e0e8b4 SHA512 0558feee6a81dfa74ee25cbd58e4e86f7b1003236d7062a80d42ad39fd1afce7dcd003cccfa36240704358b675fcd3523a406b9f1409a48828b8e7014b83a368 WHIRLPOOL 8152fd624242529629572db1e3076d05650593fe263cb7aa51ff99d1acfc1b07c8ee772818ee06b6de15169422e21e941afd18f831912f6a230cbfb9a37f74e5
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-libs/gpm/metadata.xml
+++ b/sys-libs/gpm/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/libcap-ng/Manifest b/sys-libs/libcap-ng/Manifest
index 11ae6c1..6a51ffa 100644
--- a/sys-libs/libcap-ng/Manifest
+++ b/sys-libs/libcap-ng/Manifest
@@ -3,4 +3,4 @@ DIST libcap-ng-0.7.3.tar.gz 392613 SHA256 5ca441c8d3a1e4cfe8a8151907977662679457
 DIST libcap-ng-0.7.4.tar.gz 407007 SHA256 48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b SHA512 443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 WHIRLPOOL 3d62f26fad8c9e7756374022982a4f2fcdde5af5532474dfa7eb6ba1bc7f97984691bdda8975ef32423b8e86af2462ef672ba3175a3121a484c46096cc8f10b2
 EBUILD libcap-ng-0.7.3-r99.ebuild 2540 SHA256 f833f7500c634248076f78762f87b1e88b67d31106aec7c91a6e1b71fae10f84 SHA512 2655051f3ecb442e1b06173991e93ba1db3b8a0b4c10fd30c0408cb21824c4cacdeb02b60e06027b3232086f08ceff7d4acd427cd1b79c33156eec37ceba6c90 WHIRLPOOL 6c7e871a73c374ee90919354e74ab45d40356d12a4e0e33c25c0e9d3580979302c50271d9e2a01d072b29189bf425fda18125c2eaafb0ca44cc6455052a06dc3
 EBUILD libcap-ng-0.7.4-r99.ebuild 2092 SHA256 668d18348988182957545c68b84a4085d5652fbdf2cc827b9608bf919cb9ca1b SHA512 c0d469ee46b6e83ee4e55788a372ab9b7546223f9d3399e6fadae46eeae453eac934bd3ed7748293160b0032ce18679ae247315738a0edb194b66189428f9c30 WHIRLPOOL 9722b249a472511e20bcb0c4ff1dc8b5500f197cb3ba0795ecde6c05385526e359f0986abe9ad5516e2478144bc895517fbf3b7e5716fac13815a2a2657573ac
-MISC metadata.xml 501 SHA256 2ba6118979e987255eff0de2453eff6e9a76d4e2ffa04e3acbe1bc92fda0a171 SHA512 f974d0009e90640257cab704897db67cc736663313d026ba2092a6aaae004973416e1f649c9d7a0373b1f58d49db8103217e85803faa8c37a7830c9057f2c5e8 WHIRLPOOL 38c2e18fffda49e0b81e47bce317af92b0e992d1371c79e2e8bed04ea69e704902e005af8693735f7bf1fbf8d1cda5bea6ec9e0c20886018103914d11a95ec30
+MISC metadata.xml 580 SHA256 d6000e84fe72c4f6b507c04edda36269aed6a1cab6aaf430eab08ad3592bf48c SHA512 51d670d97a94c8c668a4580bf6106a5b027b4d8d0c2f27ca88a508e60ece5a5390b619f0368c8111f2b843748a9ad31f1804c2a60df91ae1717a2c8b2a7aedc3 WHIRLPOOL e29b31c47bdb74ea61049e6cebd897e4147c9d5acefbcd1c1f752cf8cc5893047b5918805bbc9b8553eec3b68319825a1c9a5c48f987b6f788e6415bebac8c7e

diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index 703c252..9aa642f 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -1,10 +1,14 @@
-<?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>
-  <herd>base-system</herd>
-  <longdescription>The libcap-ng library is intended to make programming with
-  POSIX capabilities much easier than the traditional libcap library. It
-  includes utilities that can analyse all currently running applications and
-  print out any capabilities and whether or not it has an open ended bounding
-  set.</longdescription>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<longdescription>
+	The libcap-ng library is intended to make programming with POSIX
+	capabilities much easier than the traditional libcap library. It includes
+	utilities that can analyse all currently running applications and print
+	out any capabilities and whether or not it has an open ended bounding set.
+</longdescription>
 </pkgmetadata>

diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 5ddeeee..398bfab 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -3,4 +3,4 @@ AUX libcxx-3.7.0-musl-compatibility.patch 2673 SHA256 9671760510032749208f4eacc3
 AUX prepare_snapshot.sh 427 SHA256 9ebf22257a2e296dee41a56b0a721cd1ba459c620009ca8422ba812515ff726f SHA512 ebac2a467f8b1dfb68f1dc46a35f8294d1cf74b70be2a008217fa13b3366ddf4a9f2ebbe611cd63824f42305c5c0304aac2f46386b2956c9e07d82d5d984b435 WHIRLPOOL 232a60d6a22f50c424ec9cf6f325bbb4e8e96815ba9dffdad0a5b1b872b19d20126d316ced71956978eb5ce098f72584d21104c14e232330b3893a73e4c3c358
 DIST libcxx-3.7.0.src.tar.xz 994580 SHA256 c18f3c8333cd7e678c1424a57fe5e25efe740ca7caf62ac67152b4723f3ad08e SHA512 e71d04efa0fafab129a97ca6f4fd7b5f185258de7455c7a25d0964f459bc6068c69c5d67199f6d7cd3541bdce630106cbaf3b7099e4737dddbdd57c77a3fe054 WHIRLPOOL 26672e3f6e0772504e7ee174c37e5fc20079c730ac8bd0d2563d5415ca9589360aa3be42a8aac15eb5a63c69227bd4911aa822b158b9a35e3d74ec0d71bb1300
 EBUILD libcxx-3.7.0-r99.ebuild 5444 SHA256 caf6ad314fdbdf86e9290bbcbb1b7619b215afbcee279d3dac9b67278aae36da SHA512 d17bc205320ec01c3546e99289d9923c1dc65214c49762f6fa41d498727c5e5cd658fe665c87b657ad41bc2c07640cd1b7fa907d6a30d9fa87e8d3fd61bbc703 WHIRLPOOL 0825e0cd24aebcfbe2bb23e5c1b3aba04fd65ea0a966b72c186f2ef736328b2a129eb7087e234d2ea88ddc30ab397630002a63bb898c0d76e67f16a19b58c714
-MISC metadata.xml 558 SHA256 c9fe7077a8c7f767d7cdbe154d85dd344fb86ea246b16613242c70a40f3e1ef2 SHA512 3f324c4959a7c9f2613b29928957fd010b35c6e9c1601f0296e7e8b7c8d59a3c27c5c04fef87ac825f2f7bb07553bc617c4405e1e22847dc8db3e7a1ebb21f50 WHIRLPOOL 3ade5e3852afcd533c89ce0aeead55101f23d1b31825718bfccd60fac485961df617c93962be4c60333a21335dcd6bb5630c8002fe06f456c4e177c14d434455
+MISC metadata.xml 661 SHA256 5d6db653ff40b42a6ce8158a87cfa6bcd1804c7e65a291491623c989091ca6d4 SHA512 4e46096f0b9e33ef5c4e7db79ece835a6f9598e692930d620cdfa0c262ce638417a6ed64196c574f5cc54ea646313563fc644e6fd3330d4ceca8ae4767a7afad WHIRLPOOL 4580760d0205e55bace5836cb1cc4cec7b76ecf36041a78057625dd3a01c809021fa861ab5440c4f9d85008e43d0a170e232a0c86bc1891b6adcbbc9b12a649b

diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index 578f810..77398bd 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>bsd</herd>
   <!-- BSD is here because the plan is to have libc++ as the standard C++
 	   library with clang. A llvm herd would make a lot of sense here too -->
-  <maintainer>
+  <maintainer type="person">
     <email>aballier@g.o</email>
     <name>Alexis Ballier</name>
   </maintainer>
+  <maintainer type="project">
+    <email>bsd@g.o</email>
+    <name>BSD Project</name>
+  </maintainer>
   <use>
 	  <flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
   </use>
 </pkgmetadata>
-

diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
index d44524d..cb21364 100644
--- a/sys-libs/libnih/Manifest
+++ b/sys-libs/libnih/Manifest
@@ -4,3 +4,4 @@ AUX libnih-1.0.3-pkg-config.patch 2491 SHA256 cefe32c74c2c23f991e78bb8eaf97da8bc
 AUX libnih-1.0.3-signal-race.patch 2081 SHA256 e7c67f06c0812cabf4f2af05f8d66ecd8819278416f29e7dd6122d9091b6368e SHA512 5367cb0c6382004cc2a829b9b71f0c02a09e4983940afac90c4c5c0bfbda53fb36a6cc7e38ede7a895ce28f99a4f69e89392ebaadefdc536eb7efa90c2426ff8 WHIRLPOOL 2435627ed636ffff2e45b5a2708999a20b88525f438f3382a9acaa08c1ca4b81a7b4d926a6b7930add8c5b692f5790b52af8145cd8a0f8cac8b7f069a7ef4046
 DIST libnih-1.0.3.tar.gz 1187624 SHA256 897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4 WHIRLPOOL da001ba05111d3a654e6800cf283e11b5508e53d6d91b37ed277df5a889a1138e90ae13161e0af81bdcac929b105bf889e4dcdc443789f28417c6e3f61530d8c
 EBUILD libnih-1.0.3-r3.ebuild 1538 SHA256 c1486cd739cc906384090dca7850edb6d32c056d2c357cfab5037be1058b1aed SHA512 879b91466977e9f12a21c22e5fd9438d7c676f848a45bda6e84a66407b4fccfd323c3fcee083723b5202e38c108ed16046373d89b336ca4cea053fa8441c8a49 WHIRLPOOL 8570f981d26610f12b1a1ff1e33df7906083fc11981f655053e048d1ce8127888b92524e2a22436c1cdbd582518f50cce82a66a7f22989818092518bcaa70d79
+MISC metadata.xml 357 SHA256 b2b2590a099343e5a92652941311b719c648b1dd33325e9d19d3298e5a213bf7 SHA512 c9748a867960a45077282ebfbb48051e3995bee6648f14547ac5385b8baddcd36f927bfd94dfcd1656342de935ee97a2f376e687470720ea761e035c7c5feddd WHIRLPOOL d4e69e09195bbca0713c2c13c5d107560d0854ec1f6d545a84b529e518ec20e76ec89d25b6b3d33cb2f5bd32ac2ecf36fe89074408d39567a4ddc3fca4800c31

diff --git a/sys-libs/efivar/metadata.xml b/sys-libs/libnih/metadata.xml
similarity index 50%
copy from sys-libs/efivar/metadata.xml
copy to sys-libs/libnih/metadata.xml
index 52ba01d..a889a86 100644
--- a/sys-libs/efivar/metadata.xml
+++ b/sys-libs/libnih/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>floppym@g.o</email>
-		<name>Mike Gilbert</name>
+	<maintainer type="person">
+		<email>vapier@g.o</email>
+		<description>feel free to update however you like</description>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">vathpela/efivar</remote-id>
+		<remote-id type="launchpad">libnih</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sys-libs/libraw1394/Manifest b/sys-libs/libraw1394/Manifest
index 1422a5f..1ed720f 100644
--- a/sys-libs/libraw1394/Manifest
+++ b/sys-libs/libraw1394/Manifest
@@ -1,4 +1,4 @@
 AUX libraw1394-2.1.1-replace__uint32.patch 1812 SHA256 2ce86a0ee775a0ac07f6ca06c25ad932bccaf529954414a80305bb08b31bd769 SHA512 fb2d5e27e8599c90449d7f29d5a5c18b90c0728ecb14e0bd23f7100af84dec46452ecaed12e62e714a24f98b3374005ceadee3005ff24dd70c9b6ee8bf7d423e WHIRLPOOL 325e4668adec6a50701f78be36c4e0bf4e689f35f7c393c64d2483207218313cb2e9313fab73c2174b97b664d92fa69f9d94c5d9d642d5ad2fc26a4a52684bb3
 DIST libraw1394-2.1.1.tar.xz 309396 SHA256 1bab9780189f9d1eb4e973df12679c04f979c21e024240fc98e536ff5b680ee9 SHA512 ed6acf10e50593e6070764e57cb6cc0eabb6f2bc4b4ed805a55cdfc37109c1975eb597dfbef9b6f8bc73a9e9270e7d643956489f54682f4c670fa510ef726fbe WHIRLPOOL 10e075374855c03395cefb7357f055fafd223b91b7e89ed22d96d691a398d3371db580e38fd53718305a5b1f2708bd52bc55cf1ccedfa5e508bd6e64bc04f6ad
 EBUILD libraw1394-2.1.1-r99.ebuild 788 SHA256 9d8e1ebb7fc9c15c7335473ccc5a1c071c8b64202fc04161843e87a99c952bd3 SHA512 2872c08c69e41eeaef98532a1af9c46fd0f5b1eed216152109ea969aa96f5f40fe29831470e4e349323f56a72f3e4b6b4f027d3d0fdf814b6f801e6d4aa229aa WHIRLPOOL 625c5ce86e4af37ce3e9dd9662bc765460e5a073bcd2b626c05bfbb8bcbe579ce435f14b862e79e7eda576f8d5656ccd8e44dc1b9c2ef26b596911adf489460a
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8

diff --git a/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
index 96a2d58..56c1244 100644
--- a/sys-libs/libraw1394/metadata.xml
+++ b/sys-libs/libraw1394/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/libseccomp/Manifest b/sys-libs/libseccomp/Manifest
index 0cb2290..c87b91b 100644
--- a/sys-libs/libseccomp/Manifest
+++ b/sys-libs/libseccomp/Manifest
@@ -1,3 +1,4 @@
 AUX libseccomp-2.2.3-musl_compile.patch 684 SHA256 f8de96893d9d7007fba9af8d194ca2b3a25ba47379eb4a926894a9b941c5700c SHA512 726b511eae52d85f6c7aa54953b55b2bd099cde23923b3d61d2316ab709df65291994f3033bc7f04658089624ccfaaf2d99ff071de9675c36f613e4dea8282a4 WHIRLPOOL 0ad85f42d41f05a021c06722cd83f8b2ea8a2c54cee1ab9436727f89b8758e16007e38b45a6b59cde7c344cabd60bcc82f7683a0505161c3be7773b72cecfe49
 DIST libseccomp-2.2.3.tar.gz 522755 SHA256 d9b400b703cab7bb04b84b9b6e52076a630b673819d7541757bcc16467b6d49e SHA512 e7bce0627c7ee107ea4780a6d2d7f24da162fdb5a85fc064c94e629918de2ee7ce7ed5ed98490f17392d9ca7ec1204945db3fea4415fae4370495b71c9edb61e WHIRLPOOL a32105a4cf3b514531e3cd7f1c703305318eceb90ef030317139fe08fe62fd14670b5ddc6f0dc8165cac23da1df89ee6efea3c366cec64102194c12ae53eac4f
 EBUILD libseccomp-2.2.3.ebuild 998 SHA256 2c81ed84144b51b3c741f66620779ce21b3d08e6ea9da02394c7f9b90c3715a2 SHA512 1d65f71f4c622e3b1f976c265a81b4f5b939a3ba86cd14e41a41b1558390a185193602b1c38bfefdad034e38dd3da4a5eb6f38adca8a860cc249f810a8de39a3 WHIRLPOOL 36f8962968dda50eb5a2493c91f2d9ddaba3fc7bd25babc7e1c00fbb262c2725c1a362571e1227b18223c4f0ebd1e24aaded6256306efa0d34e7d974648d47c6
+MISC metadata.xml 355 SHA256 8087b7a37ab380f3809766fad5e5d72b88795e76a9856ea19b062e54bc8b5447 SHA512 dbf3c5decd7e918af6092ae690a2566c98f9b5386eee17c363dde79c03ca7d3a4103926a9327711aa059cf82916a4cb36360ce3c762093301aa44bc8cfd70f42 WHIRLPOOL 98020ffdc094b2a3a8d0a60d645bd34167feb0fdc280d3f366020a1daf2d540b6bca34a3f8a070c46b439d91104425417d07338c8afb3245260f33f57852b335

diff --git a/sys-fs/encfs/metadata.xml b/sys-libs/libseccomp/metadata.xml
similarity index 50%
rename from sys-fs/encfs/metadata.xml
rename to sys-libs/libseccomp/metadata.xml
index 3693a6a..3a6400d 100644
--- a/sys-fs/encfs/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>blueness@g.o</email>
-		<name>Anthony G. Basile</name>
+	<maintainer type="person">
+		<email>vapier@g.o</email>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">encfs</remote-id>
+		<remote-id type="github">seccomp/libseccomp</remote-id>
+		<remote-id type="sourceforge">libseccomp</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index adc76aa..d563a8b 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,4 +1,4 @@
 AUX libutempter-remove-glibc-assumption.patch 1704 SHA256 4116a2dfb6925b2a513d2e289dd9e2f18160202af8be12d99fbb77d94e2e3941 SHA512 2d487a44ae3c84417f3dd55917ae707bee682b811ebe7aefe8b50aa9f309f879a7f9ed5cbce08119b6fea7dfddb97702348cfbb05ed45e79f95952d15f0366ff WHIRLPOOL e761bbf80fbc4b3323e176f21cb9f2fb2a9bddae7bd22c8975cd05aae1f673f0c2563e0099f5195b76432f0fe12ace7e866f844c533b505643ae2d90f0295f1d
 DIST libutempter-1.1.6.tar.bz2 15705 SHA256 b898565f31ced7e5c1fa0a2eaa0f6ff0ed862b5fe375d26375b64bfbdfeac397 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede WHIRLPOOL c94d42d6929754608f9504defec3ab5b4c5c61fd0baa373e07508a11167241c07de4ecf26e14271e2c9914b731afba12ff7930e8ecd0126da1f472dccabdea30
 EBUILD libutempter-1.1.6-r99.ebuild 1834 SHA256 d347a8dc90c95c27869b9089014689a5d414f202c153318d79c0b8ef0ce6c928 SHA512 e1cc023b4d0adc14e7c273ad588ba2197c498ba5f2e8d13b84d18c1ac95dfe5a5255412f0d926c8df6817966ebc06cff1ecb41a496d37bbdaf85b428ae2f7f10 WHIRLPOOL 4b2e6bc54f98bbc602d5f0a368672dd0096b29620005a8cda8017a87d319ed9c16cc5db4a17a0d5e8f18eb3348528b86fc6f56a4926b7b082de88a7591ce06fa
-MISC metadata.xml 183 SHA256 0903359b99ca4bfefc1aa654cc0c787e6b104ec133318f522842aab7e42f9286 SHA512 db31aeacd92ae0a3081eb18c65711705b0fb162a75e45b8b0c1775d3ebc11ef3260f5c9ea80c19d40a7ea3b1d086fcfe9417def53085dafc64677fb58d3a2659 WHIRLPOOL c8b29cb8cb38d204f2ec96033ac02369ae1c71148eb282e0d7cc1ad345e69467078dcf75d85f72477657d917f8ba69394f4cde850b9adf97d41ae1f75cc4c344
+MISC metadata.xml 344 SHA256 c1ff5b28d97a3d25b8bdd7bdf1f44d583b364107c662ae469624bfdca7aa8efd SHA512 77307533cb1ddb71561957493f7062330c1748f62ab1381f369c5fb864f0e2a6608cfa5c86005b816c2a9a2523bb9a2264c807f1d6c31a5e2bb6177876b94ed9 WHIRLPOOL 91066d3e43d3147d614f2b55a5af5bc346b05b6264d1bc806c8a927609d0b757c2b287643fa389505fd4c959d161a7a36919c7a038fd4e3617de84b07b67204e

diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
index 5aafc10..910808b 100644
--- a/sys-libs/libutempter/metadata.xml
+++ b/sys-libs/libutempter/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
-	<herd>x11</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<maintainer type="project">
+	<email>x11@g.o</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/pam/Manifest b/sys-libs/pam/Manifest
index f5f232f..1866bbd 100644
--- a/sys-libs/pam/Manifest
+++ b/sys-libs/pam/Manifest
@@ -10,4 +10,4 @@ DIST Linux-PAM-1.2.0-docs.tar.bz2 490586 SHA256 3bc9ae398f759e372dbf4065ceed2df8
 DIST Linux-PAM-1.2.1.tar.bz2 1279523 SHA256 342b1211c0d3b203a7df2540a5b03a428a087bd8a48c17e49ae268f992b334d9 SHA512 4572aa1eaf5a1312410c74b5ed055b2592c5efe2bb82f59981da4e9e93555ad40aee3a89f446d9dc6c6af79efc04c33f739f66db9edc07e02479475a14e426da WHIRLPOOL 562917945b3b3a407955cc5bf5cd251ff7e257a94055d7cfbf06d5c2619b58d61624f16848de3512ddf61636ad8618315de3f7bd8e4e51b3b7d109adfa212c8a
 EBUILD pam-1.1.8-r99.ebuild 6289 SHA256 d9fac218f4e3a095a1d7bbe62d65db2c73a5183681b28006972c2575a1473221 SHA512 f341057c9234e57e102c38d46bdb2670bc6e2c50e53a3175cf3e65a35bd37e633712608f458b2e59fb7ec61a41169279efdbeeb4be468d5ba9287239ca5033e1 WHIRLPOOL 074506f012d3d820951d003b1350f62f9745d841b26ad7c89a345c819734c6cfd26d69a89f4f08dfb4c3ac67bf68e9b938d630fa3887cea33dcc0a7dcde18e7c
 EBUILD pam-1.2.1-r99.ebuild 6733 SHA256 c897194ead8ee56e68efa98c98ed32ea13e1ac994d5bd452129bd255d24fcade SHA512 85a800b89e3859a3deba2bec8e51bf4374c44978ecb48bfee853c45f732bbba26e6a824bbc43f17aa8023b494aec0437839f1758a5afe89d49a683f387caf1d9 WHIRLPOOL 7fed197982bc3483d413b5404c76e45f48c1c2d142dc9c5f1ae66f640e35d196f0c3342d2460c0f442415a01691dfd54d857496a49e80001f90ebce3fceffcca
-MISC metadata.xml 1139 SHA256 bd152404f476ae44a7e577f9d823725215d2fb6220f48005a7814358e2d2d6b6 SHA512 80c06a813fbcbe5fd85b73ee03b8f7bc4aba18a6005bdb1f80de523a6f221e139f7c73e29db9c1b599e90a6eb769240b9e302d4c1e24aca32f06479712b2d5fa WHIRLPOOL 3ad745a45d828eecf45e3221aa012c6a6d99cc332dc60022dc9da0220af36737f47b4952cf84ff10cc196cda5535cadb360f4db9b56c9f7c55dd62777b26c760
+MISC metadata.xml 1135 SHA256 19e87cb2aa29dcd1b12d3fd5a001a7fe08fcb9153cc80045d0b95a88c4cad3d7 SHA512 de2a617918085c4e6a7a1976447ed2c0bcdb8eb257d28351e095b29ea219382ce8964206ba0fcdefe9b69db9ab17a52556371cfbee3ed4d5c5293c8d21738d55 WHIRLPOOL abf1d986d9fb8a6654db2ecb982ef50a4aea376c5386f3b68baec1faa19811a6b58f1a08e617711737879f173db729e34d92c8be29ee4acb47f2a0deec5241fc

diff --git a/sys-libs/pam/metadata.xml b/sys-libs/pam/metadata.xml
index f69d9e3..2933b7d 100644
--- a/sys-libs/pam/metadata.xml
+++ b/sys-libs/pam/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>pam</herd>
-  <maintainer>
+  <maintainer type="project">
     <email>pam-bugs@g.o</email>
   </maintainer>
   <use>

diff --git a/sys-libs/queue/Manifest b/sys-libs/queue/Manifest
index 45fbce3..3f312ee 100644
--- a/sys-libs/queue/Manifest
+++ b/sys-libs/queue/Manifest
@@ -1,3 +1,3 @@
 AUX queue.h 19539 SHA256 8b284031772b1ba2035d9b05b24f2cb9b23e7bd324bcccb5e3fcc57d34aafa48 SHA512 0bd66194fc3c6ee185948d17cc34475afd19a7a3b6c1d2531fb7fac68bee6fd170428188b2c0c74a918adbfded43c4fb36892823c78c197e0af484d24601adef WHIRLPOOL 9af0bf7399a291f73db4c9eade364edd2d97dc403711b0e1f8b4567411ab00153cb11ffd26bd15bd8789fd6d58851835eccdd8a01616f3bf237b58b19bb97b2c
-EBUILD queue-0.1.ebuild 453 SHA256 1a0a0f731fb4a0be564db8461221376cb4eed2e27d96184775bd6e64ecc64d6c SHA512 85124b81d923048c08c446ad80b7e08f86d155857927051eb24fe57a1286a8b0d46ed06f52a1dd363220a6fe4ae8306b2e6ae0113ecdce607093011ce816b669 WHIRLPOOL 178977b4752824163e89ad675e124c19200749ca4881994c04828ad36b8f227ceb6412d4d976f67816afce99d667db7f3f3d7faaaf16070e4304dc17a03cf853
-MISC metadata.xml 261 SHA256 8f10a5b7f7571c6e73739c4bed1ecaf34aa8278355e9d163f8bbae77a11575a4 SHA512 7350bedbae4104f555ee7f95e7858069ec6cf5a2d41ffba46aa669dfa5663b100b39cc5f1502b6515aa149d1e661cce1e7e36fbfa350ed086fdf678dbe87661f WHIRLPOOL aa6a80ddc7a5dc80a6cf892e2bfb21616b80c05978435e4f4c6ba7b3be4685a9d15b92a23db0bf333373c436c4e256f02795f6064b476bd7d82309394bd15b3a
+EBUILD queue-0.1.ebuild 447 SHA256 e39267b275ffd73f21db12073df68ce6e8949e7af5ca9966b6e24d77217c4e17 SHA512 a6aa123acc8e3cb2a17d61e45898e15364ebdbeee849dfb3aa351d6eec4a09797eeac7a60aa5b99ab419697e22d62b51d4fd21962c89ee1798ea05d4259483db WHIRLPOOL 94ca7333ce8e238f66f0b683202510bb528772d1f86340beee9084d9cd7b91840903bdc72ff4b2763f654a2aca8411cd783999cffcd7939f306dcc16990e702f
+MISC metadata.xml 238 SHA256 f13e6e7b65d20beb9ae945d520160ef0dba80c1965754958945904d7e3c0a75f SHA512 3c3d75f1cb90ffcfb98df47481fbde6d451254a29fa87577acd25bc27cbcc3e5dbc0c1efce5974be905428f0b7caf912c8b051417aff92763847fa377493a153 WHIRLPOOL 6ec3d597b87aff99014404b8b732e6f600aafc3c3eeebfab135c9c19cde2e43161cfa23f841bd72826cc3393b724e1dac115c15dcce2b74ace6f1d6ec209dbf3

diff --git a/sys-libs/queue/metadata.xml b/sys-libs/queue/metadata.xml
index e217c37..1e75873 100644
--- a/sys-libs/queue/metadata.xml
+++ b/sys-libs/queue/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
 		<email>blueness@g.o</email>
 		<name>Anthony G. Basile</name>

diff --git a/sys-libs/queue/queue-0.1.ebuild b/sys-libs/queue/queue-0.1.ebuild
index 09de922..db4df5c 100644
--- a/sys-libs/queue/queue-0.1.ebuild
+++ b/sys-libs/queue/queue-0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 

diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 97e2a31..09ecbe4 100644
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,4 +3,4 @@ AUX slang-2.2.4-memset.patch 1054 SHA256 d389884d73811314a6dbdb6223a7241bca5abc9
 AUX slang-2.2.4-rename-posix_close.patch 779 SHA256 2d17c884ca2fec500dff90358d3447e001c21f7597bb425feca231b0e8817b20 SHA512 e8b01306d10d2538b8113bdfbcf6e7c43d04570ad97a7bdf3cf3a1f9315ca0cba571a808b0a0d87a1413b1ee52eb4799602fb21aa600f3a196b26e89501370fe WHIRLPOOL ba14e577ba88df572c4d06e73ee5a973f7db71ce8d1f9a8429686d7045c34f6f55ca8726c78a3355cc8806785805dbcb0a4cc15033068d560b562d5c51b43c02
 DIST slang-2.2.4.tar.bz2 1427363 SHA256 9a8257a9a2a55099af858b13338dc8f3a06dd2069f46f0df2c9c3bb84a01d5db SHA512 aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f WHIRLPOOL 5a0c81ef103116733df952fec8593f476bd57c9b2799ee566b0bf93dfd465709ef5f565a369d89a92bfd13cfc7577a047c46116bcac2f0b3176e50556c7484e1
 EBUILD slang-2.2.4-r99.ebuild 2207 SHA256 ff504abbd971c6651e72d93a1adb55b50bc5822644f3cdd10a3da833fae9fb92 SHA512 1fc9847a7c29b83cd10b661478b6db99264d07d58ef7d493533d8ebba627d55ab8f68d59235c21ea499eb7699f577533f7284d9b6c9231fcee718aaecad6f1af WHIRLPOOL c50b4f360940a66df2a0af30b2d40c1dbbb6b0c72dc4f356e0405c46b13635bcfc43f314636cf8418a2cedf5a5a8ef00e9204eac8214a6a0a34ba29b4d35307e
-MISC metadata.xml 157 SHA256 c3c089740b31ec0f4d7fbc3bf2d6bb8460ccfd0694f01bf91b22a2e1930d6d5d SHA512 eaa4f0b5e4f9173245bcb2158d56335c959e2b15571f9992efdcd89ab2375a771f6d06a8bde9aba369489bfe15c123abc2745ed93b7c3fd04af29b7262367040 WHIRLPOOL a5d0d7ac8ce5fe93f1a64440cb3cdb943c30d8deaa5a19e90d24917411bcb69c89d6f56bf5c84bb2604b42d9fd4211905c5c0d1f1710b936b41443b302cbff2c
+MISC metadata.xml 234 SHA256 5ee3f7d7197cf269efebe240796a0484e0bd2da3cff78e63b87c32cb4297c175 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441 WHIRLPOOL a29087cfdc7418c4dfdeffc62f80a934a759de3f014f9599dc3be9a8292c4717165dc75c1a565b4dca34479115f4ae17ddb62aa6960e93ad71e12b4c26c8040d

diff --git a/sys-libs/slang/metadata.xml b/sys-libs/slang/metadata.xml
index aef01fc..6f2ca22 100644
--- a/sys-libs/slang/metadata.xml
+++ b/sys-libs/slang/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cjk</herd>
+	<maintainer type="project">
+		<email>cjk@g.o</email>
+		<name>Cjk</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index e975047..7079974 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -3,4 +3,4 @@ DIST talloc-2.0.8.tar.gz 433489 SHA256 1ec11e635e0318dbbb014db38ff96e8dba3ce5f61
 DIST talloc-2.1.0.tar.gz 416097 SHA256 0701393882647f823503e3aa075bc67d75c194b376822377dae2d20f9130f08f SHA512 7bdc448c91211299edf16502d263362ac660d5123d8ea7bb2ed58af2231537e4f29da5384b8d5be10254a02b193520890e95a73d697c40eba09728a9b6d56d57 WHIRLPOOL d8593cba27f5d971acb39acacdbea70df5b80ed31288cf440a2ebeaca266e070deeea8322f4ba5682580f66044128f18dd6d76b735aa0670aed46f13f5a4e857
 EBUILD talloc-2.0.8-r99.ebuild 1963 SHA256 f8f6bb2b6979a6b16037d1fe0effec45cb89ee0df1ac671dd17d025973de9573 SHA512 e4e71371062ba390f9e1b4ddc3f91e2743b6c50ba92fc2bef85cbe97322f88accd3b618a68ab5baa7b34d6f273b9a015e77c257b52b0915a2885a5f7c8e70b47 WHIRLPOOL 2f337527a1e965c45103635005a9f092db5a6d9c1680ae2b6426af92c64c5f17f206ebde7c5fb66d7a47cff339bb9f322eab27186c40848f8cd4848caa5c55bb
 EBUILD talloc-2.1.0-r99.ebuild 1963 SHA256 d8300c166dd1586d3e36bbd7e30c24eedcbc49d6251a3c14366f5bb7a3c19502 SHA512 21359b9cd37e0c48887737781e2ef273a8e18064cc72e4123aac1b449b1c876861e60551f255edfb83c9649622950ff3d3eae136574c19e90ac6e474e65679c7 WHIRLPOOL 7bab34ee41daf5ff53c15723b3117e11dcb75da9fba28c50fc8e3fd826715affdeeb3375b41a83a09f682be66732edc5e379e0ce821da5bb9417f83d288471fc
-MISC metadata.xml 341 SHA256 f12826bad0472c46c8bd1ee18e7ab0acdc4cf26dd8b1322b1a93ff7c95b14a7e SHA512 dd141022832b17bc47f40cc940c2165c849b5ad786df5cbba7685da4543a8969ed992fb9dda3a136d045418f6de731c83909f3d02fd3ad2dee4d0ab4689b0c44 WHIRLPOOL 1fff0d00542a6e5b3f64edb985e53fe978a9d91dde0b0118cf790dc113a1a3e3fd01632f2f19517af9b47fef51902de579e43c30eaedf3fa298230848cb125a3
+MISC metadata.xml 439 SHA256 1ada965eca76363431e96b05d3220a25d5100e9de31f189c5a07145760894cbd SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3 WHIRLPOOL 14b29f433af8722d9a94f3b351f3ed46c85f32f7e6169586fc8d41239e1f1bd2f6bc8b657fd5ce4ad4facf14bbf25edf683d0f6f7aaa4d6b911d92cab24586ca

diff --git a/sys-libs/talloc/metadata.xml b/sys-libs/talloc/metadata.xml
index be0176a..afa6476 100644
--- a/sys-libs/talloc/metadata.xml
+++ b/sys-libs/talloc/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>patrick@g.o</email>
     <name>Patrick Lauer</name>
   </maintainer>
+  <maintainer type="project">
+    <email>samba@g.o</email>
+    <name>Samba</name>
+  </maintainer>
   <use>
     <flag name="compat">Enable extra compatibility stuff</flag>
   </use>

diff --git a/sys-libs/tdb/Manifest b/sys-libs/tdb/Manifest
index d08a7bd..dc3c6ec 100644
--- a/sys-libs/tdb/Manifest
+++ b/sys-libs/tdb/Manifest
@@ -2,4 +2,4 @@ AUX add_missing_stdbool_h_include.patch 735 SHA256 d183183b15242ca3f2273983a5ba6
 AUX tdb-remove-check-bsd-strtoll.patch 1133 SHA256 75cb8c9f2ad7f8f93841d2ca0d8260c39ea5faab00ab294cbdd6840802bba9a2 SHA512 b85cb132efb17fccf9dbdffe50cfa9468b3da15b28923ee2f0908be558460ce2e5ec421b2f90b47036eb55d159804de016caf025c7ad9aebe79cc446b12e9cd6 WHIRLPOOL af8e044d43693d8bcc1622de2d5072467103d812acd0744185aa94c13b74d2aa0880f71beefa36847dbb355a77af2b1245cf2699bb6ea404772d5c7d9b6298cf
 DIST tdb-1.3.0.tar.gz 479096 SHA256 04bee48d405ab7815810575a6e0cb364cc0eea6187b54b18c84e9c18a768ba20 SHA512 b9a66070002879119627bae82d8bafeb52ae336afdc4d97e14a7e4ff78e42c7c516f8349781964c2bfbbcc6949247c5fa9519f936c884151ffff9e121f9f9334 WHIRLPOOL 88da0b12ecdc8746bf627f2e1ce896b1a2b435c1dc34cd5649cd1554aa2cf90fe16014dd31fc45605d6a3dcdf02c3a09b1a43e68527497379734a96a3dd99711
 EBUILD tdb-1.3.0-r99.ebuild 1461 SHA256 96c36670987f1ec11ba2ff07911aeaafdf80dae0ef004211e6b2e11f45b403aa SHA512 86ff5b9110dc34e8fc8f2c2eeb8619797386280e1877cc112723d8b60d78071d2e312dd3843d9fae710263cf9dd4bc03bccc59ccd3b28e60ede27ce35a40aca5 WHIRLPOOL 5c5990f302b5336a8a76e68d9706fd5613dec5e922f38355e605d6d3d191fd684a8318991cc2bf3058b965c5627a3e296533c3a36c8e09941fca9cbca243ddb1
-MISC metadata.xml 260 SHA256 9c67a75d6c6db8d88233eb27271c93874a4b763907a61f189970574fc957e0e6 SHA512 611e0004aba6d842ba71a9b9f74b8301d1a7d8d366208122001f5d164ae34b88c1ba2d41c0b25c760cea155387e5e7a4b3d141d6b21cc997f894a21c519a07c9 WHIRLPOOL 1bf0ee15987eee963adc9506dff9e8e978bcb8b7bdc9381f468fdc92ed39e356c69dc67af161da4eac8b46098a28ab8b6249f0efeb5709f7cd4f3f8a4749b675
+MISC metadata.xml 356 SHA256 0990f052548eb3a00ce43438f8753a35456ea27c1d3da699f00b12e66a5039cd SHA512 59095952e57315232ef95494f2c30f520f13538f279df25f17a923a836194c4df78e11a03ff6fab814c1db1fe5a81cae2cf20988d77ef30e0c0d47f9a74f01cb WHIRLPOOL 3460b24cad2050d51f7196967aba58b491cce004285b5fb41ec7d879e7fff5551dad15ec4ec797567383e906f5fde716f55945ed81f9b16624636b92caaa833d

diff --git a/sys-libs/tdb/metadata.xml b/sys-libs/tdb/metadata.xml
index eb993d3..f0c4a5f 100644
--- a/sys-libs/tdb/metadata.xml
+++ b/sys-libs/tdb/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>samba</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>patrick@g.o</email>
     <name>Patrick Lauer</name>
   </maintainer>
+<maintainer type="project">
+    <email>samba@g.o</email>
+    <name>Samba</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 3fbf905..f5f61ea 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -1,4 +1,4 @@
 AUX tevent-remove-check-bsd-strtoll.patch 1149 SHA256 3c912c5129e9bcfce51cb1c0517e4fe641371d3eea9af43454024858eb6418fe SHA512 69ef329df08066b877b554b1fdc0270190db4b80d3fc11988736584e7743047d3afc11c1678dcaaff71d00fe443a13de118a85727df1097ae7edf80d43b7bdf9 WHIRLPOOL c50aa5ffef33ff9fc099893f81081dcb2d939216a05bad7106d210eba08ab41413ebb5054675e30a943fe0d5dd91190576069a9156d6735576daf744e22923f3
 DIST tevent-0.9.21.tar.gz 550606 SHA256 f2be7463573dab2d8210cb57fe7e7e2aeb323274cbdc865a6e29ddcfb977f0f4 SHA512 d1d76402bf32c4da9394ec5e0eb149abefa3f4dc86e5d22529f5cc4f30b1d3071e7a00aac3bd5707532e68dfed5a03dc5a267ea367c8fbe0aaead9df63beafdf WHIRLPOOL 4b4525394cdc06a5ce2535216eea8fdcf44dc0b4ab7964506042df3ee67ce9463d82e9b6be3bdd4cd9983ce92a62e3dfc69c6abf66d30b9b6466e863b2c1d7cd
 EBUILD tevent-0.9.21-r99.ebuild 1382 SHA256 c46d259567c1d393d49d6a59cc99d2d307664842b774ec4a5e47bc6940ba70dd SHA512 3cfbc1aab681f1502269e6a00757ce5a2827cfd1a5fa57c19083032409bbe2ccbee896a4ca55c4a4af1f04430ab618ba3c100bc58b1d95281aae09506a300838 WHIRLPOOL 255bae50fb10489a06d7cb430c50d60d2e32703219df93af0626b77bc61e1893e56d069f2059242ecb3014f1cbc0364cefd9bcfa51fca0292ae6485d0faa2982
-MISC metadata.xml 253 SHA256 89737be021da6f1a76894bd234f227b72ba57fd0213bdfdc0f5b38f1051ce775 SHA512 58c5ed90694ec0914f49f21b7066d7bd5610f53bbd0ee01e6d1b285e5f8f261bcb681e19b21c39287c312fc982b300f2a34a8cc638eaa0e939dd0da2b046288a WHIRLPOOL 15e90e302adf797a5761d14558f652e319613ec179ea5a4cdfcff2040bcf8d0cc734266744a69e644108ec47bcdde213ad5eaf0c7adf9d796a21e62a58ed9dfe
+MISC metadata.xml 345 SHA256 c71a19f7b21e012e46ed9e3c5f48a7f8345678680907434bd2e708ff48d69401 SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5 WHIRLPOOL 0dc86f0d823c4f4b58ea7d623c27cd1f1985acb35ab891f32e3a7cf0bc307f029e6e94ab4f7385e44d13664b49bf4f0876b2447b45e8132a881dcaf45d4c063f

diff --git a/sys-libs/tevent/metadata.xml b/sys-libs/tevent/metadata.xml
index e06ba37..00dd5f3 100644
--- a/sys-libs/tevent/metadata.xml
+++ b/sys-libs/tevent/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>samba</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>patrick@g.o</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
+<maintainer type="project">
+		<email>samba@g.o</email>
+		<name>Samba</name>
+	</maintainer>
 </pkgmetadata>

diff --git a/sys-process/lsof/Manifest b/sys-process/lsof/Manifest
index 6056e5f..5335bc4 100644
--- a/sys-process/lsof/Manifest
+++ b/sys-process/lsof/Manifest
@@ -3,4 +3,4 @@ AUX lsof-4.87-remove-glibc-check.patch 514 SHA256 c90a71adbdcc5fb6d32b7469196315
 AUX lsof-4.88-linux.dnode.c.patch 494 SHA256 8c824fe2ac4f4cb492a2d4539e8a921d50e337235c4f42650bade3728487b34b SHA512 253c0b3e3d50f805ffde21ba214e0a56fa554eb98fd126fd3edc4aa0401e24c2fbb72e30288fe8cc371a3f615f5365e6fc753e7dc2aa0a8367f132c7411b28f1 WHIRLPOOL 31aa05df4e7b3a1b0f9c8f37544a2c3d6be3d596a6ef844855cd3e99fb53291ded85e61690e91e274f5edcf805c73e7663723e8c43458d3a70e3abb6689fe2eb
 DIST lsof_4.88.tar.bz2 778563 SHA256 fe6f9b0e26b779ccd0ea5a0b6327c2b5c38d207a6db16f61ac01bd6c44e5c99b SHA512 acf3901ac08bac5acaa123af835de03fcf86c1cb851a2cba5bb6d08c53dff62570e4129c18ffa241ae84a83d5e6fc5207fb12e43b5ff5a21a0c1967ca117848b WHIRLPOOL 74d85794e5f05920ac83b160b02e510442ebe3f390a8f30bbf514f31bb8ff74ad191f89bed5b3eee47033cc7d6fe01ba4d9d812050d7132e041899d96264076f
 EBUILD lsof-4.88-r99.ebuild 2957 SHA256 c9897d1d795662fc9064f1ed513cda5f4f8f1e9f147396c5ecc3507387ac1e3d SHA512 dd617537bcfae2c133d90f7902f5e6e55e4bf8a8364a31d195678bb6ddd63d41ffc159ebe7a1db58719a719bc060977b5e40e3dc3421c91c9e2498b7ace0dc64 WHIRLPOOL e7a331cf92831b97ac27684db9a0a4d547043fe25080c19d053ac5dc0f9744932204c4081c7e923ba5d4698b08317c6fa69dfdd411d4889429947c3a824e8731
-MISC metadata.xml 238 SHA256 27f27d7c7ba9fb670a6867a79ff8af354e48735f9bd672d387d96b4bd49d415b SHA512 b8434ca8a5f116234268cca5c8d7cf20b3187e1f2c326bfe3693e2e85c2dac961618b39a20d0d5b7a01744b5159057e2861eeaff7fef6a08e0fc4c1b47bbf778 WHIRLPOOL f3ada27de4f86d469929230f1649727d91cc303e007ae728038062a04522053f0b49559d5bc4b6dd203744ba117d1577d03d62a1cb5d7c24c86c268edf057761
+MISC metadata.xml 327 SHA256 be9246f94d3a616b0eed2cfe506c6673aafefb5d2bd85946ec462c2ff3f49494 SHA512 c8c0efc3b339063936d805d533cf3528e1a4e1a84829c0e0f993fd3268751f4d7d4713f45cc6fec2956101b611e6e344e0c0336eb8d1b769a47481d72088fb98 WHIRLPOOL fa94b6d626e8e3d55b5f90ed6a9dbcfdb806cadf43ebdf5086c3dcdf08138f75cf7c14442edd4c5825571a5264d1dc666d4e0c6e242a450f5c8d2424d22416c6

diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 49fb858..4f913c0 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
 <use>
- <flag name='rpc'>support looking up RPC service info</flag>
+	<flag name="rpc">support looking up RPC service info</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 70a1a6e..2160002 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -11,4 +11,4 @@ DIST procps-ng-3.3.9.tar.xz 560812 SHA256 00f0cb0fadf968ddf605b0ef119846af073866
 EBUILD procps-3.3.10-r99.ebuild 1909 SHA256 6ecaab61ee1932be7331c310762213cf8bbc3d7a4223a7b6fbaed478334c4c0a SHA512 21014530561f93884034b8b1e1fa694e459b14888153817221bdb5be6a4423d480971cf2715fb3881f830d044fb2d5ed84e648a2d8c65165770ae2ddd3ab6fcf WHIRLPOOL 952c44f05eda80ed1172a60d3617a4343b050d23b4f88934887bbf8f5e8dacf93c91c1b566d58db656559f696f53cf97c6934822fedd8063ab3827437c73b115
 EBUILD procps-3.3.8-r99.ebuild 1818 SHA256 fd06e9254f0216b401346463268112c9bf9a008c73d8407fe78d005437b4aed7 SHA512 44811f384402b264d1474775db477edf28f733d1b1785326d609e1d6ce0be5da1c72037db51283456e2ff90b6ee58009015e259812aeb2854309a69a1561545e WHIRLPOOL 7405808b4178630c047a4bd14776cc22c88a4c49de70d788aae333670d0277db39b5901197fbcd4c22a9f3f6df6726e96dffff3d5a7d79f53f35755c0a41a282
 EBUILD procps-3.3.9-r99.ebuild 1698 SHA256 10d81de372db3c00a1e3bc5e1d88e8200cc58f16f2fbbbe0886403f4421d565e SHA512 cb44fd715fdf82d62789dce81bc49a796eedce0bcfd1ed682bd7bbb23223a8c8b02137231f1dbd4c3c267410042609c357b976cbf4697a105cbd3879a6f8a1b1 WHIRLPOOL 2c86fa70f08158601318f18a1fb8a5cc3ceca79e651935be3e9fdef86920578809eae9872fafd34349c2c474e3ea0b23ac2d81169e154b02d563b62d5ca06a13
-MISC metadata.xml 377 SHA256 c0a45638c35d967d63370589161a647aff1e986589bbad5c1d0ed49566e6cdba SHA512 b554a36656163db9ad2d27719b2b2a5b5c9033ac83723c9387dcb68a895f83213bbed08f6a7cddb4777bfcb91981f958dab3ec6527c6bf9bd175c1d3c60cf973 WHIRLPOOL 58aad116a5100d29538791538d1accb86acb808267a431e95c8051f6a682ac94def16131e4ae86c4b29b71c9eb7748d7edf64284c9c86295680c45fe9fe02a84
+MISC metadata.xml 570 SHA256 700c7801cdcdd25b5c65a24ce890def0d4e513d81ef6965c717e7ec4a9931001 SHA512 e4f5a3f955c05409167a1cd240847fc4a578b005ebe834f27bd600d37896539a5b331c0fee85ef1ff96c5a3dc06511e2f0c382a0c400773e47269f4cff4ce0ed WHIRLPOOL 00738c327bc1f084cbd30e188375d0909b0efd4cec44b2ebcd5aa9eb22d6319e659664d8270174a581bb4e7b63c4b91180c83a40bfd45b6abd738b5ab311d92c

diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index f805f9b..a21aac9 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>base-system</herd>
-    <use>
-	<flag name='modern-top'>Enables new startup defaults of top. Keeps old 
-		defaults if disabled</flag>
-	<flag name='ncurses'>Build programs that use ncurses: top, slabtop, 
-		watch</flag>
-    </use>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<use>
+	<flag name="kill">Build the kill program</flag>
+	<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
+	<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
+</use>
+<upstream>
+	<remote-id type="sourceforge">procps</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/sys-process/psmisc/Manifest b/sys-process/psmisc/Manifest
index 6c03e80..6bf22b7 100644
--- a/sys-process/psmisc/Manifest
+++ b/sys-process/psmisc/Manifest
@@ -1,4 +1,4 @@
 AUX psmisc-22.21-add-limits_h.patch 355 SHA256 363ba4dcc2627d7db260f29a97888fe8b58315fa5317bf3506e685c9fc30e46e SHA512 a26cd96decdbcb7ed8822a5cee74254b428a0ff8b76c972b08be80a345f29bfb915ccd7b3816d1ca0c559ddc7b1a945f49091142abef74e508d57ba487b39c49 WHIRLPOOL 3fc7e0172f709158a19e7f6679d1918f8abd4a085be99537634beff5075eb7527cf9dbf20ed960047b7506ce7800808560245cb76ae87cda27b01d70d0aa14bd
 DIST psmisc-22.21.tar.gz 457702 SHA256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a SHA512 766aeb45687090b88b17176c5117a603e83fe92a13c013aea72c8ee80048adf02e18c7daa52ddfb8b2135f7c9a1bcae38896cdfb8d0158728d85a446c5e0d5ae WHIRLPOOL cbd4af3e54ce01f43558184b57a24e44dfb6e05d8438bd11e2308ee62535bb93dc417b08e66603966cc5912d7fa88c29df1529995a42e2a8b7c3da663b01681f
 EBUILD psmisc-22.21-r99.ebuild 1343 SHA256 82d077e6930d8d2eff5bb2ef780c46b87cb7c47cc903aa793a1e8f5893fc33ee SHA512 2dc58ef39345a28438df9b76656daa9a2d53168362b115f97861863b9cf078174d5c747a3d421bf81a6345a1e54c719a21a47e1eb0d65419038e588c79702869 WHIRLPOOL 4ee6d1c533ca54b4582a10b7e5937fb08306c209d8df729a71b4d71dccca359fdbfc155861660bc1fe02179181336a91d652be599e957a5882c3afe2acf1b684
-MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+MISC metadata.xml 326 SHA256 f9e015cc6214350091a0d68a07299ed5e6ad518b10eb91902da25726658623f3 SHA512 580a0e66078b7304d0bf76e3c990e61ee4c073b49381b60c5f3f01e2b64d5f0c318eb5596f7da09a70fa52dc93769b25f37f531038e5d7ce6278dda10e18117c WHIRLPOOL c0a2727f3ee0a38abe0ad2ceb0adf0b476a1fe9ba8435168c457aa0326aa8fb54f25d7828ac11a1f98b9e1066e69112ecb77b02111449680b64073163130bfa5

diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
index 96a2d58..df39eb8 100644
--- a/sys-process/psmisc/metadata.xml
+++ b/sys-process/psmisc/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+	<email>base-system@g.o</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">psmisc</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 42f79be..5e3aa26 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -92,4 +92,4 @@ DIST firefox-41.0.2-zh-CN.xpi 486222 SHA256 8c49c52b80937a00da8953ecb1bdd1c6505e
 DIST firefox-41.0.2-zh-TW.xpi 479033 SHA256 a1b3661c004ead49b5b1adac7515de402319ae82b06121313deb51b1ec7fcb20 SHA512 08a7e516fb556b1134a9a05c782b0312c5b4d8907d671be47a0aeedd1a0933fb22b0fd5ab6fcc7888a00258b06b420555752baeccacbea7de8e2d996578ba95b WHIRLPOOL 40f955c3d9d96fa2a2a5ffdab65260d7dd06e9d10b855a0397baf72305002b517dfba55d75e762dbe1a3ea237a691c082b9a6cf1d0241fa055232f02349b46db
 DIST firefox-41.0.2.source.tar.xz 159761468 SHA256 ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e SHA512 700c1f355436747f8707b4086dfa0865c87ca7d1c3a5a879347e3460b26158681716addf085dc2446b1eeaccf328b3f3d6282df8e00cd97d8affd97dd780b409 WHIRLPOOL dd52ac3fa4c97ff0252eaf8530340a9baf515a0ad7afd121391c05de7fa030cd5151476073665a917568fe9c81cddc67109d19ad8f453ce601ff7ef4de148f08
 EBUILD firefox-41.0.2-r99.ebuild 12887 SHA256 1796347c9699e023410fa9c0f68f6c26913b3b33330cecc97b9be2be676e07b6 SHA512 a74aaf8f396b6acc428b430eef131c1ab5c451ab2eae13a7caa0243dd1aa821c78517119917d401580d2ad8427d51b922e5f565d9c808b10cc66003b4c46cc6d WHIRLPOOL 7d94ce7a9f8cff2031bcb11e65b52affd1c7e30e1a002674bd4e7a8c7512eadb158fcfa5c12bf223e2303e0faaea67a7fdd2f9ba8ea7d0bae862153e5fb8f2aa
-MISC metadata.xml 1569 SHA256 5bd9bff289f326b1aef443ff6a4681bab63aa9a12acbaaff13a11bfabceca518 SHA512 372d8e0793c8edd608975d094b608a2aa04aba4b87891df589597ee14a04e748745339e2cb8ace1342e73e4c282bda5c73b621226f410c41f7659da273e0f083 WHIRLPOOL 10a890b2176e8b75814340546b34983f0d40848452dff13088cc36c2f44611107975a0d4491374c25f995c0e37be19e3f0b60ee1e4f887de26fd82c14fbfec35
+MISC metadata.xml 1893 SHA256 e34287b92dcace30b607e3dd899e82b6a06fde0fda782f1f213466d736a77b0b SHA512 bf4154f04ef6bcbb3e2a5d4ea6b841db4e4de03dbc1a1e0dc1b83f5f03181dfa3eaf50b4ae366b46b1e225aa0851d67c9a19e24711c8f1d7568c73ed86581048 WHIRLPOOL 1da1ec9c707d2ed46de6d98aac8e956a00d371daad70172faf6978b7825c28f51010bfd90153c518ac1ad613a90f8fa86cffcd71918fc6f0a7156a13c45ed23d

diff --git a/www-client/firefox/metadata.xml b/www-client/firefox/metadata.xml
index 7c281db..246b346 100644
--- a/www-client/firefox/metadata.xml
+++ b/www-client/firefox/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mozilla</herd>
+<maintainer type="project">
+	<email>mozilla@g.o</email>
+	<name>Gentoo Mozilla Team</name>
+</maintainer>
 <use>
 	<flag name="bindist">Disable official Firefox branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
@@ -10,6 +13,8 @@
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
 	<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="gtk3">Use the cairo-gtk3 rendering engine</flag>
+	<flag name="hwaccel">Use hardware-accelerated rendering</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
 	<flag name="minimal">Prevent sdk and headers from being installed</flag>
 	<flag name="pgo">Add support for profile-guided optimization using gcc-4.5,
@@ -20,6 +25,8 @@
 		instead of bundled.</flag>
 	<flag name="system-jpeg">Use the system-wide <pkg>media-libs/libjpeg-turbo</pkg>
 		instead of bundled.</flag>
+	<flag name="system-libevent">Use the system-wide <pkg>dev-libs/libevent</pkg>
+		instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
 	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index 6704d63..89368bd 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,6 +1,6 @@
 AUX midori-0.5.10-check_execinfo_h.patch 929 SHA256 a054bbe22b1f259da2def7eebbb6595a86d0ccbd889823a619e7bb99b36d798f SHA512 118826d3fb3a582f29064764833968d4c500aca3f7cf5d62276f57c10e69f2c40c8b0a564995d59e008b95835f9d328ea7733c1bfcac26441497bceae41e3be8 WHIRLPOOL a19beb2d973d9317fc2b5b5ae3062314d8905bab7e0e0a48e043c09478207924a6e4964a9d8d53e2034f1d6021f5ff78389cd9faa6543afdfac9194211ff351e
 AUX midori-0.5.10-fix-webkit2-build-breakage.patch 970 SHA256 64ad7d35ee95c63f39f1607b7c01646cc6b8b1781c8ce082ff51bba3c6f9a1ff SHA512 e0454fb5478839a0b9bd35546e6f57a57e07e36a2ac370c3bcd9762d46be7b3aa7ba860beb4ce338d286cecffb796ec9af8b4704bac48f941814287b10fec9f6 WHIRLPOOL cc9fa9f8ac6fd57522238a617801b0e1c27cf998e62c8f858266254ad77ab280d5a0e15d76b6b5e3c334e8a6e96ca4b34beedf17cd3d2de3f7d4f686a3090a00
 DIST midori_0.5.10_all_.tar.bz2 1379519 SHA256 702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f SHA512 9e615581b2029e2167d13bab3a580cf89b87da4979bb27982f2002b4ddb97e44d27ea910ee60df6479bd0dfa8cbef75217fa1956eb34b13475c99ab25b83f245 WHIRLPOOL 754b5d7b6851a2c0e537c6746d945f9412cf3757c559bcb07e455f555fa67bfc3e29ff08a39517359ba99bd0759252adea3d78f6281d7a07c8411f02da24fdc7
-EBUILD midori-0.5.10-r99.ebuild 3114 SHA256 4e8b1918edd56e80350005f13529a2f5ee94c78d0dacfba05c7b8438da1fb95c SHA512 ffb83393d2abda9863084942667c968e9ab3575561ebdd44649d2c94b2cd1571f5cbd49ce0d4cfdf705172be93dcfb10c218adb43d2c4cc6415722b12256a40e WHIRLPOOL 16b4aca53ca89b0d16708d32c21172e6e2c1ed77686f9a53b1ffcc65d3e924acac1df5e872435b34b9daf4489537bdc34c75e1716c06afcbeae1043811e1e28a
+EBUILD midori-0.5.10-r99.ebuild 3001 SHA256 5ba751a19c9f95592aae8abead9879c31d80ec33ec52313323514236d7f12811 SHA512 00abf6913ca66f01d3df1a92d63493a44facd65b5a00039017b943c64ac24df62543e75168235b25254fc4a102daf439e1b9dba611fc6c0942f4783055546881 WHIRLPOOL f526adcdf6fdba2e8b740d91b1de6141d922ffe4709145f621963a7b6a9241cafacc3615245889178102dfdc6f12badcfbd620240ca83aa03cfc570bf843542d
 MISC ChangeLog 20370 SHA256 3675c485bd964efdb4d685b77d2f4291c27292b20904b4d5901f45bc3eb5faf2 SHA512 c08b17bc29d72a036edc2af555b547ffd90ee524a22867b8554e78b98d9461f0891be4636db853aff2a091bfb5f8e4a2f1633a2fb876af9484a3ce32e74c7af0 WHIRLPOOL 158b24fd965ebbe6c27ee86f3e2d483d39d87eb6f479823306e619fe5b13353c35ea5b88330bb0a4c0dd033c76a9258c20b2b3178b18cb611bbc7742d25a2bec
-MISC metadata.xml 600 SHA256 d95e833c1eacf1d25e590e113e9c8e5070c708287992ec89b61aac7f03f16928 SHA512 17acff07ae7ee5fbfac9a8cb30202e7d497a1eae395eb83460352ad896f41eb47c010c45c452c8147f15cf9f04b1364f2eb2260f20547a21dee45d26a801666a WHIRLPOOL d223d4177a0885bd14079a55c439542acc102cddc6e36a14b68bb36d334e4ad33f44a1df28e74c3f1482ebe228acb7ca64c51838e02e1c2f28eecf5287aa92ce
+MISC metadata.xml 688 SHA256 cb9e2a11c349c9511ccd24d69cb74ff0a85f887d2ea7e0207743d4a71f0e4e54 SHA512 dfaa7adcf2f0db8d176961be398f8f2821c8630005564a406130b7f2ace3d7f22c482ae4b4ca5741ccfab6fa95d40635edb3da07a065b58fffdfb0e74cd55945 WHIRLPOOL c065207daa59285043a5692d3a8c57733cdb81388f31006d8828f9b64cf8e50f3fb1986742320eb2812e770b8dc37cdebbb6047bedb060a50eff6254295fa703

diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index ead2b54..a04dda3 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xfce</herd>
+  <maintainer type="project">
+    <email>xfce@g.o</email>
+    <name>XFCE Team</name>
+  </maintainer>
   <use>
-    <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
-    <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
-    <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
-    <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
+    <flag name="deprecated">Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
+    <flag name="granite">Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
+    <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
+    <flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>

diff --git a/www-client/midori/midori-0.5.10-r99.ebuild b/www-client/midori/midori-0.5.10-r99.ebuild
index f18ad1b..e2da754 100644
--- a/www-client/midori/midori-0.5.10-r99.ebuild
+++ b/www-client/midori/midori-0.5.10-r99.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.5.10.ebuild,v 1.4 2015/07/04 14:09:02 perfinion Exp $
+# $Id$
 
 EAPI=5
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
 	_live_inherits=git-2
 else
-	KEYWORDS="~amd64 ~arm ~mips ~ppc x86"
+	KEYWORDS="~amd64 ~arm ~mips ~x86"
 	SRC_URI="http://www.${PN}-browser.org/downloads/${PN}_${PV}_all_.tar.bz2"
 fi
 

diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index d58460e..41097a2 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -4,4 +4,4 @@ AUX htdig-3.2.0_beta6-gcc4.patch 541 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef
 AUX htdig-3.2.0_beta6-quoting.patch 1130 SHA256 d84222aa6895305c2ee87f9975bfc348a7872f63ee02a33e862b325f125b8109 SHA512 7edadb8cecb378eac8352e43ce12d5fa6af711f847f1e1ca0a49303daedffb1cef9795b74eb8cd64120e981c57c947f082f60d857985ee5ac0d54537fd6b4181 WHIRLPOOL f2be945441f52c0eba84153d5da1d403272f80dbdcc58fd8b3e300948a258839982bb08c51944251c4fe30926fc8de7f0ecc975f91f98d832687549739ab7b7e
 DIST htdig-3.2.0b6.tar.gz 3104936 SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 SHA512 29832f4aebd2b1f944cc4d800a5202342c8ce66936980476d49f679ec169c0268a902e85cd7440a3b6bea9db0a3b640bb1a9719c680d857ff00d34590af63064 WHIRLPOOL 63b0635873a24ad84c62fb85b6f9e645b3166630a4db52948604e6179f5f41978ef3c1b663122e8e5b74173c2e1cad269d4d92c5e678dcaf4dbac06d6b930cf3
 EBUILD htdig-3.2.0_beta6-r99.ebuild 1894 SHA256 8b259a96d9b2528d02bf9700451cb300b30af0a6ba7c208e0781389d429d4cec SHA512 140f3aa55ea9a9ec73a65639000575549bfd4303e39511b3a90ee67416c20bda0e6070849e95ff73844b9522afc2c4824b8297add50682be14fc2cf99a50ad33 WHIRLPOOL 844f79ba428a98184884c02e74801a13c3348f697ae8d6733b1261d7350e6212df1d5447c4952a2328cb420a5718706546588e35880999019c75f13701b1e814
-MISC metadata.xml 161 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4 SHA512 da8733f12ac4bebcfa485138fd9880683c1196efc0312a588ffce412ed14c1dd831e005129b6598d027af44d381fceb844453a433d0c982348e21f2d9c49f52e WHIRLPOOL 2b56ebef4f0870596c32c35c96e6dfbc911f6a3d8fe0e8c463df76dfa73dde112948c814b9a9ee996b7d71a85e4a723033ee3b92f4cde0f31d0770404d7dba61
+MISC metadata.xml 246 SHA256 f696b469729aeeb7810f246774e90471415680a9ebd6b55c56c13a5213057508 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed WHIRLPOOL fef696fa5b101de1ba4bdc0188a4757648d9eb40d4b01408cf17416d1f39909026a80e4b082d8497801aae1caea588b6d28616cd3853e1b03b94a8fd672f9c85

diff --git a/www-misc/htdig/metadata.xml b/www-misc/htdig/metadata.xml
index 95c06f0..f2f2ba9 100644
--- a/www-misc/htdig/metadata.xml
+++ b/www-misc/htdig/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
+<maintainer type="project">
+	<email>web-apps@g.o</email>
+	<name>Gentoo Webapps</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 544e4d0..9ae0537 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -12,4 +12,4 @@ DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739
 DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab
 EBUILD xorg-server-1.16.4-r99.ebuild 6878 SHA256 2964b54ef3281174961903084f4c6333ced6e16f7fafc20e0655aa7a8d556694 SHA512 1258f0db4d9b91e428e325c9ed0472792f1b34df290115aff29e3f8211d294ffbc0d4dc4b0d51ae6ffe919f89668dbeed3ea202f4477762034ae6014e634033e WHIRLPOOL 5399e6a4f6d359049082290f0d39de1f8f09fed28d1f2b861a0d07bf14c4588388a366c0f56cf1a6d10b755c048b7353a2deedb8ea35624d64ff814c5f589ec7
 EBUILD xorg-server-1.17.4.ebuild 6389 SHA256 bed54a4700a79eac2ed3ad6286e42a87f2f07b16c35b995d7b4bb204e69a522c SHA512 59d061448ba8c9b780843bfb02bc884354829d9bcd9b37b6857fb11317b6d1c1fd606cbaaf202e9cc75e6dba26752c4aa5a39187aa8a5698cbb1b6d800aa9eab WHIRLPOOL f6212d5172b74c9c7bc0b4a3210e199692fced0110c8e55ae7cf6da183d0b59ebc65d73c6371b991aa1bade89aca400b9c20fe3c58259821bff7c3c1d93de07f
-MISC metadata.xml 751 SHA256 02f470045d13e4baad4089f1cbc7cafd4dd1ab1b1799eeb2c0fb7864e956df80 SHA512 a58ad7f347519d7ba3bd710f1eab0f67925645961bcfa97fd9f106d5ea81400da79eebe95037ee4589b19c462fbdf6948949818f31210995ec9a930eaef78b26 WHIRLPOOL 67b3f0584a5c1d9e6da206761fc34a82caae36a4d9544c5512a95cdef800417c0f3f03a49606ebef72aa61522f097bf448fa0bdf651b5dd3b04554dcc86aaf5f
+MISC metadata.xml 877 SHA256 b41a133db7c20ca9b78a620f30af984d178baef7207c8c4329e1309835e8b522 SHA512 370e41da26388e328697958396b808c831e07245dc9e2ea230316bee8067d8501d032a0c9f89b7f1ea27c816490803839a8f14485aacde6143b3db38a6e1ede2 WHIRLPOOL ce70642eac3ef6ea824755d4d1bc7bdf8e5d3b95300ef43a41e1f5e710df0f12179f0a15b21dae0fbebb0dd56e35008f1e991463215a7f23dd2fd977400da40b

diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index cbff1d2..dae89ec 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+	<email>x11@g.o</email>
+	<name>X11</name>
+</maintainer>
 <use>
-	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
-	<flag name='glamor'>Enable Glamor OpenGL 2D acceleration</flag>
-	<flag name='kdrive'>Build the kdrive X servers</flag>
-	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
-	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
-	<flag name='xnest'>Build the Xnest server</flag>
-	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
-	<flag name='xvfb'>Build the Xvfb server</flag>
+	<flag name="dmx">Build the Distributed Multiheaded X server</flag>
+	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
+	<flag name="kdrive">Build the kdrive X servers</flag>
+	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+	<flag name="unwind">Enable libunwind usage for backtraces</flag>
+	<flag name="xnest">Build the Xnest server</flag>
+	<flag name="xephyr">Build the Xephyr server</flag>
+	<flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+	<flag name="xvfb">Build the Xvfb server</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>

diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 29cea56..e4e1955 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,4 +1,4 @@
 AUX libdrm-2.4.65-add-limits_h.patch 716 SHA256 f3a9f8fee736d7981df9f887b37ff03c5f1b9397950c337e899623d7fa7c0dfc SHA512 07710c258c2b665c1a6c8d6cbd4bca1f0c9976f1065d55ba7e31be4c2dd961d88c8d12e0fb4a80d4cd2db8d7d6f98b16977b27e4657b49041df9141de15d9031 WHIRLPOOL 12b7f1ac5afe7b4aee1951627bbeb3bba76fe01bd8dca336736ba0ddf4fb5835b26fd056d8741761c4279fd37d6e171376843acb99d511ac56ec27b769069116
 DIST libdrm-2.4.65.tar.bz2 645877 SHA256 71960ac8bde7d710992b1bc8879935e8300a870c36bd06f22412d0447e3d96c4 SHA512 fabbb3ba163aa1307288472c11c6ce8f1e412cbd67ba3135a614f0e05bf4f881bf6ccc581e9cf05a7e2e965817bb71c0b5335263b5c0b0cb85829a0f29a6029d WHIRLPOOL b00d7aed0437ee0f64f60ed59becf41d165c101725cab700345203b2108a2adc9ed95d17acc0dff5706df86c87c13d058991417f42db40dfc523279cc5eb8547
 EBUILD libdrm-2.4.65-r99.ebuild 1860 SHA256 fafdb6f95fa8dbd183acf65db3152b635484b1a667d4cb3713ed424a26dc0f67 SHA512 5dc3856d63d7705e63d3a7377de4ed425cba8c9a96a397c9940a196580a80edad4a05cacd47e50bd2640004b8c8482343a9c0aca821f3028b97fd6913318889b WHIRLPOOL 43b98db86977ad8e79f6667cc91af59f3b057c3c5975cc05b7892fd346c98f72b13758066109002472755669c31c681ddd33411333c7d368bf3cb1796c60cad0
-MISC metadata.xml 334 SHA256 9d19c1397f594181749abef539a5ddd1d39fd5b9565a95de5788bc85231b68b2 SHA512 051cb32876b20b1c6d4dbe62dc3b1dabd268a6a26abb1e7b1d72d6fc7e2cb6c25751b1f56833d1c4f0773a563ce59a2cfb32bdfba6aaf75a019ad08a5c041601 WHIRLPOOL 7d9d0977b53fd1c058e9a2ebbed487528c40489b86eab6917ae06cd0c4ed64d14d9964d1ad93d73911e58b31c8a149a2c1c984b1b31012762de9319b6e793c46
+MISC metadata.xml 406 SHA256 4c8d75a84f37733d8e746655b9b809083158de1db8129c2b8e0d2dc4500dbf4c SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da WHIRLPOOL 6d09e0a07a60f4a47a7d4ad57c21298f4160baf57576e9eb58ad55e039843ef32fa1ac86ac99c450529bc81339ff369357b25c93e0c4a453d765584339fe62a9

diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 92b2156..25fe9f8 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+<email>x11@g.o</email>
+<name>X11</name>
+</maintainer>
 <use>
-<flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
-<flag name='valgrind'>Compile in valgrind memory hints</flag>
+<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name="valgrind">Compile in valgrind memory hints</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
index ebf0c3d..1f8d2c2 100644
--- a/x11-libs/libpciaccess/Manifest
+++ b/x11-libs/libpciaccess/Manifest
@@ -2,4 +2,4 @@ AUX libpciaccess-0.13.2-arm.patch 308 SHA256 177fa4db376ce1f1ef405bd26efc10014ab
 AUX libpciaccess-0.13.2-limits.patch 280 SHA256 b2cc4d3f0671e2bfb069c0195f286b134289c8ac74ca3b102ac4ce916c5dca16 SHA512 90fb7f4ae553e528f14764c7eaa3abf9d71330d7cab25d7fb5304ed13e967adf319cbd836a460b43d5a3828b10405c06d3140028e7cf05fe151e0275558db5ab WHIRLPOOL 36674f63b4de4e99acff7002c53c919acd995b8b170ae9e697f216d639770d55cf5392c2820a3ddc3a4600d85e9ed8828816f8add182b572bfc638fd4de02baa
 DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92 WHIRLPOOL d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
 EBUILD libpciaccess-0.13.4-r99.ebuild 825 SHA256 6418963310211694468d07fbfdcb0b5f168c97aba86201e2be153fa7c45920ca SHA512 3c8a41c41dc5d602245b86c98a1f368ebf389e43b0238a8e9cb86e3ca6a0361060a553c421b8a71457a365ce6a2fad08ab3531ac49ce7eec43153554f7d6dce7 WHIRLPOOL 42ecd8036e5044fce18e38bec87067585650a1a21bfbcd4f3e0168fdf4c933cd94b364d5a076a5c477ddd32d2b177843d6450044b350d9d316fe0717519cc834
-MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306

diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
index 01c4c00..e943b72 100644
--- a/x11-libs/libpciaccess/metadata.xml
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>x11</herd>
+<maintainer type="project">
+	<email>x11@g.o</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index 084ae9e..2521b11 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -8,4 +8,4 @@ DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d733
 DIST vte-0.42.4.tar.xz 928048 SHA256 08c88bf5c0aa1dfa3711e2e83b784fb5ea82025661f30b54e93eebd5f4bce113 SHA512 871b47d976ae8faafabd2b9dd092b40b2b452fcfd7f60182db7c12ade0c265a1810e811a9a54b6a2c2061ff05f06743b90057babf300b98f391481bb02265fb5 WHIRLPOOL e3e9fbf5303770244b10259f1a07e41a7c0168debda2e81673f8fa1e19f591a4d2c643f614636e691ecaf22fc00eb8fce79d9d4a8d20c899f5a7e4ac187259db
 EBUILD vte-0.28.2-r207.ebuild 3022 SHA256 bfe8faf003e9f10f9a70b27a15e822265bf44fc375b060f7c3735a5c74fcf5a5 SHA512 0546a2af39f62a676328de3942dbc4182d406407ab34b72eeeafd29aa90c4f365e3bc5908dac9ba078d5bb8cecda5f8fbb995dceb455fb24c2d5d53b7de9e4d0 WHIRLPOOL 3905df734234be357499767eedc473e3028d5671eff9d4c62bb7200d2da28e661729e5d2e9f24a19c2313998e7d03a3d703e4d3b6d1cb4b9abd697c7d12ff5a4
 EBUILD vte-0.42.4-r99.ebuild 1820 SHA256 20e23be71bbe97a96ed5698f1f1911ac780969483470f625aa5467dc94dcdc3e SHA512 0ff4e4fdb13ec876ecf727dc23461d977ccb190633b4e28219f2fa67f14bb6fd8b9ad4e0676c3cf6ef06c58240a618d6c5afd2e8b8850037169deb0627fda3e8 WHIRLPOOL 49150d3e74a027e00346df886717cec86b319d977d2e0aee69f1e188a8288c838913bff43a033493a52c63b5c282798d0dbe953745d3d5ef1a6b46030feadd0f
-MISC metadata.xml 250 SHA256 86cd2180b3599ddb2bef78131a9c86a37fa1ee7247aa3245e11e7ff6a239e2e0 SHA512 78b3c7ca8d3e9b51aa7901579627ec33ab3754a16b1e86b108d35b6feca57d5565dcba04e5948d52284c212f5a2f6134bbe0912a2a121822ed07d004c7cdd209 WHIRLPOOL c7ad250c312d9537b3b810984fcebab430a9bb9a87c5639ede513b1523e447a98ce2509e208217afbdc3c3cdaf1a9f0a491ea27e2c09efae77cf933e26bde022
+MISC metadata.xml 348 SHA256 e70b7fc4a21f1a7caba00ef2dcc656a7e79e15e0459519e260a27136fb6f0d88 SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4 WHIRLPOOL 15b683c11d7ab6a5648686b2b6a66dd1cf6034a612504a83f96b81253e3089a278bb7c70681ebe543e6904aab9e9f3d3579505cec4caf3df5ed44b34391a4138

diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index 84c40c2..e72feac 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-	<flag name='glade'>Provide integration with <pkg>dev-util/glade</pkg>.</flag>
-</use>
+	<maintainer type="project">
+		<email>gnome@g.o</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
+	</use>
 </pkgmetadata>

diff --git a/x11-misc/slim/Manifest b/x11-misc/slim/Manifest
index 4b9778c..25871df 100644
--- a/x11-misc/slim/Manifest
+++ b/x11-misc/slim/Manifest
@@ -13,4 +13,4 @@ AUX slim-1.3.6-systemd-session.patch 820 SHA256 1cb2b5f322ae975cd5a5a9ccca45854c
 AUX slim.logrotate 102 SHA256 d0559cf7764147f601f2bab8077fd956b1171adad4872c0d324279f6a978264a SHA512 b49ce2dc1a1943c5f8eea8e6394cc27b014832e2d9908220f32ffd21fbe69442ec45b18f6e435430c6cbed074e5983e2136ebade10218bb073bb13106716f5b2 WHIRLPOOL 9e940bd1d88613e46ac4a333afa0f02cd16c583a1b34f509c4409321f7d5c5e14ec86e38e9743a6176187a72e403683127fbaf293abbef678e23873c428613c1
 DIST slim-1.3.6.tar.gz 232547 SHA256 21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df SHA512 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c WHIRLPOOL 473fa2f3752ec0c1bd2410ff3110649ce792c2e904928694b5fb8a43de619945276282e4a9de86198b9f38cdd74d1f9dc9cbcc754cc97989002b368ef26a8429
 EBUILD slim-1.3.6-r99.ebuild 3796 SHA256 44b41b2863e2857385e528271e98c1cb3abdb2c8181c09b84b9d6dc54d35853c SHA512 10ec7ebe13fccf4c8d85212621405a130c906d8fe07be7d5ec2542403e306f7f956230dbcca32013f16b40ec1e16c3385765c1558f6e1e15905097dc5dd8a896 WHIRLPOOL 0e7918cf37a38330f8e22e1e10e7011cd7bebe83100969b60f4bef06bb55ef4d373c4e52925c9692bf75eb3595da61e28f2e2b41ef98efda76b8621ff8a3f791
-MISC metadata.xml 317 SHA256 5b7154fd1fce1e40461b40b06533854dc7605d8b5eb19f68eeb9d84527c579c4 SHA512 6b5a9244c1b0fc0abec27900a10673fc431a0559d8cddd917d4117965e4ae569c153bc47ba3342ca4d8b114b949bcf10205a3d07645eb2a2834f300152028687 WHIRLPOOL 886788720a8dd6ca0fefa991e6e5f1640fa5913594be0acb6abcf92bb8e2d684a793721bdbb60a243f39cee097704b00620ae77c75a1f7d55672e875a34dedfc
+MISC metadata.xml 514 SHA256 8096ec96a71df42b3dad271816d305140ad3dc67321778a300a8d3876a4fcb0e SHA512 28f99f92bda5c50f97a164aa53915ecc458dfd84e6c3dbfb9dbfd6e64d0a98b7de9bfc202949506b2af91cb716a8b681f1db07b974d3d3776f15e2cdf5129950 WHIRLPOOL 695802103c841ee6ae60fe8225e6eefbbeae6ed65d7dcf51b249a77c3ef1339e485f29c60ddd4f392aa9e524fe97e5e9a7ed519c262b62fd67b52d0836265e60

diff --git a/x11-misc/slim/metadata.xml b/x11-misc/slim/metadata.xml
index f6d2292..8f38f15 100644
--- a/x11-misc/slim/metadata.xml
+++ b/x11-misc/slim/metadata.xml
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-misc</herd>
-	<maintainer>
+	<maintainer type="person">
 		<email>axs@g.o</email>
 	</maintainer>
-	<use> 
-        	<flag name='consolekit'>Enable native consolekit support</flag>
+	<maintainer type="project">
+		<email>desktop-misc@g.o</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<use>
+		<flag name="consolekit">Enable native consolekit support</flag>
 	</use>
+	<upstream>
+		<remote-id type="sourceforge">slim.berlios</remote-id>
+	</upstream>
 </pkgmetadata>
-

diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest
index ef9de5c..358ea32 100644
--- a/x11-terms/rxvt-unicode/Manifest
+++ b/x11-terms/rxvt-unicode/Manifest
@@ -7,4 +7,5 @@ AUX rxvt-unicode-9.14-clear.patch 937 SHA256 c1010b15d74f56671351e8314264d76f638
 AUX rxvt-unicode-9.19-secondary-wheel.patch 5009 SHA256 1fcc9ecb433fe4ab7568d2ac66199ad112b2f5d685489b7f5fd8b4a9dbf3827a SHA512 adf2b3e48041fddec1ebd617e5d15226d40bfa55e9fb57af3d70084ef44d1110641f393921932c0613a03fe9cba34cf78f0e022b56c522610fc5cd8e24ec0db9 WHIRLPOOL 3a7d0231f843b3949cbfe274c4d95bc8d0041e9258b2cad04a9ec39155d5ed6ed3957453c1a6980e47d133a94cc2fc504e4bddfdb74e0b9345b9d34390a8c07a
 AUX rxvt-unicode-9.21-xsubpp.patch 640 SHA256 845d753be1c61a881344700f4b5b2e4e21f2d49f04f5c80350d4c8d7f2834992 SHA512 70f4c5cb7b6a440f009f693c4dc2f8595051e198250d375cd18704c35059596d77938a3d062740bd26f947bfebdb67ea7d46f59f8cbf08fc73193a62267723ec WHIRLPOOL af26cf6e4da79ee73f4d346bb410a863d075223e4ab410532ac41c3de5ea6188ba6a3fb06183065c429d2335caae932a5e46f0071a55e2ba920dcf13260e67b0
 DIST rxvt-unicode-9.21.tar.bz2 925293 SHA256 75270ed72bc5895a64a1d7392bf45a622204192371c3965bd3dd978dc088956b SHA512 d50adf6b1e6ae3b13492b4f40455d3a56bb174a7c6db4d4525a1277736994adfb74a2cd1e7d3e8a8cfdc4509a9ae32c05a627829e295dc1bd4a5ba7cc2f80776 WHIRLPOOL 92499cfa0ca154d3cbe1d7b6525e01de6a5d14677a28c605a6b676c88f1d9bc0f6cd663a1f1d8b003ac7cc46a9c6fbe49ff9adc7b3dd63eb345c80de9038a6ad
-EBUILD rxvt-unicode-9.21.ebuild 3912 SHA256 89df90c3666f917fc1ced63cfdc03159ad23af60e30c114c97edc765974d165d SHA512 0fa774447e34a0c8643349224a7b5ad6695e006b95a8063b616aa912eda28486f9c4c2586e58889f139d4cd9fddd2eac0cdd5ebc61d84d661868cf2f76180ae8 WHIRLPOOL 3b21a32005d3a20eb938dafb33997851cf11f6e12d99bebe729e8d23311fc5e6e9f3b70f5a3a6b2eddd7d4dbc9beb5890943d26e284ba6e681498b15dd839c1b
+EBUILD rxvt-unicode-9.21-r99.ebuild 3770 SHA256 1a34e86b9e7696b9d9677689294fe2f28e09445cc353d6ca08d883dc2fb9195a SHA512 83ae6aaaa787993ec342f34597722e264ede692b2817a502dd7fb2ef94bbb30ac38d5fcfe6e99fed884cf66884f280b89063aeea74f832a94eb3c7d8a92f7f39 WHIRLPOOL 32e1379fa3c987f1ab0a12340309e3643f4c19687d6ce3d4ae3dc6da9db050e17eb562be93d40cb8b4546a81629eb46f23f4849cafcddf8be06473cd8215cf95
+MISC metadata.xml 1710 SHA256 98b104faa689abc63cef831edcd3e501fe771b807e892edada29826b3bdf30a4 SHA512 be0cbbc7df76c63e195340f7229db832d0adf337366a021496b2db02ed764ce19823245e5d0ca3ef29952170f8ae2ab2735738496f422433e9a6b017d8f1a3d0 WHIRLPOOL 67671ae8f5b9a66e033224f8c69cc51b78f65613b9b4b392e8cb85822458362c5771a29b7a8b99f4c6d7278294210d29aa23af737cc6ff947a12fa994b799d1b

diff --git a/x11-terms/rxvt-unicode/metadata.xml b/x11-terms/rxvt-unicode/metadata.xml
new file mode 100644
index 0000000..764722e
--- /dev/null
+++ b/x11-terms/rxvt-unicode/metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@g.o</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>wired@g.o</email>
+		<name>Alex Alexander</name>
+	</maintainer>
+	<use>
+		<flag name="256-color">Enable 256 color support</flag>
+		<flag name="alt-font-width">Calculate the font width using a different method</flag>
+		<flag name="blink">Enable blinking text</flag>
+		<flag name="buffer-on-clear">Store visible output to history buffer when clearing the screen with ctrl-l.
+	Read https://bbs.archlinux.org/viewtopic.php?id=129302</flag>
+		<flag name="fading-colors">Enable colors fading when off focus</flag>
+		<flag name="focused-urgency">Enable the urgent flag when a terminal window is focused</flag>
+		<flag name="font-styles">Enable support for bold and italic fonts</flag>
+		<flag name="iso14755">Enable ISO-14755 support</flag>
+		<flag name="mousewheel">Enable scrolling via mouse wheel or buttons 4 and 5</flag>
+		<flag name="perl">Enable perl script support. You can still disable this at runtime with -pe ""</flag>
+		<flag name="pixbuf">Enable transparency support using gtk's pixbuf</flag>
+		<flag name="secondary-wheel">Support for wheel scrolling on secondary screens (like mutt).
+	Read http://lists.schmorp.de/pipermail/rxvt-unicode/2011q4/001491.html</flag>
+		<flag name="unicode3">Use 21 instead of 16 bits to represent unicode characters</flag>
+		<flag name="wcwidth">Enable wide char width support</flag>
+	</use>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:rxvt-unicode:rxvt-unicode</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.21-r99.ebuild
similarity index 93%
rename from x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
rename to x11-terms/rxvt-unicode/rxvt-unicode-9.21-r99.ebuild
index 4029acd..ae1492a 100644
--- a/x11-terms/rxvt-unicode/rxvt-unicode-9.21.ebuild
+++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.21-r99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
 IUSE="
 	256-color alt-font-width blink buffer-on-clear +focused-urgency
 	fading-colors +font-styles iso14755 +mousewheel +perl pixbuf secondary-wheel
@@ -19,7 +19,7 @@ IUSE="
 "
 
 RDEPEND="
-	>=sys-libs/ncurses-5.7-r6
+	>=sys-libs/ncurses-5.7-r6:=
 	kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 	media-libs/fontconfig
 	perl? ( dev-lang/perl:= )
@@ -93,8 +93,6 @@ src_configure() {
 		$(use_enable startup-notification) \
 		$(use_enable xft) \
 		$(use_enable unicode3) \
-		--disable-utmp \
-		--disable-wtmp \
 		${myconf}
 }